Merge master into staging-next

maintainers/maintainer-list.nix

@@ -1789,6 +1789,12 @@
     githubId = 19378309;
     name = "Simon Struck";
   };
+  aoli-al = {
+    email = "aoli.al@hotmail.com";
+    github = "aoli-al";
+    githubId = 5557706;
+    name = "Ao Li";
+  };
   aorith = {
     email = "aomanu+nixpkgs@gmail.com";
     github = "aorith";
@@ -16756,6 +16762,13 @@
     githubId = 6295090;
     name = "Mats";
   };
+  mymindstorm = {
+    name = "Brendan Early";
+    email = "mymindstorm@evermiss.net";
+    github = "mymindstorm";
+    githubId = 27789806;
+    keys = [ { fingerprint = "52B9 A09F 788F 4D1F 0C94  9EBE EE39 A9F3 0C9D 72B5"; } ];
+  };
   mynacol = {
     github = "Mynacol";
     githubId = 26695166;

nixos/tests/installer.nix

@@ -638,7 +638,7 @@ let
       clevisTest ? false,
       clevisFallbackTest ? false,
       disableFileSystems ? false,
-      selectNixPackage ? pkgs: pkgs.nixStable,
+      selectNixPackage ? pkgs: pkgs.nixVersions.stable,
     }:
     let
       isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);

pkgs/applications/editors/vim/plugins/generated.nix

@@ -1609,6 +1609,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  bloat-nvim = buildVimPlugin {
+    pname = "bloat.nvim";
+    version = "2025-04-30";
+    src = fetchFromGitHub {
+      owner = "dundalek";
+      repo = "bloat.nvim";
+      rev = "f90bef655ac40fecbaae53e10db1cf7894d090b1";
+      sha256 = "0ah5c84172wkc75zx5ll2dp9y3r867lik29aw5mm7i3lj530p0ri";
+    };
+    meta.homepage = "https://github.com/dundalek/bloat.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   block-nvim = buildVimPlugin {
     pname = "block.nvim";
     version = "2023-10-10";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -122,6 +122,7 @@ https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
 https://github.com/Saghen/blink.compat/,HEAD,
+https://github.com/dundalek/bloat.nvim/,HEAD,
 https://github.com/HampusHauffman/block.nvim/,HEAD,
 https://github.com/blueballs-theme/blueballs-neovim/,,
 https://github.com/uloco/bluloco.nvim/,,

pkgs/applications/misc/opencpn/default.nix

@@ -35,8 +35,6 @@
   lz4,
   libmpg123,
   makeWrapper,
-  pcre,
-  pcre2,
   pkg-config,
   portaudio,
   rapidjson,
@@ -103,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
       libxkbcommon
       lz4
       libmpg123
-      pcre
-      pcre2
       portaudio
       rapidjson
       sqlite

pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix

@@ -4,6 +4,7 @@
   cmake,
   libbfd,
   SDL2,
+  libGL,
   obs-studio,
   looking-glass-client,
 }:
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
     obs-studio
     libbfd
     SDL2
+    libGL
   ];
 
   env.NIX_CFLAGS_COMPILE = "-mavx";

pkgs/by-name/ad/adcli/package.nix

@@ -14,7 +14,7 @@
   xmlto,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "adcli";
   version = "0.9.2";
 
@@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
     domain = "gitlab.freedesktop.org";
     owner = "realmd";
     repo = "adcli";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     docbook_xsl
+    libxslt # xsltproc
     pkg-config
     util-linux
     xmlto
@@ -37,11 +38,15 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cyrus_sasl
     libkrb5
-    libxslt
     openldap
   ];
 
-  configureFlags = [ "--disable-debug" ];
+  strictDeps = true;
+
+  configureFlags = [
+    "--disable-debug"
+    "ac_cv_path_KRB5_CONFIG=${lib.getExe' (lib.getDev libkrb5) "krb5-config"}"
+  ];
 
   postPatch = ''
     substituteInPlace tools/Makefile.am \
@@ -61,15 +66,15 @@ stdenv.mkDerivation rec {
     patch_docbook doc/adcli-docs.xml
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html";
     description = "Helper library and tools for Active Directory client operations";
     mainProgram = "adcli";
-    license = licenses.lgpl21Only;
+    license = lib.licenses.lgpl21Only;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       SohamG
       anthonyroussel
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})

pkgs/by-name/al/aligator/package.nix

@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [
       # ignore one failing test for now
-      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout")
+      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'")
     ];
 
   # Fontconfig error: Cannot load default config file: No such file: (null)

pkgs/by-name/ca/candy-icons/package.nix

@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "candy-icons";
-  version = "0-unstable-2025-04-14";
+  version = "0-unstable-2025-04-23";
 
   src = fetchFromGitHub {
     owner = "EliverLara";
     repo = "candy-icons";
-    rev = "2ba176007c40957b43d26b7a9be2c9f23a480e98";
+    rev = "1763fc1f476e6c2ba7ca8df878645815b808ebca";
-    hash = "sha256-6eWxf13ZBknN7IeLICpmDXu4GdxubkGJ9D4/ZEuOvfs=";
+    hash = "sha256-aXAtVtsJC9MdkhUJWZnOQteaR005+KnPxFrEepfomCk=";
   };
 
   nativeBuildInputs = [ gtk3 ];

pkgs/by-name/co/codec2/fix-pkg-config.patch

@@ -0,0 +1,13 @@
+diff --git a/codec2.pc.in b/codec2.pc.in
+index ecca704..94fca12 100644
+--- a/codec2.pc.in
++++ b/codec2.pc.in
+@@ -1,6 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2
++libdir=@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_INCLUDEDIR@/codec2
+ 
+ Name: codec2
+ Description: A speech codec for 2400 bit/s and below

pkgs/by-name/co/codec2/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  testers,
   stdenv,
   buildPackages,
   fetchFromGitHub,
@@ -8,17 +9,28 @@
   lpcnetfreedv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "codec2";
   version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "codec2";
-    rev = "${version}";
+    rev = finalAttrs.version;
     hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM=";
   };
 
+  patches = [
+    # Fix nix-store path dupliucations
+    ./fix-pkg-config.patch
+  ];
+
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+  ];
+
   nativeBuildInputs = [
     cmake
     buildPackages.stdenv.cc # needs to build a C program to run at build time
@@ -40,9 +52,17 @@ stdenv.mkDerivation rec {
     install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/
   '';
 
+  postFixup =
     # Swap keyword order to satisfy SWIG parser
-  postFixup = ''
+    ''
-    sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h
+      sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h
+    ''
+    +
+      # generated cmake module is not compatible with multiple outputs
+      ''
+        substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \
+          '"''${_IMPORT_PREFIX}/include/codec2' \
+          "\"$dev/include/codec2"
       '';
 
   cmakeFlags =
@@ -56,6 +76,8 @@ stdenv.mkDerivation rec {
       "-DLPCNET=ON"
     ];
 
+  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+
   meta = with lib; {
     description = "Speech codec designed for communications quality speech at low data rates";
     homepage = "https://www.rowetel.com/codec2.html";
@@ -64,5 +86,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ markuskowa ];
     # generate_codebook only built for host platform
     broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    pkgConfigModules = [ "codec2" ];
   };
-}
+})

pkgs/by-name/di/dialect/package.nix

@@ -68,10 +68,13 @@ python3.pkgs.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  postFixup = ''
+    patchShebangs --update --host $out/share/dialect/search_provider
+  '';
+
   doCheck = false;
 
-  # handle setup hooks better
+  strictDeps = true;
-  strictDeps = false;
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/ha/harper/package.nix

@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.31.0";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-+XO81A7F3QOGcDm/keqUHbURCQfzAHRiAlQmNzGo1IU=";
+    hash = "sha256-6W1NFZ5wRL3RxNYbgRH4qCSDNwOc3uQFeFujffusjGo=";
   };
 
   buildAndTestSubdir = "harper-ls";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EwWBqVTkBH4p1ljBitXtGkjUlx96Uajxc0z7DDkGawo=";
+  cargoHash = "sha256-PKqLf7UrtQp8pLIJbFgZ53iW+So6Yq7cpETARsnMFvI=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/hi/high-tide/package.nix

@@ -0,0 +1,70 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  wrapGAppsHook4,
+  meson,
+  ninja,
+  pkg-config,
+  blueprint-compiler,
+  desktop-file-utils,
+  libadwaita,
+  gst_all_1,
+  libsecret,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "high-tide";
+  version = "0-unstable-2025-05-01";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "Nokse22";
+    repo = "high-tide";
+    rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc";
+    hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ=";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    meson
+    ninja
+    pkg-config
+    blueprint-compiler
+    desktop-file-utils
+  ];
+
+  buildInputs =
+    [ libadwaita ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+      gst-plugins-bad
+      libsecret
+    ]);
+
+  dependencies = with python3Packages; [
+    pygobject3
+    tidalapi
+    requests
+    mpd2
+  ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ];
+
+  meta = {
+    description = "Libadwaita TIDAL client for Linux";
+    homepage = "https://github.com/Nokse22/high-tide";
+    license = with lib.licenses; [ gpl3Plus ];
+    mainProgram = "HighTide";
+    maintainers = with lib.maintainers; [
+      nyabinary
+      griffi-gh
+    ];
+    platforms = lib.platforms.linux;
+  };
+}

pkgs/by-name/hv/hvm/package.nix

@@ -13,6 +13,11 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4=";
   };
 
+  # Insert empty line in expected output of rust panic in a test
+  postPatch = ''
+    sed -i '6G' tests/snapshots/run__file@empty.hvm.snap
+  '';
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo=";
 

pkgs/by-name/li/libxeddsa/package.nix

@@ -0,0 +1,39 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gitUpdater,
+  cmake,
+  libsodium,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxeddsa";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Syndace";
+    repo = "libxeddsa";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kdy+S51nQstRFGw5mIW3TW+WBNynHLpmFC1t6Mc02K4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libsodium ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
+    description = "Toolkit around Curve25519 and Ed25519 key pairs";
+    homepage = "https://github.com/Syndace/libxeddsa";
+    changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/op/open-policy-agent/package.nix

@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wWxWpJSDOaZLJ7ULdAzPFJ9YNXX3FyQRod2roaLsuis=";
+    hash = "sha256-oFtF/Uze9X1aaDzQXpZwbRXi11VnTTkkosfSSIeIxcc=";
   };
 
   vendorHash = null;

pkgs/by-name/re/remind/package.nix

@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.03.05";
+  version = "05.03.06";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-dMnsMV4DRxXWgev9LCb4wwdnx7A++giCsW7c2cMde9Q=";
+    hash = "sha256-zJmDx9AJntL08uBZEquho2Iud0y7WPZDGef/pSHX2h0=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

pkgs/by-name/ru/rutabaga_gfx/package.nix

@@ -93,5 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     maintainers = with maintainers; [ qyliss ];
     platforms = platforms.darwin ++ platforms.linux;
+    # error[E0432]: unresolved import `self::consts`
+    badPlatforms = [ "loongarch64-linux" ];
   };
 })

pkgs/by-name/su/surreal-engine/package.nix

@@ -9,6 +9,7 @@
   openal,
   pkg-config,
   SDL2,
+  libX11,
   stdenv,
   vulkan-loader,
   wayland,
@@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     libffi
     openal
     SDL2
+    libX11
     vulkan-loader
     wayland
     waylandpp

pkgs/by-name/ta/tangerine/package.nix

@@ -6,6 +6,7 @@
   cmake,
   ncurses,
   SDL2,
+  libGL,
   libX11,
 }:
 
@@ -32,6 +33,7 @@ stdenv.mkDerivation {
   buildInputs = [
     ncurses
     SDL2
+    libGL
     libX11
   ];
 

pkgs/by-name/tm/tm/missing-string-header.patch

@@ -0,0 +1,24 @@
+diff --git a/unix_client.c b/unix_client.c
+index 920910a..6d608fd 100644
+--- a/unix_client.c
++++ b/unix_client.c
+@@ -8,6 +8,7 @@
+ #include <sys/socket.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ #include "main.h"
+ #include "handlers.h"
+diff --git a/unix_server.c b/unix_server.c
+index 5cf93ed..d3c51c9 100644
+--- a/unix_server.c
++++ b/unix_server.c
+@@ -8,6 +8,7 @@
+ #include <assert.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/un.h>
+ #include <sys/socket.h>
+ #include <sys/select.h>

pkgs/by-name/tm/tm/package.nix

@@ -4,27 +4,32 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAtts: {
   pname = "tm";
   version = "0.4.1";
 
   src = fetchurl {
-    url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${version}.tar.gz";
+    url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAtts.version}.tar.gz";
-    sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0";
+    hash = "sha256-OzibwDtpZK1f+lejRLiR/bz3ybJgSt2nI6hj+DZXxKA=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  patches = [
+    # fix using strncpy and strlen without including string.h
+    ./missing-string-header.patch
+  ];
+
   postPatch = ''
     sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Terminal mixer - multiplexer for the i/o of terminal applications";
     homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "tm";
   };
-}
+})

pkgs/by-name/tz/tzf-rs/package.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tzf-rs";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ringsaturn";
+    repo = "tzf-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cYi8FsB1aR0h1HxqkdFlLwCLzRwVM9Ak1LtjHezCSe0=";
+  };
+
+  cargoHash = "sha256-9bUQpEP+vc3xwWCicHpl+56OYz3huirSOA4yw1iaxaY=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A fast timezone finder for Rust";
+    homepage = "https://github.com/ringsaturn/tzf-rs";
+    changelog = "https://github.com/ringsaturn/tzf-rs/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pcboy ];
+    mainProgram = "tzf";
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/un/unvanquished/package.nix

@@ -20,6 +20,7 @@
   libpng,
   libvorbis,
   libwebp,
+  libX11,
   lua5,
   makeDesktopItem,
   ncurses,
@@ -171,6 +172,7 @@ stdenv.mkDerivation rec {
     libvorbis
     libjpeg
     libwebp
+    libX11
     libpng
   ];
 

pkgs/by-name/wa/wapiti/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   python3Packages,
   fetchpatch,
@@ -148,9 +149,14 @@ python3Packages.buildPythonApplication rec {
     "test_attack_unifi"
   ];
 
-  disabledTestPaths = [
+  disabledTestPaths =
+    [
       # Requires sslyze which is obsolete and was removed
       "tests/attack/test_mod_ssl.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # PermissionError: [Errno 13] Permission denied: '/tmp/crawl.db'
+      "tests/web/test_persister.py"
     ];
 
   pythonImportsCheck = [ "wapitiCore" ];

pkgs/by-name/ze/zenmap/package.nix

@@ -0,0 +1,81 @@
+{
+  gobject-introspection,
+  gtk3,
+  lib,
+  nmap,
+  python3Packages,
+  wrapGAppsHook3,
+  xterm,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "zenmap";
+  version = nmap.version;
+  pyproject = true;
+
+  src = nmap.src;
+
+  prePatch = ''
+    cd zenmap
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  buildInputs = [
+    nmap
+    gtk3
+    xterm
+  ];
+
+  nativeBuildInputs = [
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+
+  nativeCheckInputs = [
+    nmap
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+  ];
+
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ nmap ]})
+  '';
+  postInstall = ''
+    # Icons
+    install -Dm 644 "zenmapCore/data/pixmaps/zenmap.png" -t "$out/share/pixmaps/"
+    # Desktop-files for application
+    install -Dm 644 "install_scripts/unix/zenmap.desktop" -t "$out/share/applications/"
+    install -Dm 644 "install_scripts/unix/zenmap-root.desktop" -t "$out/share/applications/"
+    install -Dm 755 "install_scripts/unix/su-to-zenmap.sh" -t "$out/bin/"
+    substituteInPlace "$out/bin/su-to-zenmap.sh" \
+        --replace-fail 'COMMAND="zenmap"' \
+                      'COMMAND="'"$out/bin/zenmap"'"' \
+        --replace-fail 'xterm' \
+                      '"${xterm}/bin/xterm"'
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    cd test
+    ${python3Packages.python.interpreter} run_tests.py 2>&1 | tee /dev/stderr | tail -n1 | grep '^OK$'
+
+    runHook postCheck
+  '';
+
+  meta = nmap.meta // {
+    description = "Offical nmap Security Scanner GUI";
+    homepage = "https://nmap.org/zenmap/";
+    maintainers = with lib.maintainers; [
+      dvaerum
+      mymindstorm
+    ];
+  };
+}

pkgs/development/compilers/jetbrains-jdk/default.nix

@@ -172,7 +172,10 @@ jdk.overrideAttrs (oldAttrs: rec {
     '';
     homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
     inherit (jdk.meta) license platforms mainProgram;
-    maintainers = with maintainers; [ edwtjo ];
+    maintainers = with maintainers; [
+      edwtjo
+      aoli-al
+    ];
 
     broken = stdenv.hostPlatform.isDarwin;
   };

pkgs/development/compilers/ocaml/generic.nix

@@ -49,7 +49,7 @@ let
 in
 
 let
-  useNativeCompilers = !stdenv.hostPlatform.isMips;
+  useNativeCompilers = !stdenv.hostPlatform.isMips && !stdenv.hostPlatform.isLoongArch64;
   inherit (lib)
     optional
     optionals

pkgs/development/haskell-modules/hoogle-local-wrapper.sh

@@ -2,4 +2,4 @@
 
 COMMAND=$1
 shift
-exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@"
+exec @hoogle@/bin/hoogle "$COMMAND" --database @database@ "$@"

pkgs/development/haskell-modules/hoogle.nix

@@ -8,6 +8,7 @@
   buildPackages,
   haskellPackages,
   writeText,
+  runCommand,
 }:
 
 # This argument is a function which selects a list of Haskell packages from any
@@ -40,8 +41,11 @@ let
       # we grab the doc outputs
       (map (lib.getOutput "doc") packages);
 
+  # Hoogle database path, relative to `$out`.
+  databasePath = "share/doc/hoogle/default.hoo";
+
 in
-buildPackages.stdenv.mkDerivation {
+buildPackages.stdenv.mkDerivation (finalAttrs: {
   name = "hoogle-with-packages";
   buildInputs = [
     ghc
@@ -101,8 +105,10 @@ buildPackages.stdenv.mkDerivation {
       )
     }
 
+    databasePath="$out/"${lib.escapeShellArg databasePath}
+
     echo building hoogle database
-    hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle
+    hoogle generate --database "$databasePath" --local=$out/share/doc/hoogle
 
     echo building haddock index
     # adapted from GHC's gen_contents_index
@@ -122,13 +128,23 @@ buildPackages.stdenv.mkDerivation {
     echo finishing up
     mkdir -p $out/bin
     substitute ${wrapper} $out/bin/hoogle \
-        --subst-var out --subst-var-by shell ${stdenv.shell} \
+        --subst-var-by shell ${stdenv.shell} \
+        --subst-var-by database "$databasePath" \
         --subst-var-by hoogle ${hoogle}
     chmod +x $out/bin/hoogle
   '';
 
   passthru = {
     isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix
+
+    # The path to the Hoogle database.
+    database = "${finalAttrs.finalPackage}/${databasePath}";
+
+    tests.can-search-database = runCommand "can-search-database" { } ''
+      # This succeeds even if no results are found, but `Prelude.map` should
+      # always be available.
+      ${finalAttrs.finalPackage}/bin/hoogle search Prelude.map > $out
+    '';
   };
 
   meta = {
@@ -137,4 +153,4 @@ buildPackages.stdenv.mkDerivation {
     hydraPlatforms = with lib.platforms; none;
     maintainers = with lib.maintainers; [ ttuegel ];
   };
-}
+})

pkgs/development/haskell-modules/with-packages-wrapper.nix

@@ -47,9 +47,9 @@ selectPackages:
 let
   inherit (haskellPackages) llvmPackages ghc;
 
-  packages =
+  hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null;
-    selectPackages haskellPackages
+
-    ++ lib.optional withHoogle (hoogleWithPackages selectPackages);
+  packages = selectPackages haskellPackages ++ [ hoogleWithPackages' ];
 
   isGhcjs = ghc.isGhcjs or false;
   isHaLVM = ghc.isHaLVM or false;
@@ -202,6 +202,8 @@ else
     passthru = {
       inherit (ghc) version meta;
 
+      hoogle = hoogleWithPackages';
+
       # Inform users about backwards incompatibilities with <= 21.05
       override =
         _:

pkgs/development/ocaml-modules/raylib/default.nix

@@ -1,35 +1,43 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchurl,
   buildDunePackage,
   dune-configurator,
   ctypes,
   integers,
   patch,
-  gitUpdater,
+  libGL,
+  libX11,
+  libXcursor,
+  libXi,
+  libXinerama,
+  libXrandr,
 }:
 
 buildDunePackage rec {
   pname = "raylib";
   version = "1.4.0";
 
-  src = fetchFromGitHub {
+  src = fetchurl {
-    owner = "tjammer";
+    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raylib-${version}.tbz";
-    repo = "raylib-ocaml";
+    hash = "sha256-/SeKgQOrhsAgMNk6ODAZlopL0mL0lVfCTx1ugmV1P/s=";
-    tag = version;
-    hash = "sha256-Fh79YnmboQF5Kn3VF//JKLaIFKl8QJWVOqRexTzxF0U=";
-    # enable submodules for vendored raylib sources
-    fetchSubmodules = true;
   };
 
-  propagatedBuildInputs = [
+  buildInputs = [
     dune-configurator
-    ctypes
-    integers
     patch
   ];
 
-  passthru.updateScript = gitUpdater { };
+  propagatedBuildInputs = [
+    ctypes
+    integers
+    libGL
+    libX11
+    libXcursor
+    libXi
+    libXinerama
+    libXrandr
+  ];
 
   meta = {
     description = "OCaml bindings for Raylib (5.0.0)";

pkgs/development/ocaml-modules/raylib/raygui.nix

@@ -1,12 +1,17 @@
 {
   buildDunePackage,
+  fetchurl,
   raylib,
 }:
 
-buildDunePackage {
+buildDunePackage rec {
   pname = "raygui";
+  version = "1.4.0";
 
-  inherit (raylib) src version;
+  src = fetchurl {
+    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raygui-${version}.tbz";
+    hash = "sha256-PQcVTAQKeTPkOOHk5w3O3Tz0n7jLvkIo3Urvrk66eMs=";
+  };
 
   propagatedBuildInputs = [
     raylib

pkgs/development/python-modules/greatfet/default.nix

@@ -39,6 +39,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [ "ipython" ];
+
   dependencies = [
     cmsis-svd
     future

pkgs/development/python-modules/sbom2dot/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "sbom2dot";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "sbom2dot";
     tag = "v${version}";
-    hash = "sha256-xrphhTbIyqe0CqQOpJSyzTWbGYFFOKdyWJTTAlURkoo=";
+    hash = "sha256-g6IAGZCLRVxF0f6JEcxNaAKWYlTDt0zYSchsz6hDgdg=";
   };
 
   build-system = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/v${version}";
+    changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/${src.tag}";
     description = "Create a dependency graph of the components within a SBOM";
     homepage = "https://github.com/anthonyharrison/sbom2dot";
     license = lib.licenses.asl20;

pkgs/development/python-modules/xeddsa/default.nix

@@ -0,0 +1,55 @@
+{
+  buildPythonPackage,
+  lib,
+  fetchFromGitHub,
+  setuptools,
+  cffi,
+  libsodium,
+  libxeddsa,
+  pytestCheckHook,
+  nix-update-script,
+}:
+
+buildPythonPackage rec {
+  pname = "xeddsa";
+  version = "1.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Syndace";
+    repo = "python-xeddsa";
+    tag = "v${version}";
+    hash = "sha256-636zsJXD8EtLDXMIkJTON0g3sg0EPrMzcfR7SUrURac=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools<74" "setuptools"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  build-system = [ setuptools ];
+
+  buildInputs = [
+    libsodium
+    libxeddsa
+  ];
+
+  dependencies = [ cffi ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "xeddsa" ];
+
+  meta = {
+    description = "Python bindings to libxeddsa";
+    homepage = "https://github.com/Syndace/python-xeddsa";
+    changelog = "https://github.com/Syndace/python-xeddsa/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ ngi ];
+    maintainers = with lib.maintainers; [ ];
+  };
+}

pkgs/development/tools/ocaml/findlib/default.nix

@@ -39,8 +39,11 @@ stdenv.mkDerivation rec {
     "${placeholder "out"}/etc/findlib.conf"
   ];
 
-  buildFlags = [
+  buildFlags =
+    [
       "all"
+    ]
+    ++ lib.optionals ocaml.nativeCompilers [
       "opt"
     ];
 

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -4,35 +4,35 @@
         "hash": "sha256:0zg817b9bbpl80cjmxgmxivi6xr80hng704mdl6m5knrl0v4ay5j"
     },
     "6.1": {
-        "version": "6.1.135",
+        "version": "6.1.136",
-        "hash": "sha256:1fbyjprj65b1blb033lcy9y4bkh9jb7m06h6qph739wnzzhpmlg9"
+        "hash": "sha256:0wdhgaa578x7jhhq2p2g272gyb12818ifan4c5zan6npp6dhf756"
     },
     "5.15": {
-        "version": "5.15.180",
+        "version": "5.15.181",
-        "hash": "sha256:0ffdy7zhp25z75n49j4rs8fs79icbmz1yy7k3xgcl2p6pfw6h7zm"
+        "hash": "sha256:0f6sc0wyd1gdx2kvbvp5sx6il780fdmjr4j0bcci1s7skrnl6iik"
     },
     "5.10": {
-        "version": "5.10.236",
+        "version": "5.10.237",
-        "hash": "sha256:12gv03hbddwm4nl8xxdvdr983nbh2lzrl4jr9p5kmv9rgn7wr9bd"
+        "hash": "sha256:098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z"
     },
     "5.4": {
-        "version": "5.4.292",
+        "version": "5.4.293",
-        "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb"
+        "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
     },
     "6.6": {
-        "version": "6.6.88",
+        "version": "6.6.89",
-        "hash": "sha256:0l0697dcfdjkl80c7x1nfvw3n6390nnbznlpfbg51sgp7sv8kpqr"
+        "hash": "sha256:005s3vf1fkcv3fady2ax9azyc4lj8p4flhn20h3srr38c39zf6n2"
     },
     "6.12": {
-        "version": "6.12.25",
+        "version": "6.12.26",
-        "hash": "sha256:141visdf85iw011ncp77csmkahvn598lqvhi493a4g31dw7piby8"
+        "hash": "sha256:1jivbv08j43rn0dn7xmwxb178b305cyxbp82h71r6n22qwif4ba0"
     },
     "6.13": {
         "version": "6.13.12",
         "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
     },
     "6.14": {
-        "version": "6.14.4",
+        "version": "6.14.5",
-        "hash": "sha256:0fak7y9dr5rxzmi4m545kz7pyk2c91dkj4k7i2jgnl80ga6z4lll"
+        "hash": "sha256:02gl4hdxzijyyk57jsr85grdkxs2yi2gkvqa043kbamy5g2pw818"
     }
 }

pkgs/top-level/python-packages.nix

@@ -19057,6 +19057,8 @@ self: super: with self; {
 
   xdxf2html = callPackage ../development/python-modules/xdxf2html { };
 
+  xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { });
+
   xen = toPythonModule (pkgs.xen.override { python3Packages = self; });
 
   xformers = callPackage ../development/python-modules/xformers { };