From b15edf445b05791315a39c0e333ab6461150d908 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <t@lichess.org>
Date: Sun, 8 Sep 2024 11:13:09 +0200
Subject: [PATCH 01/42] stockfish: 16.1 -> 17

---
 pkgs/games/stockfish/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index ac8c765ac94c..456c36784d5f 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -12,29 +12,29 @@ let
            "unknown";
 
     # These files can be found in src/evaluate.h
-    nnueBigFile = "nn-b1a57edbea57.nnue";
+    nnueBigFile = "nn-1111cefa1111.nnue";
     nnueBig = fetchurl {
       name = nnueBigFile;
       url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}";
-      sha256 = "sha256-saV+2+pXTKi4jWg3RzhFeRvrU9iF+H+G1czdVln787I=";
+      sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ=";
     };
-    nnueSmallFile = "nn-baff1ede1f90.nnue";
+    nnueSmallFile = "nn-37f18f62d772.nnue";
     nnueSmall = fetchurl {
       name = nnueSmallFile;
       url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}";
-      sha256 = "sha256-uv8e3h+Qwd0bT3cvHv8phIghgB6BhjRdp/DrQSG9b2M=";
+      sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0=";
     };
 in
 
 stdenv.mkDerivation rec {
   pname = "stockfish";
-  version = "16.1";
+  version = "17";
 
   src = fetchFromGitHub {
     owner = "official-stockfish";
     repo = "Stockfish";
     rev = "sf_${version}";
-    sha256 = "sha256-xTtjfJgEHF0SQT9Fw/9RLZA0Quh00jrIbihr7IYCm2U=";
+    sha256 = "sha256-oXvLaC5TEUPlHjhm7tOxpNPY88QxYHFw+Cev3Q8NEeQ=";
   };
 
   postUnpack = ''
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       Stockfish is one of the strongest chess engines in the world. It is also
       much stronger than the best human chess grandmasters.
       '';
-    maintainers = with maintainers; [ luispedro siraben ];
+    maintainers = with maintainers; [ luispedro siraben thibaultd ];
     platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
     license = licenses.gpl3Only;
   };

From e2c6cd349d8417c0da36ad38b2519869686f46fd Mon Sep 17 00:00:00 2001
From: satler <119724672+satler-git@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:40:51 +0900
Subject: [PATCH 02/42] pureref: 2.0.2 -> 2.0.3

---
 pkgs/applications/graphics/pureref/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix
index 2e355ee37614..3d54b41290f7 100644
--- a/pkgs/applications/graphics/pureref/default.nix
+++ b/pkgs/applications/graphics/pureref/default.nix
@@ -2,11 +2,11 @@
 
 appimageTools.wrapType1 rec {
   pname = "pureref";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = runCommand "PureRef-${version}_x64.Appimage" {
     nativeBuildInputs = [ curl gnugrep cacert ];
-    outputHash = "sha256-dCiQlYtjIkh/3x3Rt3Yzbn1KN7ip37Rxv1u8D9y+EMA=";
+    outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
   } ''
     key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
     curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out

From 12ab22bbb28a43381570b63a0c2494059158b6c1 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 13 Sep 2024 21:05:14 -0700
Subject: [PATCH 03/42] unbook: format with nixfmt-rfc-style

---
 pkgs/by-name/un/unbook/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix
index 28c73451a18d..a0ecd35f5e41 100644
--- a/pkgs/by-name/un/unbook/package.nix
+++ b/pkgs/by-name/un/unbook/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, makeWrapper
-, calibre
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  makeWrapper,
+  calibre,
 }:
 
 rustPlatform.buildRustPackage rec {

From 3c5896e3bffbf2d46a850586cff414a24ada76f3 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 13 Sep 2024 21:12:28 -0700
Subject: [PATCH 04/42] unbook: 0.8.2 -> 0.9.1

https://github.com/ludios/unbook/compare/0.8.2...0.9.1
---
 pkgs/by-name/un/unbook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix
index a0ecd35f5e41..30e72eb4dfed 100644
--- a/pkgs/by-name/un/unbook/package.nix
+++ b/pkgs/by-name/un/unbook/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "unbook";
-  version = "0.8.2";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "ludios";
     repo = "unbook";
     rev = version;
-    hash = "sha256-THCPJ4zOKSXKZDa5DuqpBfBKZ96TdFEuDMVw/HmO7Eo=";
+    hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo=";
   };
 
-  cargoHash = "sha256-EbSayNz9cPmMDQOaOiyQAYmtlnb+4jzbffm1On0BBxI=";
+  cargoHash = "sha256-whmp4ST89TZuxQe9fnkW98A9t3rwpTdQCej49ZsDanE=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 97e08eb079a9d7bb33e5a815ad5e3dc8b680d74e Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Fri, 13 Sep 2024 21:13:52 -0700
Subject: [PATCH 05/42] unbook: add git updater

---
 pkgs/by-name/un/unbook/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix
index 30e72eb4dfed..3c50f83d5a5e 100644
--- a/pkgs/by-name/un/unbook/package.nix
+++ b/pkgs/by-name/un/unbook/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   calibre,
+  gitUpdater,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -25,6 +26,8 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/unbook --prefix PATH : ${lib.makeBinPath [ calibre ]}
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     description = "Ebook to self-contained-HTML converter";
     homepage = "https://unbook.ludios.org";

From 00915de65840e09a941419578d3cea4adefb6fc6 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 14 Sep 2024 20:47:09 +0200
Subject: [PATCH 06/42] v2raya: remove mkYarnPackage usage

---
 pkgs/tools/networking/v2raya/default.nix  | 79 +++++++++++------------
 pkgs/tools/networking/v2raya/package.json | 59 -----------------
 2 files changed, 39 insertions(+), 99 deletions(-)
 delete mode 100644 pkgs/tools/networking/v2raya/package.json

diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix
index 800bf07d754a..848fccaf17f2 100644
--- a/pkgs/tools/networking/v2raya/default.nix
+++ b/pkgs/tools/networking/v2raya/default.nix
@@ -1,13 +1,19 @@
-{ lib
-, fetchFromGitHub
-, mkYarnPackage
-, buildGoModule
-, makeWrapper
-, v2ray
-, v2ray-geoip
-, v2ray-domain-list-community
-, symlinkJoin
-, fetchYarnDeps
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  symlinkJoin,
+
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+
+  makeWrapper,
+  v2ray,
+  v2ray-geoip,
+  v2ray-domain-list-community,
 }:
 let
   pname = "v2raya";
@@ -16,52 +22,44 @@ let
   src = fetchFromGitHub {
     owner = "v2rayA";
     repo = "v2rayA";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-tXVyroQ2yXwLe+OulvVQYgfd9EcC87S0L8d7w5gLnMI=";
     postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
   };
-  guiSrc = "${src}/gui";
 
-  web = mkYarnPackage {
-    inherit pname version;
+  web = stdenv.mkDerivation {
+    inherit pname version src;
 
-    src = guiSrc;
-    packageJSON = ./package.json;
+    sourceRoot = "${src.name}/gui";
 
     offlineCache = fetchYarnDeps {
-      yarnLock = "${guiSrc}/yarn.lock";
-      sha256 = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw=";
+      yarnLock = "${src}/gui/yarn.lock";
+      hash = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw=";
     };
 
-    buildPhase = ''
-      runHook preBuild
-      OUTPUT_DIR=$out yarn --offline build
-      runHook postBuild
-    '';
+    env.OUTPUT_DIR = placeholder "out";
 
-    configurePhase = ''
-      runHook preConfigure
-      cp -r $node_modules node_modules
-      chmod +w node_modules
-      runHook postConfigure
-    '';
-
-    distPhase = "true";
-
-    dontInstall = true;
-    dontFixup = true;
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      nodejs
+    ];
   };
 
   assetsDir = symlinkJoin {
     name = "assets";
-    paths = [ v2ray-geoip v2ray-domain-list-community ];
+    paths = [
+      v2ray-geoip
+      v2ray-domain-list-community
+    ];
   };
 
 in
 buildGoModule {
-  inherit pname version;
+  inherit pname version src;
+
+  sourceRoot = "${src.name}/service";
 
-  src = "${src}/service";
   vendorHash = "sha256-8MSNTKeN0N2/yaHnXsKmxzw9vRy+E5q60IpwLycqC2I=";
 
   ldflags = [
@@ -73,15 +71,16 @@ buildGoModule {
   subPackages = [ "." ];
 
   nativeBuildInputs = [ makeWrapper ];
+
   preBuild = ''
     cp -a ${web} server/router/web
   '';
 
   postInstall = ''
-    install -Dm 444 ${src}/install/universal/v2raya.desktop -t $out/share/applications
-    install -Dm 444 ${src}/install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps
+    install -Dm 444 ../install/universal/v2raya.desktop -t $out/share/applications
+    install -Dm 444 ../install/universal/v2raya.png -t $out/share/icons/hicolor/512x512/apps
     substituteInPlace $out/share/applications/v2raya.desktop \
-      --replace 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya'
+      --replace-fail 'Icon=/usr/share/icons/hicolor/512x512/apps/v2raya.png' 'Icon=v2raya'
 
     wrapProgram $out/bin/v2rayA \
       --prefix PATH ":" "${lib.makeBinPath [ v2ray ]}" \
diff --git a/pkgs/tools/networking/v2raya/package.json b/pkgs/tools/networking/v2raya/package.json
deleted file mode 100644
index a4b16d15821c..000000000000
--- a/pkgs/tools/networking/v2raya/package.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "name": "v2raya",
-  "version": "0.1.0",
-  "private": true,
-  "license": "GPL-3.0",
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "resolutions": {
-    "@achrinza/node-ipc": "^10",
-    "@achrinza/event-pubsub": "^5"
-  },
-  "dependencies": {
-    "@achrinza/node-ipc": "^10.1.10",
-    "@mdi/font": "^5.8.55",
-    "@nuintun/qrcode": "^3.3.0",
-    "@vue/babel-preset-app": "^4.2.2",
-    "axios": "^0.21.1",
-    "buefy": "^0.9.22",
-    "clipboard": "^2.0.4",
-    "dayjs": "^1.10.6",
-    "js-base64": "^2.5.1",
-    "nanoid": "^3.1.23",
-    "normalize.css": "^8.0.1",
-    "pace-js": "^1.2.4",
-    "qrcode": "^1.4.2",
-    "register-service-worker": "^1.6.2",
-    "vue": "^2.7.14",
-    "vue-i18n": "^8.15.3",
-    "vue-router": "^3.0.6",
-    "vue-virtual-scroller": "^1.0.10",
-    "vuex": "^3.0.1",
-    "webpack-iconfont-plugin-nodejs": "^1.0.16"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.12.16",
-    "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
-    "@vue/eslint-config-prettier": "^5.0.0",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-loader": "^5.2.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.0.3",
-    "highlight.js": "^11.4.0",
-    "prettier": "^2.4.1",
-    "sass": "^1.19.0",
-    "sass-loader": "^8.0.0",
-    "terser-webpack-plugin": "^5.3.6",
-    "urijs": "^1.19.11"
-  }
-}

From 259f670ec58d5cb4fe8f248594918a724d576896 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 15 Sep 2024 01:00:23 +0000
Subject: [PATCH 07/42] kitex: 0.11.0 -> 0.11.3

---
 pkgs/by-name/ki/kitex/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index b18d972886f0..cde4f5d62c14 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "kitex";
-  version = "0.11.0";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "cloudwego";
     repo = "kitex";
     rev = "v${version}";
-    hash = "sha256-SD898LbygIHL0X5YVSoJRdP1GQiB8NGfIAFAlx4Gfe8=";
+    hash = "sha256-FjFhbkEMxuBUVfytPk27mrBaAlGXZ9RPWeBy+m0bPV8=";
   };
 
-  vendorHash = "sha256-tdtiG0jf7Ilvs1KZWggGyqBOQXAWs+zlF09AN80AoC0=";
+  vendorHash = "sha256-e98x8lSwO/u8lFbqDmbVNjVG57Y93/P0ls2UUgRvkH0=";
 
   subPackages = [ "tool/cmd/kitex" ];
 

From c3d27bc28d9e5d82f86b13d890ec4a81a0f84e3f Mon Sep 17 00:00:00 2001
From: Avery <git@avery.cafe>
Date: Sat, 14 Sep 2024 22:10:06 -0400
Subject: [PATCH 08/42] delfin: 0.4.5 -> 0.4.6

---
 pkgs/by-name/de/delfin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix
index d5eaa8beb93e..359098559bca 100644
--- a/pkgs/by-name/de/delfin/package.nix
+++ b/pkgs/by-name/de/delfin/package.nix
@@ -21,20 +21,20 @@
 
 stdenv.mkDerivation rec {
   pname = "delfin";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "avery42";
     repo = "delfin";
     rev = "v${version}";
-    hash = "sha256-iqibdVMf4RBl/EuFvE6tEPDliYmRtIYCW/mO+nNKcWU=";
+    hash = "sha256-kCPLfGeMsWAjNrtrxUeXaLv1ZkDCfhDl0HLwYDaoMTY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-2V2jx78S0Gj4/w3oduH/s7Pd6XG/GCs4lwhFCdGVdd8=";
+    hash = "sha256-LOW4Gm69e0Cyif3UuzYITy0GMGEgZOHURNxrsZRLdWo=";
   };
 
   nativeBuildInputs = [

From 684c0e50607a1180b828a193bb1bfee5248ba0ee Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 15 Sep 2024 08:14:42 +0000
Subject: [PATCH 09/42] pdf-parser: add updateScript

---
 pkgs/tools/misc/pdf-parser/default.nix | 35 ++++++++++++++++++++------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix
index 593960c4d2cf..614bb9d30826 100644
--- a/pkgs/tools/misc/pdf-parser/default.nix
+++ b/pkgs/tools/misc/pdf-parser/default.nix
@@ -1,12 +1,19 @@
-{ lib, python3Packages, fetchzip }:
+{
+  lib,
+  python3Packages,
+  fetchzip,
+  writeScript,
+}:
 
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication rec {
   pname = "pdf-parser";
   version = "0.7.4";
 
   src = fetchzip {
-    url = "https://didierstevens.com/files/software/pdf-parser_V0_7_4.zip";
-    sha256 = "1j39yww2yl4cav8xgd4zfl5jchbbkvffnrynkamkzvz9dd5np2mh";
+    url = "https://didierstevens.com/files/software/pdf-parser_V${
+      lib.replaceStrings [ "." ] [ "_" ] version
+    }.zip";
+    hash = "sha256-sIprS2vp7z+rmtZn69yea0EmC3WftNfRVoxQLzj3acg=";
   };
 
   format = "other";
@@ -20,16 +27,28 @@ python3Packages.buildPythonApplication {
       --replace '/usr/bin/python' '${python3Packages.python}/bin/python'
   '';
 
-  meta = with lib; {
+  passthru.updateScript = writeScript "update-pdf-parser" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p common-updater-scripts curl pcre2
+
+    set -eu -o pipefail
+
+    version="$(curl -s https://blog.didierstevens.com/programs/pdf-tools/ |
+      pcre2grep -O '$1.$2.$3' '\bpdf-parser_V(\d+)_(\d+)_(\d+)\.zip\b.*')"
+
+    update-source-version "$UPDATE_NIX_ATTR_PATH" "$version"
+  '';
+
+  meta = {
     description = "Parse a PDF document";
     longDescription = ''
       This tool will parse a PDF document to identify the fundamental elements used in the analyzed file.
       It will not render a PDF document.
     '';
     homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
-    license = licenses.publicDomain;
-    maintainers = [ maintainers.lightdiscord ];
-    platforms = platforms.all;
+    license = lib.licenses.publicDomain;
+    maintainers = [ lib.maintainers.lightdiscord ];
+    platforms = lib.platforms.all;
     mainProgram = "pdf-parser.py";
   };
 }

From f23cdfedfa6ce783fa97edfa88f63bb49e4a8cb3 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sun, 15 Sep 2024 08:14:42 +0000
Subject: [PATCH 10/42] pdf-parser: 0.7.4 -> 0.7.9

https://github.com/DidierStevens/DidierStevensSuite/compare/5f81a8f7a8aac15b580413f6f3a2ec3d72c5d10c..91faa8f5d101e9216de0206af44d9864818ba233#diff-901accb21b87dbbf58011e6c337f4f45cd040ed7b65e61cbc266089767e3fb38
---
 pkgs/tools/misc/pdf-parser/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix
index 614bb9d30826..b083ebd3e4ed 100644
--- a/pkgs/tools/misc/pdf-parser/default.nix
+++ b/pkgs/tools/misc/pdf-parser/default.nix
@@ -7,16 +7,26 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pdf-parser";
-  version = "0.7.4";
+  version = "0.7.9";
+  pyproject = false;
 
   src = fetchzip {
     url = "https://didierstevens.com/files/software/pdf-parser_V${
       lib.replaceStrings [ "." ] [ "_" ] version
     }.zip";
-    hash = "sha256-sIprS2vp7z+rmtZn69yea0EmC3WftNfRVoxQLzj3acg=";
+    hash = "sha256-1mFThtTe1LKkM/MML44RgskGv3FZborNVBsTqSKanks=";
   };
 
-  format = "other";
+  postPatch = ''
+    # quote regular expressions correctly
+    substituteInPlace pdf-parser.py \
+      --replace-fail \
+        "re.sub('" \
+        "re.sub(r'" \
+      --replace-fail \
+        "re.match('" \
+        "re.match(r'"
+  '';
 
   installPhase = ''
     install -Dm555 pdf-parser.py $out/bin/pdf-parser.py
@@ -24,7 +34,7 @@ python3Packages.buildPythonApplication rec {
 
   preFixup = ''
     substituteInPlace $out/bin/pdf-parser.py \
-      --replace '/usr/bin/python' '${python3Packages.python}/bin/python'
+      --replace-fail '/usr/bin/python' '${python3Packages.python}/bin/python'
   '';
 
   passthru.updateScript = writeScript "update-pdf-parser" ''

From a413abb622c27219fe7aa94d663c440a20f82829 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:30:26 +0200
Subject: [PATCH 11/42] signal-desktop: 7.22.0 -> 7.24.1

https://github.com/signalapp/Signal-Desktop/compare/v7.22.0...v7.24.1
---
 .../instant-messengers/signal-desktop/signal-desktop.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
index 74c5d82b052b..1277c5752787 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "7.22.0";
+  version = "7.24.1";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-om3hhGYgrBrcNt3tV9QHZOKuhN/ljaR6SG/6S51xqOo=";
+  hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ=";
 }

From 48c0a6a95938d9f976417f03e1a565ee0e34cc74 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:31:15 +0200
Subject: [PATCH 12/42] signal-desktop-beta: 7.23.0-beta.1 -> 7.25.0-beta.2

https://github.com/signalapp/Signal-Desktop/releases/tag/v7.25.0-beta.2
---
 .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
index da88b7e02e72..f557734764cd 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop-beta";
   dir = "Signal Beta";
-  version = "7.23.0-beta.1";
+  version = "7.25.0-beta.2";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-qVPvzz5dEzff9+qmy92X2VWOhcfYdeoOsV4hX/PcJ+k=";
+  hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8=";
 }

From 3f085074152f1ebbfba8cb34e266035779829b98 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:32:01 +0200
Subject: [PATCH 13/42] signal-desktop(aarch64): 7.19.0 -> 7.23.0

https://github.com/0mniteck/Signal-Desktop-Mobian/compare/7.19.0...7.23.0
---
 .../signal-desktop/signal-desktop-aarch64.nix                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
index 72cde3388e82..8f3eabb7bc27 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "7.19.0";
+  version = "7.23.0";
   url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
-  hash = "sha256-wyXVZUuY1TDGAVq7Gx9r/cuBuoMmSk9KQttTJlIN+k8=";
+  hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8=";
 }

From 681f4fa861d66b67a2be836e2b2b3930c7042f71 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Wed, 24 Jul 2024 18:38:39 -0700
Subject: [PATCH 14/42] z88dk: run nixfmt and apply finalAttrs pattern.

No other change.
---
 pkgs/development/compilers/z88dk/default.nix | 45 +++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index cd95406c84d8..dbc23f6b2649 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -1,13 +1,25 @@
-{ fetchFromGitHub, lib, stdenv, makeWrapper, unzip, libxml2, gmp, m4, uthash, which, pkg-config }:
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+  makeWrapper,
+  unzip,
+  libxml2,
+  gmp,
+  m4,
+  uthash,
+  which,
+  pkg-config,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "z88dk";
   version = "2.3";
 
   src = fetchFromGitHub {
     owner = "z88dk";
     repo = "z88dk";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44=";
     fetchSubmodules = true;
   };
@@ -32,22 +44,35 @@ stdenv.mkDerivation rec {
   #_FORTIFY_SOURCE requires compiling with optimization (-O)
   env.NIX_CFLAGS_COMPILE = "-O";
 
-  short_rev = builtins.substring 0 7 src.rev;
+  short_rev = builtins.substring 0 7 finalAttrs.src.rev;
   makeFlags = [
-    "git_rev=${short_rev}"
-    "version=${version}"
+    "git_rev=${finalAttrs.short_rev}"
+    "version=${finalAttrs.version}"
     "DESTDIR=$(out)"
     "git_count=0"
   ];
 
-  nativeBuildInputs = [ which makeWrapper unzip pkg-config ];
-  buildInputs = [ libxml2 m4 uthash gmp ];
+  nativeBuildInputs = [
+    which
+    makeWrapper
+    unzip
+    pkg-config
+  ];
+  buildInputs = [
+    libxml2
+    m4
+    uthash
+    gmp
+  ];
 
   preInstall = ''
     mkdir -p $out/{bin,share}
   '';
 
-  installTargets = [ "libs" "install" ];
+  installTargets = [
+    "libs"
+    "install"
+  ];
 
   meta = with lib; {
     homepage = "https://www.z88dk.org";
@@ -56,4 +81,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.siraben ];
     platforms = platforms.unix;
   };
-}
+})

From 5e310193e892e78fd3aaa36382923e8133575b07 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Wed, 24 Jul 2024 18:42:07 -0700
Subject: [PATCH 15/42] z88dk: correct install location; make tests work

 * The final installation was not at the correct place; looks like
   the DESTDIR that worked previously needs to be PREFIX now.
 * Make tests work. These aldo didn't run anymore even though it
   looked they might've in the past.
   For that, add a bunch of local Perl packages needed by these
   tests that were not available in nixpkgs yet (Plan is to move
   them to perl-packages.nix, but as first step have them local
   here to have a self-contained z88dx.
---
 pkgs/development/compilers/z88dk/default.nix | 137 +++++++++++++++++--
 1 file changed, 126 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix
index dbc23f6b2649..ea5582375abd 100644
--- a/pkgs/development/compilers/z88dk/default.nix
+++ b/pkgs/development/compilers/z88dk/default.nix
@@ -2,7 +2,6 @@
   fetchFromGitHub,
   lib,
   stdenv,
-  makeWrapper,
   unzip,
   libxml2,
   gmp,
@@ -10,8 +9,96 @@
   uthash,
   which,
   pkg-config,
+  perl,
+  perlPackages,
+  fetchurl,
 }:
 
+let
+  # Perl packages used by this project.
+  # TODO: put these into global perl-packages.nix once this is submitted.
+  ObjectTinyRW = perlPackages.buildPerlPackage {
+    pname = "Object-Tiny-RW";
+    version = "1.07";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SC/SCHWIGON/object-tiny-rw/Object-Tiny-RW-1.07.tar.gz";
+      hash = "sha256-NbQIy9d4ZcMnRJJApPBSej+W6e/aJ8rkb5E7rD7GVgs=";
+    };
+    meta = {
+      description = "A date object with as little code as possible (and rw accessors)";
+      license = with lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+  IteratorSimple = perlPackages.buildPerlPackage {
+    pname = "Iterator-Simple";
+    version = "0.07";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz";
+      hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q=";
+    };
+    meta = {
+      description = "Simple iterator and utilities";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+
+  IteratorSimpleLookahead = perlPackages.buildPerlPackage {
+    pname = "Iterator-Simple-Lookahead";
+    version = "0.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz";
+      hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw=";
+    };
+    propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [
+      ClassAccessor
+    ]);
+    meta = {
+      description = "Simple iterator with lookahead and unget";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+
+  AsmPreproc = perlPackages.buildPerlPackage {
+    pname = "Asm-Preproc";
+    version = "1.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PS/PSCUST/Asm-Preproc-1.03.tar.gz";
+      hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M=";
+    };
+    propagatedBuildInputs = [
+        IteratorSimple
+        IteratorSimpleLookahead
+      ] ++ (with perlPackages; [
+        TextTemplate
+        DataDump
+        FileSlurp
+      ]);
+    meta = {
+      description = "Preprocessor to be called from an assembler";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+
+  CPUZ80Assembler = perlPackages.buildPerlPackage {
+    pname = "CPU-Z80-Assembler";
+    version = "2.25";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PS/PSCUST/CPU-Z80-Assembler-2.25.tar.gz";
+      hash = "sha256-cJ8Fl2KZw9/bnBDUzFuwwdw9x23OUvcftk78kw7abdU=";
+    };
+    buildInputs = [ AsmPreproc ] ++ (with perlPackages; [
+        CaptureTiny
+        RegexpTrie
+        PathTiny
+        ClassAccessor
+      ]);
+    meta = {
+      description = "Functions to assemble a set of Z80 assembly instructions";
+      license = with lib.licenses; [ artistic1 gpl2Only ];
+    };
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "z88dk";
   version = "2.3";
@@ -28,39 +115,67 @@ stdenv.mkDerivation (finalAttrs: {
     # we dont rely on build.sh :
     export PATH="$PWD/bin:$PATH" # needed to have zcc in testsuite
     export ZCCCFG=$PWD/lib/config/
+
     # we don't want to build zsdcc since it required network (svn)
     # we test in checkPhase
     substituteInPlace Makefile \
       --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\
       --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT ='
+
+    # rc2014.lib not created, making corresponding tests fail. Comment out.
+    substituteInPlace  test/suites/make.config \
+      --replace 'zcc +rc2014'            '#zcc +rc2014' \
+      --replace '@$(MACHINE) -pc 0x9000' '#@$(MACHINE) -pc 0x9000'
+
+    # The following tests don't pass.
+    rm src/z80asm/t/issue_0341.t
+    rm src/z80asm/t/z80asm_lib.t
   '';
 
+  # Parallel building is not working yet with the upstream Makefiles.
+  # Explicitly switch this off for now.
+  enableParallelBuilding = false;
+
+  doCheck = true;
   checkPhase = ''
-    make testsuite
+    # Need to build libs first, Makefile deps not fully defined
+    make libs      $makeFlags
+    make testsuite $makeFlags
+    make -k test   $makeFlags
   '';
-  #failed on Issue_1105_function_pointer_calls
-  doCheck = stdenv.hostPlatform.system != "aarch64-linux";
-
-  #_FORTIFY_SOURCE requires compiling with optimization (-O)
-  env.NIX_CFLAGS_COMPILE = "-O";
 
   short_rev = builtins.substring 0 7 finalAttrs.src.rev;
   makeFlags = [
     "git_rev=${finalAttrs.short_rev}"
     "version=${finalAttrs.version}"
-    "DESTDIR=$(out)"
+    "PREFIX=$(out)"
     "git_count=0"
   ];
 
   nativeBuildInputs = [
     which
-    makeWrapper
     unzip
+    m4
+    perl
     pkg-config
-  ];
+
+    # Local perl packages
+    AsmPreproc
+    CPUZ80Assembler
+    ObjectTinyRW
+  ] ++ (with perlPackages; [
+    CaptureTiny
+    DataHexDump
+    ModernPerl
+    PathTiny
+    RegexpCommon
+    TestHexDifferences
+    TextDiff
+    RegexpTrie
+  ]);
+
   buildInputs = [
     libxml2
-    m4
     uthash
     gmp
   ];

From 2d314787f4bc5bc56e64584595912c7cfa87405b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 16:24:57 +0000
Subject: [PATCH 16/42] intel-compute-runtime: 24.31.30508.7 -> 24.35.30872.22

---
 pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
index 7808788fbdcb..8eed47235f06 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "24.31.30508.7";
+  version = "24.35.30872.22";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     rev = version;
-    hash = "sha256-8oerVjEeqouOT0+9YgNYxK2200XyUSPu5hDnZg+Ong4=";
+    hash = "sha256-OI1pyH6g4U6FI2zE63oU9y8e39VgZUO0tSIOsOOon88=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 2238a5a1d0a80368a326c66d5c571e6aadcc6150 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 17 Sep 2024 15:06:59 -0300
Subject: [PATCH 17/42] emacs: use lib.getDev to get harfbuzz

---
 pkgs/applications/editors/emacs/make-emacs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index ad77abc0c44f..fe4df1bab3b0 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -212,12 +212,12 @@ mkDerivation (finalAttrs: {
   ] ++ lib.optionals srcRepo [
     autoreconfHook
     texinfo
-  ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3;
+  ] ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
 
   buildInputs = [
     gettext
     gnutls
-    harfbuzz.dev
+    (lib.getDev harfbuzz)
     jansson
     libxml2
     ncurses

From b585a1d35ee8f3d76a89d819026f292319fe19c2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 17 Sep 2024 15:02:31 -0300
Subject: [PATCH 18/42] emacs30: init

---
 pkgs/applications/editors/emacs/default.nix      | 14 ++++++++++++++
 pkgs/applications/editors/emacs/make-emacs.nix   |  4 +++-
 .../emacs/native-comp-driver-options-30.patch    | 16 ++++++++++++++++
 pkgs/applications/editors/emacs/sources.nix      |  8 ++++++++
 pkgs/top-level/all-packages.nix                  |  7 +++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/editors/emacs/native-comp-driver-options-30.patch

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index c65961b275d6..df04ceaf2c75 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -46,6 +46,20 @@ lib.makeScope pkgs.newScope (self:
       withPgtk = true;
     };
 
+    emacs30 = callPackage (self.sources.emacs30) inheritedArgs;
+
+    emacs30-gtk3 = self.emacs30.override {
+      withGTK3 = true;
+    };
+
+    emacs30-nox = self.emacs30.override {
+      noGui = true;
+    };
+
+    emacs30-pgtk = self.emacs30.override {
+      withPgtk = true;
+    };
+
     emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;
 
     emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index fe4df1bab3b0..1906a89ac85f 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -157,7 +157,9 @@ mkDerivation (finalAttrs: {
     (substituteAll {
       src = if lib.versionOlder finalAttrs.version "29"
             then ./native-comp-driver-options-28.patch
-            else ./native-comp-driver-options.patch;
+            else if lib.versionOlder finalAttrs.version "30"
+            then ./native-comp-driver-options.patch
+            else ./native-comp-driver-options-30.patch;
       backendPath = (lib.concatStringsSep " "
         (builtins.map (x: ''"-B${x}"'') ([
           # Paths necessary so the JIT compiler finds its libraries:
diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch
new file mode 100644
index 000000000000..bd3ff2adf77c
--- /dev/null
+++ b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch
@@ -0,0 +1,16 @@
+diff -Naur a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
+--- old/lisp/emacs-lisp/comp.el	1969-12-31 21:00:01.000000000 -0300
++++ source/lisp/emacs-lisp/comp.el	2024-09-13 14:26:37.246614196 -0300
+@@ -101,8 +101,10 @@
+   :version "28.1")
+ 
+ (defcustom native-comp-driver-options
+-  (cond ((eq system-type 'darwin) '("-Wl,-w"))
+-        ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
++  (append
++   (cond ((eq system-type 'darwin) '("-Wl,-w"))
++         ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
++   '(@backendPath@))
+   "Options passed verbatim to the native compiler's back-end driver.
+ Note that not all options are meaningful; typically only the options
+ affecting the assembler and linker are likely to be useful.
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index da243044b689..ae93a2ed019a 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -110,6 +110,14 @@ in
     hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s=";
   });
 
+  emacs30 = import ./make-emacs.nix (mkArgs {
+    pname = "emacs";
+    version = "30.0.91";
+    variant = "mainline";
+    rev = "30.0.91";
+    hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ=";
+  });
+
   emacs28-macport = import ./make-emacs.nix (mkArgs {
     pname = "emacs-mac";
     version = "28.2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4578b4c46e48..cfdb03310359 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29258,10 +29258,17 @@ with pkgs;
     emacs28-gtk2
     emacs28-gtk3
     emacs28-nox
+
     emacs29
     emacs29-gtk3
     emacs29-nox
     emacs29-pgtk
+
+    emacs30
+    emacs30-gtk3
+    emacs30-nox
+    emacs30-pgtk
+
     emacs28-macport
     emacs29-macport
   ;

From c499cb13990a14c9d9f8e7a381d9aac598a70b63 Mon Sep 17 00:00:00 2001
From: lelgenio <lelgenio@lelgenio.com>
Date: Tue, 17 Sep 2024 16:01:33 -0300
Subject: [PATCH 19/42] yarnInstallHook: fix temporary directory location

Currently the directory is being created in $src/yarnInstallHook.XXXXXX
Giving the directory a readable name is not particularly useful
---
 pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh
index bef51f7ef0d7..240879ad7182 100644
--- a/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh
+++ b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh
@@ -17,7 +17,7 @@ yarnInstallHook() {
         --offline
     )
 
-    local -r tmpDir="$(mktemp -d yarnInstallHook.XXXXXX)"
+    local -r tmpDir="$(mktemp -d)"
 
     # yarn pack does not work at all with bundleDependencies.
     # Since we are imediately unpacking, we can just remove them from package.json

From afb9fff17718125a26caad74d329ab679488ec73 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 17 Sep 2024 15:07:44 -0300
Subject: [PATCH 20/42] emacs: jansson is now optional

Since it is not needed in Emacs 30+.
---
 pkgs/applications/editors/emacs/make-emacs.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 1906a89ac85f..26e5346e0123 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -75,6 +75,8 @@
 , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)
 , withGpm ? stdenv.isLinux
 , withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
+# Emacs 30+ has native JSON support
+, withJansson ? lib.versionOlder version "30"
 , withMailutils ? true
 , withMotif ? false
 , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui)
@@ -220,7 +222,9 @@ mkDerivation (finalAttrs: {
     gettext
     gnutls
     (lib.getDev harfbuzz)
+  ] ++ lib.optionals withJansson [
     jansson
+  ] ++ [
     libxml2
     ncurses
   ] ++ lib.optionals withAcl [

From 076aa0be1bfa696063a76be4dd67d0c74c120777 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 20:55:52 +0200
Subject: [PATCH 21/42] sonic-server: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../so/sonic-server/package.nix}              | 38 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 21 insertions(+), 19 deletions(-)
 rename pkgs/{servers/search/sonic-server/default.nix => by-name/so/sonic-server/package.nix} (73%)

diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/by-name/so/sonic-server/package.nix
similarity index 73%
rename from pkgs/servers/search/sonic-server/default.nix
rename to pkgs/by-name/so/sonic-server/package.nix
index cb5521e9dfe8..62857f464dfc 100644
--- a/pkgs/servers/search/sonic-server/default.nix
+++ b/pkgs/by-name/so/sonic-server/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
-, nixosTests
-, testers
-, sonic-server
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  nixosTests,
+  rustPlatform,
+  sonic-server,
+  testers,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,9 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM=";
 
-  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
-  doCheck = false;
-
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
@@ -31,19 +29,22 @@ rustPlatform.buildRustPackage rec {
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
 
   postPatch = ''
-    substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg"
+    substituteInPlace src/main.rs \
+      --replace-fail "./config.cfg" "$out/etc/sonic/config.cfg"
   '';
 
   postInstall = ''
     install -Dm444 -t $out/etc/sonic config.cfg
     install -Dm444 -t $out/lib/systemd/system debian/sonic.service
 
-    substituteInPlace \
-      $out/lib/systemd/system/sonic.service \
-      --replace /usr/bin/sonic $out/bin/sonic \
-      --replace /etc/sonic.cfg $out/etc/sonic/config.cfg
+    substituteInPlace $out/lib/systemd/system/sonic.service \
+      --replace-fail /usr/bin/sonic $out/bin/sonic \
+      --replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg
   '';
 
+  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
+  doCheck = false;
+
   passthru = {
     tests = {
       inherit (nixosTests) sonic-server;
@@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mpl20;
     platforms = platforms.unix;
     mainProgram = "sonic";
-    maintainers = with maintainers; [ pleshevskiy anthonyroussel ];
+    maintainers = with maintainers; [
+      pleshevskiy
+      anthonyroussel
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f5a5ece5be8..9b57916434ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8315,8 +8315,6 @@ with pkgs;
 
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 
-  sonic-server = callPackage ../servers/search/sonic-server { };
-
   gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
 
   gsmlib = callPackage ../development/libraries/gsmlib

From ce6a11f471044bfb94d9e4e821001a33d6ddaa2f Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:01:23 +0200
Subject: [PATCH 22/42] vpcs: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../vp/vpcs/package.nix}                      | 27 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 18 deletions(-)
 rename pkgs/{applications/virtualization/vpcs/default.nix => by-name/vp/vpcs/package.nix} (80%)

diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/by-name/vp/vpcs/package.nix
similarity index 80%
rename from pkgs/applications/virtualization/vpcs/default.nix
rename to pkgs/by-name/vp/vpcs/package.nix
index 15f769ef9698..0b8582c54a47 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/by-name/vp/vpcs/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, testers
-, vpcs
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  testers,
+  vpcs,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -12,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "vpcs";
-    rev = "v${finalAttrs.version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY=";
   };
 
@@ -26,22 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  installPhase = ''
-    runHook preInstall
-
+  postInstall = ''
     install -D -m555 vpcs $out/bin/vpcs
     install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1
-
-    runHook postInstall
   '';
 
   enableParallelBuilding = true;
 
-  passthru = {
-    tests.version = testers.testVersion {
-      package = vpcs;
-      command = "vpcs -v";
-    };
+  passthru.tests.version = testers.testVersion {
+    package = vpcs;
+    command = "vpcs -v";
   };
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b57916434ed..0515125e06fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33731,8 +33731,6 @@ with pkgs;
 
   vivictpp = callPackage ../applications/video/vivictpp { };
 
-  vpcs = callPackage ../applications/virtualization/vpcs { };
-
   primusLib = callPackage ../tools/X11/primus/lib.nix {
     nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
   };

From 7a386c3cc008e142d2218c8885caa0cad2bd519d Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:06:59 +0200
Subject: [PATCH 23/42] amazon-ec2-utils: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../am/amazon-ec2-utils/package.nix}          | 50 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 29 insertions(+), 23 deletions(-)
 rename pkgs/{tools/admin/amazon-ec2-utils/default.nix => by-name/am/amazon-ec2-utils/package.nix} (73%)

diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/by-name/am/amazon-ec2-utils/package.nix
similarity index 73%
rename from pkgs/tools/admin/amazon-ec2-utils/default.nix
rename to pkgs/by-name/am/amazon-ec2-utils/package.nix
index 5458572f311c..27fdef05c1a8 100644
--- a/pkgs/tools/admin/amazon-ec2-utils/default.nix
+++ b/pkgs/by-name/am/amazon-ec2-utils/package.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, bash
-, python3
-, installShellFiles
-, gawk
-, curl
+{
+  stdenv,
+  lib,
+  bash,
+  curl,
+  fetchFromGitHub,
+  gawk,
+  installShellFiles,
+  python3,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,20 +20,23 @@ stdenv.mkDerivation rec {
     hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg=";
   };
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];
 
   strictDeps = true;
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   buildInputs = [
     bash
     python3
   ];
 
-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  installPhase = ''
+  postInstall = ''
     install -Dm755 -t $out/bin/ ebsnvme-id
     install -Dm755 -t $out/bin/ ec2-metadata
     install -Dm755 -t $out/bin/ ec2nvme-nsid
@@ -48,14 +52,14 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do
-      substituteInPlace "$i" \
-        --replace '/usr/sbin' "$out/bin" \
-        --replace '/bin/awk' '${gawk}/bin/awk'
-    done
+    substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \
+      --replace-fail '/usr/sbin' "$out/bin"
+
+    substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \
+      --replace-fail '/bin/awk' '${gawk}/bin/awk'
 
     substituteInPlace "$out/bin/ec2-metadata" \
-      --replace 'curl' '${curl}/bin/curl'
+      --replace-fail 'curl' '${curl}/bin/curl'
   '';
 
   doInstallCheck = true;
@@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
     description = "Contains a set of utilities and settings for Linux deployments in EC2";
     homepage = "https://github.com/amazonlinux/amazon-ec2-utils";
     license = licenses.mit;
-    maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ];
+    maintainers = with maintainers; [
+      ketzacoatl
+      thefloweringash
+      anthonyroussel
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0515125e06fc..96f0ba831f9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2980,8 +2980,6 @@ with pkgs;
 
   alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
 
-  amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { };
-
   amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
 
   amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell {

From 2b2c6eb3fca157cea423b1f2cefa622c56906d62 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:16:01 +0200
Subject: [PATCH 24/42] thanos: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../th/thanos/package.nix}                    | 46 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 27 insertions(+), 21 deletions(-)
 rename pkgs/{servers/monitoring/thanos/default.nix => by-name/th/thanos/package.nix} (64%)

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/by-name/th/thanos/package.nix
similarity index 64%
rename from pkgs/servers/monitoring/thanos/default.nix
rename to pkgs/by-name/th/thanos/package.nix
index b0f1ca4f6a3d..4842cb0a7d42 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, go
-, nix-update-script
-, nixosTests
-, testers
-, thanos
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  go,
+  nix-update-script,
+  nixosTests,
+  testers,
+  thanos,
 }:
 
 buildGoModule rec {
@@ -21,18 +22,22 @@ buildGoModule rec {
 
   vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50=";
 
-  doCheck = true;
-
   subPackages = "cmd/thanos";
 
-  ldflags = let t = "github.com/prometheus/common/version"; in [
-    "-X ${t}.Version=${version}"
-    "-X ${t}.Revision=unknown"
-    "-X ${t}.Branch=unknown"
-    "-X ${t}.BuildUser=nix@nixpkgs"
-    "-X ${t}.BuildDate=unknown"
-    "-X ${t}.GoVersion=${lib.getVersion go}"
-  ];
+  ldflags =
+    let
+      t = "github.com/prometheus/common/version";
+    in
+    [
+      "-X ${t}.Version=${version}"
+      "-X ${t}.Revision=unknown"
+      "-X ${t}.Branch=unknown"
+      "-X ${t}.BuildUser=nix@nixpkgs"
+      "-X ${t}.BuildDate=unknown"
+      "-X ${t}.GoVersion=${lib.getVersion go}"
+    ];
+
+  doCheck = true;
 
   passthru = {
     updateScript = nix-update-script { };
@@ -51,6 +56,9 @@ buildGoModule rec {
     changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}";
     license = licenses.asl20;
     mainProgram = "thanos";
-    maintainers = with maintainers; [ basvandijk anthonyroussel ];
+    maintainers = with maintainers; [
+      basvandijk
+      anthonyroussel
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96f0ba831f9a..be0b06563647 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25525,8 +25525,6 @@ with pkgs;
 
   tailspin = callPackage ../tools/misc/tailspin { };
 
-  thanos = callPackage ../servers/monitoring/thanos { };
-
   trafficserver = callPackage ../servers/http/trafficserver { };
 
   inherit (callPackages ../servers/http/tomcat { })

From b85b6425ffac38485707b92dff56b09c2300eebd Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:18:43 +0200
Subject: [PATCH 25/42] win-pvdrivers: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../wi/win-pvdrivers/package.nix}             | 22 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 14 insertions(+), 9 deletions(-)
 rename pkgs/{applications/virtualization/driver/win-pvdrivers/default.nix => by-name/wi/win-pvdrivers/package.nix} (88%)

diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/by-name/wi/win-pvdrivers/package.nix
similarity index 88%
rename from pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
rename to pkgs/by-name/wi/win-pvdrivers/package.nix
index c44f101ba946..275dd5e21205 100644
--- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+++ b/pkgs/by-name/wi/win-pvdrivers/package.nix
@@ -1,4 +1,8 @@
-{ lib, stdenvNoCC, fetchurl }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
 
 let
   # Upstream versioned download links are broken
@@ -44,13 +48,15 @@ stdenvNoCC.mkDerivation {
   pname = "win-pvdrivers";
   version = "unstable-2023-08-17";
 
-  srcs = map ({hash, url}: fetchurl {
-    inherit hash url;
-    # Wait & retry up to 3 times as archive.org can closes connection
-    # when an HTTP client makes too many requests
-    curlOpts = "--retry 3 --retry-delay 5";
-  }) files;
-
+  srcs = map (
+    { hash, url }:
+    fetchurl {
+      inherit hash url;
+      # Wait & retry up to 3 times as archive.org can closes connection
+      # when an HTTP client makes too many requests
+      curlOpts = "--retry 3 --retry-delay 5";
+    }
+  ) files;
 
   unpackPhase = ''
     runHook preUnpack
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be0b06563647..c4ac4922f45e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34135,7 +34135,6 @@ with pkgs;
   xkbmon = callPackage ../applications/misc/xkbmon { };
 
   win-spice = callPackage ../applications/virtualization/driver/win-spice { };
-  win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { };
 
   xfig = callPackage ../applications/graphics/xfig { };
 

From e08704965a52919348d9dba3570baf9c57befdf9 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:20:18 +0200
Subject: [PATCH 26/42] ccid: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../cc/ccid/package.nix}                      | 31 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 16 insertions(+), 17 deletions(-)
 rename pkgs/{tools/security/ccid/default.nix => by-name/cc/ccid/package.nix} (84%)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/by-name/cc/ccid/package.nix
similarity index 84%
rename from pkgs/tools/security/ccid/default.nix
rename to pkgs/by-name/cc/ccid/package.nix
index 12f65546e92e..af3afd1b24ac 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/by-name/cc/ccid/package.nix
@@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchurl
-, flex
-, pcsclite
-, pkg-config
-, libusb1
-, perl
-, zlib
-, gitUpdater
+{
+  lib,
+  stdenv,
+  fetchurl,
+  flex,
+  gitUpdater,
+  libusb1,
+  pcsclite,
+  perl,
+  pkg-config,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs .
-    substituteInPlace src/Makefile.in --replace /bin/echo echo
+    substituteInPlace src/Makefile.in --replace-fail /bin/echo echo
   '';
 
   configureFlags = [
@@ -39,25 +40,25 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     flex
-    pkg-config
     perl
+    pkg-config
   ];
 
   buildInputs = [
-    pcsclite
     libusb1
+    pcsclite
     zlib
   ];
 
   postInstall = ''
     install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules
     substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
-      --replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
+      --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
   '';
 
   # The resulting shared object ends up outside of the default paths which are
   # usually getting stripped.
-  stripDebugList = ["pcsc"];
+  stripDebugList = [ "pcsc" ];
 
   passthru.updateScript = gitUpdater {
     url = "https://salsa.debian.org/rousseau/CCID.git";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4ac4922f45e..29fa719a02ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6263,8 +6263,6 @@ with pkgs;
 
   ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };
 
-  ccid = callPackage ../tools/security/ccid { };
-
   ccrypt = callPackage ../tools/security/ccrypt { };
 
   ccze = callPackage ../tools/misc/ccze { };

From 63f137ac3faa8ac20fba1e12d855102ba94640eb Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:23:58 +0200
Subject: [PATCH 27/42] axis2: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../tomcat/axis2/default.nix => by-name/ax/axis2/package.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{servers/http/tomcat/axis2/default.nix => by-name/ax/axis2/package.nix} (100%)

diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/by-name/ax/axis2/package.nix
similarity index 100%
rename from pkgs/servers/http/tomcat/axis2/default.nix
rename to pkgs/by-name/ax/axis2/package.nix
index 771a38376fa9..adb305f3100e 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/by-name/ax/axis2/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
   stdenvNoCC,
-  fetchurl,
   ant,
+  fetchurl,
   jdk,
+  nixosTests,
   stripJavaArchivesHook,
   unzip,
-  nixosTests,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29fa719a02ce..1d6ba63c43ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25554,8 +25554,6 @@ with pkgs;
     matomo_5
     matomo-beta;
 
-  axis2 = callPackage ../servers/http/tomcat/axis2 { };
-
   inherit (callPackages ../servers/unifi { })
     unifi7
     unifi8;

From 8b9ca93a748bbdb29f779becada69b6ff3832a58 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:25:03 +0200
Subject: [PATCH 28/42] asouldocs: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../default.nix => by-name/as/asouldocs/package.nix}        | 6 +++++-
 pkgs/top-level/all-packages.nix                             | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/{servers/asouldocs/default.nix => by-name/as/asouldocs/package.nix} (92%)

diff --git a/pkgs/servers/asouldocs/default.nix b/pkgs/by-name/as/asouldocs/package.nix
similarity index 92%
rename from pkgs/servers/asouldocs/default.nix
rename to pkgs/by-name/as/asouldocs/package.nix
index ee8ced4f156c..28d65ce01f66 100644
--- a/pkgs/servers/asouldocs/default.nix
+++ b/pkgs/by-name/as/asouldocs/package.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   pname = "asouldocs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d6ba63c43ee..88a7fd563b1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24383,8 +24383,6 @@ with pkgs;
 
   appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
 
-  asouldocs = callPackage ../servers/asouldocs { };
-
   atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { };
   atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };
   atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { };

From 1246e83b488ed5728cbe94a0226beba6603d302c Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:26:51 +0200
Subject: [PATCH 29/42] powertop: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 pkgs/by-name/po/powertop/package.nix        | 76 +++++++++++++++++++++
 pkgs/os-specific/linux/powertop/default.nix | 58 ----------------
 pkgs/top-level/all-packages.nix             |  2 -
 3 files changed, 76 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/by-name/po/powertop/package.nix
 delete mode 100644 pkgs/os-specific/linux/powertop/default.nix

diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix
new file mode 100644
index 000000000000..e5bca7571a20
--- /dev/null
+++ b/pkgs/by-name/po/powertop/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  autoconf-archive,
+  autoreconfHook,
+  fetchFromGitHub,
+  gettext,
+  libnl,
+  ncurses,
+  nix-update-script,
+  pciutils,
+  pkg-config,
+  powertop,
+  testers,
+  xorg,
+  zlib,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "powertop";
+  version = "2.15";
+
+  src = fetchFromGitHub {
+    owner = "fenrus75";
+    repo = "powertop";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
+  };
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    gettext
+    libnl
+    ncurses
+    pciutils
+    zlib
+  ];
+
+  postPatch = ''
+    substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe"
+    substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}"
+    substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool"
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = powertop;
+      command = "powertop --version";
+      inherit version;
+    };
+  };
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
+    description = "Analyze power consumption on Intel-based laptops";
+    mainProgram = "powertop";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [
+      fpletz
+      anthonyroussel
+    ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
deleted file mode 100644
index 756bd99816fb..000000000000
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gettext
-, libnl
-, ncurses
-, pciutils
-, pkg-config
-, zlib
-, autoreconfHook
-, autoconf-archive
-, nix-update-script
-, testers
-, powertop
-, xorg
-}:
-
-stdenv.mkDerivation rec {
-  pname = "powertop";
-  version = "2.15";
-
-  src = fetchFromGitHub {
-    owner = "fenrus75";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
-  };
-
-  outputs = [ "out" "man" ];
-
-  nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
-  buildInputs = [ gettext libnl ncurses pciutils zlib ];
-
-  postPatch = ''
-    substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
-    substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "${lib.getExe xorg.xset}"
-    substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool"
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = powertop;
-      command = "powertop --version";
-      inherit version;
-    };
-  };
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
-    description = "Analyze power consumption on Intel-based laptops";
-    mainProgram = "powertop";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fpletz anthonyroussel ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88a7fd563b1e..bf9a34b10c0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26619,8 +26619,6 @@ with pkgs;
 
   dnsdist = callPackage ../servers/dns/dnsdist { };
 
-  powertop = callPackage ../os-specific/linux/powertop { };
-
   pps-tools = callPackage ../os-specific/linux/pps-tools { };
 
   procps = if stdenv.isLinux

From 417bc18feb28c65e28b8ed91cab06a9f4754f779 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:29:17 +0200
Subject: [PATCH 30/42] adcli: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../ad/adcli/package.nix}                     | 52 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 28 insertions(+), 26 deletions(-)
 rename pkgs/{os-specific/linux/adcli/default.nix => by-name/ad/adcli/package.nix} (57%)

diff --git a/pkgs/os-specific/linux/adcli/default.nix b/pkgs/by-name/ad/adcli/package.nix
similarity index 57%
rename from pkgs/os-specific/linux/adcli/default.nix
rename to pkgs/by-name/ad/adcli/package.nix
index 2f81c12977dc..6ca3445c88a4 100644
--- a/pkgs/os-specific/linux/adcli/default.nix
+++ b/pkgs/by-name/ad/adcli/package.nix
@@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, openldap
-, libkrb5
-, libxslt
-, autoreconfHook
-, pkg-config
-, cyrus_sasl
-, util-linux
-, xmlto
-, docbook_xsl
-, docbook_xml_dtd_43
+{
+  lib,
+  stdenv,
+  autoreconfHook,
+  cyrus_sasl,
+  docbook_xml_dtd_43,
+  docbook_xsl,
+  fetchFromGitLab,
+  libkrb5,
+  libxslt,
+  openldap,
+  pkg-config,
+  util-linux,
+  xmlto,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,40 +21,40 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "realmd";
-    repo = pname;
+    repo = "adcli";
     rev = version;
-    sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
+    hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
-    pkg-config
     docbook_xsl
+    pkg-config
     util-linux
     xmlto
   ];
 
   buildInputs = [
-    openldap
+    cyrus_sasl
     libkrb5
     libxslt
-    cyrus_sasl
+    openldap
   ];
 
   configureFlags = [ "--disable-debug" ];
 
   postPatch = ''
     substituteInPlace tools/Makefile.am \
-      --replace 'sbin_PROGRAMS' 'bin_PROGRAMS'
+      --replace-fail 'sbin_PROGRAMS' 'bin_PROGRAMS'
 
     substituteInPlace doc/Makefile.am \
-        --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
-                  '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
+      --replace-fail 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
+                     '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
 
     function patch_docbook() {
       substituteInPlace $1 \
-        --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-                  "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+        --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+                       "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
     }
     patch_docbook doc/adcli.xml
     patch_docbook doc/adcli-devel.xml
@@ -65,7 +66,10 @@ stdenv.mkDerivation rec {
     description = "Helper library and tools for Active Directory client operations";
     mainProgram = "adcli";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ SohamG anthonyroussel ];
+    maintainers = with maintainers; [
+      SohamG
+      anthonyroussel
+    ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf9a34b10c0c..b743ce995bf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -227,8 +227,6 @@ with pkgs;
 
   quickgui = callPackage ../applications/virtualization/quickgui { };
 
-  adcli = callPackage ../os-specific/linux/adcli { };
-
   alda = callPackage ../development/interpreters/alda { };
 
   align = callPackage ../tools/text/align { };

From 91beb4b016d6b680248118ae6f7d58b27ea03bed Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:38:03 +0200
Subject: [PATCH 31/42] solfege: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 pkgs/{misc => by-name/so}/solfege/css.patch   |  0
 .../so}/solfege/menubar.patch                 |  0
 .../so/solfege/package.nix}                   | 50 ++++++++++++++-----
 .../so}/solfege/texinfo.patch                 |  0
 .../so}/solfege/webbrowser.patch              |  0
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 37 insertions(+), 15 deletions(-)
 rename pkgs/{misc => by-name/so}/solfege/css.patch (100%)
 rename pkgs/{misc => by-name/so}/solfege/menubar.patch (100%)
 rename pkgs/{misc/solfege/default.nix => by-name/so/solfege/package.nix} (67%)
 rename pkgs/{misc => by-name/so}/solfege/texinfo.patch (100%)
 rename pkgs/{misc => by-name/so}/solfege/webbrowser.patch (100%)

diff --git a/pkgs/misc/solfege/css.patch b/pkgs/by-name/so/solfege/css.patch
similarity index 100%
rename from pkgs/misc/solfege/css.patch
rename to pkgs/by-name/so/solfege/css.patch
diff --git a/pkgs/misc/solfege/menubar.patch b/pkgs/by-name/so/solfege/menubar.patch
similarity index 100%
rename from pkgs/misc/solfege/menubar.patch
rename to pkgs/by-name/so/solfege/menubar.patch
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/by-name/so/solfege/package.nix
similarity index 67%
rename from pkgs/misc/solfege/default.nix
rename to pkgs/by-name/so/solfege/package.nix
index 09964fd58bcc..d3c8d113f75c 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/by-name/so/solfege/package.nix
@@ -1,17 +1,34 @@
-{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3
-, buildPythonApplication, pycairo, pygobject3
-, gdk-pixbuf, gobject-introspection, gtk3, librsvg
-, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
-, automake, autoconf, txt2man
+{
+  lib,
+  alsa-utils,
+  autoconf,
+  automake,
+  csound,
+  fetchurl,
+  gdk-pixbuf,
+  gettext,
+  gobject-introspection,
+  gtk3,
+  librsvg,
+  lilypond,
+  mpg123,
+  pkg-config,
+  python3Packages,
+  texinfo,
+  timidity,
+  txt2man,
+  vorbis-tools,
+  wrapGAppsHook3,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "solfege";
   version = "3.23.4";
+  format = "other";
 
   src = fetchurl {
     url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz";
-    sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
+    hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=";
   };
 
   patches = [
@@ -27,15 +44,14 @@ buildPythonApplication rec {
   '';
 
   nativeBuildInputs = [
-    automake
     autoconf
+    automake
     gdk-pixbuf
     gettext
+    gobject-introspection
     pkg-config
     texinfo
     txt2man
-
-    gobject-introspection
     wrapGAppsHook3
   ];
 
@@ -44,7 +60,7 @@ buildPythonApplication rec {
     librsvg
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     pycairo
     pygobject3
   ];
@@ -59,7 +75,11 @@ buildPythonApplication rec {
            default.config
   '';
 
-  format = "other";
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
 
   enableParallelBuilding = true;
 
@@ -68,7 +88,11 @@ buildPythonApplication rec {
     homepage = "https://www.gnu.org/software/solfege/";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor orivej anthonyroussel ];
+    maintainers = with maintainers; [
+      bjornfor
+      orivej
+      anthonyroussel
+    ];
     mainProgram = "solfege";
   };
 }
diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/by-name/so/solfege/texinfo.patch
similarity index 100%
rename from pkgs/misc/solfege/texinfo.patch
rename to pkgs/by-name/so/solfege/texinfo.patch
diff --git a/pkgs/misc/solfege/webbrowser.patch b/pkgs/by-name/so/solfege/webbrowser.patch
similarity index 100%
rename from pkgs/misc/solfege/webbrowser.patch
rename to pkgs/by-name/so/solfege/webbrowser.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b743ce995bf7..3ce3bd6b76d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38066,8 +38066,6 @@ with pkgs;
 
   nvd = callPackage ../tools/package-management/nvd { };
 
-  solfege = python3Packages.callPackage ../misc/solfege { };
-
   disnix = callPackage ../tools/package-management/disnix { };
 
   dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {

From 6b6cffe125b35c5e39e5ef3287684c2efab07b8d Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:42:35 +0200
Subject: [PATCH 32/42] jira-cli-go: migrate to pkgs/by-name, format with
 nixfmt-rfc-style

---
 .../ji/jira-cli-go/package.nix}               | 55 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 37 insertions(+), 20 deletions(-)
 rename pkgs/{development/tools/jira-cli-go/default.nix => by-name/ji/jira-cli-go/package.nix} (80%)

diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/by-name/ji/jira-cli-go/package.nix
similarity index 80%
rename from pkgs/development/tools/jira-cli-go/default.nix
rename to pkgs/by-name/ji/jira-cli-go/package.nix
index eab6becf61ff..49b375ad0017 100644
--- a/pkgs/development/tools/jira-cli-go/default.nix
+++ b/pkgs/by-name/ji/jira-cli-go/package.nix
@@ -1,4 +1,15 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }:
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  jira-cli-go,
+  less,
+  more,
+  nix-update-script,
+  testers,
+}:
 
 buildGoModule rec {
   pname = "jira-cli-go";
@@ -7,33 +18,22 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "ankitpokhrel";
     repo = "jira-cli";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs=";
   };
 
   vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao=";
 
+  nativeBuildInputs = [ installShellFiles ];
+
   ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
     "-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}"
     "-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0"
     "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}"
   ];
 
-  __darwinAllowLocalNetworking = true;
-
-  nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = jira-cli-go;
-      command = "jira version";
-      inherit version;
-    };
-    updateScript = nix-update-script { };
-  };
-
-  nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd jira \
       --bash <($out/bin/jira completion bash) \
@@ -44,12 +44,31 @@ buildGoModule rec {
     installManPage man/*
   '';
 
+  nativeCheckInputs = [
+    less
+    more
+  ]; # Tests expect a pager in $PATH
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = jira-cli-go;
+      command = "jira version";
+      inherit version;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Feature-rich interactive Jira command line";
     homepage = "https://github.com/ankitpokhrel/jira-cli";
     changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ bryanasdev000 anthonyroussel ];
+    maintainers = with maintainers; [
+      bryanasdev000
+      anthonyroussel
+    ];
     mainProgram = "jira";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ce3bd6b76d1..64bac28c6214 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8918,8 +8918,6 @@ with pkgs;
     jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  jira-cli-go = callPackage ../development/tools/jira-cli-go { };
-
   jirafeau = callPackage ../servers/web-apps/jirafeau { };
 
   jitterentropy = callPackage ../development/libraries/jitterentropy { };

From 53c7d6fd6b4cc6c44b9b1598953756a6cf0627b7 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 21:54:20 +0200
Subject: [PATCH 33/42] asouldocs: add passthru.tests.version

---
 pkgs/by-name/as/asouldocs/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/as/asouldocs/package.nix b/pkgs/by-name/as/asouldocs/package.nix
index 28d65ce01f66..f5392796fdde 100644
--- a/pkgs/by-name/as/asouldocs/package.nix
+++ b/pkgs/by-name/as/asouldocs/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  asouldocs,
   buildGoModule,
   fetchFromGitHub,
+  testers,
 }:
 
 buildGoModule rec {
@@ -17,6 +19,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU=";
 
+  passthru.tests.version = testers.testVersion {
+    package = asouldocs;
+    command = "asouldocs --version";
+  };
+
   meta = with lib; {
     description = "Web server for multi-language, real-time synchronization and searchable documentation";
     homepage = "https://asouldocs.dev/";

From 560d82a6835eb01c3a0b0b933209d39627041214 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 17 Sep 2024 22:03:29 +0200
Subject: [PATCH 34/42] aws-encryption-sdk-cli: migrate to pkgs/by-name, format
 with nixfmt-rfc-style

---
 .../aw/aws-encryption-sdk-cli/package.nix}    | 20 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename pkgs/{tools/admin/aws-encryption-sdk-cli/default.nix => by-name/aw/aws-encryption-sdk-cli/package.nix} (90%)

diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
similarity index 90%
rename from pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
rename to pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
index 5fab6fe34ea4..62cda863f0c7 100644
--- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
+++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
@@ -1,9 +1,10 @@
-{ lib
-, python3
-, fetchPypi
-, nix-update-script
-, testers
-, aws-encryption-sdk-cli
+{
+  lib,
+  aws-encryption-sdk-cli,
+  fetchPypi,
+  nix-update-script,
+  python3,
+  testers,
 }:
 
 let
@@ -41,8 +42,8 @@ localPython.pkgs.buildPythonApplication rec {
     attrs
     aws-encryption-sdk
     base64io
-    urllib3
     setuptools # for pkg_resources
+    urllib3
   ];
 
   doCheck = true;
@@ -59,7 +60,10 @@ localPython.pkgs.buildPythonApplication rec {
   ];
 
   # Upstream did not adapt to pytest 8 yet.
-  pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ];
+  pytestFlagsArray = [
+    "-W"
+    "ignore::pytest.PytestRemovedIn8Warning"
+  ];
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64bac28c6214..83b8a00fe531 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3167,8 +3167,6 @@ with pkgs;
 
   aliyun-cli = callPackage ../tools/admin/aliyun-cli { };
 
-  aws-encryption-sdk-cli = callPackage ../tools/admin/aws-encryption-sdk-cli { };
-
   aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { };
 
   awscli = callPackage ../tools/admin/awscli { };

From fb7e6450f936dca9896f3830139876044170b0e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 20:52:04 +0000
Subject: [PATCH 35/42] waylyrics: 0.3.13 -> 0.3.15

---
 pkgs/applications/audio/waylyrics/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix
index e3cf437258df..ca43d76b5581 100644
--- a/pkgs/applications/audio/waylyrics/default.nix
+++ b/pkgs/applications/audio/waylyrics/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "waylyrics";
-  version = "0.3.13";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "waylyrics";
     repo = "waylyrics";
     rev = "v${version}";
-    hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080=";
+    hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U=";
   };
 
-  cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM=";
+  cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE=";
 
   nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
   buildInputs = [ openssl dbus ];

From d2f8479f886a61e3578ffb4fc278fbf479a593f8 Mon Sep 17 00:00:00 2001
From: itslychee <itslychee@protonmail.com>
Date: Tue, 17 Sep 2024 17:00:24 -0500
Subject: [PATCH 36/42] maintainers: drop lychee

---
 maintainers/maintainer-list.nix                             | 6 ------
 pkgs/by-name/ce/celeste64/package.nix                       | 2 +-
 pkgs/by-name/so/soteria/package.nix                         | 1 -
 .../python-modules/import-expression/default.nix            | 2 +-
 pkgs/development/python-modules/jishaku/default.nix         | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 26cecd9d0dda..fb68bf14e030 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12478,12 +12478,6 @@
     githubId = 7910815;
     name = "Alex McGrath";
   };
-  lychee = {
-    email = "itslychee+nixpkgs@protonmail.com";
-    githubId = 82718618;
-    github = "itslychee";
-    name = "Lychee";
-  };
   lyndeno = {
     name = "Lyndon Sanche";
     email = "lsanche@lyndeno.ca";
diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix
index 7d497ec35166..8588a2d6f581 100644
--- a/pkgs/by-name/ce/celeste64/package.nix
+++ b/pkgs/by-name/ce/celeste64/package.nix
@@ -78,7 +78,7 @@ buildDotnetModule rec {
   meta = {
     license = with lib.licenses; [ unfree mit ];
     platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
-    maintainers = with lib.maintainers; [ lychee ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "Celeste64";
     homepage = "https://github.com/ExOK/Celeste64";
     description = "Celeste 64: Fragments of the Mountain";
diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix
index e7c66ed0c305..4ab043deb0e0 100644
--- a/pkgs/by-name/so/soteria/package.nix
+++ b/pkgs/by-name/so/soteria/package.nix
@@ -56,7 +56,6 @@ rustPlatform.buildRustPackage {
     mainProgram = "soteria";
     maintainers = with lib.maintainers; [
       NotAShelf
-      lychee
     ];
     inherit (polkit.meta) platforms;
   };
diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 7dec7e5dadd0..369495b96e29 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
       psfl
     ];
     mainProgram = "import-expression";
-    maintainers = with lib.maintainers; [ lychee ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix
index bcb026bae11c..32a560a1a1f2 100644
--- a/pkgs/development/python-modules/jishaku/default.nix
+++ b/pkgs/development/python-modules/jishaku/default.nix
@@ -65,7 +65,7 @@ buildPythonPackage rec {
     description = "Debugging and testing cog for discord.py bots";
     homepage = "https://jishaku.readthedocs.io/en/latest";
     changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}";
-    maintainers = with lib.maintainers; [ lychee ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "jishaku";
     license = lib.licenses.mit;
   };

From 447d1edf508d7a8256f10eb3863deb8fd85b597f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 16 Sep 2024 21:16:41 +0200
Subject: [PATCH 37/42] .github/labeler.yml: mark CONTRIBUTING.md and README's
 for "policy discussion"

---
 .github/labeler.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 9ef1ec30b6e9..148aa3d7c48d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -270,6 +270,12 @@
     - changed-files:
       - any-glob-to-any-file:
         - .github/**/*
+        - CONTRIBUTING.md
+        - pkgs/README.md
+        - nixos/README.md
+        - maintainers/README.md
+        - lib/README.md
+        - doc/README.md
 
 "6.topic: printing":
   - any:

From 366e562113ceae0383daa2a8b95a761959e28286 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 18 Sep 2024 04:27:54 +0200
Subject: [PATCH 38/42] cdemu: update packages (#342549)

cdemu-daemon: 3.2.6 -> 3.2.7
libmirage: 3.2.7 -> 3.2.9
linuxPackages.vhba: 20240202 -> 20240917
---
 pkgs/applications/emulators/cdemu/daemon.nix    | 4 ++--
 pkgs/applications/emulators/cdemu/libmirage.nix | 4 ++--
 pkgs/applications/emulators/cdemu/vhba.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix
index 5382efbff237..9b43c2084ba6 100644
--- a/pkgs/applications/emulators/cdemu/daemon.nix
+++ b/pkgs/applications/emulators/cdemu/daemon.nix
@@ -2,9 +2,9 @@
 stdenv.mkDerivation {
 
   inherit (callPackage ./common-drv-attrs.nix {
-    version = "3.2.6";
+    version = "3.2.7";
     pname = "cdemu-daemon";
-    hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8=";
+    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
   }) pname version src meta;
 
   nativeBuildInputs = [ cmake pkg-config intltool ];
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix
index bbc013be18a0..9773c900fda3 100644
--- a/pkgs/applications/emulators/cdemu/libmirage.nix
+++ b/pkgs/applications/emulators/cdemu/libmirage.nix
@@ -5,9 +5,9 @@
 stdenv.mkDerivation {
 
   inherit (callPackage ./common-drv-attrs.nix {
-    version = "3.2.7";
+    version = "3.2.9";
     pname = "libmirage";
-    hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M=";
+    hash = "sha256-JBd+wHSZRyRW1SZsaAaRO2dNUFkpwRCr3s1f39KyWIs=";
   }) pname version src meta;
 
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix
index 15b69500f3d2..e1d251a76392 100644
--- a/pkgs/applications/emulators/cdemu/vhba.nix
+++ b/pkgs/applications/emulators/cdemu/vhba.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vhba";
-  version = "20240202";
+  version = "20240917";
 
   src  = fetchurl {
     url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz";
-    hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM=";
+    hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";
   };
 
   makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];

From 4e1e27e537b76bbdee5c0526d9e4dbe45e9d81ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <github@dotlambda.de>
Date: Wed, 18 Sep 2024 05:10:56 +0200
Subject: [PATCH 39/42] Revert "cdemu: update packages (#342549)"

This reverts commit 366e562113ceae0383daa2a8b95a761959e28286.
---
 pkgs/applications/emulators/cdemu/daemon.nix    | 4 ++--
 pkgs/applications/emulators/cdemu/libmirage.nix | 4 ++--
 pkgs/applications/emulators/cdemu/vhba.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix
index 9b43c2084ba6..5382efbff237 100644
--- a/pkgs/applications/emulators/cdemu/daemon.nix
+++ b/pkgs/applications/emulators/cdemu/daemon.nix
@@ -2,9 +2,9 @@
 stdenv.mkDerivation {
 
   inherit (callPackage ./common-drv-attrs.nix {
-    version = "3.2.7";
+    version = "3.2.6";
     pname = "cdemu-daemon";
-    hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
+    hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8=";
   }) pname version src meta;
 
   nativeBuildInputs = [ cmake pkg-config intltool ];
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix
index 9773c900fda3..bbc013be18a0 100644
--- a/pkgs/applications/emulators/cdemu/libmirage.nix
+++ b/pkgs/applications/emulators/cdemu/libmirage.nix
@@ -5,9 +5,9 @@
 stdenv.mkDerivation {
 
   inherit (callPackage ./common-drv-attrs.nix {
-    version = "3.2.9";
+    version = "3.2.7";
     pname = "libmirage";
-    hash = "sha256-JBd+wHSZRyRW1SZsaAaRO2dNUFkpwRCr3s1f39KyWIs=";
+    hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M=";
   }) pname version src meta;
 
   PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix
index e1d251a76392..15b69500f3d2 100644
--- a/pkgs/applications/emulators/cdemu/vhba.nix
+++ b/pkgs/applications/emulators/cdemu/vhba.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vhba";
-  version = "20240917";
+  version = "20240202";
 
   src  = fetchurl {
     url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz";
-    hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg=";
+    hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM=";
   };
 
   makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];

From 78bf4dea0fbdb0945103a5a4a80a7ae9fbde5fbd Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 17 Sep 2024 20:14:46 -0700
Subject: [PATCH 40/42] python312Packages.gpy: 1.13.1 -> 1.13.2 (#341238)

---
 .../development/python-modules/gpy/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix
index 161c364694e3..f0a7efc0005f 100644
--- a/pkgs/development/python-modules/gpy/default.nix
+++ b/pkgs/development/python-modules/gpy/default.nix
@@ -16,19 +16,23 @@
 
 buildPythonPackage rec {
   pname = "gpy";
-  version = "1.13.1";
+  version = "1.13.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
-  # 1.13.0 not on PyPI yet
   src = fetchFromGitHub {
     owner = "SheffieldML";
     repo = "GPy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ykoGdXy1uagKrP9Nqn74mDESZwKVPq6wQgnHlCznevM=";
+    hash = "sha256-kggXePDKJcgw8qwLIBTxbwhiLw2H4dkx7082FguKP0Y=";
   };
 
+  pythonRelaxDeps = [
+    "paramz"
+    "scipy"
+  ];
+
   nativeBuildInputs = [ setuptools ];
   buildInputs = [ cython ];
   propagatedBuildInputs = [
@@ -47,14 +51,18 @@ buildPythonPackage rec {
     done
   '';
 
+  disabledTests = lib.optionals (stdenv.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Rounding difference break comparison
+    "TestGradientMultiOutputGPModel"
+  ];
+
   pythonImportsCheck = [ "GPy" ];
 
   meta = with lib; {
     description = "Gaussian process framework in Python";
     homepage = "https://sheffieldml.github.io/GPy";
-    changelog = "https://github.com/SheffieldML/GPy/releases/tag/v.${version}";
+    changelog = "https://github.com/SheffieldML/GPy/releases/tag/v${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bcdarwin ];
-    broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547
   };
 }

From 25c916d554a6a3c2f1fd4c2e27637757b2d522b8 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Wed, 18 Sep 2024 09:06:50 +0530
Subject: [PATCH 41/42] bfs: 3.1.3 -> 4.0.2

Diff: https://github.com/tavianator/bfs/compare/3.1.3...4.0.2
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/tools/system/bfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 2b714b56def5..464c5f67ed57 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "bfs";
-  version = "3.1.3";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    hash = "sha256-/thPPueNrYzbxxZYAqlxZ2GEsceCzd+LkI84S8AS1mo=";
+    hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY=";
   };
 
   buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ];
 
+  configureFlags = [ "--enable-release" ];
   makeFlags = [ "PREFIX=$(out)" ];
-  buildFlags = [ "release" ]; # "release" enables compiler optimizations
 
   meta = with lib; {
     description = "Breadth-first version of the UNIX find command";

From ae0a87956efcfe73f03e058ad27160ece7d5ac46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Tue, 17 Sep 2024 22:22:42 -0600
Subject: [PATCH 42/42] nix-serve: pin nix to nixVersions.nix_2_18 (previous
 stable) due to breaking changes

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34ab7c71648f..c3346dae73e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38044,7 +38044,9 @@ with pkgs;
 
   nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
 
-  nix-serve = callPackage ../tools/package-management/nix-serve { };
+  nix-serve = callPackage ../tools/package-management/nix-serve {
+    nix = nixVersions.nix_2_18;
+  };
 
   nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;