Merge master into staging-next

maintainers/maintainer-list.nix

@@ -93,11 +93,6 @@
     github = "0x120581f";
     githubId = 130835755;
   };
-  _0x2B = {
-    name = "0x2B";
-    github = "0x2B-bin";
-    githubId = 49249957;
-  };
   _0x3f = {
     name = "0x3f";
     github = "0x3fiona";
@@ -12306,12 +12301,6 @@
     githubId = 67414100;
     name = "Jachym Putta";
   };
-  jack-avery = {
-    email = "jack.avery.business@gmail.com";
-    github = "jack-avery";
-    githubId = 47289484;
-    name = "Jack Avery";
-  };
   jackcres = {
     email = "crespomerchano@gmail.com";
     github = "omarcresp";
@@ -29867,11 +29856,6 @@
     githubId = 7038383;
     name = "Vojta Káně";
   };
-  vokinn = {
-    github = "vokinn";
-    githubId = 113241287;
-    name = "vokin";
-  };
   volfyd = {
     email = "lb.nix@lisbethmail.com";
     github = "volfyd";

pkgs/by-name/fr/freecad/package.nix

@@ -51,7 +51,6 @@ let
     scipy
     shiboken6
     vtk
-    networkx # for sheetmetal plugin
   ];
 
   freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };

pkgs/by-name/gi/gitte/package.nix

@@ -22,7 +22,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitte";
-  version = "0.9.0";
+  version = "0.8.1";
 
   __structuredAttrs = true;
 
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ckruse";
     repo = "Gitte";
     tag = finalAttrs.version;
-    hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI=";
+    hash = "sha256-c7GhPn7/0PzRTYQbhfvlSUMJqHs4dRqeWRMBJG2eqdc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4=";
+    hash = "sha256-yR4MYQJQMjqEs++8RhQwDV+h/blSVgFqrGYUfrPUGOg=";
   };
 
   strictDeps = true;

pkgs/by-name/hu/hunk/package.nix

@@ -10,13 +10,13 @@
 
 let
   pname = "hunk";
-  version = "0.17.3";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "modem-dev";
     repo = "hunk";
     tag = "v${version}";
-    hash = "sha256-Sm/JPTjKw6zbXmBqiXt9wogTR0C24wxVzK3G9Ms7h9Y=";
+    hash = "sha256-FlwCtcu2JRECyKC1balItY/DmQyb+obh+97wo7+06DU=";
   };
 
   node_modules = stdenv.mkDerivation {
@@ -56,7 +56,7 @@ let
 
     dontFixup = true;
 
-    outputHash = "sha256-m1XHfN5wnIoEFBnNMAUPErgL56KzKPMWmUJuz6T0vts=";
+    outputHash = "sha256-LkOAWScuNPx9/KOcG110ngLz0QmB4/S3VxIAb3EIH7I=";
     outputHashMode = "recursive";
   };
 in

pkgs/by-name/jw/jwtcat/package.nix

@@ -1,44 +0,0 @@
-{
-  lib,
-  python3Packages,
-  fetchFromGitHub,
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "jwtcat";
-  version = "0-unstable-2022-10-15";
-  pyproject = false;
-
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "aress31";
-    repo = "jwtcat";
-    rev = "f80f3d9352b82f0e7da504b2ee11f4a61f23c385";
-    hash = "sha256-pk0/Lzw4yUIXfLBX/0Xwaecio42MjLYUzECQ8xaH3vY=";
-  };
-
-  dependencies = with python3Packages; [
-    pyjwt
-    coloredlogs
-    tqdm
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 jwtcat.py $out/bin/jwtcat
-
-    runHook postInstall
-  '';
-
-  doCheck = false;
-
-  meta = {
-    description = "CPU-based JSON Web Token cracker and scanner";
-    homepage = "https://github.com/aress31/jwtcat";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ _0x2B ];
-    mainProgram = "jwtcat";
-  };
-}

pkgs/by-name/mo/monero-cli/package.nix

@@ -38,13 +38,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.5.1";
+  version = "0.18.5.0";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-RxuhR+GH4Y5kSzNxsqJklRWMbq1K82K3A2V+6JqYR98=";
+    hash = "sha256-clw+7mZenWp58iA7fuEp4BPFH3KUwL53cC4IChIVh7w=";
   };
 
   patches = [

pkgs/by-name/mo/monero-gui/package.nix

@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.5.2";
+  version = "0.18.5.0";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-2FlenQtrsoHmRTfU+KhWtg3eVPzz9ktQ3dnOlWhOPC8=";
+    hash = "sha256-uBZMBQ6Co1+H8DsyeL1vbjtVlKyIkJopKxHxr24BZv0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ne/nezha/package.nix

@@ -49,13 +49,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "nezha";
-  version = "2.3.0";
+  version = "2.2.10";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wlGDNsh67pAuPPgae56bXrtDsgwuviLxiaZ6CrOi3go=";
+    hash = "sha256-eAJj+R3tSaZNa7aSfwLg8fS9grbGJRoBUBXdQpncqdI=";
   };
 
   proxyVendor = true;
@@ -95,7 +95,7 @@ buildGoModule (finalAttrs: {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs
   '';
 
-  vendorHash = "sha256-U2rZVluYM+XcI8e9TBXAlb9sKz4IL+FMEj1CTDcH6qM=";
+  vendorHash = "sha256-rYzkaJqk5r31Uagn1FRFDeICUeK392o1fyP6IBk9zgk=";
 
   ldflags = [
     "-s"

pkgs/by-name/pe/peergos/package.nix

@@ -41,13 +41,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peergos";
-  version = "1.30.0";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
     rev = "v${version}";
-    hash = "sha256-lxxOPS/G+dNcdr0pnF/5KHLb/isrL759YT3tRAOn7Yw=";
+    hash = "sha256-WaTWz55pEfE/ncJnyc8FjkxJhsBYBXt7cFjBz8v0hw8=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/pe/pesde/package.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-  dbus,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "pesde";
-  version = "0.7.3";
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "pesde-pkg";
-    repo = "pesde";
-    rev = "e57b4c2db9eaf295c8af998212f427ea039ed46e";
-    hash = "sha256-+8SneWw3UQwXg1IV1zn0OM1ySAJpcvMqyoQd7eYAarE=";
-  };
-
-  cargoHash = "sha256-1k7bmH4ocF9JK15C7YonCmwDKVh639Nropuzm62roDA=";
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    openssl
-    dbus
-  ];
-  buildFeatures = [ "bin" ];
-
-  meta = {
-    description = "Package manager for the Luau programming language, supporting multiple runtimes including Roblox and Lune.";
-    homepage = "https://github.com/pesde-pkg/pesde";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ vokinn ];
-    mainProgram = "pesde";
-  };
-}

pkgs/by-name/ra/randomx/package.nix

@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "randomX";
-  version = "1.2.2";
+  version = "1.2.1";
 
   nativeBuildInputs = [ cmake ];
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "tevador";
     repo = "randomX";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-15hRPPEo48SL09gYpGtdpXqsVlOTQuMRn4AoXQJWEMI=";
+    sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM=";
   };
 
   meta = {

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

@@ -4,17 +4,15 @@
   fetchFromGitHub,
   fetchpatch2,
   pkgsStatic,
-  rc,
   byacc,
   ed,
   ncurses,
   readline,
-  editline,
   installShellFiles,
   historySupport ? true,
   readlineSupport ? true,
-  editlineSupport ? false,
-  lineEditingLibrary ? if stdenv.hostPlatform.isDarwin then "null" else "readline",
+  lineEditingLibrary ?
+    if (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isStatic) then "null" else "readline",
 }:
 
 assert lib.elem lineEditingLibrary [
@@ -27,10 +25,10 @@ assert lib.elem lineEditingLibrary [
 assert
   !(lib.elem lineEditingLibrary [
     "edit"
+    "editline"
     "vrl"
   ]); # broken
 assert (lineEditingLibrary == "readline") -> readlineSupport;
-assert (lineEditingLibrary == "editline") -> editlineSupport;
 stdenv.mkDerivation (finalAttrs: {
   pname = "rc";
   version = "unstable-2025-10-01";
@@ -63,8 +61,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ncurses
   ]
-  ++ lib.optional readlineSupport readline
-  ++ lib.optional editlineSupport editline;
+  ++ lib.optionals readlineSupport [
+    readline
+  ];
 
   strictDeps = true;
 
@@ -74,9 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     "MANPREFIX=${placeholder "man"}/share/man"
     "CPPFLAGS=\"-DSIGCLD=SIGCHLD\""
     "EDIT=${lineEditingLibrary}"
-  ]
-  # Required to fix static build, harmless for dynamic builds.
-  ++ lib.optional (lineEditingLibrary == "readline") "LDLIBS=-lncurses";
+  ];
 
   buildFlags = [
     "all"
@@ -91,21 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     shellPath = "/bin/rc";
-    tests = {
-      static = pkgsStatic.rc;
-      readline = lib.optionalDrvAttr (!stdenv.hostPlatform.isDarwin) (
-        rc.override {
-          readlineSupport = true;
-          lineEditingLibrary = "readline";
-        }
-      );
-      editline = lib.optionalDrvAttr (!stdenv.hostPlatform.isDarwin) (
-        rc.override {
-          editlineSupport = true;
-          lineEditingLibrary = "editline";
-        }
-      );
-    };
+    tests.static = pkgsStatic.rc;
   };
 
   meta = {

pkgs/by-name/st/storeBackup/package.nix

@@ -9,7 +9,6 @@
   diffutils,
   writeScriptBin,
   bzip2,
-  runtimeShellPackage,
 }:
 
 # quick usage:
@@ -23,29 +22,18 @@
 
 let
   dummyMount = writeScriptBin "mount" "#!${stdenv.shell}";
-
-  perl' = perl.withPackages (p: [ p.DBFile ]);
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.5.2";
-  pname = "storebackup";
 
-  __structuredAttrs = true;
+  version = "3.5.2";
+
+  pname = "store-backup";
+
   enableParallelBuilding = true;
 
-  strictDeps = true;
   nativeBuildInputs = [ makeWrapper ];
-  nativeInstallCheckInputs = [
-    diffutils
-    perl'
-  ];
-  buildInputs = [
-    perl'
-    which
-    bzip2
-    runtimeShellPackage
-  ];
+  buildInputs = [ perl ];
 
   src = fetchurl {
     url = "mirror://savannah/storebackup/storeBackup-${finalAttrs.version}.tar.bz2";
@@ -58,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   installPhase = ''
-    runHook preInstall
-
     mkdir -p $out/scripts
     mv * $out
     mv $out/_ATTENTION_ $out/doc
     mv $out/{correct.sh,cron-storebackup} $out/scripts
 
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    find $out -name "*.pl" -print0 | xargs --null sed -i \
-      -e 's@/bin/pwd@${coreutils}/bin/pwd@g' \
-      -e 's@/bin/sync@${coreutils}/bin/sync@g'
+    find $out -name "*.pl" | xargs sed -i \
+      -e 's@/bin/pwd@${coreutils}/bin/pwd@' \
+      -e 's@/bin/sync@${coreutils}/bin/sync@' \
+      -e '1 s@/usr/bin/env perl@${perl.withPackages (p: [ p.DBFile ])}/bin/perl@'
 
     for p in $out/bin/*
       do wrapProgram "$p" --prefix PATH ":" "${
@@ -81,12 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
         ]
       }"
     done
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
 
+    patchShebangs $out
     # do a dummy test ensuring this works
 
     PATH=$PATH:${dummyMount}/bin
@@ -106,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
         $out/bin/storeBackup.pl --sourceDir "$source" --backupDir backup
         latestBackup=backup/default/$(ls -1 backup/default | sort | tail -n 1)
         $out/bin/storeBackupRecover.pl -b "$latestBackup" -t restored -r /
-        diff -r "$source" restored
+        ${diffutils}/bin/diff -r "$source" restored
 
         # storeBackupCheckSource should return 0
         $out/bin/storeBackupCheckSource.pl -s "$source" -b "$latestBackup"
@@ -120,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
         rm -fr restored
       }
 
-      testDir=$HOME/testDir
+      testDir=$TMP/testDir
 
       mkdir $testDir
       echo X > $testDir/X
@@ -142,8 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
       backupRestore 'test 3: backup, restore' $out
       backupRestore 'test 4: backup diffutils to same backup locations, restore' ${diffutils}
     }
-
-    runHook postInstallCheck
   '';
 
   meta = {

pkgs/by-name/xm/xmlrpc_c/package.nix

@@ -4,7 +4,6 @@
   fetchurl,
   fetchDebianPatch,
   pkg-config,
-  bashNonInteractive,
   curl,
   libxml2,
 }:
@@ -13,9 +12,6 @@ stdenv.mkDerivation rec {
   pname = "xmlrpc-c";
   version = "1.60.05";
 
-  __structuredAttrs = true;
-  strictDeps = true;
-
   src = fetchurl {
     url = "mirror://sourceforge/xmlrpc-c/xmlrpc-c-${version}.tgz";
     hash = "sha256-Z9hgBiRZ6ieEwHtNeRMxnZU5+nKfU0N46OQciRjyrfY=";
@@ -35,7 +31,6 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    bashNonInteractive
     pkg-config
   ];
 
@@ -48,24 +43,12 @@ stdenv.mkDerivation rec {
     "--enable-libxml2-backend"
   ];
 
-  preConfigure = ''
-    export PATH="${
-      lib.makeBinPath [
-        (lib.getDev curl)
-        (lib.getDev libxml2)
-      ]
-    }:$PATH"
-  '';
-
   # Build and install the "xmlrpc" tool (like the Debian package)
   postInstall = ''
     (cd tools/xmlrpc && make && make install)
-    patchShebangs --build $out/bin/xmlrpc-c-config
   '';
 
-  # parallel make sometimes fails with:
-  # ln: failed to create symbolic link 'libxmlrpc_util.so.4': File exists
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration";
@@ -73,7 +56,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Lightweight RPC library based on XML and HTTP";
     homepage = "https://xmlrpc-c.sourceforge.net/";
-    changelog = "https://xmlrpc-c.sourceforge.io/change.html";
     # <xmlrpc-c>/doc/COPYING also lists "ABYSS Web Server License" and "Python 1.5.2 License"
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;

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

@@ -15,16 +15,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zeroclaw";
-  version = "0.8.3";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "zeroclaw-labs";
     repo = "zeroclaw";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H1512vayE35bLxlFpWExT6u/z3rMKsrv6gs5un9IPaA=";
+    hash = "sha256-mTH7DRaCHmYw3m9DguceP+nGGMYff7vsoIe3J0XNb/Q=";
   };
 
-  cargoHash = "sha256-zLj2ItDp8tbldBvFNxlrcoqcE0J5Ce19NDlV+lCu/BY=";
+  cargoHash = "sha256-6tLLt8cblYABOTli1LrrWbyTOJYGmmewHJgTxBAhJlE=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;

pkgs/development/compilers/openjdk/17/source.json

@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-0cmzR5KZY6q+ZhoF90HkiIqHJsEdMeLOt4bmV8ID5so=",
+  "hash": "sha256-Szed0lCe3parouN7VjBrKY7FcocyIuA4umuDqurbM4Y=",
   "owner": "openjdk",
   "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.20+8"
+  "rev": "refs/tags/jdk-17.0.20+2"
 }

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

@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  setuptools-scm,
-  pytestCheckHook,
-}:
-buildPythonPackage (finalAttrs: {
-  pname = "rcon";
-  version = "2.4.9";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-1BqDEdwTNS2jUWP0ajzBPrIPXN4Sl7dbVudkXvdtCkg=";
-  };
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = {
-    changelog = "https://github.com/conqp/rcon/releases/tag/v${finalAttrs.version}";
-    description = "Python RCON client library";
-    homepage = "https://pypi.org/project/rcon/";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ jack-avery ];
-  };
-})

pkgs/development/tools/language-servers/crystalline/default.nix

@@ -8,12 +8,12 @@
 }:
 
 let
-  version = "0.18.0";
+  version = "0.17.1";
   src = fetchFromGitHub {
     owner = "elbywan";
     repo = "crystalline";
     tag = "v${version}";
-    hash = "sha256-Z5qVm1ovhMUccS9KSp8i7UowxxgEr9OvnJRYREaNmnM=";
+    hash = "sha256-SIfInDY6KhEwEPZckgobOrpKXBDDd0KhQt/IjdGBhWo=";
   };
 in
 crystal.buildCrystalPackage {

pkgs/top-level/aliases.nix

@@ -2178,7 +2178,6 @@ mapAliases {
   steamPackages.steam-fhsenv = throw "'steamPackages.steam-fhsenv' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
   steamPackages.steam-fhsenv-small = throw "'steamPackages.steam-fhsenv-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
   steamPackages.steamcmd = throw "'steamPackages.steamcmd' has been renamed to/replaced by 'steamcmd'"; # Converted to throw 2025-10-27
-  storeBackup = storebackup; # Added 2026-07-05
   StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19

pkgs/top-level/python-packages.nix

@@ -17414,8 +17414,6 @@ self: super: with self; {
 
   rclone-python = callPackage ../development/python-modules/rclone-python { };
 
-  rcon = callPackage ../development/python-modules/rcon { };
-
   rcssmin = callPackage ../development/python-modules/rcssmin { };
 
   rctclient = callPackage ../development/python-modules/rctclient { };