From 9059a37d41fb5ffb2a0b7b1e01025a4761a175ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Aug 2024 15:24:17 +0000
Subject: [PATCH 01/26] python312Packages.pynetbox: 7.3.4 -> 7.4.0

---
 pkgs/development/python-modules/pynetbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix
index e58ae0afdf45..e31759ec981c 100644
--- a/pkgs/development/python-modules/pynetbox/default.nix
+++ b/pkgs/development/python-modules/pynetbox/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pynetbox";
-  version = "7.3.4";
+  version = "7.4.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Ie309I19BhzASrmc3Ws1zV/BySc49AhFPNrNKQhTD0U=";
+    hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 0dc1c7294c13f5d1dd6eccab4f75d268d7296efe Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sat, 31 Aug 2024 19:16:54 +0300
Subject: [PATCH 02/26] etesync-dav: 0.32.1 -> 0.32.1-unstable-2024-09-02

Diff: https://github.com/etesync/etesync-dav/compare/v0.32.1...b9b23bf6fba60d42012008ba06023bccd9109c08

- contains commit pulled previously pulled with fetchpatch:
https://www.github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e
- contains commit with changes to log.set_level() from radicale 3.2.2
update (additional second arg - backtrace_on_debug):
https://www.github.com/Kozea/Radicale/pull/1519
https://www.github.com/etesync/etesync-dav/pull/318
---
 .../applications/misc/etesync-dav/default.nix | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index 85ff399ac83f..6b68334f20f4 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -1,29 +1,22 @@
 { lib
 , stdenv
-, fetchpatch
 , nixosTests
 , python3
-, fetchPypi
+, fetchFromGitHub
 , radicale3
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication {
   pname = "etesync-dav";
-  version = "0.32.1";
+  version = "0.32.1-unstable-2024-09-02";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA=";
+  src = fetchFromGitHub {
+    owner = "etesync";
+    repo = "etesync-dav";
+    rev = "b9b23bf6fba60d42012008ba06023bccd9109c08";
+    hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "add-missing-comma-in-setup.py.patch";
-      url = "https://github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e.patch";
-      hash = "sha256-87IpIQ87rgpinvbRwUlWd0xeegn0zfVSiDFYNUqPerg=";
-    })
-  ];
-
   propagatedBuildInputs = with python3.pkgs; [
     appdirs
     etebase

From a0e1d1fd6c57eb2282b2d96b007d3536c0c5316a Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 8 Sep 2024 16:09:41 +0300
Subject: [PATCH 03/26] nixos/tests/gitdaemon: fix user and group

- change tmpfiles rule user/group to default daemon user/group set by
gitDaemon module - git:git
- add chown of created repo to user/group of daemon after local subtest
on server (that run from root user) pass. Without it next subtest doing
clone from remote fails with "detected dubious ownership in repository"
on server side.
---
 nixos/tests/gitdaemon.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix
index 052fa902b450..2211960b457f 100644
--- a/nixos/tests/gitdaemon.nix
+++ b/nixos/tests/gitdaemon.nix
@@ -20,7 +20,7 @@ in {
 
         systemd.tmpfiles.rules = [
           # type path mode user group age arg
-          " d    /git 0755 root root  -   -"
+          " d    /git 0755 git  git   -   -"
         ];
 
         services.gitDaemon = {
@@ -56,6 +56,10 @@ in {
             "rm -r /project",
         )
 
+    # Change user/group to default daemon user/group from module
+    # to avoid "fatal: detected dubious ownership in repository at '/git/project.git'"
+    server.succeed("chown git:git -R /git/project.git")
+
     with subtest("git daemon starts"):
         server.wait_for_unit("git-daemon.service")
 

From 68263b9ab8113ccea1fdbcc3616826552e338be7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Sep 2024 16:17:01 +0000
Subject: [PATCH 04/26] glance: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index 11ba4a35406d..6d6b0bb03dfa 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "glance";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "glanceapp";
     repo = "glance";
     rev = "v${version}";
-    hash = "sha256-ebHSnzTRmWw2YBnVIR4h2zdZvbUHbKVzmQYPHDTvZDQ=";
+    hash = "sha256-0P1f7IDEPSlVHtrygIsD502lIHqLISsSAi9pqB/gFdA=";
   };
 
-  vendorHash = "sha256-Okme73vLc3Pe9+rNlmG8Bj1msKaVb5PaIBsAAeTer6s=";
+  vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08=";
 
   excludedPackages = [ "scripts/build-and-ship" ];
 

From 45bb5cea1e824749eba9e9460d7c8bc90a703c1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 Aug 2024 05:43:31 +0000
Subject: [PATCH 05/26] bun: 1.1.20 -> 1.1.27

---
 pkgs/development/web/bun/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix
index 0cc03477db96..66f0bd7a6431 100644
--- a/pkgs/development/web/bun/default.nix
+++ b/pkgs/development/web/bun/default.nix
@@ -12,7 +12,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "1.1.20";
+  version = "1.1.27";
   pname = "bun";
 
   src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-ErutjiXBjC9GDvb0F39AgbbsSo6zhRzpDEvDor/xRbI=";
+        hash = "sha256-I/axYOXXLU5V+82jfNwsmhjwGOMkK+e5Sx7pKqQlvBE=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        hash = "sha256-vqL/H5t0elgT9fSk0Op7Td69eP9WPY2XVo1a8sraTwM=";
+        hash = "sha256-LvIjCWx7fd0EOLEY9qy26SS5/5ztAvEPKdv8mUG+TCA=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-5PLk8q3di5TW8HUfo7P3xrPWLhleAiSv9jp2XeL47Kk=";
+        hash = "sha256-/YgDnB8m0ZhkKpqPvFL8Hd6IBitySD+jMOJCn/7xxG8=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        hash = "sha256-bLcK0DSaLOzJSrIRPNHQeld5qud8ccqxzyDIgawMB3U=";
+        hash = "sha256-Ir0EQH+bnHPwOTakrO/ZQ6pyeOWvhu5bK5j+YLN8Myc=";
       };
     };
     updateScript = writeShellScript "update-bun" ''

From 5543645978aad3d26e9da77fc6e24363af494c4d Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 12 Sep 2024 02:13:36 +0300
Subject: [PATCH 06/26] openmpi: fix cross eval

`error: attribute 'gfortran' missing` because `__raw` `targetPackages`
only contains `stdenv`
---
 pkgs/development/libraries/openmpi/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index ea98064820c2..7725be4c8000 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -175,7 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
         // lib.optionalAttrs fortranSupport {
           "fort" = [
             "gfortran"
-            "${targetPackages.gfortran}/bin/${targetPackages.gfortran.targetPrefix}gfortran"
+            "${targetPackages.gfortran or gfortran}/bin/${
+              targetPackages.gfortran.targetPrefix or gfortran.targetPrefix
+            }gfortran"
           ];
         };
       # The -wrapper-data.txt files that are not symlinks, need to be iterated as

From 66538a85a0fcbd2ef0afba3465068c93ecfaf1a0 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 12 Sep 2024 02:18:43 +0300
Subject: [PATCH 07/26] openmpi: fix `pkgsStatic` eval

The dependencies to `openmpi` don't build anyways, so it's fine if this
doesn't work as long as it evals without attribute missing errors.

`error: attribute 'sharedLibrary' missing`
---
 pkgs/development/libraries/openmpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 7725be4c8000..0ae1118a36b0 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -240,11 +240,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup =
     lib.optionalString (lib.elem "man" finalAttrs.outputs) ''
-      remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary})
+      remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
     ''
     + lib.optionalString (lib.elem "dev" finalAttrs.outputs) ''
       remove-references-to -t "''${!outputDev}" $out/bin/mpirun
-      remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary})
+      remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library})
 
       # The path to the wrapper is hard coded in libopen-pal.so, which we just cleared.
       wrapProgram "''${!outputDev}/bin/opal_wrapper" \

From 15d5ce3687725ed41921289a1ab8fdbe1a69e5e4 Mon Sep 17 00:00:00 2001
From: Siddarth Kumar <siddarthkay@gmail.com>
Date: Wed, 3 Jul 2024 12:51:20 +0530
Subject: [PATCH 08/26] xcodeenv: accept version & perform runtime checks

- xcodewrapper nix derivation has been updated to now accept a list of acceptable versions.
- allowHigher is now removed
- this matches closely to what we use for building react-native with nix at status-mobile repo
ref -> https://github.com/status-im/status-mobile/blob/develop/nix/pkgs/xcodeenv/compose-xcodewrapper.nix
- The key change done here is that now xcodewrapper checks Xcode versions at runtime instead of build time. This helps us to show warning messages when underlying environment does not have the Xcode version we want to support.
---
 .../mobile/xcodeenv/compose-xcodewrapper.nix  | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
index f1ac578f26ef..5a888fb13b29 100644
--- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix
@@ -1,19 +1,41 @@
-{ stdenv, lib }:
-{ version ? "11.1"
-, allowHigher ? false
-, xcodeBaseDir ? "/Applications/Xcode.app" }:
+{ lib,
+  stdenv,
+  writeShellScriptBin }:
+{ versions ? [ ] , xcodeBaseDir ? "/Applications/Xcode.app" }:
 
 assert stdenv.isDarwin;
+let
+  xcodebuildPath = "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild";
 
+  xcodebuildWrapper = writeShellScriptBin "xcodebuild" ''
+    currentVer="$(${xcodebuildPath} -version | awk 'NR==1{print $2}')"
+    wrapperVers=(${lib.concatStringsSep " " versions})
+
+    for ver in "''${wrapperVers[@]}"; do
+      if [[ "$currentVer" == "$ver" ]]; then
+        # here exec replaces the shell without creating a new process
+        # https://www.gnu.org/software/bash/manual/bash.html#index-exec
+        exec "${xcodebuildPath}" "$@"
+      fi
+    done
+
+    echo "The installed Xcode version ($currentVer) does not match any of the allowed versions: ${lib.concatStringsSep ", " versions}"
+    echo "Please update your local Xcode installation to match one of the allowed versions"
+    exit 1
+  '';
+in
 stdenv.mkDerivation {
-  pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}";
-  inherit version;
+  name = "xcode-wrapper-impure";
   # Fails in sandbox. Use `--option sandbox relaxed` or `--option sandbox false`.
   __noChroot = true;
   buildCommand = ''
     mkdir -p $out/bin
     cd $out/bin
-    ln -s /usr/bin/xcode-select
+    ${if versions == [ ] then ''
+    ln -s "${xcodebuildPath}"
+    '' else ''
+    ln -s "${xcodebuildWrapper}/bin/xcode-select"
+    ''}
     ln -s /usr/bin/security
     ln -s /usr/bin/codesign
     ln -s /usr/bin/xcrun
@@ -22,23 +44,9 @@ stdenv.mkDerivation {
     ln -s /usr/bin/lipo
     ln -s /usr/bin/file
     ln -s /usr/bin/rev
-    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
     ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
 
     cd ..
     ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
-
-    # Check if we have the xcodebuild version that we want
-    currVer=$($out/bin/xcodebuild -version | head -n1)
-    ${if allowHigher then ''
-    if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
-    '' else ''
-    if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
-    ''}
-    then
-        echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
-        echo "Instead what was found: $currVer"
-        exit 1
-    fi
   '';
 }

From a0f3c9ac5026c1a1c29d3befab8897fd7e570a0a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 5 Aug 2024 22:37:22 -0300
Subject: [PATCH 09/26] flutter: move build-support/flutter to flutter
 directory

Rationale:

With the advent of RFC 140, Nixpkgs becomes to promote self-contained package
directories and strongly discourages scattering along the old and deprecated
filesystem hierarchy.

Further, `build-support/flutter/*` is not referenced by any other expressions in
Nixpkgs besides flutter itself.

Further, concentrating all Flutter-related toolset below a same directory
hierarchy (arguably?) eases maintenance and future migrations.
---
 .../flutter/build-support/build-flutter-application.nix}        | 0
 pkgs/development/compilers/flutter/default.nix                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{build-support/flutter/default.nix => development/compilers/flutter/build-support/build-flutter-application.nix} (100%)

diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
similarity index 100%
rename from pkgs/build-support/flutter/default.nix
rename to pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index c3ef3ab9db4a..bfc9597f3874 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -56,7 +56,7 @@ let
     (mkCustomFlutter args).overrideAttrs (prev: next: {
       passthru = next.passthru // rec {
         inherit wrapFlutter mkCustomFlutter mkFlutter;
-        buildFlutterApplication = callPackage ../../../build-support/flutter { flutter = wrapFlutter (mkCustomFlutter args); };
+        buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix { flutter = wrapFlutter (mkCustomFlutter args); };
       };
     });
 

From 6e8656a0f8202ed6c72a84cbf8c6c3c19b0732ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Mar 2024 14:27:27 +0000
Subject: [PATCH 10/26] python312Packages.pyreadstat: 1.2.6 -> 1.2.7

---
 pkgs/development/python-modules/pyreadstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix
index e2c39b05b020..b49de99c62b7 100644
--- a/pkgs/development/python-modules/pyreadstat/default.nix
+++ b/pkgs/development/python-modules/pyreadstat/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pyreadstat";
-  version = "1.2.6";
+  version = "1.2.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Roche";
     repo = "pyreadstat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VcPpGRrE/5udNijodO88Lw69JPOm6ZN7BZb4xD34srQ=";
+    hash = "sha256-XuLFLpZbaCj/MHq0+l6GoNqR5nAldAlEJhoO5ioWYTA=";
   };
 
   nativeBuildInputs = [ cython ];

From 382e693a3e3543ea6dea0da93c06c0895c024c0f Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 13 Sep 2024 10:58:51 +0900
Subject: [PATCH 11/26] python312Packages.pyreadstat: switch to pypa build

---
 pkgs/development/python-modules/pyreadstat/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix
index b49de99c62b7..12262cdff9cb 100644
--- a/pkgs/development/python-modules/pyreadstat/default.nix
+++ b/pkgs/development/python-modules/pyreadstat/default.nix
@@ -9,13 +9,14 @@
   python,
   pythonOlder,
   readstat,
+  setuptools,
   zlib,
 }:
 
 buildPythonPackage rec {
   pname = "pyreadstat";
   version = "1.2.7";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -26,11 +27,14 @@ buildPythonPackage rec {
     hash = "sha256-XuLFLpZbaCj/MHq0+l6GoNqR5nAldAlEJhoO5ioWYTA=";
   };
 
-  nativeBuildInputs = [ cython ];
+  build-system = [
+    cython
+    setuptools
+  ];
 
   buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     readstat
     pandas
   ];

From f5417608ad418e5fbbd8ee84c91e40d1abbe9ebf Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 13 Sep 2024 11:52:58 +0900
Subject: [PATCH 12/26] python312Packages.pynetbox: refactor

---
 .../python-modules/pynetbox/default.nix          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix
index e31759ec981c..14ce4a0de929 100644
--- a/pkgs/development/python-modules/pynetbox/default.nix
+++ b/pkgs/development/python-modules/pynetbox/default.nix
@@ -2,10 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   setuptools-scm,
   packaging,
   requests,
-  six,
   pytestCheckHook,
   pyyaml,
 }:
@@ -13,23 +13,27 @@
 buildPythonPackage rec {
   pname = "pynetbox";
   version = "7.4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netbox-community";
-    repo = pname;
+    repo = "pynetbox";
     rev = "refs/tags/v${version}";
     hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     packaging
     requests
-    six
   ];
 
+  pythonImportsCheck = [ "pynetbox" ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pyyaml

From 45bbdb9f51461c5998fa4a418a211f0816075c5a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:10:34 +1000
Subject: [PATCH 13/26] telegraf: move to pkgs/by-name

---
 .../telegraf/default.nix => by-name/te/telegraf/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/monitoring/telegraf/default.nix => by-name/te/telegraf/package.nix} (100%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/by-name/te/telegraf/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/telegraf/default.nix
rename to pkgs/by-name/te/telegraf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9736d1ec8d3..da604fd83ae5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13031,8 +13031,6 @@ with pkgs;
 
   teip = callPackage ../tools/text/teip { };
 
-  telegraf = callPackage ../servers/monitoring/telegraf { };
-
   inherit (callPackages ../servers/teleport {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
   }) teleport_14 teleport_15 teleport_16 teleport;

From b09b1438b457427496fd10b934f30dc7db9aae23 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 13 Sep 2024 07:04:44 +0000
Subject: [PATCH 14/26] telegraf: 1.31.3 -> 1.32.0

Diff: https://github.com/influxdata/telegraf/compare/v1.31.3...v1.32.0

Changelog: https://github.com/influxdata/telegraf/blob/v1.32.0/CHANGELOG.md
---
 pkgs/by-name/te/telegraf/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index d2291890d8b6..bda948d342aa 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -1,5 +1,5 @@
 { lib
-, buildGoModule
+, buildGo123Module
 , fetchFromGitHub
 , nixosTests
 , stdenv
@@ -7,9 +7,9 @@
 , telegraf
 }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "telegraf";
-  version = "1.31.3";
+  version = "1.32.0";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -17,10 +17,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-J5jIyrxG2cLEu909/fcPQCo+xUlW6VAoge5atCrW4HY=";
+    hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU=";
   };
 
-  vendorHash = "sha256-lxLFUKOFg7HAjgZIVACW6VlWLgCeZX38SNRsjxc9D7g=";
+  vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU=";
   proxyVendor = true;
 
   ldflags = [

From fb6efe3dfb7ac8910aa8fb84c79d2d687fdc607b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 08:55:33 +0000
Subject: [PATCH 15/26] marwaita-teal: 20.3.1 -> 21

---
 pkgs/by-name/ma/marwaita-teal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix
index 6e06211e2c03..0c5784c3f71a 100644
--- a/pkgs/by-name/ma/marwaita-teal/package.nix
+++ b/pkgs/by-name/ma/marwaita-teal/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita-teal";
-  version = "20.3.1";
+  version = "21";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    hash = "sha256-0OKG7JOpPiYbofiHWtLfkqHsZZIeGJPhl/tW1CIO3co=";
+    hash = "sha256-9WH/mbnLLLAf8B5Fwd7PMRAX2psWVJn7gGO4C5KkLjM=";
   };
 
   buildInputs = [

From c425822e17ca7f599644fde133a629a24677f070 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Fri, 13 Sep 2024 09:35:26 +0000
Subject: [PATCH 16/26] maintainers/scripts/sha-to-sri: format

---
 maintainers/scripts/sha-to-sri.py | 68 +++++++++++++++++--------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py
index 1af7ff215ad3..657d5ac5d87f 100755
--- a/maintainers/scripts/sha-to-sri.py
+++ b/maintainers/scripts/sha-to-sri.py
@@ -26,11 +26,12 @@ class Encoding(ABC):
         assert len(digest) == self.n
 
         from base64 import b64encode
+
         return f"{self.hashName}-{b64encode(digest).decode()}"
 
     @classmethod
-    def all(cls, h) -> 'List[Encoding]':
-        return [ c(h) for c in cls.__subclasses__() ]
+    def all(cls, h) -> "List[Encoding]":
+        return [c(h) for c in cls.__subclasses__()]
 
     def __init__(self, h):
         self.n = h.digest_size
@@ -38,54 +39,57 @@ class Encoding(ABC):
 
     @property
     @abstractmethod
-    def length(self) -> int:
-        ...
+    def length(self) -> int: ...
 
     @property
     def regex(self) -> str:
         return f"[{self.alphabet}]{{{self.length}}}"
 
     @abstractmethod
-    def decode(self, s: str) -> bytes:
-        ...
+    def decode(self, s: str) -> bytes: ...
 
 
 class Nix32(Encoding):
     alphabet = "0123456789abcdfghijklmnpqrsvwxyz"
-    inverted  = { c: i for i, c in enumerate(alphabet) }
+    inverted = {c: i for i, c in enumerate(alphabet)}
 
     @property
     def length(self):
         return 1 + (8 * self.n) // 5
+
     def decode(self, s: str):
         assert len(s) == self.length
-        out = [ 0 for _ in range(self.n) ]
+        out = [0 for _ in range(self.n)]
         # TODO: Do better than a list of byte-sized ints
 
         for n, c in enumerate(reversed(s)):
             digit = self.inverted[c]
             i, j = divmod(5 * n, 8)
-            out[i] = out[i] | (digit << j) & 0xff
+            out[i] = out[i] | (digit << j) & 0xFF
             rem = digit >> (8 - j)
             if rem == 0:
                 continue
             elif i < self.n:
-                out[i+1] = rem
+                out[i + 1] = rem
             else:
                 raise ValueError(f"Invalid nix32 hash: '{s}'")
 
         return bytes(out)
 
+
 class Hex(Encoding):
     alphabet = "0-9A-Fa-f"
 
     @property
     def length(self):
         return 2 * self.n
+
     def decode(self, s: str):
         from binascii import unhexlify
+
         return unhexlify(s)
 
+
 class Base64(Encoding):
     alphabet = "A-Za-z0-9+/"
 
@@ -94,36 +98,39 @@ class Base64(Encoding):
         """Number of characters in data and padding."""
         i, k = divmod(self.n, 3)
         return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3
+
     @property
     def length(self):
         return sum(self.format)
+
     @property
     def regex(self):
         data, padding = self.format
         return f"[{self.alphabet}]{{{data}}}={{{padding}}}"
+
     def decode(self, s):
         from base64 import b64decode
+
         return b64decode(s, validate = True)
 
 
-_HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512'))
-ENCODINGS = {
-    h.name: Encoding.all(h)
-    for h in _HASHES
-}
+_HASHES = (hashlib.new(n) for n in ("SHA-256", "SHA-512"))
+ENCODINGS = {h.name: Encoding.all(h) for h in _HASHES}
 
 RE = {
     h: "|".join(
-        (f"({h}-)?" if e.name == 'base64' else '') +
-        f"(?P<{h}_{e.name}>{e.regex})"
+        (f"({h}-)?" if e.name == "base64" else "") + f"(?P<{h}_{e.name}>{e.regex})"
         for e in encodings
-    ) for h, encodings in ENCODINGS.items()
+    )
+    for h, encodings in ENCODINGS.items()
 }
 
-_DEF_RE = re.compile("|".join(
-    f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)"
-    for h, re in RE.items()
-))
+_DEF_RE = re.compile(
+    "|".join(
+        f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)"
+        for h, re in RE.items()
+    )
+)
 
 
 def defToSRI(s: str) -> str:
@@ -153,7 +160,7 @@ def defToSRI(s: str) -> str:
 
 @contextmanager
 def atomicFileUpdate(target: Path):
-    '''Atomically replace the contents of a file.
+    """Atomically replace the contents of a file.
 
     Guarantees that no temporary files are left behind, and `target` is either
     left untouched, or overwritten with new content if no exception was raised.
@@ -164,9 +171,10 @@ def atomicFileUpdate(target: Path):
 
     Upon exiting the context, the files are closed; if no exception was
     raised, `new` (atomically) replaces the `target`, otherwise it is deleted.
-    '''
+    """
     # That's mostly copied from noto-emoji.py, should DRY it out
     from tempfile import mkstemp
+
     fd, _p = mkstemp(
         dir = target.parent,
         prefix = target.name,
@@ -175,7 +183,7 @@ def atomicFileUpdate(target: Path):
 
     try:
         with target.open() as original:
-            with tmpPath.open('w') as new:
+            with tmpPath.open("w") as new:
                 yield (original, new)
 
         tmpPath.replace(target)
@@ -188,22 +196,20 @@ def atomicFileUpdate(target: Path):
 def fileToSRI(p: Path):
     with atomicFileUpdate(p) as (og, new):
         for i, line in enumerate(og):
-            with log_context(line=i):
+            with log_context(line = i):
                 new.write(defToSRI(line))
 
 
-_SKIP_RE = re.compile(
-    "(generated by)|(do not edit)",
-    re.IGNORECASE
-)
+_SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE)
 
 if __name__ == "__main__":
     from sys import argv, stderr
+
     logger.info("Starting!")
 
     for arg in argv[1:]:
         p = Path(arg)
-        with log_context(path=str(p)):
+        with log_context(path = str(p)):
             try:
                 if p.name == "yarn.nix" or p.name.find("generated") != -1:
                     logger.warning("File looks autogenerated, skipping!")

From 915799a2b9e59a3b32d596a216893554f9c87f07 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Fri, 13 Sep 2024 08:00:12 +0000
Subject: [PATCH 17/26] maintainers/scripts/sha-to-sri: fix file-descriptor
 leak

---
 maintainers/scripts/sha-to-sri.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py
index 657d5ac5d87f..881e03071913 100755
--- a/maintainers/scripts/sha-to-sri.py
+++ b/maintainers/scripts/sha-to-sri.py
@@ -173,17 +173,18 @@ def atomicFileUpdate(target: Path):
     raised, `new` (atomically) replaces the `target`, otherwise it is deleted.
     """
     # That's mostly copied from noto-emoji.py, should DRY it out
-    from tempfile import mkstemp
-
-    fd, _p = mkstemp(
-        dir = target.parent,
-        prefix = target.name,
-    )
-    tmpPath = Path(_p)
+    from tempfile import NamedTemporaryFile
 
     try:
         with target.open() as original:
-            with tmpPath.open("w") as new:
+            with NamedTemporaryFile(
+                dir = target.parent,
+                prefix = target.stem,
+                suffix = target.suffix,
+                delete = False,
+                mode="w",  # otherwise the file would be opened in binary mode by default
+            ) as new:
+                tmpPath = Path(new.name)
                 yield (original, new)
 
         tmpPath.replace(target)

From bf6b5f7f85e4d0b71392241f3824d880dd9414e5 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Fri, 13 Sep 2024 08:00:53 +0000
Subject: [PATCH 18/26] maintainers/scripts/sha-to-sri: accept directories as
 input

Doesn't skip files passed as CLI arguments based on their name anymore,
since bulk changes can now be done without resorting to `xargs` or equivalent.
---
 maintainers/scripts/sha-to-sri.py | 32 +++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py
index 881e03071913..35ce2ca3389a 100755
--- a/maintainers/scripts/sha-to-sri.py
+++ b/maintainers/scripts/sha-to-sri.py
@@ -7,7 +7,7 @@ from pathlib import Path
 from structlog.contextvars import bound_contextvars as log_context
 from typing import ClassVar, List, Tuple
 
-import hashlib, re, structlog
+import hashlib, logging, re, structlog
 
 
 logger = structlog.getLogger("sha-to-SRI")
@@ -208,24 +208,20 @@ if __name__ == "__main__":
 
     logger.info("Starting!")
 
-    for arg in argv[1:]:
-        p = Path(arg)
-        with log_context(path = str(p)):
+    def handleFile(p: Path, skipLevel = logging.INFO):
+        with log_context(file = str(p)):
             try:
-                if p.name == "yarn.nix" or p.name.find("generated") != -1:
-                    logger.warning("File looks autogenerated, skipping!")
-                    continue
-
                 with p.open() as f:
                     for line in f:
                         if line.strip():
                             break
 
                     if _SKIP_RE.search(line):
-                        logger.warning("File looks autogenerated, skipping!")
-                        continue
+                        logger.log(skipLevel, "File looks autogenerated, skipping!")
+                        return
 
                 fileToSRI(p)
+
             except Exception as exn:
                 logger.error(
                     "Unhandled exception, skipping file!",
@@ -233,3 +229,19 @@ if __name__ == "__main__":
                 )
             else:
                 logger.info("Finished processing file")
+
+    for arg in argv[1:]:
+        p = Path(arg)
+        with log_context(arg = arg):
+            if p.is_file():
+                handleFile(p, skipLevel = logging.WARNING)
+
+            elif p.is_dir():
+                logger.info("Recursing into directory")
+                for q in p.glob("**/*.nix"):
+                    if q.is_file():
+                        if q.name == "yarn.nix" or q.name.find("generated") != -1:
+                            logger.info("File looks autogenerated, skipping!")
+                            continue
+
+                        handleFile(q)

From e079a279f4be68e45d47c2d424df6f314616ab5c Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Fri, 13 Sep 2024 08:25:54 +0000
Subject: [PATCH 19/26] maintainers/scripts/sha-to-sri: drop unused imports

---
 maintainers/scripts/sha-to-sri.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py
index 35ce2ca3389a..e31091242341 100755
--- a/maintainers/scripts/sha-to-sri.py
+++ b/maintainers/scripts/sha-to-sri.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i "python3 -I" -p "python3.withPackages(p: with p; [ rich structlog ])"
 
-from abc import ABC, abstractclassmethod, abstractmethod
+from abc import ABC, abstractmethod
 from contextlib import contextmanager
 from pathlib import Path
 from structlog.contextvars import bound_contextvars as log_context
@@ -204,7 +204,7 @@ def fileToSRI(p: Path):
 _SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE)
 
 if __name__ == "__main__":
-    from sys import argv, stderr
+    from sys import argv
 
     logger.info("Starting!")
 

From 011daf916106828a70a5adf3a55b393fffec4a11 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Fri, 13 Sep 2024 10:15:19 +0000
Subject: [PATCH 20/26] maintainers/scripts: document sha-to-sri

---
 maintainers/scripts/README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md
index 2b99a4e75114..44a5fc9bc590 100644
--- a/maintainers/scripts/README.md
+++ b/maintainers/scripts/README.md
@@ -56,3 +56,16 @@ The maintainer is designated by a `selector` which must be one of:
   see [`maintainer-list.nix`] for the fields' definition.
 
 [`maintainer-list.nix`]: ../maintainer-list.nix
+
+
+## Conventions
+
+### `sha-to-sri.py`
+
+`sha-to-sri.py path ...` (atomically) rewrites hash attributes (named `hash` or `sha(1|256|512)`)
+into the SRI format: `hash = "{hash name}-{base64 encoded value}"`.
+
+`path` must point to either a nix file, or a directory which will be automatically traversed.
+
+`sha-to-sri.py` automatically skips files whose first non-empty line contains `generated by` or `do not edit`.
+Moreover, when walking a directory tree, the script will skip files whose name is `yarn.nix` or contains `generated`.

From 5fc3cb3ca05bf4aedf51987cdc1817cca1794520 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Sep 2024 06:37:36 +0200
Subject: [PATCH 21/26] =?UTF-8?q?ocamlPackages.ocsigenserver:=205.1.2=20?=
 =?UTF-8?q?=E2=86=92=206.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.eliom: 10.4.1 → 11.0.0
---
 pkgs/development/ocaml-modules/eliom/default.nix          | 4 ++--
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 30b955876ace..205fa78371fb 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -17,13 +17,13 @@
 
 buildDunePackage rec {
   pname = "eliom";
-  version = "10.4.1";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "eliom";
     rev = version;
-    hash = "sha256-j4t6GEd8hYyM87b9XvgcnaV9XMkouz6+v0SYW22/bqg=";
+    hash = "sha256-RgIK3xkKdX+zOurhML4370rsO4blJrWoEla09Nfe9Mw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index c475ebdecd26..0984416020e9 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,6 +1,6 @@
 { lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib
 , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs
-, cohttp, cohttp-lwt-unix, hmap
+, cohttp, cohttp-lwt-unix
 , lwt_log, re, cryptokit, xml-light, ipaddr
 , camlzip
 , makeWrapper
@@ -17,7 +17,7 @@ let caml_ld_library_path =
 ; in
 
 buildDunePackage rec {
-  version = "5.1.2";
+  version = "6.0.0";
   pname = "ocsigenserver";
 
   minimalOCamlVersion = "4.08";
@@ -26,13 +26,13 @@ buildDunePackage rec {
     owner = "ocsigen";
     repo = "ocsigenserver";
     rev = "refs/tags/${version}";
-    hash = "sha256-piWHA4RMO370TETC9FtISyBvS1Uhk5CAGAtZleJTpjU=";
+    hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI=";
   };
 
   nativeBuildInputs = [ makeWrapper which ];
   buildInputs = [ lwt_react camlzip findlib ];
 
-  propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl
+  propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit ipaddr lwt_log lwt_ssl
     re xml-light
   ];
 

From c960ba48d1b84714b29e8fa1157e4ef77d7e848f Mon Sep 17 00:00:00 2001
From: Parker Hoyes <parkerhoyes@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:08:29 +0000
Subject: [PATCH 22/26] nixos/nix-daemon: Enable cgroups delegation (#339310)

When `use-cgroups` is enabled, the nix daemon creates sub-cgroups for the build processes (and itself if NixOS/nix#11412 is merged, see NixOS/nix#9675). `Delegate` should be set to prevent systemd from messing with the nix service's cgroups (https://github.com/systemd/systemd/blob/main/docs/CGROUP_DELEGATION.md) and ensure the OOM killer only targets the offending derivation and not the entire service (NixOS/nix#10374).
---
 nixos/modules/services/system/nix-daemon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix
index 3d44bdac34bf..adadce4f88d6 100644
--- a/nixos/modules/services/system/nix-daemon.nix
+++ b/nixos/modules/services/system/nix-daemon.nix
@@ -198,6 +198,7 @@ in
             IOSchedulingClass = cfg.daemonIOSchedClass;
             IOSchedulingPriority = cfg.daemonIOSchedPriority;
             LimitNOFILE = 1048576;
+            Delegate = "yes";
           };
 
         restartTriggers = [ config.environment.etc."nix/nix.conf".source ];

From 9259479c421ede2348d756f739b5690578ad4a38 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Fri, 13 Sep 2024 14:11:34 +0000
Subject: [PATCH 23/26] maintainers/scripts/sha-to-sri: minor efficiency
 improvement of the `Nix32` decoder

---
 maintainers/scripts/sha-to-sri.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py
index e31091242341..971c24fe1fff 100755
--- a/maintainers/scripts/sha-to-sri.py
+++ b/maintainers/scripts/sha-to-sri.py
@@ -59,8 +59,7 @@ class Nix32(Encoding):
 
     def decode(self, s: str):
         assert len(s) == self.length
-        out = [0 for _ in range(self.n)]
-        # TODO: Do better than a list of byte-sized ints
+        out = bytearray(self.n)
 
         for n, c in enumerate(reversed(s)):
             digit = self.inverted[c]

From bc12c1fdff8a90cad8e127ce37ca2e0e63ca39ee Mon Sep 17 00:00:00 2001
From: d73027e7 <166523163+d73027e7@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:13:49 +0000
Subject: [PATCH 24/26] nusmv: fix homepage URL

The previous homepage URL contained a typo in the domain name and the path pointed to a location no longer available.
---
 pkgs/applications/science/logic/nusmv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/applications/science/logic/nusmv/default.nix
index d7ecbc7cd887..058949083caf 100644
--- a/pkgs/applications/science/logic/nusmv/default.nix
+++ b/pkgs/applications/science/logic/nusmv/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "New symbolic model checker for the analysis of synchronous finite-state and infinite-state systems";
-    homepage = "https://nuxmv.fbk.eu/pmwiki.php";
+    homepage = "https://nusmv.fbk.eu/";
     maintainers = with maintainers; [ mgttlinger ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     platforms = platforms.linux;

From 135b49bb5cf2f3c459f9734190b6d49708e11da0 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Thu, 12 Sep 2024 10:37:18 -0400
Subject: [PATCH 25/26] fastfetch: update description to match the project

---
 pkgs/by-name/fa/fastfetch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index dadcf2def1ac..d240ac5abd92 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -167,7 +167,7 @@ stdenv'.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Like neofetch, but much faster because written in C";
+    description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool";
     homepage = "https://github.com/fastfetch-cli/fastfetch";
     changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;

From 345c263f2f53a3710abe117f28a5cb86d0ba4059 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 8 Sep 2024 18:19:32 -0500
Subject: [PATCH 26/26] zoekt: unstable-2022-11-09 -> 0-unstable-2024-09-05

Also incorporate `nix-update-script`, so the update robot can prevent future
bitrotting (there are no stable release tags at all.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../default.nix => by-name/zo/zoekt/package.nix}   | 14 ++++++++++----
 pkgs/top-level/all-packages.nix                    |  4 ----
 2 files changed, 10 insertions(+), 8 deletions(-)
 rename pkgs/{tools/text/zoekt/default.nix => by-name/zo/zoekt/package.nix} (62%)

diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/by-name/zo/zoekt/package.nix
similarity index 62%
rename from pkgs/tools/text/zoekt/default.nix
rename to pkgs/by-name/zo/zoekt/package.nix
index 293ad7a0954c..afc6e099c0ad 100644
--- a/pkgs/tools/text/zoekt/default.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -2,19 +2,21 @@
 , buildGoModule
 , fetchFromGitHub
 , git
+, nix-update-script
 }:
+
 buildGoModule {
   pname = "zoekt";
-  version = "unstable-2022-11-09";
+  version = "0-unstable-2024-09-05";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "c4b18d3b44da94b3e7c9c94467d68c029666bb86";
-    hash = "sha256-QtwOiBxBeFkhRfH3R2fP72b05Hc4+zt9njqCNVcprZ4=";
+    rev = "35dda3e212b7d7fb0df43dcbd88eb7a7b49ad9d8";
+    hash = "sha256-YdInCAq7h7iC1sfMekLgxqu3plUHr5Ku6FxyPKluQzw=";
   };
 
-  vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k=";
+  vendorHash = "sha256-GPeMRL5zWVjJVYpFPnB211Gfm/IaqisP1s6RNaLvN6M=";
 
   nativeCheckInputs = [
     git
@@ -25,6 +27,10 @@ buildGoModule {
     git config --global --replace-all protocol.file.allow always
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version" "branch" ];
+  };
+
   meta = {
     description = "Fast trigram based code search";
     homepage = "https://github.com/sourcegraph/zoekt";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85fb98cb0f44..a5f76ffe5856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7438,10 +7438,6 @@ with pkgs;
 
   zeekscript = callPackage ../tools/security/zeekscript { };
 
-  zoekt = callPackage ../tools/text/zoekt {
-    buildGoModule = buildGo121Module;
-  };
-
   zonemaster-cli = perlPackages.ZonemasterCLI;
 
   zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { };