From 89aaab565e830235f2026763cc13f1f33df27820 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 16 Jun 2024 20:21:39 +0200
Subject: [PATCH 01/77] nixos/doc: add documentation for formats.hocon

---
 .../development/settings-options.section.md   | 153 ++++++++++++++++++
 1 file changed, 153 insertions(+)

diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index cedc82d32f89..ae15113567f6 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -46,6 +46,159 @@ have a predefined type and string generator already declared under
     `generate` to build a Java `.properties` file, taking
     care of the correct escaping, etc.
 
+`pkgs.formats.hocon` { *`generator`* ? `<derivation>`, *`validator`* ? `<derivation>`, *`doCheck`* ? true }
+
+:  A function taking an attribute set with values
+
+    `generator`
+
+    :   A derivation used for converting the JSON output
+        from the nix settings into HOCON. This might be
+        useful if your HOCON variant is slightly different
+        from the java-based one, or for testing purposes.
+
+    `validator`
+
+    :   A derivation used for verifying that the HOCON
+        output is correct and parsable. This might be
+        useful if your HOCON variant is slightly different
+        from the java-based one, or for testing purposes.
+
+    `doCheck`
+
+    :   Whether to enable/disable the validator check.
+
+    It returns an attrset with a `type`, `generate` function,
+    and a `lib` attset, as specified [below](#pkgs-formats-result).
+    Some of the lib functions will be best understood if you have
+    read the reference specification. You can find this
+    specification here:
+
+    <https://github.com/lightbend/config/blob/main/HOCON.md>
+
+    Inside of `lib`, you will find these functions
+
+    `mkInclude`
+
+    :   This is used together with a specially named
+        attribute `includes`, to include other HOCON
+        sources into the document.
+
+        The function has a shorthand variant where it
+        is up to the HOCON parser to figure out what type
+        of include is being used. The include will default
+        to being non-required. If you want to be more
+        explicit about the details of the include, you can
+        provide an attrset with following arguments
+
+        `required`
+
+        :   Whether the parser should fail upon failure
+            to include the document
+
+        `type`
+
+        :   Type of the source of the included document.
+            Valid values are `file`, `url` and `classpath`.
+            See upstream documentation for the semantics
+            behind each value
+
+        `value`
+
+        :   The URI/path/classpath pointing to the source of
+            the document to be included.
+
+        `Example usage:`
+
+        ```nix
+          let
+            format = pkgs.formats.hocon { };
+            hocon_file = pkgs.writeText "to_include.hocon" ''
+              a = 1;
+            '';
+          in {
+            some.nested.hocon.attrset = {
+              _includes = [
+                (format.lib.mkInclude hocon_file)
+                (format.lib.mkInclude "https://example.com/to_include.hocon")
+                (format.lib.mkInclude {
+                  required = true;
+                  type = "file";
+                  value = include_file;
+                })
+              ];
+              ...
+            };
+          }
+        ```
+
+    `mkAppend`
+
+    :   This is used to invoke the `+=` operator.
+        This can be useful if you need to add something
+        to a list that is included from outside of nix.
+        See upstream documentation for the semantics
+        behind the `+=` operation.
+
+        `Example usage:`
+
+        ```nix
+          let
+            format = pkgs.formats.hocon { };
+            hocon_file = pkgs.writeText "to_include.hocon" ''
+              a = [ 1 ];
+              b = [ 2 ];
+            '';
+          in {
+            _includes = [
+              (format.lib.mkInclude hocon_file)
+            ];
+
+            c = 3;
+            a = format.lib.mkAppend 3;
+            b = format.lib.mkAppend (format.lib.mkSubstitution "c");
+          }
+        ```
+
+    `mkSubstitution`
+
+    :   This is used to make HOCON substitutions.
+        Similarly to `mkInclude`, this function has
+        a shorthand variant where you just give it
+        the string with the substitution value.
+        The substitution is not optional by default.
+        Alternatively, you can provide an attrset
+        with more options
+
+        `optional`
+
+        :   Whether the parser should fail upon
+            failure to fetch the substitution value.
+
+        `value`
+
+        :   The name of the variable to use for
+            substitution.
+
+        See upstream documentation for semantics
+        behind the substitution functionality.
+
+        `Example usage:`
+
+        ```nix
+          let
+            format = pkgs.formats.hocon { };
+          in {
+            a = 1;
+            b = format.lib.mkSubstitution "a";
+            c = format.lib.mkSubstition "SOME_ENVVAR";
+            d = format.lib.mkSubstition {
+              value = "SOME_OPTIONAL_ENVVAR";
+              optional = true;
+            };
+          }
+        ```
+
 `pkgs.formats.json` { }
 
 :   A function taking an empty attribute set (for future extensibility)

From 141a8a6c86a4b14554add0457c864182c6fb6332 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 16 Jun 2024 20:44:48 +0200
Subject: [PATCH 02/77] nixos/doc: move implementation notes for formats.hocon
 to docs

---
 nixos/doc/manual/development/settings-options.section.md | 8 ++++++++
 pkgs/pkgs-lib/formats/hocon/default.nix                  | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index ae15113567f6..030d5ae3dce0 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -199,6 +199,14 @@ have a predefined type and string generator already declared under
           }
         ```
 
+    `Implementation notes:`
+
+    - classpath includes are not implemented in pyhocon,
+      which is used for validating the HOCON output. This
+      means that if you are using classpath includes,
+      you will want to either use an alternative validator
+      or set `doCheck = false` in the format options.
+
 `pkgs.formats.json` { }
 
 :   A function taking an empty attribute set (for future extensibility)
diff --git a/pkgs/pkgs-lib/formats/hocon/default.nix b/pkgs/pkgs-lib/formats/hocon/default.nix
index d7ff1e85bda6..a5e081875b89 100644
--- a/pkgs/pkgs-lib/formats/hocon/default.nix
+++ b/pkgs/pkgs-lib/formats/hocon/default.nix
@@ -27,13 +27,9 @@ let
   '';
 in
 {
-  # https://github.com/lightbend/config/blob/main/HOCON.md
   format = {
     generator ? hocon-generator
     , validator ? hocon-validator
-    # `include classpath("")` is not implemented in pyhocon.
-    # In the case that you need this functionality,
-    # you will have to disable pyhocon validation.
     , doCheck ? true
   }: let
     hoconLib = {

From a891526b22a9cc741dcf5a070925c8a5ab7b452a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 16 Jun 2024 20:39:59 +0200
Subject: [PATCH 03/77] nixos/doc: add documentation for formats.libconfig

---
 .../development/settings-options.section.md   | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index 030d5ae3dce0..19984a7e345c 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -207,6 +207,68 @@ have a predefined type and string generator already declared under
       you will want to either use an alternative validator
       or set `doCheck = false` in the format options.
 
+`pkgs.formats.libconfig` { *`generator`* ? `<derivation>`, *`validator`* ? `<derivation>` }
+
+:  A function taking an attribute set with values
+
+    `generator`
+
+    :   A derivation used for converting the JSON output
+        from the nix settings into libconfig. This might be
+        useful if your libconfig variant is slightly different
+        from the original one, or for testing purposes.
+
+    `validator`
+
+    :   A derivation used for verifying that the libconfig
+        output is correct and parsable. This might be
+        useful if your libconfig variant is slightly different
+        from the original one, or for testing purposes.
+
+    It returns an attrset with a `type`, `generate` function,
+    and a `lib` attset, as specified [below](#pkgs-formats-result).
+    Some of the lib functions will be best understood if you have
+    read the reference specification. You can find this
+    specification here:
+
+    <https://hyperrealm.github.io/libconfig/libconfig_manual.html#Configuration-Files>
+
+    Inside of `lib`, you will find these functions
+
+    `mkHex`, `mkOctal`, `mkFloat`
+
+    :   Use these to specify numbers in other formats.
+
+        `Example usage:`
+
+        ```nix
+          let
+            format = pkgs.formats.libconfig { };
+          in {
+            myHexValue = format.lib.mkHex "0x1FC3";
+            myOctalValue = format.lib.mkOctal "0027";
+            myFloatValue = format.lib.mkFloat "1.2E-3";
+          }
+        ```
+
+    `mkArray`, `mkList`
+
+    :   Use these to differentiate between whether
+        a nix list should be considered as a libconfig
+        array or a libconfig list. See the upstream
+        documentation for the semantics behind these types.
+
+        `Example usage:`
+
+        ```nix
+          let
+            format = pkgs.formats.libconfig { };
+          in {
+            myList = format.lib.mkList [ "foo" 1 true ];
+            myArray = format.lib.mkArray [ 1 2 3 ];
+          }
+        ```
+
 `pkgs.formats.json` { }
 
 :   A function taking an empty attribute set (for future extensibility)

From bf2adb82b7f1fd702ffd8a16b1c3f14b068874c6 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 16 Jun 2024 20:40:28 +0200
Subject: [PATCH 04/77] nixos/doc: move implementation notes for
 formats.libconfig to docs

---
 nixos/doc/manual/development/settings-options.section.md | 8 ++++++++
 pkgs/pkgs-lib/formats/libconfig/default.nix              | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index 19984a7e345c..48cc62bb424c 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -269,6 +269,14 @@ have a predefined type and string generator already declared under
           }
         ```
 
+    `Implementation notes:`
+
+    - Since libconfig does not allow setting names to start with an underscore,
+      this is used as a prefix for both special types and include directives.
+
+    - The difference between 32bit and 64bit values became optional in libconfig
+      1.5, so we assume 64bit values for all numbers.
+
 `pkgs.formats.json` { }
 
 :   A function taking an empty attribute set (for future extensibility)
diff --git a/pkgs/pkgs-lib/formats/libconfig/default.nix b/pkgs/pkgs-lib/formats/libconfig/default.nix
index 5687ab8c0057..e30c6c3c9300 100644
--- a/pkgs/pkgs-lib/formats/libconfig/default.nix
+++ b/pkgs/pkgs-lib/formats/libconfig/default.nix
@@ -3,14 +3,6 @@
 }:
 let
   inherit (pkgs) buildPackages callPackage;
-  # Implementation notes:
-  #   Libconfig spec: https://hyperrealm.github.io/libconfig/libconfig_manual.html
-  #
-  #   Since libconfig does not allow setting names to start with an underscore,
-  #   this is used as a prefix for both special types and include directives.
-  #
-  #   The difference between 32bit and 64bit values became optional in libconfig
-  #   1.5, so we assume 64bit values for all numbers.
 
   libconfig-generator = buildPackages.rustPlatform.buildRustPackage {
     name = "libconfig-generator";

From 2e73274b605341828eb1aae87087c694eb29ad18 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 24 Aug 2024 02:11:20 -0400
Subject: [PATCH 05/77] veilid: add updateScript

---
 pkgs/tools/networking/veilid/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix
index ad78af648d21..c41f4b414af0 100644
--- a/pkgs/tools/networking/veilid/default.nix
+++ b/pkgs/tools/networking/veilid/default.nix
@@ -9,6 +9,7 @@
 , cmake
 , testers
 , veilid
+, gitUpdater
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -54,9 +55,12 @@ rustPlatform.buildRustPackage rec {
     moveToOutput "lib" "$lib"
   '';
 
-  passthru.tests = {
-    veilid-version = testers.testVersion {
-      package = veilid;
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      veilid-version = testers.testVersion {
+        package = veilid;
+      };
     };
   };
 

From 0295652d91b30980e534251734b94d249643bec7 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 24 Aug 2024 22:25:52 +0800
Subject: [PATCH 06/77] todesk: init at 4.7.2.0

---
 pkgs/by-name/to/todesk/package.nix | 144 +++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 pkgs/by-name/to/todesk/package.nix

diff --git a/pkgs/by-name/to/todesk/package.nix b/pkgs/by-name/to/todesk/package.nix
new file mode 100644
index 000000000000..24f9ec992a41
--- /dev/null
+++ b/pkgs/by-name/to/todesk/package.nix
@@ -0,0 +1,144 @@
+{
+  stdenv,
+  lib,
+  procps,
+  fetchurl,
+  dpkg,
+  writeShellScript,
+  buildFHSEnv,
+  nspr,
+  kmod,
+  systemdMinimal,
+  glib,
+  pulseaudio,
+  libXext,
+  libX11,
+  libXrandr,
+  glibc,
+  cairo,
+  libva,
+  libdrm,
+  coreutils,
+  libXi,
+  libGL,
+  bash,
+  libXcomposite,
+  libXdamage,
+  libXfixes,
+  libXtst,
+  nss,
+  libXxf86vm,
+  gtk3,
+  gdk-pixbuf,
+  pango,
+  libz,
+  libayatana-appindicator,
+}:
+
+let
+  version = "4.7.2.0";
+  todesk-unwrapped = stdenv.mkDerivation (finalAttrs: {
+    pname = "todesk-unwrapped";
+    version = version;
+    src = fetchurl {
+      url = "https://newdl.todesk.com/linux/todesk-v${finalAttrs.version}-amd64.deb";
+      hash = "sha256-v7VpXXFVaKI99RpzUWfAc6eE7NHGJeFrNeUTbVuX+yg=";
+      curlOptsList = [
+        "--user-agent"
+        "Mozilla/5.0"
+      ];
+    };
+    nativeBuildInputs = [ dpkg ];
+
+    unpackPhase = ''
+      runHook preUnpack
+      dpkg -x $src ./todesk-src
+      runHook postUnpack
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p "$out/lib"
+      cp -r todesk-src/* "$out"
+      cp "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" "$out/opt/todesk/bin/libappindicator3.so.1"
+      mv "$out/opt/todesk/bin" "$out/bin"
+      cp "$out/bin/libmfx.so.1" "$out/lib"
+      cp "$out/bin/libglut.so.3" "$out/lib"
+      mkdir "$out/opt/todesk/config"
+      mkdir "$out/opt/todesk/bin"
+      mkdir -p "$out/share/applications"
+      mkdir "$out/share/icons"
+      runHook postInstall
+    '';
+
+  });
+
+in
+buildFHSEnv {
+  inherit version;
+  name = "todesk";
+  targetPkgs = pkgs: [
+    todesk-unwrapped
+    pulseaudio
+    nspr
+    kmod
+    libXi
+    systemdMinimal
+    glib
+    libz
+    bash
+    coreutils
+    libX11
+    libXext
+    libXrandr
+    glibc
+    libdrm
+    libGL
+    procps
+    cairo
+    libXcomposite
+    libXdamage
+    libXfixes
+    libXtst
+    nss
+    libXxf86vm
+    gtk3
+    gdk-pixbuf
+    pango
+    libva
+  ];
+  extraBwrapArgs = [
+    "--bind /var/lib/todesk /opt/todesk/config" # create the folder before bind to avoid permission denided.
+    "--bind ${todesk-unwrapped}/bin /opt/todesk/bin"
+    "--bind /var/lib/todesk /etc/todesk" # service write uuid here. Such a pain!
+  ]; # soft link doesn't work so that we should bind ourselves
+  runScript = writeShellScript "ToDesk.sh" ''
+    export LIBVA_DRIVER_NAME=iHD
+    export LIBVA_DRIVERS_PATH=${todesk-unwrapped}/bin
+    if [ "''${1}" = 'service' ]
+    then
+        /opt/todesk/bin/ToDesk_Service
+    else
+        /opt/todesk/bin/ToDesk
+    fi
+  ''; # a small script to choose what to exec
+  extraInstallCommands = ''
+    mkdir -p "$out/share/applications"
+    mkdir -p "$out/share/icons"
+    cp ${todesk-unwrapped}/usr/share/applications/todesk.desktop $out/share/applications
+    cp -rf ${todesk-unwrapped}/usr/share/icons/* $out/share/icons
+    substituteInPlace "$out/share/applications/todesk.desktop" \
+      --replace-fail '/opt/todesk/bin/ToDesk' "$out/bin/todesk desktop"
+    substituteInPlace "$out/share/applications/todesk.desktop" \
+      --replace-fail '/opt/todesk/bin' "${todesk-unwrapped}/lib"
+  '';
+  meta = {
+    description = "Remote Desktop Application";
+    homepage = "https://www.todesk.com/linux.html";
+    license = lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    mainProgram = "todesk";
+  };
+}

From 1c77c14c21d415c5b461c345aa340e63efe96159 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 24 Aug 2024 22:26:00 +0800
Subject: [PATCH 07/77] nixos/todesk: init

---
 .../manual/release-notes/rl-2411.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/monitoring/todesk.nix  | 45 +++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/todesk.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 0fea2aa31494..5d0fdb6e3790 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -109,6 +109,8 @@
 
 - [foot](https://codeberg.org/dnkl/foot), a fast, lightweight and minimalistic Wayland terminal emulator. Available as [programs.foot](#opt-programs.foot.enable).
 
+- [ToDesk](https://www.todesk.com/linux.html), a remote desktop applicaton. Available as [services.todesk.enable](#opt-services.todesk.enable).
+
 ## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
 
 - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage:
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 88715af4dc0e..8540a70789cd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -928,6 +928,7 @@
   ./services/monitoring/teamviewer.nix
   ./services/monitoring/telegraf.nix
   ./services/monitoring/thanos.nix
+  ./services/monitoring/todesk.nix
   ./services/monitoring/tremor-rs.nix
   ./services/monitoring/tuptime.nix
   ./services/monitoring/unpoller.nix
diff --git a/nixos/modules/services/monitoring/todesk.nix b/nixos/modules/services/monitoring/todesk.nix
new file mode 100644
index 000000000000..807d924abfcf
--- /dev/null
+++ b/nixos/modules/services/monitoring/todesk.nix
@@ -0,0 +1,45 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.todesk;
+in
+{
+  options = {
+    services.todesk.enable = lib.mkEnableOption "ToDesk daemon";
+    services.todesk.package = lib.mkPackageOption pkgs "todesk" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.todeskd = {
+      description = "ToDesk Daemon Service";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [
+        "network-online.target"
+        "display-manager.service"
+        "nss-lookup.target"
+      ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${cfg.package}/bin/todesk service";
+        ExecReload = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID";
+        Restart = "on-failure";
+        WorkingDirectory = "/var/lib/todesk";
+        PrivateTmp = true;
+        StateDirectory = "todesk";
+        StateDirectoryMode = "0777"; # Desktop application read and write /opt/todesk/config/config.ini. Such a pain!
+        ProtectSystem = "strict";
+        ProtectHome = "read-only";
+        RemoveIPC = "yes";
+      };
+    };
+  };
+}

From 97e4ebd0e8ecbcb877fc1c4ecb41e02cfe776ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 2 Sep 2024 17:17:33 +0200
Subject: [PATCH 08/77] intel-gmmlib: 22.4.1 -> 22.5.1

---
 pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index f685a571de0c..a54872d6c2a5 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "22.4.1";
+  version = "22.5.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "gmmlib";
     rev = "intel-gmmlib-${version}";
-    sha256 = "sha256-z8FPSqWlSubtt+gurntWnkeKsdO2B+KZXTv2Y+TL7t4=";
+    hash = "sha256-YHloVW5TtNI583GOEhx7S27jzHEVTSdbJSDOzv7KZiI=";
   };
 
   nativeBuildInputs = [ cmake ];

From 11dd437b6572f479d9d86c964f208ccf63e96b3f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Fri, 30 Aug 2024 00:46:43 +0200
Subject: [PATCH 09/77] nixos/services.radicle: remove `with lib;`

---
 nixos/modules/services/misc/radicle.nix | 123 ++++++++++++------------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix
index 3a393bf0f1f2..cd7a2452223a 100644
--- a/nixos/modules/services/misc/radicle.nix
+++ b/nixos/modules/services/misc/radicle.nix
@@ -1,5 +1,4 @@
 { config, lib, pkgs, ... }:
-with lib;
 let
   cfg = config.services.radicle;
 
@@ -14,18 +13,18 @@ let
   # Convenient wrapper to run `rad` in the namespaces of `radicle-node.service`
   rad-system = pkgs.writeShellScriptBin "rad-system" ''
     set -o allexport
-    ${toShellVars env}
+    ${lib.toShellVars env}
     # Note that --env is not used to preserve host's envvars like $TERM
-    exec ${getExe' pkgs.util-linux "nsenter"} -a \
-      -t "$(${getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \
-      -S "$(${getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \
-      -G "$(${getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \
-      ${getExe' cfg.package "rad"} "$@"
+    exec ${lib.getExe' pkgs.util-linux "nsenter"} -a \
+      -t "$(${lib.getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \
+      -S "$(${lib.getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \
+      -G "$(${lib.getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \
+      ${lib.getExe' cfg.package "rad"} "$@"
   '';
 
   commonServiceConfig = serviceName: {
     environment = env // {
-      RUST_LOG = mkDefault "info";
+      RUST_LOG = lib.mkDefault "info";
     };
     path = [
       pkgs.gitMinimal
@@ -41,11 +40,11 @@ let
       "network-online.target"
     ];
     wantedBy = [ "multi-user.target" ];
-    serviceConfig = mkMerge [
+    serviceConfig = lib.mkMerge [
       {
         BindReadOnlyPaths = [
           "${cfg.configFile}:${env.RAD_HOME}/config.json"
-          "${if types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub"
+          "${if lib.types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub"
         ];
         KillMode = "process";
         StateDirectory = [ "radicle" ];
@@ -107,7 +106,7 @@ let
         pkgs.gitMinimal
         cfg.package
         pkgs.iana-etc
-        (getLib pkgs.nss)
+        (lib.getLib pkgs.nss)
         pkgs.tzdata
       ];
     };
@@ -116,11 +115,11 @@ in
 {
   options = {
     services.radicle = {
-      enable = mkEnableOption "Radicle Seed Node";
-      package = mkPackageOption pkgs "radicle-node" { };
-      privateKeyFile = mkOption {
+      enable = lib.mkEnableOption "Radicle Seed Node";
+      package = lib.mkPackageOption pkgs "radicle-node" { };
+      privateKeyFile = lib.mkOption {
         # Note that a key encrypted by systemd-creds is not a path but a str.
-        type = with types; either path str;
+        type = with lib.types; either path str;
         description = ''
           Absolute file path to an SSH private key,
           usually generated by `rad auth`.
@@ -130,44 +129,44 @@ in
           and the string after as a path encrypted with `systemd-creds`.
         '';
       };
-      publicKey = mkOption {
-        type = with types; either path str;
+      publicKey = lib.mkOption {
+        type = with lib.types; either path str;
         description = ''
           An SSH public key (as an absolute file path or directly as a string),
           usually generated by `rad auth`.
         '';
       };
       node = {
-        listenAddress = mkOption {
-          type = types.str;
+        listenAddress = lib.mkOption {
+          type = lib.types.str;
           default = "[::]";
           example = "127.0.0.1";
           description = "The IP address on which `radicle-node` listens.";
         };
-        listenPort = mkOption {
-          type = types.port;
+        listenPort = lib.mkOption {
+          type = lib.types.port;
           default = 8776;
           description = "The port on which `radicle-node` listens.";
         };
-        openFirewall = mkEnableOption "opening the firewall for `radicle-node`";
-        extraArgs = mkOption {
-          type = with types; listOf str;
+        openFirewall = lib.mkEnableOption "opening the firewall for `radicle-node`";
+        extraArgs = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ ];
           description = "Extra arguments for `radicle-node`";
         };
       };
-      configFile = mkOption {
-        type = types.package;
+      configFile = lib.mkOption {
+        type = lib.types.package;
         internal = true;
         default = (json.generate "config.json" cfg.settings).overrideAttrs (previousAttrs: {
           preferLocalBuild = true;
           # None of the usual phases are run here because runCommandWith uses buildCommand,
           # so just append to buildCommand what would usually be a checkPhase.
-          buildCommand = previousAttrs.buildCommand + optionalString cfg.checkConfig ''
+          buildCommand = previousAttrs.buildCommand + lib.optionalString cfg.checkConfig ''
             ln -s $out config.json
             install -D -m 644 /dev/stdin keys/radicle.pub <<<"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil"
             export RAD_HOME=$PWD
-            ${getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || {
+            ${lib.getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || {
               cat -n config.json
               echo "Invalid config.json according to rad."
               echo "Please double-check your services.radicle.settings (producing the config.json above),"
@@ -177,13 +176,13 @@ in
           '';
         });
       };
-      checkConfig = mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; };
-      settings = mkOption {
+      checkConfig = lib.mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; };
+      settings = lib.mkOption {
         description = ''
           See https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275
         '';
         default = { };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             web.pinned.repositories = [
               "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5" # heartwood
@@ -191,27 +190,27 @@ in
             ];
           }
         '';
-        type = types.submodule {
+        type = lib.types.submodule {
           freeformType = json.type;
         };
       };
       httpd = {
-        enable = mkEnableOption "Radicle HTTP gateway to radicle-node";
-        package = mkPackageOption pkgs "radicle-httpd" { };
-        listenAddress = mkOption {
-          type = types.str;
+        enable = lib.mkEnableOption "Radicle HTTP gateway to radicle-node";
+        package = lib.mkPackageOption pkgs "radicle-httpd" { };
+        listenAddress = lib.mkOption {
+          type = lib.types.str;
           default = "127.0.0.1";
           description = "The IP address on which `radicle-httpd` listens.";
         };
-        listenPort = mkOption {
-          type = types.port;
+        listenPort = lib.mkOption {
+          type = lib.types.port;
           default = 8080;
           description = "The port on which `radicle-httpd` listens.";
         };
-        nginx = mkOption {
+        nginx = lib.mkOption {
           # Type of a single virtual host, or null.
-          type = types.nullOr (types.submodule (
-            recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {
+          type = lib.types.nullOr (lib.types.submodule (
+            lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {
               options.serverName = {
                 default = "radicle-${config.networking.hostName}.${config.networking.domain}";
                 defaultText = "radicle-\${config.networking.hostName}.\${config.networking.domain}";
@@ -219,7 +218,7 @@ in
             }
           ));
           default = null;
-          example = literalExpression ''
+          example = lib.literalExpression ''
             {
               serverAliases = [
                 "seed.''${config.networking.domain}"
@@ -237,8 +236,8 @@ in
             If this is set to null (the default), no nginx virtual host will be configured.
           '';
         };
-        extraArgs = mkOption {
-          type = with types; listOf str;
+        extraArgs = lib.mkOption {
+          type = with lib.types; listOf str;
           default = [ ];
           description = "Extra arguments for `radicle-httpd`";
         };
@@ -246,19 +245,19 @@ in
     };
   };
 
-  config = mkIf cfg.enable (mkMerge [
+  config = lib.mkIf cfg.enable (lib.mkMerge [
     {
-      systemd.services.radicle-node = mkMerge [
+      systemd.services.radicle-node = lib.mkMerge [
         (commonServiceConfig "radicle-node")
         {
           description = "Radicle Node";
           documentation = [ "man:radicle-node(1)" ];
           serviceConfig = {
-            ExecStart = "${getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${escapeShellArgs cfg.node.extraArgs}";
-            Restart = mkDefault "on-failure";
+            ExecStart = "${lib.getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${lib.escapeShellArgs cfg.node.extraArgs}";
+            Restart = lib.mkDefault "on-failure";
             RestartSec = "30";
             SocketBindAllow = [ "tcp:${toString cfg.node.listenPort}" ];
-            SystemCallFilter = mkAfter [
+            SystemCallFilter = lib.mkAfter [
               # Needed by git upload-pack which calls alarm() and setitimer() when providing a rad clone
               "@timer"
             ];
@@ -271,11 +270,11 @@ in
         {
           serviceConfig =
             let keyCred = builtins.split ":" "${cfg.privateKeyFile}"; in
-            if length keyCred > 1
+            if lib.length keyCred > 1
             then {
               LoadCredentialEncrypted = [ cfg.privateKeyFile ];
               # Note that neither %d nor ${CREDENTIALS_DIRECTORY} works in BindReadOnlyPaths=
-              BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${head keyCred}:${env.RAD_HOME}/keys/radicle" ];
+              BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${lib.head keyCred}:${env.RAD_HOME}/keys/radicle" ];
             }
             else {
               LoadCredential = [ "radicle:${cfg.privateKeyFile}" ];
@@ -288,7 +287,7 @@ in
         rad-system
       ];
 
-      networking.firewall = mkIf cfg.node.openFirewall {
+      networking.firewall = lib.mkIf cfg.node.openFirewall {
         allowedTCPPorts = [ cfg.node.listenPort ];
       };
 
@@ -304,19 +303,19 @@ in
       };
     }
 
-    (mkIf cfg.httpd.enable (mkMerge [
+    (lib.mkIf cfg.httpd.enable (lib.mkMerge [
       {
-        systemd.services.radicle-httpd = mkMerge [
+        systemd.services.radicle-httpd = lib.mkMerge [
           (commonServiceConfig "radicle-httpd")
           {
             description = "Radicle HTTP gateway to radicle-node";
             documentation = [ "man:radicle-httpd(1)" ];
             serviceConfig = {
-              ExecStart = "${getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${escapeShellArgs cfg.httpd.extraArgs}";
-              Restart = mkDefault "on-failure";
+              ExecStart = "${lib.getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${lib.escapeShellArgs cfg.httpd.extraArgs}";
+              Restart = lib.mkDefault "on-failure";
               RestartSec = "10";
               SocketBindAllow = [ "tcp:${toString cfg.httpd.listenPort}" ];
-              SystemCallFilter = mkAfter [
+              SystemCallFilter = lib.mkAfter [
                 # Needed by git upload-pack which calls alarm() and setitimer() when providing a git clone
                 "@timer"
               ];
@@ -328,12 +327,12 @@ in
         ];
       }
 
-      (mkIf (cfg.httpd.nginx != null) {
+      (lib.mkIf (cfg.httpd.nginx != null) {
         services.nginx.virtualHosts.${cfg.httpd.nginx.serverName} = lib.mkMerge [
           cfg.httpd.nginx
           {
-            forceSSL = mkDefault true;
-            enableACME = mkDefault true;
+            forceSSL = lib.mkDefault true;
+            enableACME = lib.mkDefault true;
             locations."/" = {
               proxyPass = "http://${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort}";
               recommendedProxySettings = true;
@@ -342,8 +341,8 @@ in
         ];
 
         services.radicle.settings = {
-          node.alias = mkDefault cfg.httpd.nginx.serverName;
-          node.externalAddresses = mkDefault [
+          node.alias = lib.mkDefault cfg.httpd.nginx.serverName;
+          node.externalAddresses = lib.mkDefault [
             "${cfg.httpd.nginx.serverName}:${toString cfg.node.listenPort}"
           ];
         };

From 11b4b119cf2bdb9a2400f3095f49a0a1f21c8742 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Sep 2024 01:26:26 +0000
Subject: [PATCH 10/77] htpdate: 1.3.7 -> 2.0.0

---
 pkgs/tools/networking/htpdate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix
index 60934216a2ef..0f906b4586a0 100644
--- a/pkgs/tools/networking/htpdate/default.nix
+++ b/pkgs/tools/networking/htpdate/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.7";
+  version = "2.0.0";
   pname = "htpdate";
 
   src = fetchFromGitHub {
     owner = "twekkel";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-XdqQQw87gvWvdx150fQhnCio478PNCQBMw/g/l/T1ZA=";
+    sha256 = "sha256-X7r95Uc4oGB0eVum5D7pC4tebZIyyz73g6Q/D0cjuFM=";
   };
 
   makeFlags = [

From b745b4f77cf3d6ec227aed31302065b5f974a2c5 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 5 Sep 2024 11:26:22 +0200
Subject: [PATCH 11/77] hyperion-ng: 2.0.14 -> 2.0.16

---
 pkgs/applications/video/hyperion-ng/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                 | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index 00c2467624b8..50c00e03c4ef 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub
 , cmake, wrapQtAppsHook, perl
 , flatbuffers, protobuf, mbedtls
-, hidapi, libcec, libusb1
+, alsa-lib, hidapi, libcec, libusb1
 , libX11, libxcb, libXrandr, python3
 , qtbase, qtserialport, qtsvg, qtx11extras
 , withRPiDispmanx ? false, libraspberrypi
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hyperion.ng";
-  version = "2.0.14";
+  version = "2.0.16";
 
   src = fetchFromGitHub {
     owner = "hyperion-project";
     repo = pname;
     rev = version;
-    hash = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc=";
+    hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA=";
     # needed for `dependencies/external/`:
     # * rpi_ws281x` - not possible to use as a "system" lib
     # * qmdnsengine - not in nixpkgs yet
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
+    alsa-lib
     hidapi
     libusb1
     libX11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 327ad752c650..3cbf8f5f0ab4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30663,9 +30663,7 @@ with pkgs;
 
   hydroxide = callPackage ../applications/networking/hydroxide { };
 
-  hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng {
-    protobuf = protobuf_21;
-  };
+  hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
   hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
 

From 0be133aa115608034924f5f1608035073ac45b9e Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 5 Sep 2024 23:30:47 +0530
Subject: [PATCH 12/77] firefly-iii-data-importer: 1.5.4 -> 1.5.5

---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index d647783f7381..a4614f5ae27b 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 let
   pname = "firefly-iii-data-importer";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     rev = "v${version}";
-    hash = "sha256-XnPdoNtUoJpOpKVzQlFirh7u824H4xKAe2VRXfGIKeg=";
+    hash = "sha256-nAeLXxUwaw/wHYh3NywI4/mFi82i/2b3McFfCFGAIjE=";
   };
 in
 
@@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-EjEco8zBR787eQuPhNsRScfuPQ6eS6TIJmMJOcmZA+Q=";
+  vendorHash = "sha256-yLu/FMKn/uUy5g6td3mfPAb9ptjJne4vd478fjaS9U0=";
 
   npmDeps = fetchNpmDeps {
     inherit src;
     name = "${pname}-npm-deps";
-    hash = "sha256-VP1wM0+ca17aQU4FJ9gSbT2Np/sxb8wZ4pCJ6FV1V7w=";
+    hash = "sha256-35mS+0Ea69CAwV9liTU3lcKp3ww3qLbTRWlF0AQNx5w=";
   };
 
   composerRepository = php83.mkComposerRepository {

From 3d200d28912fc1e5afb8e0b126a0edbde109b469 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 8 Sep 2024 16:24:30 +0530
Subject: [PATCH 13/77] weechat: 4.4.1 -> 4.4.2

Changes: https://github.com/weechat/weechat/releases/tag/v4.4.2
---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 0633199787ee..42090534bcc3 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -36,14 +36,14 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "4.4.1";
+      version = "4.4.2";
       pname = "weechat";
 
       hardeningEnable = [ "pie" ];
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-        hash = "sha256-5d4L0UwqV6UFgTqDw9NyZI0tlXPccoNoV78ocXMmk2w=";
+        hash = "sha256-1N8ompxbygOm1PrgBuUgNwZO8Dutb76VnFOPMZdDTew=";
       };
 
       # Why is this needed? https://github.com/weechat/weechat/issues/2031

From 05b0f36dd9ef759b02f60c98af3b85115aa739e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 09:47:14 +0000
Subject: [PATCH 14/77] melonDS: 0.9.5-unstable-2024-08-21 ->
 0.9.5-unstable-2024-09-06

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

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index 6ab2a211b710..2be371c93476 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "0.9.5-unstable-2024-08-21";
+  version = "0.9.5-unstable-2024-09-06";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "4f6498c99c5dcdb780371fe936d49e32df148e6e";
-    hash = "sha256-GfcPWWWAO9zQrqr2+CxNMaIxcfswZhDw1DFjrmpWZ2Q=";
+    rev = "268c4f14c194b72ced33f520688fb0d3d096fad5";
+    hash = "sha256-D7tponrkD+YI6MYeilP5YlpIJ3brdZYKpDV/YE9vOFA=";
   };
 
   nativeBuildInputs = [

From 3f03dc83bef65245c1b14be80260203822be9678 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 9 Sep 2024 13:36:26 +0200
Subject: [PATCH 15/77] jasmin-compiler: propagate angstrom

---
 pkgs/development/compilers/jasmin-compiler/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix
index 26b4309eb919..a19dd7cfb603 100644
--- a/pkgs/development/compilers/jasmin-compiler/default.nix
+++ b/pkgs/development/compilers/jasmin-compiler/default.nix
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     mpfr
     ppl
   ] ++ (with ocamlPackages; [
-    angstrom
     apron
     yojson
   ]);
 
   propagatedBuildInputs = with ocamlPackages; [
+    angstrom
     batteries
     menhirLib
     zarith

From dc6dbca63899de7bafe62781acfd712b3fda45de Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 27 Aug 2024 23:22:10 +0800
Subject: [PATCH 16/77] qtalarm: init at 2.5.1

---
 pkgs/by-name/qt/qtalarm/package.nix | 81 +++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 pkgs/by-name/qt/qtalarm/package.nix

diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
new file mode 100644
index 000000000000..f66c1040e5a2
--- /dev/null
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -0,0 +1,81 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  libsForQt5,
+  qt5,
+  makeDesktopItem,
+  nix-update-script,
+  copyDesktopItems,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qtalarm";
+  version = "2.5.1";
+
+  src = fetchFromGitHub {
+    owner = "CountMurphy";
+    repo = "QTalarm";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-87w5YFQ9olLnCfPF04jOnIMn1NtE2M2n5WZX4e69UGU=";
+  };
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+  ];
+
+  installPhase =
+    ''
+      runHook preInstall
+    ''
+    + (
+      if stdenv.isDarwin then
+        ''
+          mkdir -p $out/Applications
+          mv qtalarm.app $out/Applications
+        ''
+      else
+        ''
+          install -Dm755 qtalarm -t $out/bin
+          install -Dm644 Icons/1349069370_Alarm_Clock.png $out/share/icons/hicolor/48x48/apps/qtalarm.png
+          install -Dm644 Icons/1349069370_Alarm_Clock24.png $out/share/icons/hicolor/24x24/apps/qtalarm.png
+          install -Dm644 Icons/1349069370_Alarm_Clock16.png $out/share/icons/hicolor/16x16/apps/qtalarm.png
+        ''
+    )
+    + ''
+      runHook postInstall
+    '';
+
+  nativeBuildInputs = [
+    qt5.wrapQtAppsHook
+    qt5.qmake
+    copyDesktopItems
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "QTalarm";
+      exec = "qtalarm";
+      icon = "qtalarm";
+      desktopName = "QTalarm";
+      genericName = "Nifty alarm clock";
+      categories = [
+        "Application"
+        "Utility"
+      ];
+      terminal = false;
+    })
+  ];
+  meta = {
+    description = "Nifty alarm clock written in QT";
+    changelog = "https://github.com/CountMurphy/QTalarm/releases/tag/${finalAttrs.version}";
+    homepage = "https://github.com/CountMurphy/QTalarm";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "qtalarm";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    platforms = lib.platforms.unix;
+  };
+})

From 3178e4bc9ecd90edc703f951338f9f01bf56c3fc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 9 Sep 2024 16:22:57 +0200
Subject: [PATCH 17/77] ctranslate2: 4.3.1 -> 4.4.0

https://github.com/OpenNMT/CTranslate2/blob/v4.4.0/CHANGELOG.md
---
 pkgs/development/libraries/ctranslate2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index c640d5f700e2..4668404f9794 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ctranslate2";
-  version = "4.3.1";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     rev = "v${version}";
-    hash = "sha256-ApmGto9RzT8t49bsZVwk8aQnIau9sQyFvt9qnWKUGAE=";
+    hash = "sha256-E/ulk+Oo1zEP+sCKMZuMVSoO0MDjQ2opTflSwLmCJMw=";
     fetchSubmodules = true;
   };
 

From abc759221fc62d75c0441a278b381591af717c7a Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Mon, 9 Sep 2024 09:57:01 -0400
Subject: [PATCH 18/77] linux: remove unneeded and misleading
 passthru.isVanilla

This was added for use by ZFS, but it turned out that `pname == "linux"`
is sufficient enough and has better coverage since many of our Linux
variants do not have an existing `passthru.isX`, and instead are
identifiable by a different pname.
---
 pkgs/os-specific/linux/kernel/generic.nix | 1 -
 pkgs/os-specific/linux/zfs/generic.nix    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index a6067439a8f3..74e603623412 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -230,7 +230,6 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: {
   passthru = previousAttrs.passthru or { } // basicArgs // {
     features = kernelFeatures;
     inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre;
-    isVanilla = !(isHardened || isLibre || isZen);
     isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
 
     # Adds dependencies needed to edit the config:
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index d9cba044d501..263fcc448097 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -203,7 +203,7 @@ let
       inherit enableMail kernelModuleAttribute;
       latestCompatibleLinuxPackages = lib.pipe linuxKernel.packages [
         builtins.attrValues
-        (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.passthru.isVanilla && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel))
+        (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel))
         (builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)))
         lib.last
       ];

From 584c1b910ddf1c7051c4ad8e7b878e3919d08377 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 15:59:35 +0000
Subject: [PATCH 19/77] vbam: 2.1.9 -> 2.1.10

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

diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix
index b5141c59f91e..67a2d62f7567 100644
--- a/pkgs/applications/emulators/vbam/default.nix
+++ b/pkgs/applications/emulators/vbam/default.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation rec {
   pname = "visualboyadvance-m";
-  version = "2.1.9";
+  version = "2.1.10";
   src = fetchFromGitHub {
     owner = "visualboyadvance-m";
     repo = "visualboyadvance-m";
     rev = "v${version}";
-    sha256 = "sha256-t5/CM5KXDG0OCByu7mUyuC5NkYmB3BFmEHHgnMY05nE=";
+    sha256 = "sha256-ca+BKedHuOwHOCXgjLkkpR6Pd+59X2R66dbPWEg2O5A=";
   };
 
   nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ];

From 1e3de70908d1c377e95e8350279475b470dfa27e Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:06:52 +0200
Subject: [PATCH 20/77] python311Packages.openstackdocstheme: 3.2.0 -> 3.3.0

https://github.com/openstack/openstackdocstheme/compare/3.2.0...3.3.0
---
 .../python-modules/openstackdocstheme/default.nix     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
index 20c0dd9c176c..b316a7aaeee2 100644
--- a/pkgs/development/python-modules/openstackdocstheme/default.nix
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -6,19 +6,20 @@
   pbr,
   sphinx,
   pythonAtLeast,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "openstackdocstheme";
-  version = "3.2.0";
-  format = "setuptools";
+  version = "3.3.0";
+  pyproject = true;
 
   # breaks on import due to distutils import through pbr.packaging
   disabled = pythonAtLeast "3.12";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4=";
+    hash = "sha256-wmZJmX5bQKM1uwqWxynkY5jPJaBn+Y2eqSRkE2Ub0qM=";
   };
 
   postPatch = ''
@@ -27,7 +28,9 @@ buildPythonPackage rec {
     rm test-requirements.txt
   '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     dulwich
     pbr
     sphinx

From 4ba44026b4ce40ec96e1d389bb40008c6137ad40 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:11:34 +0200
Subject: [PATCH 21/77] python311Packages.python-cinderclient: 9.5.0 -> 9.6.0

https://github.com/openstack/python-cinderclient/compare/9.5.0...9.6.0
---
 .../python-cinderclient/default.nix              | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix
index b942574c6e9c..cad6609e3c78 100644
--- a/pkgs/development/python-modules/python-cinderclient/default.nix
+++ b/pkgs/development/python-modules/python-cinderclient/default.nix
@@ -10,7 +10,9 @@
   pbr,
   requests,
   prettytable,
+  pythonOlder,
   requests-mock,
+  setuptools,
   simplejson,
   stestr,
   stevedore,
@@ -18,15 +20,19 @@
 
 buildPythonPackage rec {
   pname = "python-cinderclient";
-  version = "9.5.0";
-  format = "setuptools";
+  version = "9.6.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-G51xev+TytQgBF+2xS9jdqty8IX4GTEwiSAg7EbJNVU=";
+    hash = "sha256-P+/eJoJS5S4w/idz9lgienjG3uN4/LEy0xyG5uybojg=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     simplejson
     keystoneauth1
     oslo-i18n
@@ -45,7 +51,9 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
+    runHook preCheck
     stestr run
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "cinderclient" ];

From d95f47992b90b0a8b4b18ad25a6e0c4a99c27aef Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:13:31 +0200
Subject: [PATCH 22/77] python311Packages.python-keystoneclient: 5.4.0 -> 5.5.0

https://github.com/openstack/python-keystoneclient/compare/5.4.0...5.5.0
---
 .../python-keystoneclient/default.nix               | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix
index e8f19e2a01a2..3c25f946ea2e 100644
--- a/pkgs/development/python-modules/python-keystoneclient/default.nix
+++ b/pkgs/development/python-modules/python-keystoneclient/default.nix
@@ -9,6 +9,7 @@
   pbr,
   pythonOlder,
   requests-mock,
+  setuptools,
   stestr,
   testresources,
   testscenarios,
@@ -16,17 +17,19 @@
 
 buildPythonPackage rec {
   pname = "python-keystoneclient";
-  version = "5.4.0";
-  format = "setuptools";
+  version = "5.5.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-srS9vp2vews1O4gHZy7u0B+H3QO0+LQtDQYbCbiTH0E=";
+    hash = "sha256-wvWTT5VXaTbJjkW/WZrUi8sKxFFZPl+DROv1LLD0EfU=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     keystoneauth1
     oslo-config
     oslo-serialization
@@ -42,7 +45,9 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
+    runHook preCheck
     stestr run
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "keystoneclient" ];

From a48e735877e737b6fdd805fe1d72acc6b7452831 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:17:21 +0200
Subject: [PATCH 23/77] python311Packages.python-novaclient: 18.6.0 -> 18.7.0

https://github.com/openstack/python-novaclient/compare/18.6.0...18.7.0
---
 .../python-modules/python-novaclient/default.nix    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix
index e0257ae1cfda..a6a4b3d33e88 100644
--- a/pkgs/development/python-modules/python-novaclient/default.nix
+++ b/pkgs/development/python-modules/python-novaclient/default.nix
@@ -12,23 +12,26 @@
   prettytable,
   pythonOlder,
   requests-mock,
+  setuptools,
   stestr,
   testscenarios,
 }:
 
 buildPythonPackage rec {
   pname = "python-novaclient";
-  version = "18.6.0";
-  format = "setuptools";
+  version = "18.7.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-VzwQqkILCJjTX7FG7di7AFgGv/8BMa4rWjDKIqyJR3s=";
+    hash = "sha256-lMrQ8PTBYc7VKl7NhdE0/Wc7mX2nGUoDHAymk0Q0Cw0=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     iso8601
     keystoneauth1
     oslo-i18n
@@ -46,12 +49,14 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
+    runHook preCheck
     stestr run -e <(echo "
     novaclient.tests.unit.test_shell.ParserTest.test_ambiguous_option
     novaclient.tests.unit.test_shell.ParserTest.test_not_really_ambiguous_option
     novaclient.tests.unit.test_shell.ShellTest.test_osprofiler
     novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler
     ")
+    runHook postCheck
   '';
 
   pythonImportsCheck = [ "novaclient" ];

From b9c817baad8477a9a626b1165a27ca7199728043 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:33:57 +0200
Subject: [PATCH 24/77] python311Packages.oslo-config: 9.5.0 -> 9.6.0

https://github.com/openstack/oslo.config/compare/9.5.0...9.6.0
---
 pkgs/development/python-modules/oslo-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index c799b6c67f30..dbcde501d345 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "oslo-config";
-  version = "9.5.0";
+  version = "9.6.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "oslo.config";
     inherit version;
-    hash = "sha256-qlAARIhrbFX3ZXfLWpNJKkWWxfkoM3Z2DqeFLMScmaM=";
+    hash = "sha256-nwXvcOSNmmGo0Mm+04naJPLvWonfW26N63x0HWETZn4=";
   };
 
   postPatch = ''

From 46616aeda0e1daa9644a216a5461564d75e65f24 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 21:43:22 +0200
Subject: [PATCH 25/77] python311Packages.python-novaclient: generate manpages

---
 .../python-modules/python-novaclient/default.nix      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix
index a6a4b3d33e88..481827342f53 100644
--- a/pkgs/development/python-modules/python-novaclient/default.nix
+++ b/pkgs/development/python-modules/python-novaclient/default.nix
@@ -6,6 +6,7 @@
   iso8601,
   keystoneauth1,
   openssl,
+  openstackdocstheme,
   oslo-i18n,
   oslo-serialization,
   pbr,
@@ -13,6 +14,8 @@
   pythonOlder,
   requests-mock,
   setuptools,
+  sphinxcontrib-apidoc,
+  sphinxHook,
   stestr,
   testscenarios,
 }:
@@ -29,6 +32,14 @@ buildPythonPackage rec {
     hash = "sha256-lMrQ8PTBYc7VKl7NhdE0/Wc7mX2nGUoDHAymk0Q0Cw0=";
   };
 
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxcontrib-apidoc
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 01311de0f63d8791aaaf61b26d4bfef94742e88e Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 22:41:39 +0200
Subject: [PATCH 26/77] python311Packages.bindep: enable `pyproject = true`

---
 .../python-modules/bindep/default.nix         | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix
index 8153354843a4..6d8c2d0a5a22 100644
--- a/pkgs/development/python-modules/bindep/default.nix
+++ b/pkgs/development/python-modules/bindep/default.nix
@@ -1,47 +1,48 @@
 {
   lib,
-  fetchPypi,
   buildPythonPackage,
   distro,
-  pbr,
-  setuptools,
+  fetchPypi,
   packaging,
   parsley,
+  pbr,
+  setuptools,
 }:
+
 buildPythonPackage rec {
   pname = "bindep";
   version = "2.11.0";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8=";
   };
 
-  buildInputs = [
+  env.PBR_VERSION = version;
+
+  build-system = [
     distro
     pbr
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     parsley
     pbr
     packaging
     distro
   ];
 
-  patchPhase = ''
-    # Setting the pbr version will skip any version checking logic
-    # This is required because pbr thinks it gets it's own version from git tags
-    # See https://docs.openstack.org/pbr/latest/user/packagers.html
-    export PBR_VERSION=5.11.1
-  '';
+  # Checks moved to 'passthru.tests' to workaround infinite recursion
+  doCheck = false;
+
+  pythonImportsCheck = [ "bindep" ];
 
   meta = with lib; {
     description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library";
     homepage = "https://docs.opendev.org/opendev/bindep/latest/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ melkor333 ];
+    maintainers = teams.openstack.members ++ (with maintainers; [ melkor333 ]);
   };
 }

From 2b5b1f13cbfd616dc5dc23a8c165a65a743b2298 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 23:03:18 +0200
Subject: [PATCH 27/77] reno: 3.1.0 -> 4.1.0

https://github.com/openstack/reno/compare/3.1.0...4.1.0
---
 pkgs/development/tools/reno/default.nix | 64 +++++++++++++++++--------
 pkgs/top-level/all-packages.nix         |  4 +-
 2 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
index f687583888f2..c5d79f3badf6 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@@ -1,33 +1,44 @@
-{ lib
-, git
-, gnupg1
-, python3Packages
-, fetchPypi
+{
+  lib,
+  fetchPypi,
+  git,
+  gnupg1,
+  python3Packages,
 }:
 
-with python3Packages; buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "reno";
-  version = "3.1.0";
+  version = "4.1.0";
+  pyproject = true;
 
   # Must be built from python sdist because of versioning quirks
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2510e3aae4874674187f88f22f854e6b0ea1881b77039808a68ac1a5e8ee69b6";
+    hash = "sha256-+ZLx/b0WIV7J3kevCBMdU6KDDJ54Q561Y86Nan9iU3A=";
   };
 
-  propagatedBuildInputs = [
+  # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs
+  postPatch = ''
+    rm test-requirements.txt
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     dulwich
     pbr
     pyyaml
     setuptools  # required for finding pkg_resources at runtime
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     # Python packages
-    pytestCheckHook
     docutils
     fixtures
     sphinx
+    stestr
     testtools
     testscenarios
 
@@ -36,17 +47,30 @@ with python3Packages; buildPythonApplication rec {
     gnupg1
   ];
 
-  # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs
-  postPatch = ''
-    rm test-requirements.txt
+  checkPhase = ''
+    runHook preCheck
+    export HOME=$TMPDIR
+    stestr run -e <(echo "
+      # Expects to be run from a git repository
+      reno.tests.test_cache.TestCache.test_build_cache_db
+      reno.tests.test_semver.TestSemVer.test_major_post_release
+      reno.tests.test_semver.TestSemVer.test_major_working_and_post_release
+      reno.tests.test_semver.TestSemVer.test_major_working_copy
+      reno.tests.test_semver.TestSemVer.test_minor_post_release
+      reno.tests.test_semver.TestSemVer.test_minor_working_and_post_release
+      reno.tests.test_semver.TestSemVer.test_minor_working_copy
+      reno.tests.test_semver.TestSemVer.test_patch_post_release
+      reno.tests.test_semver.TestSemVer.test_patch_working_and_post_release
+      reno.tests.test_semver.TestSemVer.test_patch_working_copy
+      reno.tests.test_semver.TestSemVer.test_same
+      reno.tests.test_semver.TestSemVer.test_same_with_note
+    ")
+    runHook postCheck
   '';
 
-  disabledTests = [
-    "test_build_cache_db" # expects to be run from a git repository
-  ];
+  pythonImportsCheck = [ "reno" ];
 
-  # verify executable
-  postCheck = ''
+  postInstallCheck = ''
     $out/bin/reno -h
   '';
 
@@ -55,6 +79,6 @@ with python3Packages; buildPythonApplication rec {
     mainProgram = "reno";
     homepage = "https://docs.openstack.org/reno/latest";
     license = licenses.asl20;
-    maintainers = with maintainers; [ drewrisinger guillaumekoenig ];
+    maintainers = teams.openstack.members ++ (with maintainers; [ drewrisinger guillaumekoenig ]);
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d13526153f6..d87ceb14e4e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18719,7 +18719,9 @@ with pkgs;
 
   regex-cli = callPackage ../development/tools/misc/regex-cli { };
 
-  reno = callPackage ../development/tools/reno { };
+  reno = callPackage ../development/tools/reno {
+    python3Packages = python311Packages;
+  };
 
   re2c = callPackage ../development/tools/parsing/re2c { };
 

From d725bdcf0dca08e9c660458b9b59520ec6b5b2ff Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 23:07:01 +0200
Subject: [PATCH 28/77] python311Packages.python-cinderclient: enable manpages

---
 .../python-modules/python-cinderclient/default.nix    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix
index cad6609e3c78..92e896e3ff65 100644
--- a/pkgs/development/python-modules/python-cinderclient/default.nix
+++ b/pkgs/development/python-modules/python-cinderclient/default.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   ddt,
   keystoneauth1,
+  openstackdocstheme,
   oslo-i18n,
   oslo-serialization,
   oslo-utils,
@@ -11,9 +12,11 @@
   requests,
   prettytable,
   pythonOlder,
+  reno,
   requests-mock,
   setuptools,
   simplejson,
+  sphinxHook,
   stestr,
   stevedore,
 }:
@@ -30,6 +33,14 @@ buildPythonPackage rec {
     hash = "sha256-P+/eJoJS5S4w/idz9lgienjG3uN4/LEy0xyG5uybojg=";
   };
 
+  nativeBuildInputs = [
+    openstackdocstheme
+    reno
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 8cad130f389f4e347a7c0d67f0398ebd4026dd47 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 23:17:38 +0200
Subject: [PATCH 29/77] bashate: enable `pyproject = true`

---
 pkgs/development/tools/bashate/default.nix | 37 ++++++++++++----------
 pkgs/top-level/all-packages.nix            |  4 ++-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix
index fd4161499c72..3cbf97398953 100644
--- a/pkgs/development/tools/bashate/default.nix
+++ b/pkgs/development/tools/bashate/default.nix
@@ -1,39 +1,42 @@
-{ lib
-, babel
-, buildPythonApplication
-, fetchPypi
-, fixtures
-, mock
-, pbr
-, pytestCheckHook
-, pythonOlder
-, setuptools
-, testtools
+{
+  lib,
+  fetchPypi,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "bashate";
   version = "2.1.1";
-  disabled = pythonOlder "3.5";
+  pyproject = true;
+
+  disabled = python3Packages.pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w=";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     babel
     pbr
     setuptools
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     fixtures
     mock
-    pytestCheckHook
+    stestr
     testtools
   ];
 
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+
   pythonImportsCheck = [ "bashate" ];
 
   meta = with lib; {
@@ -41,6 +44,6 @@ buildPythonApplication rec {
     mainProgram = "bashate";
     homepage = "https://opendev.org/openstack/bashate";
     license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
+    maintainers = teams.openstack.members ++ (with maintainers; [ fab ]);
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d87ceb14e4e8..16bf44e616ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3371,7 +3371,9 @@ with pkgs;
 
   base16384 = callPackage ../tools/text/base16384 { };
 
-  bashate = python3Packages.callPackage ../development/tools/bashate { };
+  bashate = python3Packages.callPackage ../development/tools/bashate {
+    python3Packages = python311Packages;
+  };
 
   bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
 

From fc470cc822a802568f8fb9d9d4a50225c299c545 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Fri, 30 Aug 2024 22:24:20 +0200
Subject: [PATCH 30/77] python311Packages.stevedore: 5.2.0 -> 5.3.0

https://github.com/openstack/stevedore/compare/5.2.0...5.3.0
---
 .../python-modules/stevedore/default.nix      | 29 +++++++++++++------
 .../python-modules/stevedore/tests.nix        | 29 +++++++++++++++++++
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/stevedore/tests.nix

diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index b1642c4df199..5d6c048ecfb4 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -1,38 +1,49 @@
 {
   lib,
   buildPythonPackage,
+  callPackage,
   fetchPypi,
   pythonOlder,
   importlib-metadata,
   pbr,
   setuptools,
-  six,
 }:
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "5.2.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  version = "5.3.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Rrk8pA4RFM6pPXOKbB42U5aYG7a7eMJwRbdYfJRzVE0=";
+    hash = "sha256-mmQmX0BgMSgoFRwgTvvpt6mFKg2SKHVjRNvH5AI+N1o=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [
     pbr
     setuptools
-    six
-  ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ];
 
+  dependencies = [
+    importlib-metadata
+    setuptools
+  ];
+
+  # Checks moved to 'passthru.tests' to workaround infinite recursion
   doCheck = false;
+
+  passthru.tests = {
+    tests = callPackage ./tests.nix { };
+  };
+
   pythonImportsCheck = [ "stevedore" ];
 
   meta = with lib; {
     description = "Manage dynamic plugins for Python applications";
     homepage = "https://docs.openstack.org/stevedore/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    maintainers = teams.openstack.members ++ (with maintainers; [ fab ]);
   };
 }
diff --git a/pkgs/development/python-modules/stevedore/tests.nix b/pkgs/development/python-modules/stevedore/tests.nix
new file mode 100644
index 000000000000..7ae013a6e241
--- /dev/null
+++ b/pkgs/development/python-modules/stevedore/tests.nix
@@ -0,0 +1,29 @@
+{
+  buildPythonPackage,
+  docutils,
+  sphinx,
+  stestr,
+  stevedore,
+}:
+
+buildPythonPackage {
+  pname = "stevedore-tests";
+  inherit (stevedore) version src;
+  format = "other";
+
+  dontBuild = true;
+  dontInstall = true;
+
+  nativeCheckInputs = [
+    docutils
+    sphinx
+    stestr
+    stevedore
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+}

From f448b0ef13c5b17cab875f00f3f60608319292f7 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 1 Sep 2024 16:45:54 +0200
Subject: [PATCH 31/77] python311Packages.python-designateclient: 6.0.1 ->
 6.1.0

https://github.com/openstack/python-designateclient/compare/6.0.1...6.1.0
---
 .../python-designateclient/default.nix            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix
index fa2a61d85aa4..44b5b4a665ef 100644
--- a/pkgs/development/python-modules/python-designateclient/default.nix
+++ b/pkgs/development/python-modules/python-designateclient/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "python-designateclient";
-  version = "6.0.1";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,21 +32,24 @@ buildPythonPackage rec {
     owner = "openstack";
     repo = "python-designateclient";
     rev = version;
-    hash = "sha256-vuaouOA69REx+ZrzXjLGVz5Az1/d6x4WRT1h78xeebk=";
+    hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU=";
   };
 
   env.PBR_VERSION = version;
 
-  build-system = [
+  nativeBuildInputs = [
     openstackdocstheme
-    pbr
-    setuptools
     sphinxHook
     sphinxcontrib-apidoc
   ];
 
   sphinxBuilders = [ "man" ];
 
+  build-system = [
+    pbr
+    setuptools
+  ];
+
   dependencies = [
     debtcollector
     jsonschema
@@ -57,8 +60,6 @@ buildPythonPackage rec {
     requests
   ];
 
-  doCheck = true;
-
   nativeCheckInputs = [
     oslotest
     requests-mock

From 52d83592fd3ec30e8df3ebad2f64ff42c3514073 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 1 Sep 2024 21:22:00 +0200
Subject: [PATCH 32/77] python311Packages.bindep: remove melkor333 from
 maintainers

---
 pkgs/development/python-modules/bindep/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix
index 6d8c2d0a5a22..3927c841b6e3 100644
--- a/pkgs/development/python-modules/bindep/default.nix
+++ b/pkgs/development/python-modules/bindep/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library";
     homepage = "https://docs.opendev.org/opendev/bindep/latest/";
     license = licenses.asl20;
-    maintainers = teams.openstack.members ++ (with maintainers; [ melkor333 ]);
+    maintainers = teams.openstack.members;
   };
 }

From 8b4fa8c7abd26810bd51c38896c999c264663d58 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 1 Sep 2024 21:23:17 +0200
Subject: [PATCH 33/77] python311Packages.bindep: add meta.mainProgram

---
 pkgs/development/python-modules/bindep/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix
index 3927c841b6e3..7feb91d8d971 100644
--- a/pkgs/development/python-modules/bindep/default.nix
+++ b/pkgs/development/python-modules/bindep/default.nix
@@ -43,6 +43,7 @@ buildPythonPackage rec {
     description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library";
     homepage = "https://docs.opendev.org/opendev/bindep/latest/";
     license = licenses.asl20;
+    mainProgram = "bindep";
     maintainers = teams.openstack.members;
   };
 }

From de188ad0d237d85b48bab990e195981e0779bf74 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Tue, 3 Sep 2024 20:58:53 +0200
Subject: [PATCH 34/77] python311Packages.openstacksdk: 3.3.0 -> 4.0.0

https://github.com/openstack/openstacksdk/compare/3.3.0...4.0.0
---
 .../python-modules/openstacksdk/default.nix           | 11 ++++++-----
 .../development/python-modules/openstacksdk/tests.nix |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix
index 5bf0f23accba..121f64dd535b 100644
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@@ -23,10 +23,10 @@
 
 buildPythonPackage rec {
   pname = "openstacksdk";
-  version = "3.3.0";
+  version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA=";
+    hash = "sha256-54YN2WtwUxMJI8EdVx0lgCuWjx4xOIRct8rHxrMzv0s=";
   };
 
   postPatch = ''
@@ -44,14 +44,15 @@ buildPythonPackage rec {
       --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter',"
   '';
 
-  build-system = [
+  nativeBuildInputs = [
     openstackdocstheme
-    setuptools
     sphinxHook
   ];
 
   sphinxBuilders = [ "man" ];
 
+  build-system = [ setuptools ];
+
   dependencies = [
     platformdirs
     cryptography
diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix
index 43633f98a038..be333be87665 100644
--- a/pkgs/development/python-modules/openstacksdk/tests.nix
+++ b/pkgs/development/python-modules/openstacksdk/tests.nix
@@ -56,6 +56,7 @@ buildPythonPackage {
       openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
       openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396
       openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait
+      openstack.tests.unit.test_resource.TestWaitForDelete.test_callback
       openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress
       openstack.tests.unit.test_resource.TestWaitForDelete.test_status
       openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found

From 0b8ac40f56727f7883efdbf745b6cd55bbadfb18 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Wed, 4 Sep 2024 12:41:40 +0200
Subject: [PATCH 35/77] jira-cli-go: add fish completions

Co-authored-by: Nikolay Korotkiy <sikmir@disroot.org>
---
 pkgs/development/tools/jira-cli-go/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix
index d031cd9394d7..eab6becf61ff 100644
--- a/pkgs/development/tools/jira-cli-go/default.nix
+++ b/pkgs/development/tools/jira-cli-go/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }:
+{ lib, stdenv, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }:
 
 buildGoModule rec {
   pname = "jira-cli-go";
@@ -34,9 +34,10 @@ buildGoModule rec {
   };
 
   nativeBuildInputs = [ installShellFiles ];
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd jira \
       --bash <($out/bin/jira completion bash) \
+      --fish <($out/bin/jira completion fish) \
       --zsh <($out/bin/jira completion zsh)
 
     $out/bin/jira man --generate --output man

From 7dfa72b5fdef1a334c1376b7b24a00ad11034cb9 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 9 Sep 2024 20:41:33 +0200
Subject: [PATCH 36/77] mouse-actions-gui: 0.4.4 -> 0.4.5

---
 pkgs/by-name/mo/mouse-actions-gui/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index 96051b6ab3e6..80f845038582 100644
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mouse-actions-gui";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "jersou";
     repo = "mouse-actions";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-02E4HrKIoBV3qZPVH6Tjz9Bv/mh5C8amO1Ilmd+YO5g=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/config-editor";
@@ -58,16 +58,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-Rnr5jRupdUu6mIsWvdN6AnQnsxB5h31n/24pYslGs5g=";
+    hash = "sha256-amDTYAvEoDHb7+dg39+lUne0dv0M9vVe1vHoXk2agZA=";
   };
 
   cargoRoot = "src-tauri";
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
-    inherit (finalAttrs) src;
+    inherit (finalAttrs) pname version src;
     sourceRoot = "${finalAttrs.sourceRoot}/${finalAttrs.cargoRoot}";
-    hash = "sha256-VQFRatnxzmywAiMLfkVgB7g8AFoqfWFYjt/vezpE1o8=";
+    hash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU=";
   };
 
   buildPhase = ''

From 713cbd6fa047a5269148d9dfd1f51beb68c2b286 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 19:26:26 +0000
Subject: [PATCH 37/77] lefthook: 1.7.14 -> 1.7.15

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

diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index 947fbaace104..3d4fc68dbef9 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "lefthook";
-  version = "1.7.14";
+  version = "1.7.15";
 in
 buildGoModule {
   inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-yGxEeNn6YnzivvQW+HXMAkSaKZ5mmAflyDlNYfjqguc=";
+    hash = "sha256-N79unpeeOwcdHJo9IbsGa/gmTyg+QQCJF599cshV3sc=";
   };
 
-  vendorHash = "sha256-YrBFcRQoqZPe/USZj3oJK5KR7y0LimCVGS9w4uNMG6M=";
+  vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b9a93e0c2b12327801e3d741ec7e19394d0f5dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:42:36 -0400
Subject: [PATCH 38/77] python312Packages.geoparquet: fix typo

---
 pkgs/development/python-modules/geoparquet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/geoparquet/default.nix b/pkgs/development/python-modules/geoparquet/default.nix
index ce50e2484c2d..d4b54610c506 100644
--- a/pkgs/development/python-modules/geoparquet/default.nix
+++ b/pkgs/development/python-modules/geoparquet/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage {
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
-  pythonImportCheck = "geoparquet";
+  pythonImportsCheck = [ "geoparquet" ];
 
   doCheck = false; # no tests
 

From d9a8ce569d12cac39565d57d77223473ff5fee97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:42:50 -0400
Subject: [PATCH 39/77] python312Packages.pyaiports: fix typo

---
 pkgs/development/python-modules/pyairports/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyairports/default.nix b/pkgs/development/python-modules/pyairports/default.nix
index b6c8b2a8a4c4..3803d9549218 100644
--- a/pkgs/development/python-modules/pyairports/default.nix
+++ b/pkgs/development/python-modules/pyairports/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  pythonImportChecks = [ "pyairports" ];
+  pythonImportsCheck = [ "pyairports" ];
 
   meta = with lib; {
     description = "pyairports is a package which enables airport lookup by 3-letter IATA code.";

From 3a512f25b895ee1f1c530691e450e0ac3c15180a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:43:02 -0400
Subject: [PATCH 40/77] python312Packages.pyfunctional: fix typo

---
 pkgs/development/python-modules/pyfunctional/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyfunctional/default.nix b/pkgs/development/python-modules/pyfunctional/default.nix
index 843eebd17399..1e4039cc5452 100644
--- a/pkgs/development/python-modules/pyfunctional/default.nix
+++ b/pkgs/development/python-modules/pyfunctional/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
-  pythonImportCheck = "pyfunctional";
+  pythonImportsCheck = [ "functional" ];
 
   meta = {
     description = "Python library for creating data pipelines with chain functional programming";

From 1f8f36129384bcecf7cac73f398aeaf308976652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:43:10 -0400
Subject: [PATCH 41/77] python312Packages.python-ffmpeg: fix typo

---
 pkgs/development/python-modules/python-ffmpeg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/python-ffmpeg/default.nix b/pkgs/development/python-modules/python-ffmpeg/default.nix
index 12b734c37700..3eba0ddb1d22 100644
--- a/pkgs/development/python-modules/python-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/python-ffmpeg/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pyee ];
 
   nativeBuildInputs = [ setuptools-scm ];
-  pythonImportCheck = [ "ffmpeg" ];
+  pythonImportsCheck = [ "ffmpeg" ];
 
   meta = {
     homepage = "https://github.com/jonghwanhyeon/python-ffmpeg";

From 303b35d97e72f1988ea7bac9711f7d561bf82a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 10 Sep 2024 00:45:08 +0200
Subject: [PATCH 42/77] golangci-lint: 1.60.3 -> 1.61.0

Diff: https://github.com/golangci/golangci-lint/compare/v1.60.3...v1.61.0

Changelog: https://github.com/golangci/golangci-lint/blob/v1.61.0/CHANGELOG.md
---
 pkgs/development/tools/golangci-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index f9977b1b4898..620dc94a8b03 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGo123Module rec {
   pname = "golangci-lint";
-  version = "1.60.3";
+  version = "1.61.0";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    hash = "sha256-0ScdJ5td2N8WF1dwHQ3dBSjyr1kqgrzCfBzbRg9cRrw=";
+    hash = "sha256-2YzVNOdasal27R92l6eVdeS81mAp0ZU6kYsC/Jfvkcg=";
   };
 
-  vendorHash = "sha256-ixeswsfx36D0Tg103swbBD8UXXLNYbxSMYDE+JOm+uw=";
+  vendorHash = "sha256-mFDCRxbLq08yRd0ko3CCPJD2BZiCB0Gwd1g+/1oR6w8=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 4dc12820710caf520c73fc717f04e8fba53c3d3e Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 5 Sep 2024 16:02:34 -0400
Subject: [PATCH 43/77] gitea: 1.22.1 -> 1.22.2

Diff: https://github.com/go-gitea/gitea/compare/v1.22.1...1.22.2
---
 pkgs/by-name/gi/gitea/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index f9792f89c715..3b5e5ccdf579 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildGoModule
 , fetchFromGitHub
 , makeWrapper
@@ -20,7 +19,7 @@ let
     pname = "gitea-frontend";
     inherit (gitea) src version;
 
-    npmDepsHash = "sha256-gXBBiDIIS0aW6qK37HcF0AuJOliblinznRVXoo6DV1s=";
+    npmDepsHash = "sha256-Sp3xBe5IXys2Qro4x4HKs9dQOnlbstAmtIG6xOOktEk=";
 
     # use webpack directly instead of 'make frontend' as the packages are already installed
     buildPhase = ''
@@ -34,16 +33,18 @@ let
   };
 in buildGoModule rec {
   pname = "gitea";
-  version = "1.22.1";
+  version = "1.22.2";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${gitea.version}";
-    hash = "sha256-s7su3gMdXv2sT1uYYtx29n7QDvmPU9QB3QR6ctOlE58=";
+    hash = "sha256-PwA23cbRgw5crzZmngDjAAIODMtguwBCqc9NqWMjF3o=";
   };
 
-  vendorHash = "sha256-nzhjIfQMzSf1nuBMTIe0xn+NMDFbDZ9jRHu8Nwzmp4w=";
+  proxyVendor = true;
+
+  vendorHash = "sha256-rMTKmztQNse/9CK1qFGWmSwqunwh918EvcuIHk6BSTY=";
 
   outputs = [ "out" "data" ];
 

From 4fad4c72af67ee8701a4be41e248c41ab5af30a9 Mon Sep 17 00:00:00 2001
From: John Shaffer <jdsha@pm.me>
Date: Mon, 9 Sep 2024 23:20:59 -0500
Subject: [PATCH 44/77] srvc: drop

The upstream is unmaintained, and the build is
currently broken due to Rust 1.80 changes.
See https://github.com/NixOS/nixpkgs/issues/332957
---
 .../version-management/srvc/default.nix       | 34 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/version-management/srvc/default.nix

diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix
deleted file mode 100644
index c2dc0d8bd2be..000000000000
--- a/pkgs/applications/version-management/srvc/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "srvc";
-  version = "0.20.0";
-
-  src = fetchFromGitHub {
-    owner = "insilica";
-    repo = "rs-srvc";
-    rev = "v${version}";
-    hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg=";
-  };
-
-  cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw=";
-
-  buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.CoreServices
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  nativeCheckInputs = [ git ];
-
-  # remove timeouts in tests to make them less flaky
-  TEST_SRVC_DISABLE_TIMEOUT = 1;
-
-  meta = with lib; {
-    description = "Sysrev version control";
-    homepage = "https://github.com/insilica/rs-srvc";
-    changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ john-shaffer ];
-    mainProgram = "sr";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 98a997e614bf..3ac307ad53b6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1466,6 +1466,7 @@ mapAliases ({
   spotify-unwrapped = spotify; # added 2022-11-06
   spring-boot = spring-boot-cli; # added 2020-04-24
   squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10
+  srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
   ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21
   ssm-agent = amazon-ssm-agent; # Added 2023-10-17
   starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6eb3e18594de..bfe7e8903b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6004,8 +6004,6 @@ with pkgs;
 
   spacevim = callPackage ../applications/editors/spacevim { };
 
-  srvc = callPackage ../applications/version-management/srvc { };
-
   ssmsh = callPackage ../tools/admin/ssmsh { };
 
   stacs = callPackage ../tools/security/stacs { };

From f280f79715b09aa6a652aeaecd16ff97681cf0ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 08:19:25 +0000
Subject: [PATCH 45/77] marwaita-mint: 20.3.1 -> 21

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

diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix
index d8fc37c332ee..432ad3dcea21 100644
--- a/pkgs/by-name/ma/marwaita-mint/package.nix
+++ b/pkgs/by-name/ma/marwaita-mint/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "marwaita-mint";
-  version = "20.3.1";
+  version = "21";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-mint";
     rev = finalAttrs.version;
-    hash = "sha256-0IgQbBragalLO0zVU36ZWxF3Q47cfEQ15HxQ2j9QhIc=";
+    hash = "sha256-RzQmBD4nlnzZN1BCS6EOqbuSxmjHPAgf/uv99xgAUYU=";
   };
 
   buildInputs = [

From 81663d25c2f989f23de5e88ee964cfdb1d8efa72 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 10:45:00 +0200
Subject: [PATCH 46/77] python312Packages.yalexs: 8.6.3 -> 8.6.4

Diff: https://github.com/bdraco/yalexs/compare/refs/tags/v8.6.3...v8.6.4

Changelog: https://github.com/bdraco/yalexs/blob/refs/tags/v8.6.4/CHANGELOG.md
---
 pkgs/development/python-modules/yalexs/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index b29576d5f691..953f818e8337 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -10,12 +10,13 @@
   freenub,
   poetry-core,
   pyjwt,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytest-freezegun,
   pytestCheckHook,
   python-dateutil,
   python-socketio,
   pythonOlder,
-  pytest-asyncio,
-  pytest-cov-stub,
   requests-mock,
   requests,
   typing-extensions,
@@ -23,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "8.6.3";
+  version = "8.6.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +33,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "yalexs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-z01q+sUuj9BvcN56+c3vti8xUnWhYGuV/BTXhvcTl30=";
+    hash = "sha256-KUm+e/ZrfkrS4MA0Wb3VAo9URYmC0ucKw3L+yMMoMtU=";
   };
 
   build-system = [ poetry-core ];
@@ -54,9 +55,10 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aioresponses
     aiounittest
-    pytestCheckHook
     pytest-asyncio
     pytest-cov-stub
+    pytest-freezegun
+    pytestCheckHook
     requests-mock
   ];
 

From e7d5c84166f9814de252525091d701c30987a1bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= <loic@loicreynier.fr>
Date: Tue, 10 Sep 2024 07:56:21 +0000
Subject: [PATCH 47/77] when-cli: init at 0.4.0

Co-authored-by: Callum Leslie <github@cleslie.uk>
Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 pkgs/by-name/wh/when-cli/package.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/by-name/wh/when-cli/package.nix

diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix
new file mode 100644
index 000000000000..a15a99edf8e6
--- /dev/null
+++ b/pkgs/by-name/wh/when-cli/package.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchCrate,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "when-cli";
+  version = "0.4.0";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M=";
+  };
+
+  cargoHash = "sha256-9emY0yhAKVzuk1Tlzi0kW8oR9jRqLdg8wbTcJMBrxMw=";
+
+  meta = {
+    description = "Command line tool for converting between timezones";
+    homepage = "https://github.com/mitsuhiko/when";
+    mainProgram = "when";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ loicreynier ];
+  };
+}

From d8a0df68b1eb0d01ad009379cba8d2d75fd0cee3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 11:21:38 +0200
Subject: [PATCH 48/77] python312Packages.aioairzone: 0.9.0 -> 0.9.1

Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.9.0...0.9.1

Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.9.1
---
 pkgs/development/python-modules/aioairzone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index ba74e667dee2..d8032a0e2f00 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioairzone";
     rev = "refs/tags/${version}";
-    hash = "sha256-32fd4+y3EICVesrtSZUf/jYUEIqvPPnSp4hrpgXZoxU=";
+    hash = "sha256-snZtM5iDaJjqRSTf4kZVjro2k2h/b6XiT4UUCw1gF1g=";
   };
 
   build-system = [ setuptools ];

From 8ad7b18b207dd811650b1e201e6054c502181b0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 11:22:14 +0200
Subject: [PATCH 49/77] python312Packages.aioautomower: 2024.8.0 -> 2024.9.0

Diff: https://github.com/Thomas55555/aioautomower/compare/refs/tags/2024.8.0...2024.9.0

Changelog: https://github.com/Thomas55555/aioautomower/releases/tag/2024.9.0
---
 pkgs/development/python-modules/aioautomower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 3e19ea7cc31e..c6fe28fb0ea0 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2024.8.0";
+  version = "2024.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     rev = "refs/tags/${version}";
-    hash = "sha256-FrQpRz+HESmk837L4bLDiRpJOZXstMJQ8Ic58B9Ac10=";
+    hash = "sha256-M+RiO5XTiJ1Cpmf3wbQYzcjH/VAZUlLV9ZdWJCkF6HA=";
   };
 
   postPatch = ''

From e233e7d385036ee811e911fcf599ae9eb4274ddf Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Wed, 14 Aug 2024 12:14:48 +0200
Subject: [PATCH 50/77] nixos/teeworlds: add option `environmentFile` for
 injecting secrets

---
 nixos/modules/services/games/teeworlds.nix | 37 +++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix
index b21fe008896a..77942c46a083 100644
--- a/nixos/modules/services/games/teeworlds.nix
+++ b/nixos/modules/services/games/teeworlds.nix
@@ -368,6 +368,33 @@ in
           '';
         };
       };
+
+      environmentFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
+        default = null;
+        example = "/var/lib/teeworlds/teeworlds.env";
+        description = ''
+          Environment file as defined in {manpage}`systemd.exec(5)`.
+
+          Secrets may be passed to the service without adding them to the world-readable
+          Nix store, by specifying placeholder variables as the option value in Nix and
+          setting these variables accordingly in the environment file.
+
+          ```
+            # snippet of teeworlds-related config
+            services.teeworlds.password = "$TEEWORLDS_PASSWORD";
+          ```
+
+          ```
+            # content of the environment file
+            TEEWORLDS_PASSWORD=verysecretpassword
+          ```
+
+          Note that this file needs to be available on the host on which
+          `teeworlds` is running.
+        '';
+      };
+
     };
   };
 
@@ -383,7 +410,15 @@ in
 
       serviceConfig = {
         DynamicUser = true;
-        ExecStart = "${cfg.package}/bin/teeworlds_srv -f ${teeworldsConf}";
+        RuntimeDirectory = "teeworlds";
+        RuntimeDirectoryMode = "0700";
+        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
+        ExecStartPre = ''
+          ${pkgs.envsubst}/bin/envsubst \
+            -i ${teeworldsConf} \
+            -o /run/teeworlds/teeworlds.yaml
+        '';
+        ExecStart = "${cfg.package}/bin/teeworlds_srv -f /run/teeworlds/teeworlds.yaml";
 
         # Hardening
         CapabilityBoundingSet = false;

From a719f91a85a2c303f00fa72e98b6acdf3ee56528 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Tue, 10 Sep 2024 11:40:24 +0200
Subject: [PATCH 51/77] nixos/teeworlds: use `lib.getExe` instead of hardcoded
 path

---
 nixos/modules/services/games/teeworlds.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix
index 77942c46a083..f12647149573 100644
--- a/nixos/modules/services/games/teeworlds.nix
+++ b/nixos/modules/services/games/teeworlds.nix
@@ -418,7 +418,7 @@ in
             -i ${teeworldsConf} \
             -o /run/teeworlds/teeworlds.yaml
         '';
-        ExecStart = "${cfg.package}/bin/teeworlds_srv -f /run/teeworlds/teeworlds.yaml";
+        ExecStart = "${lib.getExe cfg.package} -f /run/teeworlds/teeworlds.yaml";
 
         # Hardening
         CapabilityBoundingSet = false;

From f5d40dac128fb0f77b2d73ec70f3673b465e02c6 Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Wed, 28 Aug 2024 15:20:40 +0000
Subject: [PATCH 52/77] nitrokey-pro-firmware: init at 0.15

Co-authored-by: Simon Bruder <simon@sbruder.de>
Co-authored-by: Abdullah Imad <me@imad.nyc>
Co-authored-by: Alberto Merino <amerinor01@gmail.com>
Co-authored-by: Enric Morales <me@enric.me>
Co-authored-by: Jack Leightcap <jack@leightcap.com>
Co-authored-by: Roland Coeurjoly <rolandcoeurjoly@gmail.com>
---
 .../ni/nitrokey-pro-firmware/package.nix      | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 pkgs/by-name/ni/nitrokey-pro-firmware/package.nix

diff --git a/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix
new file mode 100644
index 000000000000..8c14178fc744
--- /dev/null
+++ b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  writeShellScriptBin,
+  python3,
+  srecord,
+  gcc-arm-embedded,
+}:
+
+let
+  version = "0.15";
+
+  # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program.
+  fakeGit = writeShellScriptBin "git" ''
+    echo "${version}.nitrokey"
+  '';
+
+in
+
+stdenv.mkDerivation {
+  pname = "nitrokey-pro-firmware";
+  inherit version;
+  src = fetchFromGitHub {
+    owner = "Nitrokey";
+    repo = "nitrokey-pro-firmware";
+    rev = "v${version}";
+    hash = "sha256-q+kbEOLA05xR6weAWDA1hx4fVsaN9UNKiOXGxPRfXuI=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    patchShebangs dapboot/libopencm3/scripts
+  '';
+
+  nativeBuildInputs = [
+    fakeGit
+    gcc-arm-embedded
+    python3
+    srecord
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -D build/gcc/bootloader.hex $out/bootloader.hex
+    install -D build/gcc/nitrokey-pro-firmware.hex $out/firmware.hex
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Firmware for the Nitrokey Pro device";
+    homepage = "https://github.com/Nitrokey/nitrokey-pro-firmware";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      imadnyc
+      kiike
+      amerino
+    ];
+    platforms = lib.platforms.unix;
+  };
+}

From 77693ec7c3b5e61953cfb923beac98a1fecea626 Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Wed, 28 Aug 2024 15:05:38 +0000
Subject: [PATCH 53/77] nitrokey-fido2-firmware: init at 2.4.1

Co-authored-by: Simon Bruder <simon@sbruder.de>
Co-authored-by: Abdullah Imad <me@imad.nyc>
Co-authored-by: Alberto Merino <amerinor01@gmail.com>
Co-authored-by: Enric Morales <me@enric.me>
Co-authored-by: Jack Leightcap <jack@leightcap.com>
Co-authored-by: Roland Coeurjoly <rolandcoeurjoly@gmail.com>
---
 .../ni/nitrokey-fido2-firmware/package.nix    | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix

diff --git a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
new file mode 100644
index 000000000000..843a3637a855
--- /dev/null
+++ b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  writeShellScriptBin,
+  gcc-arm-embedded,
+  pynitrokey,
+  python3,
+
+  # The make target to run
+  makeTarget ? "release-buildv",
+  # Whether the firmware should include the production public key for the bootloader
+  release ? true,
+}:
+
+let
+  # The latest release is found on the releases page; do not rely on the latest tag.
+  # They normally contain the suffix `.nitrokey`.
+  # https://github.com/Nitrokey/nitrokey-fido2-firmware/releases
+  version = "2.4.1";
+
+  # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program.
+  fakeGit = writeShellScriptBin "git" ''
+    echo "${version}.nitrokey"
+  '';
+
+in
+stdenv.mkDerivation {
+  pname = "nitrokey-fido2-firmware";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "Nitrokey";
+    repo = "nitrokey-fido2-firmware";
+    rev = "${version}.nitrokey";
+    hash = "sha256-7AsnxRf8mdybI6Mup2mV01U09r5C/oUX6fG2ymkkOOo=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    # Remove a duplicate firmware_version definition. Without this,
+    # firmware_version is defined multiple times, triggering a build error.
+    substituteInPlace fido2/version.h \
+      --replace-fail "const version_t firmware_version ;" ""
+  '';
+
+  nativeBuildInputs = [
+    fakeGit
+    # only gcc-arm-embedded includes libc_nano.a
+    gcc-arm-embedded
+    pynitrokey
+    python3
+  ];
+
+  preBuild = ''
+    cd targets/stm32l432
+  '';
+
+  makeFlags = [
+    "${makeTarget}"
+    "RELEASE=${toString release}"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    cp -r release $out
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Firmware for the Nitrokey FIDO2 device";
+    homepage = "https://github.com/Nitrokey/nitrokey-fido2-firmware";
+    maintainers = with lib.maintainers; [
+      amerino
+      kiike
+      imadnyc
+    ];
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    platforms = lib.platforms.unix;
+  };
+}

From a70eab343b1b5af03700d8e2312f3d89e1f85300 Mon Sep 17 00:00:00 2001
From: Alexandru Scvortov <code@scvalex.net>
Date: Tue, 10 Sep 2024 11:24:15 +0100
Subject: [PATCH 54/77] livebook: 0.13.3 -> 0.14.0

---
 pkgs/servers/web-apps/livebook/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix
index 8e8e0b997464..b85e3d7420c2 100644
--- a/pkgs/servers/web-apps/livebook/default.nix
+++ b/pkgs/servers/web-apps/livebook/default.nix
@@ -1,7 +1,7 @@
 { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }:
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.13.3";
+  version = "0.14.0";
 
   inherit elixir;
 
@@ -13,13 +13,13 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     rev = "v${version}";
-    hash = "sha256-luvqH6fjovRhVQrsP00XLSQ/rjHZgUbUWmL2B5XCyKI=";
+    hash = "sha256-8z6t7AzOPS7zxNdS5+qGE1DpvhWNbHnDLCta7igA5vY=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-/U/UmNVtl7H0rdgXpibM/bYvRbio8WzVRTv4tQ7GQcY=";
+    hash = "sha256-7avxuqbZtNWgUfalbq/OtggmUI/4QK+S792iqcCjRHM=";
   };
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac6998c1f8f2..c10a6cfe1c0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3793,8 +3793,8 @@ with pkgs;
   lesspass-cli = callPackage ../tools/security/lesspass-cli { };
 
   livebook = callPackage ../servers/web-apps/livebook {
-    elixir = elixir_1_16;
-    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; });
+    elixir = elixir_1_17;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
   };
 
   lsix = callPackage ../tools/graphics/lsix { };

From 82f77adf9b59d38ef9feda98243dcc91f52dda8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 10:41:16 +0000
Subject: [PATCH 55/77] uv: 0.4.7 -> 0.4.8

---
 pkgs/by-name/uv/uv/Cargo.lock  | 34 ++++++++++++++++++++++++++++++----
 pkgs/by-name/uv/uv/package.nix |  4 ++--
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock
index 91fd47e6f44a..28a850fcf312 100644
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@@ -1040,6 +1040,7 @@ dependencies = [
  "platform-tags",
  "pypi-types",
  "rkyv",
+ "rustc-hash",
  "schemars",
  "serde",
  "serde_json",
@@ -1047,6 +1048,7 @@ dependencies = [
  "tracing",
  "url",
  "urlencoding",
+ "uv-cache-info",
  "uv-fs",
  "uv-git",
  "uv-normalize",
@@ -1779,6 +1781,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tracing",
+ "uv-cache-info",
  "uv-fs",
  "uv-normalize",
  "uv-warnings",
@@ -2825,9 +2828,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "ea0a9b3a42929fad8a7c3de7f86ce0814cfa893328157672680e9fb1145549c5"
 dependencies = [
  "bytes",
  "rand",
@@ -4441,7 +4444,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 
 [[package]]
 name = "uv"
-version = "0.4.7"
+version = "0.4.8"
 dependencies = [
  "anstream",
  "anyhow",
@@ -4497,6 +4500,7 @@ dependencies = [
  "url",
  "uv-auth",
  "uv-cache",
+ "uv-cache-info",
  "uv-cli",
  "uv-client",
  "uv-configuration",
@@ -4594,11 +4598,24 @@ dependencies = [
  "tempfile",
  "tracing",
  "url",
+ "uv-cache-info",
  "uv-fs",
  "uv-normalize",
  "walkdir",
 ]
 
+[[package]]
+name = "uv-cache-info"
+version = "0.0.1"
+dependencies = [
+ "fs-err",
+ "schemars",
+ "serde",
+ "thiserror",
+ "toml",
+ "tracing",
+]
+
 [[package]]
 name = "uv-cli"
 version = "0.0.1"
@@ -4680,6 +4697,7 @@ name = "uv-configuration"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "cache-key",
  "clap",
  "distribution-types",
  "either",
@@ -4695,6 +4713,7 @@ dependencies = [
  "url",
  "uv-auth",
  "uv-cache",
+ "uv-cache-info",
  "uv-normalize",
 ]
 
@@ -4792,6 +4811,7 @@ dependencies = [
  "tracing",
  "url",
  "uv-cache",
+ "uv-cache-info",
  "uv-client",
  "uv-configuration",
  "uv-extract",
@@ -4895,6 +4915,7 @@ dependencies = [
  "tracing",
  "url",
  "uv-cache",
+ "uv-cache-info",
  "uv-configuration",
  "uv-distribution",
  "uv-extract",
@@ -4983,6 +5004,7 @@ dependencies = [
  "tracing",
  "url",
  "uv-cache",
+ "uv-cache-info",
  "uv-client",
  "uv-extract",
  "uv-fs",
@@ -5115,6 +5137,7 @@ dependencies = [
  "thiserror",
  "toml",
  "tracing",
+ "uv-cache-info",
  "uv-configuration",
  "uv-fs",
  "uv-macros",
@@ -5194,7 +5217,7 @@ dependencies = [
 
 [[package]]
 name = "uv-version"
-version = "0.4.7"
+version = "0.4.8"
 
 [[package]]
 name = "uv-virtualenv"
@@ -5225,6 +5248,8 @@ dependencies = [
 name = "uv-workspace"
 version = "0.0.1"
 dependencies = [
+ "anyhow",
+ "assert_fs",
  "either",
  "fs-err",
  "glob",
@@ -5238,6 +5263,7 @@ dependencies = [
  "same-file",
  "schemars",
  "serde",
+ "tempfile",
  "thiserror",
  "tokio",
  "toml",
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 74d9b70ccfbc..b94a3ee1ed45 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "uv";
-  version = "0.4.7";
+  version = "0.4.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     rev = "refs/tags/${version}";
-    hash = "sha256-81fxSvYRr0aSUlxYklA44emfa5E4SQBENkYAKoHAStc=";
+    hash = "sha256-Rdeq6M3uZhXMALHkHEtYUr5Q1ghkfQmaBUMQGduZ5Qw=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

From 511adb43d188a5bd321def5bc8ddfe1d0e018e6f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 12:48:50 +0200
Subject: [PATCH 56/77] python312Packages.tencentcloud-sdk-python: 3.0.1227 ->
 3.0.1228

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1227...3.0.1228

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1228/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 2eb746125351..dbbf81f588bd 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1227";
+  version = "3.0.1228";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-nHTsUYyGqM/4S4B8F8iz0A7MPpotTNp1S/yPL0KCkok=";
+    hash = "sha256-YNGehz2pTTJ6D2sZM95YLZ0Fr/rhcN+IsZT3mQCBgP0=";
   };
 
   build-system = [ setuptools ];

From 6bf23634b2860fab241f71b9de76186b20b5ac7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93lafur=20Bjarki=20Bogason?=
 <olafur@genkiinstruments.com>
Date: Sat, 7 Sep 2024 22:50:28 +0100
Subject: [PATCH 57/77] fireplace: init at 0-unstable-2020-02-02
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apply suggestions from code review

Co-authored-by: éclairevoyant
<848000+eclairevoyant@users.noreply.github.com>
---
 pkgs/by-name/fi/fireplace/package.nix | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/fi/fireplace/package.nix

diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix
new file mode 100644
index 000000000000..16040a18d56d
--- /dev/null
+++ b/pkgs/by-name/fi/fireplace/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ncurses,
+}:
+stdenv.mkDerivation {
+  pname = "fireplace";
+  version = "0-unstable-2020-02-02";
+
+  buildInputs = [ ncurses ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm555 fireplace -t $out/bin
+
+    runHook postInstall
+  '';
+
+  src = fetchFromGitHub {
+    owner = "Wyatt915";
+    repo = "fireplace";
+    rev = "aa2070b73be9fb177007fc967b066d88a37e3408";
+    hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc=";
+  };
+
+  meta = {
+    description = "Cozy fireplace in your terminal";
+    homepage = "https://github.com/Wyatt915/fireplace";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      multivac61
+      eclairevoyant
+    ];
+    mainProgram = "fireplace";
+    platforms = lib.platforms.all;
+  };
+}

From 4111d41c0b2b86c5b935f2ba61cd1806a797a1a9 Mon Sep 17 00:00:00 2001
From: Hugh Mandalidis <mandalidis.hugh@gmail.com>
Date: Tue, 10 Sep 2024 21:19:31 +1000
Subject: [PATCH 58/77] maintainers: add hughmandalidis

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dfcbe955346b..41f9005cbc97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8604,6 +8604,12 @@
     githubId = 1592375;
     name = "Walter Huf";
   };
+  hughmandalidis = {
+    name = "Hugh Mandalidis";
+    email = "mandalidis.hugh@gmail.com";
+    github = "ThanePatrol";
+    githubId = 23148089;
+  };
   hughobrien = {
     email = "github@hughobrien.ie";
     github = "hughobrien";

From 3a238a1f8bb71f819f073b546bc1f0e756fbe300 Mon Sep 17 00:00:00 2001
From: Hugh Mandalidis <mandalidis.hugh@gmail.com>
Date: Tue, 10 Sep 2024 21:32:32 +1000
Subject: [PATCH 59/77] thrift-ls: change binary name to mimic upstream

---
 pkgs/by-name/th/thrift-ls/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix
index b41880c6a97d..9eba51c0b680 100644
--- a/pkgs/by-name/th/thrift-ls/package.nix
+++ b/pkgs/by-name/th/thrift-ls/package.nix
@@ -17,6 +17,10 @@ buildGoModule rec {
 
   vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4=";
 
+  postInstall = ''
+    mv $out/bin/thrift-ls $out/bin/thriftls
+  '';
+
   ldflags = [
     "-s"
     "-w"
@@ -26,7 +30,10 @@ buildGoModule rec {
     description = "Thrift Language Server";
     homepage = "https://github.com/joyme123/thrift-ls";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ callumio ];
-    mainProgram = "thrift-ls";
+    maintainers = with lib.maintainers; [
+      callumio
+      hughmandalidis
+    ];
+    mainProgram = "thriftls";
   };
 }

From 6f5b0ef20153916b202ad53450c10e2272d1d580 Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Tue, 10 Sep 2024 13:54:51 +0200
Subject: [PATCH 60/77] =?UTF-8?q?radicle-node:=201.0.0-rc.17=20=E2=86=92?=
 =?UTF-8?q?=201.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ra/radicle-node/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index e3f33c7132df..8482cf0b7ea5 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -18,7 +18,7 @@
 , xdg-utils
 }: rustPlatform.buildRustPackage rec {
   pname = "radicle-node";
-  version = "1.0.0-rc.17";
+  version = "1.0.0";
   env.RADICLE_VERSION = version;
 
   src = fetchgit {
@@ -26,7 +26,7 @@
     rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
     hash = "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk=";
   };
-  cargoHash = "sha256-5xqoWW3pPU/vQs1ewPb24/fv/oKBF+ZZzbsYhC7LopM=";
+  cargoHash = "sha256-+VjYX1gGf5aIGSQRMtvK6JI118X50HaxFwg5H14Vq7g=";
 
   nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ];
   nativeCheckInputs = [ git ];

From 61be0d8e27c71537bb543ee8ffb15863f7afae40 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 22:13:16 +1000
Subject: [PATCH 61/77] sby: 0.44 -> 0.45 (#340966)

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

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index a3cfb4be0ac3..d623f732d2d6 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -20,13 +20,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sby";
-  version = "0.44";
+  version = "0.45";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     rev = "yosys-${version}";
-    hash = "sha256-/oDbbdZuWPdg0Xrh+c4i283vML9QTfyWVu8kryb4WaE=";
+    hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs=";
   };
 
   nativeBuildInputs = [ bash ];

From 871a39f6943d2477f43c85862f7404fd02cc8f8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 12:59:47 +0000
Subject: [PATCH 62/77] gh-markdown-preview: 1.7.0 -> 1.8.0

---
 pkgs/by-name/gh/gh-markdown-preview/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix
index 0690f3b36fec..7e829bd19f89 100644
--- a/pkgs/by-name/gh/gh-markdown-preview/package.nix
+++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gh-markdown-preview";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "yusukebe";
     repo = "gh-markdown-preview";
     rev = "v${version}";
-    hash = "sha256-yfl50izjjyPmyV0Er0al/PPd87Yizqc8PnFV/FMpfEU=";
+    hash = "sha256-y9AiHmBfDSJ6oCevUAUkg18qHe/oP7A6PLiz3MZqU0s=";
   };
 
   vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E=";

From 2681b012dac5733adfdb918d5486dc0e4f41640d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 13:00:53 +0000
Subject: [PATCH 63/77] gtk-layer-shell: 0.8.2 -> 0.9.0

---
 pkgs/development/libraries/gtk-layer-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix
index 417b8523df26..c977de194278 100644
--- a/pkgs/development/libraries/gtk-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk-layer-shell/default.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk-layer-shell";
-  version = "0.8.2";
+  version = "0.9.0";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc"; # for demo
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "wmww";
     repo = "gtk-layer-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA=";
+    hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY=";
   };
 
   strictDeps = true;

From b576c486ef2e94feba02f93a4544eb6f392223a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Sep 2024 15:06:51 +0200
Subject: [PATCH 64/77] Revert "nixVersions.git: improve error message"

This reverts commit 757e0a34b78e7f1c0b440ee1e7af2b388a52bd1c.
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 65fdeb5446c0..84b0f028a4bf 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -224,7 +224,7 @@ in lib.makeExtensible (self: ({
     stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
   })).overrideAttrs (o: {
     meta.knownVulnerabilities = [
-      "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nixVersions.git to nixVersions.nix_2_23"
+      "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23"
     ];
   });
 

From dfaef71403faaa8d79b487c26d980e051678c607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Sep 2024 15:07:00 +0200
Subject: [PATCH 65/77] Revert "nixVersions.nix_2_24,git: mark vulnerable"

This reverts commit 4eee59973aedfc0a710b5d356ad600a8a5ae0864.
---
 pkgs/tools/package-management/nix/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 84b0f028a4bf..35edaf2bef46 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -184,7 +184,7 @@ in lib.makeExtensible (self: ({
     self_attribute_name = "nix_2_23";
   };
 
-  nix_2_24 = ((common {
+  nix_2_24 = (common {
     version = "2.24.5";
     hash = "sha256-mYvdPwl4gcc17UAomkbbOJEgxBQpowmJDrRMWtlYzFY=";
     self_attribute_name = "nix_2_24";
@@ -197,13 +197,9 @@ in lib.makeExtensible (self: ({
     # allocation function Clang uses with this setting actually works
     # all the way back to 10.6.
     stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
-  })).overrideAttrs (o: {
-    meta.knownVulnerabilities = [
-      "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23"
-    ];
   });
 
-  git = ((common rec {
+  git = (common rec {
     version = "2.25.0";
     suffix = "pre20240807_${lib.substring 0 8 src.rev}";
     src = fetchFromGitHub {
@@ -222,13 +218,9 @@ in lib.makeExtensible (self: ({
     # allocation function Clang uses with this setting actually works
     # all the way back to 10.6.
     stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
-  })).overrideAttrs (o: {
-    meta.knownVulnerabilities = [
-      "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23"
-    ];
   });
 
-  latest = self.nix_2_23;
+  latest = self.nix_2_24;
 
   # The minimum Nix version supported by Nixpkgs
   # Note that some functionality *might* have been backported into this Nix version,

From 752666ae668deacae8df7af39c7d491530599501 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 13:07:44 +0000
Subject: [PATCH 66/77] gtk4-layer-shell: 1.0.2 -> 1.0.3

---
 pkgs/development/libraries/gtk4-layer-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix
index 067bbad8dd24..35cbb026fbc3 100644
--- a/pkgs/development/libraries/gtk4-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4-layer-shell";
-  version = "1.0.2";
+  version = "1.0.3";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc";
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "wmww";
     repo = "gtk4-layer-shell";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984=";
+    hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI=";
   };
 
   strictDeps = true;

From 3986d6976bd418f24737acd6938291e69ddfa43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Sep 2024 15:09:24 +0200
Subject: [PATCH 67/77] nixVersions.nix_2_24: 2.24.5 -> 2.24.6

---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 35edaf2bef46..ebcc664f0f11 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -185,8 +185,8 @@ in lib.makeExtensible (self: ({
   };
 
   nix_2_24 = (common {
-    version = "2.24.5";
-    hash = "sha256-mYvdPwl4gcc17UAomkbbOJEgxBQpowmJDrRMWtlYzFY=";
+    version = "2.24.6";
+    hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w=";
     self_attribute_name = "nix_2_24";
   }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
     # Fix the following error with the default x86_64-darwin SDK:

From 76b5c3b2b5523994506758c1b9e32b116e01f9ba Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:11:32 +0200
Subject: [PATCH 68/77] snpguest: 0.6.0 -> 0.7.0

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/by-name/sn/snpguest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix
index a23964246f29..d40881045fbb 100644
--- a/pkgs/by-name/sn/snpguest/package.nix
+++ b/pkgs/by-name/sn/snpguest/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "snpguest";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "virtee";
     repo = "snpguest";
-    rev = "v${version}";
-    hash = "sha256-9TchRaZPQKAsncs+mlHvzeie9IIVZeea/LfBLXOLuNg=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-qc7WooUJQa0+tzoS0z0GPV3N3WGM1WQ4ewZj8zUWHZE=";
   };
 
-  cargoHash = "sha256-1UX5GiwH38W+IgZO+0EA3M86iWMylM8fgr48DRD187A=";
+  cargoHash = "sha256-GYLJGkEI7AYUxuE57fGz4NM9hZ+Z73tq8wnOzANtwnM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From f482820efde4afdc15cd38efd8b75e06ddd339f0 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:12:22 +0200
Subject: [PATCH 69/77] snphost: 0.4.0 -> 0.5.0

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/by-name/sn/snphost/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix
index fcee69dd5370..70911bedcc95 100644
--- a/pkgs/by-name/sn/snphost/package.nix
+++ b/pkgs/by-name/sn/snphost/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "snphost";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "virtee";
     repo = "snphost";
-    rev = "v${version}";
-    hash = "sha256-ChB745I+4CuN/qvWW5e5gPWBdTDJdrUMiHO3LkmTwtk=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM=";
   };
 
-  cargoHash = "sha256-yXjrTxCRI+1IMRmBYLw9+uHr9BVVhRXx6zU2q3sYf9s=";
+  cargoHash = "sha256-fG3MTCHfIfYeFK03Ee9uzq8e7f5NN/h8LIye7Y3+0uI=";
 
   nativeBuildInputs = [
     asciidoctor

From 27e643cb3112568d1aee31735ace66183b1a7915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 10 Sep 2024 15:16:01 +0200
Subject: [PATCH 70/77] lua-language-server: 3.10.5 -> 3.10.6

---
 .../tools/language-servers/lua-language-server/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix
index e0fc157f290b..0bbab7942e8a 100644
--- a/pkgs/development/tools/language-servers/lua-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lua-language-server";
-  version = "3.10.5";
+  version = "3.10.6";
 
   src = fetchFromGitHub {
     owner = "luals";
     repo = "lua-language-server";
     rev = finalAttrs.version;
-    hash = "sha256-lFNguQxrpldOE+6KrSC3QeDJzmG4Lwq92vFHjOGX9s4=";
+    hash = "sha256-K5+xGRGmd6X3eYF1BzhqFbbfVJXSduo/9930HxLGQCo=";
     fetchSubmodules = true;
   };
 

From d6bedef965866cd2a7edb444a2aee577b054179f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 14:06:40 +0000
Subject: [PATCH 71/77] nfpm: 2.39.0 -> 2.40.0

---
 pkgs/tools/package-management/nfpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index e33d091d9345..621cd3327058 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.39.0";
+  version = "2.40.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-0afwPA4OIIBYxXwkdm36JmVXDJ+gqESOPjEp5Tkxxa8=";
+    hash = "sha256-hBA15pHCYgBKTeHBVBZkhPqoMnDkd13wx9afygTDPWk=";
   };
 
-  vendorHash = "sha256-LJM9F9NTAMvDwsaRvjnZyjKSI0AjZvVM4srOYuGLA7w=";
+  vendorHash = "sha256-d4MuoKc7LF5KCXhLxIwuqS2Xu7ClLhyJZH4/+/LYm3w=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 

From 5a99fdf1ab833bd62edef737d52b915c8567db0f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Sep 2024 00:50:40 +1000
Subject: [PATCH 72/77] coursier: 2.1.10 -> 2.1.11 (#340930)

---
 pkgs/development/tools/coursier/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 3732a1eec55f..8da4eb40b8d6 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "coursier";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchurl {
     url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    hash = "sha256-fiZwmDDuaafBbYQdOxPpTrleMLOSakCteizpKwcGStk=";
+    hash = "sha256-Gd5RM7QdFUmafr6ceQEvFjbQsWooHCiMDslG1MYFcrI=";
   };
 
   dontUnpack = true;

From 4aa2d69f55ac003d12a4c92f6fa7efb296a1086e Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 9 Sep 2024 14:57:56 +0200
Subject: [PATCH 73/77] ladybird: 0-unstable-2024-08-12 ->
 0-unstable-2024-09-08

---
 pkgs/applications/networking/browsers/ladybird/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index 2c610945e396..15ed027ded35 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -58,13 +58,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2024-08-12";
+  version = "0-unstable-2024-09-08";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "7e57cc7b090455e93261c847064f12a61d686ff3";
-    hash = "sha256-8rkgxEfRH8ERuC7iplQKOzKb1EJ4+SNGDX5gTGpOmQo=";
+    rev = "8d6f36f8d6c0aea0253df8c84746f8c99bf79b4d";
+    hash = "sha256-EB26SAh9eckpq/HrO8O+PivMMmLpFtCdCNkOJcLQvZw=";
   };
 
   postPatch = ''

From 1f38ed70139f73474113a5ee04df2a94c99717b0 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 10 Sep 2024 16:54:34 +0200
Subject: [PATCH 74/77] nixos/tests: fix nixos-rebuild-specialisations test

See https://hydra.nixos.org/build/272096143
---
 nixos/tests/nixos-rebuild-specialisations.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix
index 9192b8a8a030..ab67bbaba676 100644
--- a/nixos/tests/nixos-rebuild-specialisations.nix
+++ b/nixos/tests/nixos-rebuild-specialisations.nix
@@ -21,6 +21,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         pkgs.grub2
       ];
 
+      system.switch.enable = true;
+
       virtualisation = {
         cores = 2;
         memorySize = 4096;

From 9103a4d978ddc60e165fa26b22a471b7d50840fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Sep 2024 15:13:11 +0200
Subject: [PATCH 75/77] nixVersions.git: 2.25.0pre20240807 -> 2.25.0pre20240910

---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ebcc664f0f11..214f3a47fc5a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -201,12 +201,12 @@ in lib.makeExtensible (self: ({
 
   git = (common rec {
     version = "2.25.0";
-    suffix = "pre20240807_${lib.substring 0 8 src.rev}";
+    suffix = "pre20240910_${lib.substring 0 8 src.rev}";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "cfe66dbec325d5dcb601b642bd9c149ae1353147";
-      hash = "sha256-1hqjl4br3MRK1pkzDrhBSxKUhdfQ/P4b5KbLfGua64g=";
+      rev = "b9d3cdfbd2b873cf34600b262247d77109dfd905";
+      hash = "sha256-7zH8TU5g3Bsg6ES0O8RcTm6JGYOMuDCGlSI3AQKbKy8=";
     };
     self_attribute_name = "git";
   }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {

From 74787857f812116406bf53c56b16ba2c1df55ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 10 Sep 2024 16:00:25 +0200
Subject: [PATCH 76/77] nixVersions.git: disable test on aarch64-linux

---
 pkgs/tools/package-management/nix/common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 205cda250e21..6dc80efb4879 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -243,6 +243,9 @@ self = stdenv.mkDerivation {
   # See https://github.com/NixOS/nix/issues/5687
   + lib.optionalString (atLeast25 && stdenv.isDarwin) ''
     echo "exit 99" > tests/gc-non-blocking.sh
+  '' # TODO: investigate why this broken
+  + lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") ''
+    echo "exit 0" > tests/functional/flakes/show.sh
   '' + ''
     # nixStatic otherwise does not find its man pages in tests.
     export MANPATH=$man/share/man:$MANPATH

From dcd22533a08494dec7dd7e6dcb0c5421ac46b9b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 16:38:35 +0000
Subject: [PATCH 77/77] python312Packages.dissect-shellitem: 3.9 -> 3.10

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

diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix
index 8718b156a42b..e8fbec0f8b13 100644
--- a/pkgs/development/python-modules/dissect-shellitem/default.nix
+++ b/pkgs/development/python-modules/dissect-shellitem/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "dissect-shellitem";
-  version = "3.9";
+  version = "3.10";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect.shellitem";
     rev = "refs/tags/${version}";
-    hash = "sha256-bkh8eiq07cspRQfs1amiyDuFmoXSBwG/fS/6nn9KV/Y=";
+    hash = "sha256-BS+c9QbMMsaoZHyuv6jMxbQFQNJeLt3da8Fq/wwXesQ=";
   };
 
   build-system = [