From 867b3a929834e0228fcba40f75283770576a7d12 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@banananet.work>
Date: Sat, 14 Dec 2024 15:53:20 +0100
Subject: [PATCH 01/69] taskserver: let description reflect support for
 taskwarrior 2 only

to make it more obvious whats the difference between taskserver and taskchampion-sync-server, being both official sync server implementations
---
 pkgs/by-name/ta/taskserver/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/taskserver/package.nix b/pkgs/by-name/ta/taskserver/package.nix
index 48a71b304180..7d424cc874c0 100644
--- a/pkgs/by-name/ta/taskserver/package.nix
+++ b/pkgs/by-name/ta/taskserver/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   passthru.tests = { inherit (nixosTests) taskserver; };
 
   meta = {
-    description = "Server for synchronising Taskwarrior clients";
+    description = "Server for synchronising Taskwarrior 2 clients";
     homepage = "https://taskwarrior.org";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;

From 6a5dff7af0e7dc22b357eaadd13929e19823710d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 4 Dec 2024 14:39:54 +0100
Subject: [PATCH 02/69] nixos/glpi-agent: init

---
 .../manual/release-notes/rl-2505.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 .../services/monitoring/glpi-agent.nix        | 91 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/glpi-agent.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 10645d55e838..0c0d83d1c736 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -16,6 +16,8 @@
 
 - [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable).
 
+- [GLPI-Agent](https://github.com/glpi-project/glpi-agent), GLPI Agent. Available as [services.glpiAgent](options.html#opt-services.glpiAgent.enable).
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 91ecee0ef265..890b0dfa043e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -896,6 +896,7 @@
   ./services/monitoring/fusion-inventory.nix
   ./services/monitoring/gatus.nix
   ./services/monitoring/glances.nix
+  ./services/monitoring/glpi-agent.nix
   ./services/monitoring/goss.nix
   ./services/monitoring/grafana-agent.nix
   ./services/monitoring/grafana-image-renderer.nix
diff --git a/nixos/modules/services/monitoring/glpi-agent.nix b/nixos/modules/services/monitoring/glpi-agent.nix
new file mode 100644
index 000000000000..8ee18b5599bf
--- /dev/null
+++ b/nixos/modules/services/monitoring/glpi-agent.nix
@@ -0,0 +1,91 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.glpiAgent;
+
+  settingsType =
+    with lib.types;
+    attrsOf (oneOf [
+      bool
+      int
+      str
+      (listOf str)
+    ]);
+
+  formatValue =
+    v:
+    if lib.isBool v then
+      if v then "1" else "0"
+    else if lib.isList v then
+      lib.concatStringsSep "," v
+    else
+      toString v;
+
+  configContent = lib.concatStringsSep "\n" (
+    lib.mapAttrsToList (k: v: "${k} = ${formatValue v}") cfg.settings
+  );
+
+  configFile = pkgs.writeText "agent.cfg" configContent;
+
+in
+{
+  options = {
+    services.glpiAgent = {
+      enable = lib.mkEnableOption "GLPI Agent";
+
+      package = lib.mkPackageOption pkgs "glpi-agent" { };
+
+      settings = lib.mkOption {
+        type = settingsType;
+        default = { };
+        description = ''
+          GLPI Agent configuration options.
+          See https://glpi-agent.readthedocs.io/en/latest/configuration.html for all available options.
+
+          The 'server' option is mandatory and must point to your GLPI server.
+        '';
+        example = lib.literalExpression ''
+          {
+            server = [ "https://glpi.example.com/inventory" ];
+            delaytime = 3600;
+            tag = "production";
+            logger = [ "stderr" "file" ];
+            debug = 1;
+            "no-category" = [ "printer" "software" ];
+          }
+        '';
+      };
+
+      stateDir = lib.mkOption {
+        type = lib.types.str;
+        default = "/var/lib/glpi-agent";
+        description = "Directory where GLPI Agent stores its state.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.settings ? server;
+        message = "GLPI Agent requires a server to be configured in services.glpiAgent.settings.server";
+      }
+    ];
+
+    systemd.services.glpi-agent = {
+      description = "GLPI Agent";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        ExecStart = "${lib.getExe cfg.package} --conf-file ${configFile} --vardir ${cfg.stateDir} --daemon --no-fork";
+        Restart = "on-failure";
+      };
+    };
+  };
+}

From cd81fa2ac99eda2370927ac721526f98ce9a778e Mon Sep 17 00:00:00 2001
From: Davis Schirmer <git@djds.dev>
Date: Mon, 27 Jan 2025 01:10:09 -0500
Subject: [PATCH 03/69] maintainers: add djds

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 56bcf86bc00e..2ab9baf707f3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5945,6 +5945,12 @@
     githubId = 523628;
     name = "Jonathan Strickland";
   };
+  djds = {
+    email = "git@djds.dev";
+    github = "djds";
+    githubId = 4218822;
+    name = "djds";
+  };
   Dje4321 = {
     email = "dje4321@gmail.com";
     github = "dje4321";

From 2f34680a7db1188c34f0243ed7d0ded92e66cc17 Mon Sep 17 00:00:00 2001
From: Davis Schirmer <git@djds.dev>
Date: Mon, 27 Jan 2025 01:13:43 -0500
Subject: [PATCH 04/69] traefik: add djds as maintainer

---
 pkgs/by-name/tr/traefik/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index efa31c0d2b81..b90e417172f9 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -44,7 +44,10 @@ buildGo123Module rec {
     description = "Modern reverse proxy";
     changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ vdemeester ];
+    maintainers = with maintainers; [
+      djds
+      vdemeester
+    ];
     mainProgram = "traefik";
   };
 }

From 77163c22056094c8a089dbc57e64a5141b321719 Mon Sep 17 00:00:00 2001
From: Ota Mares <1375307+omares@users.noreply.github.com>
Date: Wed, 15 Jan 2025 14:46:51 +0100
Subject: [PATCH 05/69] nixos/recyclarr: init module

---
 nixos/modules/services/misc/recyclarr.nix | 156 ++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 nixos/modules/services/misc/recyclarr.nix

diff --git a/nixos/modules/services/misc/recyclarr.nix b/nixos/modules/services/misc/recyclarr.nix
new file mode 100644
index 000000000000..4df6266e70b5
--- /dev/null
+++ b/nixos/modules/services/misc/recyclarr.nix
@@ -0,0 +1,156 @@
+{
+  config,
+  lib,
+  pkgs,
+  utils,
+  ...
+}:
+
+let
+  cfg = config.services.recyclarr;
+  format = pkgs.formats.yaml { };
+  stateDir = "/var/lib/recyclarr";
+  configPath = "${stateDir}/config.json";
+in
+{
+  options.services.recyclarr = {
+    enable = lib.mkEnableOption "recyclarr service";
+
+    package = lib.mkPackageOption pkgs "recyclarr" { };
+
+    configuration = lib.mkOption {
+      type = format.type;
+      default = { };
+      example = {
+        sonarr = [
+          {
+            instance_name = "main";
+            base_url = "http://localhost:8989";
+            api_key = {
+              _secret = "/run/credentials/recyclarr.service/sonarr-api_key";
+            };
+          }
+        ];
+        radarr = [
+          {
+            instance_name = "main";
+            base_url = "http://localhost:7878";
+            api_key = {
+              _secret = "/run/credentials/recyclarr.service/radarr-api_key";
+            };
+          }
+        ];
+      };
+      description = lib.mdDoc ''
+        Recyclarr YAML configuration as a Nix attribute set.
+
+        For detailed configuration options and examples, see the
+        [official configuration reference](https://recyclarr.dev/wiki/yaml/config-reference/).
+
+        The configuration is processed using [utils.genJqSecretsReplacementSnippet](https://github.com/NixOS/nixpkgs/blob/master/nixos/lib/utils.nix#L232-L331) to handle secret substitution.
+
+        To avoid permission issues, secrets should be provided via systemd's credential mechanism:
+
+        ```nix
+        systemd.services.recyclarr.serviceConfig.LoadCredential = [
+          "radarr-api_key:''${config.sops.secrets.radarr-api_key.path}"
+        ];
+      '';
+    };
+
+    schedule = lib.mkOption {
+      type = lib.types.str;
+      default = "daily";
+      description = "When to run recyclarr in systemd calendar format.";
+    };
+
+    command = lib.mkOption {
+      type = lib.types.str;
+      default = "sync";
+      description = "The recyclarr command to run (e.g., sync).";
+    };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "recyclarr";
+      description = "User account under which recyclarr runs.";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "recyclarr";
+      description = "Group under which recyclarr runs.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    users.users = lib.mkIf (cfg.user == "recyclarr") {
+      recyclarr = {
+        isSystemUser = true;
+        description = "recyclarr user";
+        home = stateDir;
+        group = cfg.group;
+      };
+    };
+
+    users.groups = lib.mkIf (cfg.group == "recyclarr") {
+      ${cfg.group} = { };
+    };
+
+    systemd.services.recyclarr = {
+      description = "Recyclarr Service";
+
+      # YAML is a JSON super-set
+      preStart = utils.genJqSecretsReplacementSnippet cfg.configuration configPath;
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = cfg.user;
+        Group = cfg.group;
+        StateDirectory = "recyclarr";
+        ExecStart = "${lib.getExe cfg.package} ${cfg.command} --app-data ${stateDir} --config ${configPath}";
+
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectHostname = true;
+        ProtectClock = true;
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectKernelLogs = true;
+        ProtectControlGroups = true;
+
+        PrivateNetwork = false;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+
+        NoNewPrivileges = true;
+        RestrictSUIDSGID = true;
+        RemoveIPC = true;
+
+        ReadWritePaths = [ stateDir ];
+
+        CapabilityBoundingSet = "";
+
+        LockPersonality = true;
+        RestrictRealtime = true;
+      };
+    };
+
+    systemd.timers.recyclarr = {
+      description = "Recyclarr Timer";
+      wantedBy = [ "timers.target" ];
+      partOf = [ "recyclarr.service" ];
+
+      timerConfig = {
+        OnCalendar = cfg.schedule;
+        Persistent = true;
+        RandomizedDelaySec = "5m";
+      };
+    };
+  };
+}

From e53d0da0c5c0f342f41094bf1f7c4fbe8d2d2b13 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 28 Jan 2025 00:03:32 +0100
Subject: [PATCH 06/69] ente-auth: 4.2.8 -> 4.3.1

---
 pkgs/by-name/en/ente-auth/package.nix       | 10 +--
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 67 +++++++++------------
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 705b43691443..445c6e320808 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -17,14 +17,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.2.8";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-1vIM2MrQF0DO+5SEzIAUeZxOks6PKs3kkTdc09aCk2A=";
+    hash = "sha256-vPsF2MxGko5tMgp/WmYIw/XoSPgpKFRasNZfRpiNV9E=";
   };
 
   sourceRoot = "${src.name}/auth";
@@ -42,11 +42,11 @@ flutter324.buildFlutterApplication rec {
   '';
 
   gitHashes = {
-    desktop_webview_window = "sha256-jdNMpzFBgw53asWlGzWUS+hoPdzcL6kcJt2KzjxXf2E=";
-    ente_crypto_dart = "sha256-XBzQ268E0cYljJH6gDS5O0Pmie/GwuhMDlQPfopSqJM=";
+    ente_crypto_dart = "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=";
     flutter_local_authentication = "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=";
-    flutter_secure_storage_linux = "sha256-x45jrJ7pvVyhZlpqRSy3CbwT4Lna6yi/b2IyAilWckg=";
+    flutter_secure_storage_linux = "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=";
     sqflite = "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA=";
+    figma_squircle = "sha256-FLjABaJzrK3H5svbRb6306FxD5L6dMfddFXpXpYgH3s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index dfbe0b416411..37ed708559e5 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,17 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
+      "version": "76.0.0"
     },
     "_macros": {
       "dependency": "transitive",
       "description": "dart",
       "source": "sdk",
-      "version": "0.3.2"
+      "version": "0.3.3"
     },
     "adaptive_theme": {
       "dependency": "direct main",
@@ -30,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "6.11.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -310,11 +310,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.0"
     },
     "confetti": {
       "dependency": "direct main",
@@ -481,7 +481,7 @@
       "description": {
         "path": ".",
         "ref": "HEAD",
-        "resolved-ref": "e2e66ffd03f23bef5e0bb138b5f01b32d8e9b7bb",
+        "resolved-ref": "f91e1545f8263df127762240c4da54a0c42835b2",
         "url": "https://github.com/ente-io/ente_crypto_dart.git"
       },
       "source": "git",
@@ -540,12 +540,13 @@
     "figma_squircle": {
       "dependency": "direct main",
       "description": {
-        "name": "figma_squircle",
-        "sha256": "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "HEAD",
+        "resolved-ref": "5f1ad5aaccdf31fc398fc141979ea845a0f45383",
+        "url": "https://github.com/Ax0elz/figma_squircle.git"
       },
-      "source": "hosted",
-      "version": "0.5.3"
+      "source": "git",
+      "version": "0.5.5"
     },
     "file": {
       "dependency": "transitive",
@@ -1137,21 +1138,21 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.5"
+      "version": "10.0.7"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.8"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1237,11 +1238,11 @@
       "dependency": "transitive",
       "description": {
         "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.2-main.4"
+      "version": "0.1.3-main.0"
     },
     "matcher": {
       "dependency": "transitive",
@@ -1623,16 +1624,6 @@
       "source": "hosted",
       "version": "4.1.0"
     },
-    "scan": {
-      "dependency": "direct main",
-      "description": {
-        "name": "scan",
-        "sha256": "b343ec36f863a88d41eb4c174b810c055c6bd1f1822b2188ab31aab684fb7cdb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.6.0"
-    },
     "screen_retriever": {
       "dependency": "transitive",
       "description": {
@@ -1787,7 +1778,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1894,11 +1885,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.0"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1944,11 +1935,11 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -1984,11 +1975,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.3"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2194,11 +2185,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.2.5"
+      "version": "14.3.0"
     },
     "watcher": {
       "dependency": "transitive",

From 4357cf820759fb9aabecea8963bb621abdd496f5 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 31 Jan 2025 14:24:46 +0100
Subject: [PATCH 07/69] ente-auth: automatically update gitHashes

---
 pkgs/by-name/en/ente-auth/fetch-git-hashes.py | 46 +++++++++++++++++++
 pkgs/by-name/en/ente-auth/git-hashes.json     |  7 +++
 pkgs/by-name/en/ente-auth/package.nix         |  9 +---
 pkgs/by-name/en/ente-auth/update.sh           | 11 ++++-
 4 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100755 pkgs/by-name/en/ente-auth/fetch-git-hashes.py
 create mode 100644 pkgs/by-name/en/ente-auth/git-hashes.json

diff --git a/pkgs/by-name/en/ente-auth/fetch-git-hashes.py b/pkgs/by-name/en/ente-auth/fetch-git-hashes.py
new file mode 100755
index 000000000000..ff666a672370
--- /dev/null
+++ b/pkgs/by-name/en/ente-auth/fetch-git-hashes.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p nix-prefetch-git
+
+from dataclasses import dataclass
+import json
+import subprocess
+
+
+@dataclass
+class GitDependency:
+    name: str
+    url: str
+    revision: str
+
+
+def get_git_deps(lock_data):
+    for name, data in lock_data["packages"].items():
+        if data["source"] == "git":
+            desc = data["description"]
+            yield GitDependency(
+                name=name,
+                url=desc["url"],
+                revision=desc["resolved-ref"],
+            )
+
+
+def nix_prefetch_git(url: str, rev: str):
+    result = subprocess.run(
+        ["nix-prefetch-git", url, rev],
+        check=True,
+        text=True,
+        stdout=subprocess.PIPE,
+    )
+    return json.loads(result.stdout)
+
+
+if __name__ == "__main__":
+    with open("pubspec.lock.json") as lock_file:
+        lock_data = json.load(lock_file)
+    git_hashes = {}
+    for dep in get_git_deps(lock_data):
+        data = nix_prefetch_git(dep.url, dep.revision)
+        git_hashes[dep.name] = data["hash"]
+    with open("git-hashes.json", "w") as output_file:
+        json.dump(git_hashes, output_file, indent=2)
+        output_file.write("\n")
diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
new file mode 100644
index 000000000000..c08a0a3afac1
--- /dev/null
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -0,0 +1,7 @@
+{
+  "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
+  "figma_squircle": "sha256-FLjABaJzrK3H5svbRb6306FxD5L6dMfddFXpXpYgH3s=",
+  "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
+  "flutter_secure_storage_linux": "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=",
+  "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
+}
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 445c6e320808..7a2e10c6b6ce 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -30,6 +30,7 @@ flutter324.buildFlutterApplication rec {
   sourceRoot = "${src.name}/auth";
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
+  gitHashes = lib.importJSON ./git-hashes.json;
 
   patches = [
     # Disable update notifications and auto-update functionality
@@ -41,14 +42,6 @@ flutter324.buildFlutterApplication rec {
     ln -s ${simple-icons} assets/simple-icons
   '';
 
-  gitHashes = {
-    ente_crypto_dart = "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=";
-    flutter_local_authentication = "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=";
-    flutter_secure_storage_linux = "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=";
-    sqflite = "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA=";
-    figma_squircle = "sha256-FLjABaJzrK3H5svbRb6306FxD5L6dMfddFXpXpYgH3s=";
-  };
-
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh
index 7f79ffae58f4..ed5d30529b60 100755
--- a/pkgs/by-name/en/ente-auth/update.sh
+++ b/pkgs/by-name/en/ente-auth/update.sh
@@ -19,16 +19,23 @@ echo "Updating to $short_version"
 # Subtree needed for lockfile and icons
 auth_tree="$(gh-curl "https://api.github.com/repos/ente-io/ente/git/trees/$version" | gojq '.tree[] | select(.path == "auth") | .url' --raw-output)"
 
+pushd "$pkg_dir"
+
 # Get lockfile, filter out incompatible sqlite dependency and convert to JSON
 echo "Updating lockfile"
 pubspec_lock="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "pubspec.lock") | .url' --raw-output)"
-gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > "$pkg_dir/pubspec.lock.json"
+gh-curl "$pubspec_lock" | gojq '.content | @base64d' --raw-output | gojq --yaml-input 'del(.packages.sqlite3_flutter_libs)' > pubspec.lock.json
+
+echo "Updating git hashes"
+./fetch-git-hashes.py
 
 # Get rev and hash of simple-icons submodule
 echo "Updating icons"
 assets_tree="$(gh-curl "$auth_tree" | gojq '.tree[] | select(.path == "assets") | .url' --raw-output)"
 simple_icons_rev="$(gh-curl "$assets_tree" | gojq '.tree[] | select(.path == "simple-icons") | .sha' --raw-output)"
-nix-prefetch-github --rev "$simple_icons_rev" simple-icons simple-icons > "$pkg_dir/simple-icons.json"
+nix-prefetch-github --rev "$simple_icons_rev" simple-icons simple-icons > simple-icons.json
+
+popd
 
 # Update package version and hash
 echo "Updating package source"

From 0a423938d1bd0ee05d46a53b15cd6b85ccd26b7f Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 31 Jan 2025 15:20:18 +0100
Subject: [PATCH 08/69] ente-auth: 4.3.1 -> 4.3.2

---
 pkgs/by-name/en/ente-auth/git-hashes.json   |  1 -
 pkgs/by-name/en/ente-auth/package.nix       |  4 +-
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 55 ++++++++++-----------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
index c08a0a3afac1..ff429e3de18f 100644
--- a/pkgs/by-name/en/ente-auth/git-hashes.json
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -1,6 +1,5 @@
 {
   "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
-  "figma_squircle": "sha256-FLjABaJzrK3H5svbRb6306FxD5L6dMfddFXpXpYgH3s=",
   "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
   "flutter_secure_storage_linux": "sha256-Rp+b6ZRH7F5AnM5UvYzfVjprXkpeeA7V6Ep/oYqDeiM=",
   "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 7a2e10c6b6ce..4a369c142f02 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -17,14 +17,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-vPsF2MxGko5tMgp/WmYIw/XoSPgpKFRasNZfRpiNV9E=";
+    hash = "sha256-/WWodQcMibwXVexI+XbTZYRkIMtfNHk3bJVBPJHcoqI=";
   };
 
   sourceRoot = "${src.name}/auth";
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 37ed708559e5..e04e4f9a1544 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,17 +4,17 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
+      "version": "72.0.0"
     },
     "_macros": {
       "dependency": "transitive",
       "description": "dart",
       "source": "sdk",
-      "version": "0.3.3"
+      "version": "0.3.2"
     },
     "adaptive_theme": {
       "dependency": "direct main",
@@ -30,11 +30,11 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "6.7.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -310,11 +310,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.18.0"
     },
     "confetti": {
       "dependency": "direct main",
@@ -540,13 +540,12 @@
     "figma_squircle": {
       "dependency": "direct main",
       "description": {
-        "path": ".",
-        "ref": "HEAD",
-        "resolved-ref": "5f1ad5aaccdf31fc398fc141979ea845a0f45383",
-        "url": "https://github.com/Ax0elz/figma_squircle.git"
+        "name": "figma_squircle",
+        "sha256": "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "0.5.5"
+      "source": "hosted",
+      "version": "0.5.3"
     },
     "file": {
       "dependency": "transitive",
@@ -1138,21 +1137,21 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "10.0.5"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.5"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1238,11 +1237,11 @@
       "dependency": "transitive",
       "description": {
         "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3-main.0"
+      "version": "0.1.2-main.4"
     },
     "matcher": {
       "dependency": "transitive",
@@ -1778,7 +1777,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.0"
+      "version": "0.0.99"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1885,11 +1884,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.11.1"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1935,11 +1934,11 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.2.0"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -1975,11 +1974,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.2"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2185,11 +2184,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "14.2.5"
     },
     "watcher": {
       "dependency": "transitive",

From 3ec974ac88bb798420f561867eec981484b32d60 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 31 Jan 2025 16:47:53 +0100
Subject: [PATCH 09/69] nixos/geth: add sepolia network

---
 .../services/blockchain/ethereum/geth.nix     |  3 ++-
 nixos/tests/geth.nix                          | 25 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix
index 0c406c595a74..807d50f8aa7e 100644
--- a/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -129,8 +129,9 @@ let
               "goerli"
               "holesky"
               "rinkeby"
-              "yolov2"
               "ropsten"
+              "sepolia"
+              "yolov2"
             ]
           );
           default = null;
diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix
index 984b46935b86..7fa7b97ed3bb 100644
--- a/nixos/tests/geth.nix
+++ b/nixos/tests/geth.nix
@@ -15,7 +15,8 @@ import ./make-test-python.nix (
             enable = true;
           };
         };
-        services.geth."testnet" = {
+
+        services.geth."holesky" = {
           enable = true;
           port = 30304;
           network = "holesky";
@@ -28,15 +29,31 @@ import ./make-test-python.nix (
             port = 18551;
           };
         };
+
+        services.geth."sepolia" = {
+          enable = true;
+          port = 30305;
+          network = "sepolia";
+          http = {
+            enable = true;
+            port = 28545;
+          };
+          authrpc = {
+            enable = true;
+            port = 28551;
+          };
+        };
       };
 
     testScript = ''
       start_all()
 
       machine.wait_for_unit("geth-mainnet.service")
-      machine.wait_for_unit("geth-testnet.service")
+      machine.wait_for_unit("geth-holesky.service")
+      machine.wait_for_unit("geth-sepolia.service")
       machine.wait_for_open_port(8545)
       machine.wait_for_open_port(18545)
+      machine.wait_for_open_port(28545)
 
       machine.succeed(
           'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
@@ -45,6 +62,10 @@ import ./make-test-python.nix (
       machine.succeed(
           'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
       )
+
+      machine.succeed(
+          'geth attach --exec "eth.blockNumber" http://localhost:28545 | grep \'^0$\' '
+      )
     '';
   }
 )

From de9134175539a2bc14b25c6834aa4d7e692f4144 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 31 Jan 2025 16:58:50 +0100
Subject: [PATCH 10/69] nixos/geth: remove obsolete networks

These networks are not available anymore as flags, so allowing them would break the module at runtime.
---
 nixos/modules/services/blockchain/ethereum/geth.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix
index 807d50f8aa7e..570c556ef849 100644
--- a/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -126,12 +126,8 @@ let
         network = lib.mkOption {
           type = lib.types.nullOr (
             lib.types.enum [
-              "goerli"
               "holesky"
-              "rinkeby"
-              "ropsten"
               "sepolia"
-              "yolov2"
             ]
           );
           default = null;

From 75c3ecc5d2e27a9a239081446216cf9048a57d76 Mon Sep 17 00:00:00 2001
From: Brian McGillion <bmg.avoin@gmail.com>
Date: Sat, 1 Feb 2025 22:05:47 +0400
Subject: [PATCH 11/69] daq: fix build for gcc 14

This is a bandage on an out of date package.

fixes #372356

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
---
 pkgs/by-name/da/daq/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/da/daq/package.nix b/pkgs/by-name/da/daq/package.nix
index 40401df9ba88..40e7fec92598 100644
--- a/pkgs/by-name/da/daq/package.nix
+++ b/pkgs/by-name/da/daq/package.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
     "--with-dnet-libraries=${libdnet}/lib"
   ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types";
+
   meta = {
     description = "Data AcQuisition library (DAQ), for packet I/O";
     mainProgram = "daq-modules-config";

From c3d24051034c87bd967ffdea15f16d106af5fa88 Mon Sep 17 00:00:00 2001
From: XBagon <xbagon@outlook.de>
Date: Sat, 1 Feb 2025 20:17:03 +0100
Subject: [PATCH 12/69] tuxedo-drivers: 4.11.3 -> 4.12.1

---
 pkgs/os-specific/linux/tuxedo-drivers/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
index 9c80d1dc7767..eef374b27cf1 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tuxedo-drivers-${kernel.version}";
-  version = "4.11.3";
+  version = "4.12.1";
 
   src = fetchFromGitLab {
     group = "tuxedocomputers";
     owner = "development/packages";
     repo = "tuxedo-drivers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ylHREVzQY9U/YHmVYQ4qO+A8tUcWXOTspS4g9qn314o=";
+    hash = "sha256-ZsfPs8VvvgguyNLSVi6n5hs0OzNwiK3bkooQ267mKtA=";
   };
 
   buildInputs = [ pahole ];
@@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       blanky0230
       keksgesicht
       xaverdh
+      XBagon
     ];
     platforms = lib.platforms.linux;
   };

From db860fae49b6b5008163a2aa493cc7b8bbb31ce5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 21:41:38 +0000
Subject: [PATCH 13/69] shellhub-agent: 0.17.2 -> 0.18.0

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

diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
index 5ac4dac1fc48..84f152c06e07 100644
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@@ -12,18 +12,18 @@
 
 buildGoModule rec {
   pname = "shellhub-agent";
-  version = "0.17.2";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "shellhub-io";
     repo = "shellhub";
     rev = "v${version}";
-    hash = "sha256-zMAAimFrOMcBVKuFwl/UpJLEWJHrjH7DNno5KCEvGrM=";
+    hash = "sha256-BIcdloW0ab/hNvgUtjL7Xdz2MNFqKmi+umcUjM5gTR8=";
   };
 
   modRoot = "./agent";
 
-  vendorHash = "sha256-jQNWuOwaAx//wDUVOrMc+ETWWbTCTp/SLwL2guERJB8=";
+  vendorHash = "sha256-L+oww1HlPWgAYK16OG5bWiDb/OW7uarY8LZyw9b85ac=";
 
   ldflags = [
     "-s"

From 2fbf0753ec727bda53aca3144c3607592259af93 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sun, 2 Feb 2025 14:17:19 +0100
Subject: [PATCH 14/69] gitlab: 17.8.0 -> 17.8.1

https://about.gitlab.com/releases/2025/01/22/patch-release-gitlab-17-8-1-released/
---
 .../applications/version-management/gitlab/data.json | 12 ++++++------
 .../gitlab/gitlab-workhorse/default.nix              |  2 +-
 pkgs/by-name/gi/gitaly/package.nix                   |  4 ++--
 pkgs/by-name/gi/gitlab-pages/package.nix             |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 3a65fdff9388..2e9a7042d6e3 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "17.8.0",
-  "repo_hash": "0a6a05hip2f505yvfi4v7849cmpb1kzghsf6ivy6lrhc06ksxs19",
+  "version": "17.8.1",
+  "repo_hash": "17m0aw8gd58gs1vxzk6pbqnhrhkvc172kn47pj5p6sgq3li3mcgf",
   "yarn_hash": "0d1nzgji3y90gcx92pl0bnqlj5h9ra3r7k1z673fvsj6lzppnx8v",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v17.8.0-ee",
+  "rev": "v17.8.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "17.8.0",
-    "GITLAB_PAGES_VERSION": "17.8.0",
+    "GITALY_SERVER_VERSION": "17.8.1",
+    "GITLAB_PAGES_VERSION": "17.8.1",
     "GITLAB_SHELL_VERSION": "14.39.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
-    "GITLAB_WORKHORSE_VERSION": "17.8.0"
+    "GITLAB_WORKHORSE_VERSION": "17.8.1"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index a9c921a6c994..cb1d66938b5c 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "17.8.0";
+  version = "17.8.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 08b29fe93903..559fdd8166a3 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "17.8.0";
+  version = "17.8.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-Ofmhyz4sCcho+tVhAD/X+3BtsrUoysvxHpxwc52Abwc=";
+      hash = "sha256-ahYvfA1PvB/OP3swTABH++pZubejsb3Cohy+Z5fcAo4=";
     };
 
     vendorHash = "sha256-rR3dsKUoIVDj0NviN8p8g3mSAW8PTNChBacqd23yDf8=";
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index 7e83d179ecd3..cd7a28d1b957 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "17.8.0";
+  version = "17.8.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-jQwHVSedAtBL5A0Y6OTtpRonSG1k69wdZO011S0D8/E=";
+    hash = "sha256-h+8sgBWYBClrfIsvnD1cUMRE9cxOtfjrGpss2tYdzDg=";
   };
 
   vendorHash = "sha256-2UtdooVoyoWr4yOPCRBAjkftn29DhJonpJSguHwfHNE=";

From 86a38d48fb53b9e22a7f1077d3e9c0bb5858cd0a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Feb 2025 20:17:09 +0100
Subject: [PATCH 15/69] workflows/eval: fail hard without target run

Without a target run, we won't get any rebuild labels, rebuild counts or
maintainer pings. This might have been correct before #373935, but by
now we run eval on all commits on the target branch, so we should treat
it as a failure if we can't find the run.
---
 .github/workflows/eval.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 79384daa6b3e..4c545f8c0815 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -175,7 +175,7 @@ jobs:
             --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
             || [[ -z "$run" ]]; then
             echo "Could not find an eval.yml workflow run for $BASE_SHA, cannot make comparison"
-            exit 0
+            exit 1
           fi
           echo "Comparing against $(jq .html_url <<< "$run")"
           runId=$(jq .id <<< "$run")
@@ -189,7 +189,7 @@ jobs:
 
           if [[ "$conclusion" != "success" ]]; then
             echo "Workflow was not successful (conclusion: $conclusion), cannot make comparison"
-            exit 0
+            exit 1
           fi
 
           echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"

From 93df51fa3360017b2e92e6a65246519551cd0c7b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Feb 2025 20:17:33 +0100
Subject: [PATCH 16/69] workflows/eval: rename BASE_SHA to TARGET_SHA

To be in line with the terminology introduced in the README.md in the
same folder.
---
 .github/workflows/eval.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 4c545f8c0815..abf9b7c33704 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -171,10 +171,10 @@ jobs:
         run: |
           # Get the latest eval.yml workflow run for the PR's target commit
           if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \
-            -f head_sha="$BASE_SHA" -f event=push \
+            -f head_sha="$TARGET_SHA" -f event=push \
             --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \
             || [[ -z "$run" ]]; then
-            echo "Could not find an eval.yml workflow run for $BASE_SHA, cannot make comparison"
+            echo "Could not find an eval.yml workflow run for $TARGET_SHA, cannot make comparison"
             exit 1
           fi
           echo "Comparing against $(jq .html_url <<< "$run")"
@@ -195,7 +195,7 @@ jobs:
           echo "targetRunId=$runId" >> "$GITHUB_OUTPUT"
         env:
           REPOSITORY: ${{ github.repository }}
-          BASE_SHA: ${{ needs.attrs.outputs.targetSha }}
+          TARGET_SHA: ${{ needs.attrs.outputs.targetSha }}
           GH_TOKEN: ${{ github.token }}
 
       - uses: actions/download-artifact@v4

From c61526a2d87ebbf298a13f408bbcc801fff46557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 19:24:51 +0000
Subject: [PATCH 17/69] prowler: 5.1.5 -> 5.2.3

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

diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index 3dec004d870d..cb8eeb120561 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "prowler";
-  version = "5.1.5";
+  version = "5.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "prowler-cloud";
     repo = "prowler";
     tag = version;
-    hash = "sha256-yVoVfJGO+96ck8T63O0ubeTtdhpfziZFHYVXGFNENds=";
+    hash = "sha256-gEkD3lMOLpi2NeZBN4V2RJ/aqcuSLSQFSFYFSyDgizc=";
   };
 
   pythonRelaxDeps = true;

From f1ffa15967f481efa4439ac7394b4e10c3296aca Mon Sep 17 00:00:00 2001
From: jthulhu <adrien.lc.mathieu@gmail.com>
Date: Mon, 3 Feb 2025 19:42:32 +0100
Subject: [PATCH 18/69] lean4: 4.15.0 -> 4.16.0

Release notes: https://github.com/leanprover/lean4/releases/tag/v4.16.0
---
 pkgs/by-name/le/lean4/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 5feafb9d2969..23a1e9033ec3 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
-  version = "4.15.0";
+  version = "4.16.0";
 
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "lean4";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Xzuk41voBP93vsl3u/bBii9Y6DMfvi6UazKiLLABgHA=";
+    hash = "sha256-RdFTxLk0Yahwhu/oQeTappvWnUtnim63dxN7gmU8Jt8=";
   };
 
   postPatch = ''

From e0812fc1f8a79eaff265e085fc7db78ebde365c3 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 3 Feb 2025 13:05:58 +0100
Subject: [PATCH 19/69] pypy310Packages.cffi: make proper package

Some packages, for example brotlicffi, expect to get pycparser.
Make a placeholder package for their benefit.

It remains to be seen whether the lack of a directory in
site-packages will cause trouble.
---
 .../python-modules/cffi/default.nix           | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index d392915f05f8..bbdd6bf08cfc 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -11,12 +11,32 @@
   pycparser,
 }:
 
+let
+  version = "1.17.1";
+in
 if isPyPy then
-  null
+  buildPythonPackage {
+    pname = "cffi";
+    inherit version;
+    pyproject = false;
+
+    # cffi is bundled with PyPy.
+    dontUnpack = true;
+
+    # Some dependent packages expect to have pycparser available when using cffi.
+    dependencies = [ pycparser ];
+
+    meta = {
+      description = "Foreign Function Interface for Python calling C code (bundled with PyPy, placeholder package)";
+      homepage = "https://cffi.readthedocs.org/";
+      license = lib.licenses.mit;
+      maintainers = lib.teams.python.members;
+    };
+  }
 else
   buildPythonPackage rec {
     pname = "cffi";
-    version = "1.17.1";
+    inherit version;
     pyproject = true;
 
     src = fetchPypi {

From 23829c7e31c2fc94c34da4efd9d0532bd731bc82 Mon Sep 17 00:00:00 2001
From: nikolaizombie1 <fabio.matos999@gmail.com>
Date: Sat, 1 Feb 2025 15:10:05 -0500
Subject: [PATCH 20/69] waytrogen: 0.6.3 -> 0.6.7

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

diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 036633da5da2..9d364711b59f 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "waytrogen";
-  version = "0.6.3";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = version;
-    hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I=";
+    hash = "sha256-JlqRlB/iMeFp229bF4u7M+Z9m9zlizHgqbfmszNwd9k=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-iCcYlBqXo76QLuzdd1/YbLL99eCOnniHDAOllX8XyXQ=";
+  cargoHash = "sha256-S4DPvQ2unFt13eLFS91z7TyfFz7uwMMIgsEQ/JPe0e8=";
 
   nativeBuildInputs = [
     pkg-config

From df3b3bcc8bee9eda0b63e830a38aceaeb9446204 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Feb 2025 14:34:10 +0100
Subject: [PATCH 21/69] fwupd: 2.0.4 -> 2.0.5

Diff: https://github.com/fwupd/fwupd/compare/refs/tags/2.0.4...2.0.5

Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.5
---
 pkgs/by-name/fw/fwupd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index 49a542ed132d..e378de515de1 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -117,7 +117,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.4";
+  version = "2.0.5";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-0+2B8/ZuniZCeP1LMzLcJsvE3RzlHuw0jd6rlkoW6zY=";
+    hash = "sha256-V07alPn2+bOkKx+oh8qoX4Ie6/5ujO6h/TDzvL3UhvQ=";
   };
 
   patches = [

From f4828c6e8536bfb13d30c9b3ff5898b1f1d9bb83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Feb 2025 23:42:33 +0000
Subject: [PATCH 22/69] novelwriter: 2.6 -> 2.6.1

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

diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix
index dd0773161216..5cac7a547273 100644
--- a/pkgs/by-name/no/novelwriter/package.nix
+++ b/pkgs/by-name/no/novelwriter/package.nix
@@ -7,7 +7,7 @@
   nix-update-script,
 }:
 let
-  version = "2.6";
+  version = "2.6.1";
 in
 python3.pkgs.buildPythonApplication {
   pname = "novelwriter";
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication {
     owner = "vkbo";
     repo = "novelWriter";
     rev = "v${version}";
-    hash = "sha256-eQ0az+4SEpf07rlCHGvK8Fp8ECimpTblWNlxwANNisE=";
+    hash = "sha256-z2iDRTWiqdjEpqCn4pNthNFl/zGGoVLU/XsRJaQ3Ys4=";
   };
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];

From f7cdcbfc3c293ace2ffea5cc34b5363112d04190 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 4 Feb 2025 09:05:46 +0900
Subject: [PATCH 23/69] uv: 0.5.26 -> 0.5.27

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index ca2069e898c7..d097bc8629ea 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uv";
-  version = "0.5.26";
+  version = "0.5.27";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-Rp6DexvMbUdE7i8hik4MC2sW/VFmpxJFfF7ukc49VlE=";
+    hash = "sha256-UqwXLAo99ZtvNNIfd5eO+IfdL2fksf0LTrRU2G1/j/8=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-MZKrkxy7bXQ3lTrPwCRT8nAR8fP+SeZmBEMQrXlvkYo=";
+  cargoHash = "sha256-TS823jBGtHNUZzeRJpir6G8F8Cgq7fuxw6pPk8RrE3o=";
 
   nativeBuildInputs = [
     cmake

From 21c82b822e311e281e4828859f7af2d30b8bf5ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 00:52:04 +0000
Subject: [PATCH 24/69] sad: 0.4.31 -> 0.4.32

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

diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix
index 5353fb404828..9557f9b2eb29 100644
--- a/pkgs/by-name/sa/sad/package.nix
+++ b/pkgs/by-name/sa/sad/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sad";
-  version = "0.4.31";
+  version = "0.4.32";
 
   src = fetchFromGitHub {
     owner = "ms-jpq";
     repo = "sad";
     tag = "v${version}";
-    hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko=";
+    hash = "sha256-c5TYIVUrfKrVuyolVe7+EhiM/SOFNahz8X6F8WrKEa0=";
   };
 
-  cargoHash = "sha256-2oZf2wim2h/krGZMg7Psxx0VLFE/Xf1d1vWqkVtjSmo=";
+  cargoHash = "sha256-EoSu2xhwTRvawRpMg4QG/kSBiUyDQVsc3evAlKpO1TI=";
 
   nativeBuildInputs = [ python3 ];
 

From 24fa842a556c8c78442a0a194dbe758ef9a7cdde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 00:55:43 +0000
Subject: [PATCH 25/69] mpich: 4.2.3 -> 4.3.0

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

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index a01cc726f223..fdc2f1f7b7ed 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -33,11 +33,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
 
 stdenv.mkDerivation rec {
   pname = "mpich";
-  version = "4.2.3";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    hash = "sha256-egGRgMUdFzitnF2NRSMU3mXoKO4kC8stH4DemmW+iKg=";
+    hash = "sha256-XgQTKYStg8q5zFP3YHLSte9abSSwqf+QR6j/lhIbzGM=";
   };
 
   patches = [

From d7a3aab1c88e0d7ba499862da0000fb2c03d4b23 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Tue, 4 Feb 2025 01:24:42 +0000
Subject: [PATCH 26/69] nexusmods-app: 0.7.2 -> 0.7.3

---
 pkgs/by-name/ne/nexusmods-app/deps.json   | 47 ++++++++++++++++++++---
 pkgs/by-name/ne/nexusmods-app/package.nix |  4 +-
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index b83c979c76d3..d0f50a18e4fe 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -779,11 +779,21 @@
     "version": "2.5.2",
     "hash": "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE="
   },
+  {
+    "pname": "Jamarino.IntervalTree",
+    "version": "1.2.2",
+    "hash": "sha256-L8vFWl+1OUviHB+TOkw7Po0+IBLnJMZ1fnvqcYQOuRQ="
+  },
   {
     "pname": "JetBrains.Annotations",
     "version": "2024.3.0",
     "hash": "sha256-BQYhE7JDJ9Bw588KyWzOvQFvQTiRa0K9maVkI9lZgBc="
   },
+  {
+    "pname": "Jitbit.FastCache",
+    "version": "1.1.0",
+    "hash": "sha256-UJjNHEyBsi+XRkTF/D5EIIhVMchybD9INtXthXo49bg="
+  },
   {
     "pname": "K4os.Compression.LZ4",
     "version": "1.3.7-beta",
@@ -799,6 +809,11 @@
     "version": "0.3.1",
     "hash": "sha256-Yyt1uShHigHVCIjPT8jL2Kth9L9yq1MGrCM5w2+tj9o="
   },
+  {
+    "pname": "LinuxDesktopUtils.XDGDesktopPortal",
+    "version": "1.0.0",
+    "hash": "sha256-DTxWI/DI01Flb4yfSxukaEw6roSzD9iy4Twy1I8/5Mg="
+  },
   {
     "pname": "LiveChartsCore",
     "version": "2.0.0-rc2",
@@ -894,6 +909,11 @@
     "version": "7.0.0",
     "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
   },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "8.0.0",
+    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
+  },
   {
     "pname": "Microsoft.Build.Tasks.Git",
     "version": "8.0.0",
@@ -1606,18 +1626,18 @@
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.9.97",
-    "hash": "sha256-b0k/hM6UYvMTZN2QMk53QN9Fw/pomXJ88k9QqfrAF+s="
+    "version": "0.9.98",
+    "hash": "sha256-1B1PBH/iUuLOPsUo5WAsSAkDGWQBTlY8sk/sAiugpB0="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.9.97",
-    "hash": "sha256-EnWQMeXMKwziMoBXKf7t+Ru6EHZBml4Pt3h1eSP1Ud0="
+    "version": "0.9.98",
+    "hash": "sha256-rZ9UP6BcxYPlHKqyGj0G5q+woEjvpRS/jg69UY4aWDE="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.9.97",
-    "hash": "sha256-KOZVhS3H/qY6bRW9HmSF1Ud4fXv5oEWORDdYET9Ochw="
+    "version": "0.9.98",
+    "hash": "sha256-jP07gJZQ9ZT9DXyWIQOlgmZx0onqiUe3w2JiN55NA94="
   },
   {
     "pname": "NexusMods.Paths",
@@ -1639,6 +1659,11 @@
     "version": "0.15.0",
     "hash": "sha256-xUZIAND1Ob0SRuoTTuJqw7N2j/4ncIlck3lgfeWxd5M="
   },
+  {
+    "pname": "NLog",
+    "version": "5.2.8",
+    "hash": "sha256-IrCChiy703DRIebN//M4wwXW7gayuCVD/dHKXCoQcPw="
+  },
   {
     "pname": "NLog",
     "version": "5.3.4",
@@ -2164,6 +2189,11 @@
     "version": "2.88.9",
     "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
+  {
+    "pname": "SmartFormat",
+    "version": "3.5.1",
+    "hash": "sha256-NwvJBCT2BBfJgGa/LMbvan0XqZhRBYzlpMLtC3l5SOM="
+  },
   {
     "pname": "Spectre.Console",
     "version": "0.49.1",
@@ -3079,6 +3109,11 @@
     "version": "1.0.64",
     "hash": "sha256-ykBZOyvaX1/iFmZjue754qJG4jfPx38ZdHevEZvh7w8="
   },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.18.0",
+    "hash": "sha256-u5bRK7XbxU/NdMu8PZqxb3fmRdPTbimQ/YIe5/scPOo="
+  },
   {
     "pname": "Tmds.DBus.Protocol",
     "version": "0.20.0",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 30eba95da65e..8278059128b8 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -25,12 +25,12 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchgit {
     url = "https://github.com/Nexus-Mods/NexusMods.App.git";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-Kss1K1ZqXLZ/WbbyY3ZQRe8Kvmjdu3tRGfcagE7Q42Q=";
+    hash = "sha256-p3MTxuLR/mkVrL+hwW2R13/eVHWWulZPRh9OsuHq9kU=";
     fetchSubmodules = true;
     fetchLFS = true;
   };

From d5a8eb09dc5feff6fde7ca5da5ae6caee1065c2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 02:45:49 +0000
Subject: [PATCH 27/69] mubeng: 0.21.0 -> 0.22.0

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

diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix
index 833a47cdafee..4a3f8e010157 100644
--- a/pkgs/by-name/mu/mubeng/package.nix
+++ b/pkgs/by-name/mu/mubeng/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mubeng";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "kitabisa";
     repo = "mubeng";
     tag = "v${version}";
-    hash = "sha256-LApviKG6sgIYtosU0xW4lkBH0iB7MGB4bfG9fPI16iQ=";
+    hash = "sha256-YK3a975l/gMCaWxTB4gEQWAzzX+GRnYSvKksPmp3ZRA=";
   };
 
-  vendorHash = "sha256-Uvxkvj5hodVQ0j05HZdSKammGWy9DxEIBT0VnCW8QuI=";
+  vendorHash = "sha256-qv8gAq7EohMNbwTfLeNhucKAzkYKzRbTpkoG5jTgKI0=";
 
   ldflags = [
     "-s"

From ef07f4b6d8b7563db9aa176bb4d964a1174aadd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 02:46:40 +0000
Subject: [PATCH 28/69] pdal: 2.8.3 -> 2.8.4

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

diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 0d2b095270e5..f470cc5c93e7 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdal";
-  version = "2.8.3";
+  version = "2.8.4";
 
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
     rev = finalAttrs.version;
-    hash = "sha256-i4Kk9T9MwMGshyGtHrSDhnzqeeThRCKXsjpW3rIDVVc=";
+    hash = "sha256-52v7oDmvq820mJ91XAZI1rQEwssWcHagcd2QNVV6zPA=";
   };
 
   nativeBuildInputs = [

From cc58c5213b875221f4e232838b00b2b516168a69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 02:47:47 +0000
Subject: [PATCH 29/69] nagiosPlugins.check_ssl_cert: 2.85.1 -> 2.86.0

---
 .../monitoring/nagios-plugins/check_ssl_cert/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
index 8c000321857a..635045677c03 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "check_ssl_cert";
-  version = "2.85.1";
+  version = "2.86.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     tag = "v${version}";
-    hash = "sha256-ix3GyY7xIcrdwzECO6kD7fjccf9OK6Ey+NsSWWcH9ns=";
+    hash = "sha256-IXwy6iRjrXVxpZiAYLMVmAgwm7Z8Ck/B0Mwi1UlRcSs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From dee2302ce2e9eb3b8e3d6a84c5e2bbb7a8069749 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 03:29:25 +0000
Subject: [PATCH 30/69] sqlite_orm: 1.9 -> 1.9.1

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

diff --git a/pkgs/by-name/sq/sqlite_orm/package.nix b/pkgs/by-name/sq/sqlite_orm/package.nix
index 2d2ce1dd9024..2c5151d9f7f5 100644
--- a/pkgs/by-name/sq/sqlite_orm/package.nix
+++ b/pkgs/by-name/sq/sqlite_orm/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlite_orm";
-  version = "1.9";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "fnc12";
     repo = "sqlite_orm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-jgRCYOtCyXj2E5J3iYBffX2AyBwvhune+i4Pb2eCBrA=";
+    hash = "sha256-tlmUYHH0V4qsKSTdrg/OrS9eOEseIDAIU/HN8YK36go=";
   };
 
   nativeBuildInputs = [

From 99de8bf25cbd33d62c8c9e7169618433d235216b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 04:20:07 +0000
Subject: [PATCH 31/69] nom: 2.7.3 -> 2.8.0

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

diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 88c029ef65a7..59b38088fe9c 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "2.7.3";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     tag = "v${version}";
-    hash = "sha256-kCvNUvU3fR3v/uRPl3y9HlNXMartNb23kfj1YYY2BWg=";
+    hash = "sha256-2YXecurdmlho5LvkkMc97GiyrSy/kTZINTPtC+J+eL0=";
   };
 
   vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";

From a430b350354790d04e03f6654333b9797b612b13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 07:03:33 +0000
Subject: [PATCH 32/69] discord: 0.0.82 -> 0.0.83

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 484722aedf2d..e85c7cb9e89f 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -9,7 +9,7 @@ let
   versions =
     if stdenv.hostPlatform.isLinux then
       {
-        stable = "0.0.82";
+        stable = "0.0.83";
         ptb = "0.0.128";
         canary = "0.0.581";
         development = "0.0.68";
@@ -26,7 +26,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-L8Lwe5UavmbW1s3gsSJiHjbiZnNtyEsEJzlrN0Fgc3w=";
+        hash = "sha256-thBnSYjYa2QEHyxIhEiA73hMs/S8n808oq8IAKtA7VI=";
       };
       ptb = fetchurl {
         url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

From 31d5e15f0daddd3d8a7c089368392dcd251ffcb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 07:13:30 +0000
Subject: [PATCH 33/69] v2ray-domain-list-community: 20241221105938 ->
 20250124154827

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index b7439e413c9a..aac22888bc86 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20241221105938";
+    version = "20250124154827";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-k42qnHQY9bfSjyGGtaqKdIxlvU/C7TiN8sD0AiRQmVU=";
+      hash = "sha256-E69X6ktgZvW3xrZl+jmQMoPwRQlqU+0RW2epJHyFgeQ=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From 644ec56ed303b6e7bc41cba27a171ba23199865e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 07:26:39 +0000
Subject: [PATCH 34/69] mangojuice: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix
index 5643fb8effca..5822ac2ceeb2 100644
--- a/pkgs/by-name/ma/mangojuice/package.nix
+++ b/pkgs/by-name/ma/mangojuice/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "mangojuice";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "radiolamp";
     repo = "mangojuice";
     tag = finalAttrs.version;
-    hash = "sha256-LSwn6PIAGX1FIofnmoM2eqnhZBa3gkhlOBUJtdR9gWE=";
+    hash = "sha256-nMLymCOkml5LIvZgvp1NNHyG06KVlmQBMU+N4A4/Xus=";
   };
 
   nativeBuildInputs = [

From 92dd18f8fa5cc160163ab16d03ccfaae62aae3ca Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Mon, 3 Feb 2025 16:32:57 +0100
Subject: [PATCH 35/69] rainfrog: 0.2.11 -> 0.2.13

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

diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index b9a3177deeb1..21087ddfcc9f 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -9,7 +9,7 @@
   rainfrog,
 }:
 let
-  version = "0.2.11";
+  version = "0.2.13";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-gtiwkgNyqq+KMATkzaLOjPB6jcjVAM2qq6zwZ1WGkPE=";
+    hash = "sha256-CNxaCA7xrAkSCiVao+s5jAp3fheRCYK+/3Yekr1xUKk=";
   };
 
-  cargoHash = "sha256-u0BmDtOIlYfHEAiDp+BnY1/ne3tKwmy/Cem6+5CX3GE=";
+  cargoHash = "sha256-m3wNmrNu8XzmE/6Y7QIV9ZjvlAr0NCx/hrzhKOaB8lM=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk.frameworks;

From 07f14030db30cdd8b0247c6bc728500a3eb4dd56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 07:30:03 +0000
Subject: [PATCH 36/69] cedar: 4.3.0 -> 4.3.1

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

diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix
index 01a83b8861f0..6419c0ea4e7b 100644
--- a/pkgs/by-name/ce/cedar/package.nix
+++ b/pkgs/by-name/ce/cedar/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cedar";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "cedar-policy";
     repo = "cedar";
     tag = "v${version}";
-    hash = "sha256-E3x+FfjLNUpfu00D+UALc73STodNW2Kvfo/4x6hORiY=";
+    hash = "sha256-1EJvLQDQQTiNwPe0Ynt6VI3RD/3jGbt/0H7pzGcl1wA=";
   };
 
-  cargoHash = "sha256-z40HtNSkNpMquhwE+B1AhmtY6j8OKcFRIm09neLGUWg=";
+  cargoHash = "sha256-y8sjFpDa16nmYboLB/x1+i/Z4rd4MUhPOx0pBGkd3z0=";
 
   passthru = {
     tests.version = testers.testVersion { package = cedar; };

From b613464a62bafeaaab19f10a14f62a8019d85914 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 21:46:00 +0100
Subject: [PATCH 37/69] audible-cli: use `addBinToPathHook`

---
 pkgs/by-name/au/audible-cli/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix
index 88a8bfd55c0d..4405384f234b 100644
--- a/pkgs/by-name/au/audible-cli/package.nix
+++ b/pkgs/by-name/au/audible-cli/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  addBinToPathHook,
   installShellFiles,
   nix-update-script,
 }:
@@ -24,6 +25,7 @@ python3Packages.buildPythonApplication rec {
       setuptools
     ]
     ++ [
+      addBinToPathHook
       installShellFiles
     ];
 
@@ -46,7 +48,6 @@ python3Packages.buildPythonApplication rec {
   ];
 
   postInstall = ''
-    export PATH=$out/bin:$PATH
     installShellCompletion --cmd audible \
       --bash <(source utils/code_completion/audible-complete-bash.sh) \
       --fish <(source utils/code_completion/audible-complete-zsh-fish.sh) \

From 6a79b58e8db5f9226a2c3d9cfcf2fb4867855679 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:11:35 +0100
Subject: [PATCH 38/69] python312Packages.eliot: unbreak, use
 `addBinToPathHook`

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

diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index acd7e0e368cf..2d5467cea9f8 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -15,6 +15,7 @@
   zope-interface,
 
   daemontools,
+  addBinToPathHook,
   dask,
   distributed,
   hypothesis,
@@ -38,14 +39,6 @@ buildPythonPackage rec {
     hash = "sha256-KqAXOMrRawzjpt5do2KdqpMMgpBtxeZ+X+th0WwBl+U=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "numpy2-compat.patch";
-      url = "https://github.com/itamarst/eliot/commit/39eccdad44f91971ecf1211fb01366b4d9801817.patch";
-      hash = "sha256-al6olmvFZ8pDblljWmWqs5QrtcuHKcea255XgG+1+1o=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -56,6 +49,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    addBinToPathHook
     dask
     distributed
     hypothesis
@@ -69,11 +63,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "eliot" ];
 
-  # Tests run eliot-prettyprint in out/bin.
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
-
   disabledTests = [
     # Fails since dask's bump to 2024.12.2
     # Reported upstream: https://github.com/itamarst/eliot/issues/507

From df0dc1125db3ffa75eefd99c5ff2618bc53b63f8 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:14:42 +0100
Subject: [PATCH 39/69] eliot-tree: use `addBinToPathHook`

---
 pkgs/by-name/el/eliot-tree/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/el/eliot-tree/package.nix b/pkgs/by-name/el/eliot-tree/package.nix
index 3a8c809f933c..637f4af95be0 100644
--- a/pkgs/by-name/el/eliot-tree/package.nix
+++ b/pkgs/by-name/el/eliot-tree/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchPypi,
+  addBinToPathHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -32,15 +33,11 @@ python3Packages.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = with python3Packages; [
+    addBinToPathHook
     pytestCheckHook
     testtools
   ];
 
-  # Tests run eliot-tree in out/bin.
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
-
   pythonImportsCheck = [ "eliottree" ];
 
   meta = {

From fbac494ac20f64b97b80d92088eb22eb8588af75 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:15:08 +0100
Subject: [PATCH 40/69] flye: use `addBinToPathHook`

---
 pkgs/by-name/fl/flye/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix
index 443c66488e23..1f7bde7a2aa5 100644
--- a/pkgs/by-name/fl/flye/package.nix
+++ b/pkgs/by-name/fl/flye/package.nix
@@ -8,6 +8,7 @@
   libdeflate,
   bash,
   coreutils,
+  addBinToPathHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -54,11 +55,10 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "flye" ];
 
-  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
-
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
+  nativeCheckInputs = [
+    addBinToPathHook
+    python3Packages.pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "De novo assembler for single molecule sequencing reads using repeat graphs";

From 90c2ed254ecdd580928108a5b4136040ef374883 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:15:33 +0100
Subject: [PATCH 41/69] gallia: use `addBinToPathHook`

---
 pkgs/by-name/ga/gallia/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix
index 0878b750a958..7268e0475165 100644
--- a/pkgs/by-name/ga/gallia/package.nix
+++ b/pkgs/by-name/ga/gallia/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   python3,
   cacert,
+  addBinToPathHook,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -43,17 +44,18 @@ python3.pkgs.buildPythonApplication rec {
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-    pytest-asyncio
-  ];
+  nativeCheckInputs =
+    with python3.pkgs;
+    [
+      pytestCheckHook
+      pytest-asyncio
+    ]
+    ++ [
+      addBinToPathHook
+    ];
 
   pythonImportsCheck = [ "gallia" ];
 
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
-
   meta = with lib; {
     description = "Extendable Pentesting Framework for the Automotive Domain";
     homepage = "https://github.com/Fraunhofer-AISEC/gallia";

From b3bba66ff3c64871d6ff98b497aa8b9c04835449 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:15:53 +0100
Subject: [PATCH 42/69] gdtoolkit_3: use `addBinToPathHook`, use
 `writableTmpDirAsHomeHook`

---
 pkgs/by-name/gd/gdtoolkit_3/package.nix | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/gd/gdtoolkit_3/package.nix b/pkgs/by-name/gd/gdtoolkit_3/package.nix
index a25eddbcac1b..8469a1a647d7 100644
--- a/pkgs/by-name/gd/gdtoolkit_3/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_3/package.nix
@@ -2,6 +2,8 @@
   lib,
   python3,
   fetchFromGitHub,
+  addBinToPathHook,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -31,7 +33,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Scony";
     repo = "godot-gdscript-toolkit";
-    rev = version;
+    tag = version;
     hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4=";
   };
 
@@ -46,18 +48,16 @@ python.pkgs.buildPythonApplication rec {
 
   doCheck = true;
 
-  nativeCheckInputs = with python.pkgs; [
-    pytestCheckHook
-    hypothesis
-  ];
-
-  preCheck = ''
-    # The tests want to run the installed executables
-    export PATH=$out/bin:$PATH
-
-    # gdtoolkit tries to write cache variables to $HOME/.cache
-    export HOME=$TMP
-  '';
+  nativeCheckInputs =
+    with python.pkgs;
+    [
+      pytestCheckHook
+      hypothesis
+    ]
+    ++ [
+      addBinToPathHook
+      writableTmpDirAsHomeHook
+    ];
 
   # The tests are not working on NixOS
   disabledTests = [

From 2f69f99ff8db14f549684d68ed0f80f66bfc9b3a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:17:27 +0100
Subject: [PATCH 43/69] gdtoolkit_4: use `addBinToPathHook`, use
 `writableTmpDirAsHomeHook`

---
 pkgs/by-name/gd/gdtoolkit_4/package.nix | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix
index 301f9013409e..3c51104343c8 100644
--- a/pkgs/by-name/gd/gdtoolkit_4/package.nix
+++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix
@@ -2,6 +2,8 @@
   lib,
   python3,
   fetchFromGitHub,
+  addBinToPathHook,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -30,7 +32,7 @@ python.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Scony";
     repo = "godot-gdscript-toolkit";
-    rev = version;
+    tag = version;
     hash = "sha256-XK6s/WnbTzjCAtV8dbRPLe5olpKUglPLQdttRRMvX70=";
   };
 
@@ -45,18 +47,16 @@ python.pkgs.buildPythonApplication rec {
 
   doCheck = true;
 
-  nativeCheckInputs = with python.pkgs; [
-    pytestCheckHook
-    hypothesis
-  ];
-
-  preCheck = ''
-    # The tests want to run the installed executables
-    export PATH=$out/bin:$PATH
-
-    # gdtoolkit tries to write cache variables to $HOME/.cache
-    export HOME=$TMP
-  '';
+  nativeCheckInputs =
+    with python.pkgs;
+    [
+      pytestCheckHook
+      hypothesis
+    ]
+    ++ [
+      addBinToPathHook
+      writableTmpDirAsHomeHook
+    ];
 
   # The tests are not working on NixOS
   disabledTestPaths = [

From f0ad956733c49080da0d1ad33198aab6f0842c49 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:17:58 +0100
Subject: [PATCH 44/69] gemmi: use `addBinToPathHook`

---
 pkgs/by-name/ge/gemmi/package.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix
index 4082147ec513..17e4cebd94eb 100644
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -5,6 +5,7 @@
   cmake,
   zlib,
   enablePython ? true,
+  addBinToPathHook,
   python3Packages,
   testers,
 }:
@@ -44,15 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   doInstallCheck = enablePython;
 
-  nativeInstallCheckInputs = with python3Packages; [
-    # biopython
-    numpy
-    pytestCheckHook
-  ];
-
-  preInstallCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
+  nativeInstallCheckInputs =
+    with python3Packages;
+    [
+      # biopython
+      numpy
+      pytestCheckHook
+    ]
+    ++ [
+      addBinToPathHook
+    ];
 
   pytestFlagsArray = [ "../tests" ];
 

From 2964352875f76ece5ec973b89812e0d549797177 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:18:21 +0100
Subject: [PATCH 45/69] multiqc: use `addBinToPathHook`

---
 pkgs/by-name/mu/multiqc/package.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix
index be3f8ad6ea86..6d49ccda1d43 100644
--- a/pkgs/by-name/mu/multiqc/package.nix
+++ b/pkgs/by-name/mu/multiqc/package.nix
@@ -5,6 +5,7 @@
   procps,
   stdenv,
   versionCheckHook,
+  addBinToPathHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -77,19 +78,23 @@ python3Packages.buildPythonApplication rec {
   preCheck = ''
     chmod -R u+w ../test-data
     ln -s ../test-data .
-    export PATH=$out/bin:$PATH
   '';
 
   # Some tests run subprocess.run() with "ps"
-  nativeCheckInputs = with python3Packages; [
-    procps
-    pytest-cov
-    pytest-xdist
-    pytestCheckHook
-    syrupy
-    pygithub
-    versionCheckHook
-  ];
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      procps
+      pytest-cov
+      pytest-xdist
+      pytestCheckHook
+      syrupy
+      pygithub
+      versionCheckHook
+    ]
+    ++ [
+      addBinToPathHook
+    ];
 
   versionCheckProgramArg = [ "--version" ];
 

From 11613c422cf952ec67adf32c2265790f633f6365 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:18:39 +0100
Subject: [PATCH 46/69] parquet-tools: use `addBinToPathHook`

---
 pkgs/by-name/pa/parquet-tools/package.nix | 31 +++++++++++------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/pa/parquet-tools/package.nix b/pkgs/by-name/pa/parquet-tools/package.nix
index df25bfd14705..92771bad07f5 100644
--- a/pkgs/by-name/pa/parquet-tools/package.nix
+++ b/pkgs/by-name/pa/parquet-tools/package.nix
@@ -2,11 +2,10 @@
   lib,
   fetchFromGitHub,
   python3Packages,
+  addBinToPathHook,
 }:
 
-with python3Packages;
-
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "parquet-tools";
   version = "0.2.16";
 
@@ -27,7 +26,7 @@ buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace tests/test_inspect.py \
-      --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \
+      --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${python3Packages.pyarrow.version}" \
       --replace "serialized_size: 2222" "serialized_size: 2221" \
       --replace "format_version: 1.0" "format_version: 2.6"
   '';
@@ -38,11 +37,11 @@ buildPythonApplication rec {
     "thrift"
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3Packages; [
     poetry-core
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
     boto3
     colorama
     halo
@@ -52,16 +51,16 @@ buildPythonApplication rec {
     thrift
   ];
 
-  # TestGetMetaData.test_inspect shells out to `parquet-tools` CLI entrypoint
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
-
-  nativeCheckInputs = [
-    moto
-    pytest-mock
-    pytestCheckHook
-  ];
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      moto
+      pytest-mock
+      pytestCheckHook
+    ]
+    ++ [
+      addBinToPathHook
+    ];
 
   disabledTests = [
     # test file is 2 bytes bigger than expected

From a8ad6d2988b99d8f82723a6df89a972a03ee84d9 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:19:38 +0100
Subject: [PATCH 47/69] pifpaf: use `addBinToPathHook`

---
 pkgs/by-name/pi/pifpaf/package.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/pi/pifpaf/package.nix b/pkgs/by-name/pi/pifpaf/package.nix
index 18bdd1d2fa73..232a6bde2871 100644
--- a/pkgs/by-name/pi/pifpaf/package.nix
+++ b/pkgs/by-name/pi/pifpaf/package.nix
@@ -1,10 +1,11 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchPypi,
+  addBinToPathHook,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pifpaf";
   version = "3.2.3";
   format = "setuptools";
@@ -14,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-L039ZAFnYLCU52h1SczJU0T7+1gufxQlVzQr1EPCqc8=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3Packages; [
     click
     daiquiri
     fixtures
@@ -24,14 +25,15 @@ python3.pkgs.buildPythonApplication rec {
     xattr
   ];
 
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
-
-  nativeCheckInputs = with python3.pkgs; [
-    requests
-    testtools
-  ];
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      requests
+      testtools
+    ]
+    ++ [
+      addBinToPathHook
+    ];
 
   pythonImportsCheck = [ "pifpaf" ];
 

From b5279fcbed3f27ef0961792f5ac804a93051476b Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:19:57 +0100
Subject: [PATCH 48/69] tts: use `addBinToPathHook`, use
 `writableTmpDirAsHomeHook`

---
 pkgs/by-name/tt/tts/package.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix
index 26ad68675736..f4ce01fe7cdc 100644
--- a/pkgs/by-name/tt/tts/package.nix
+++ b/pkgs/by-name/tt/tts/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   espeak-ng,
   tts,
+  addBinToPathHook,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -111,18 +113,20 @@ python.pkgs.buildPythonApplication rec {
     doCheck = true;
   });
 
-  nativeCheckInputs = with python.pkgs; [
-    espeak-ng
-    pytestCheckHook
-  ];
+  nativeCheckInputs =
+    with python.pkgs;
+    [
+      espeak-ng
+      pytestCheckHook
+    ]
+    ++ [
+      addBinToPathHook
+      writableTmpDirAsHomeHook
+    ];
 
   preCheck = ''
     # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules.
     mv TTS{,.old}
-    export PATH=$out/bin:$PATH
-
-    # numba tries to write to HOME directory
-    export HOME=$TMPDIR
 
     for file in $(grep -rl 'python TTS/bin' tests); do
       substituteInPlace "$file" \

From b092a528f30f25e78acfa9dc459912bb8c8ca41f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:20:19 +0100
Subject: [PATCH 49/69] xonsh: use `addBinToPathHook`

---
 pkgs/by-name/xo/xonsh/unwrapped.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix
index 93544f928fd6..3992262d873c 100644
--- a/pkgs/by-name/xo/xonsh/unwrapped.nix
+++ b/pkgs/by-name/xo/xonsh/unwrapped.nix
@@ -2,10 +2,12 @@
   lib,
   coreutils,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   glibcLocales,
   nix-update-script,
   pythonPackages,
+  addBinToPathHook,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -19,7 +21,7 @@ let
     src = fetchFromGitHub {
       owner = "xonsh";
       repo = "xonsh";
-      rev = "refs/tags/${argset.version}";
+      tag = argset.version;
       hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs=";
     };
 
@@ -39,8 +41,10 @@ let
 
     nativeCheckInputs =
       [
-        git
+        addBinToPathHook
+        gitMinimal
         glibcLocales
+        writableTmpDirAsHomeHook
       ]
       ++ (with pythonPackages; [
         pip
@@ -77,6 +81,9 @@ let
 
       # https://github.com/xonsh/xonsh/issues/5569
       "test_spec_decorator_alias_output_format"
+
+      # Broken test
+      "test_repath_backslash"
     ];
 
     disabledTestPaths = [
@@ -103,11 +110,6 @@ let
       patchShebangs .
     '';
 
-    preCheck = ''
-      export HOME=$TMPDIR
-      export PATH=$out/bin:$PATH
-    '';
-
     passthru = {
       shellPath = "/bin/xonsh";
       python = pythonPackages.python; # To the wrapper

From 2a5c17865a9c6481ccddb7d673d483e1793ce3ee Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 3 Feb 2025 22:20:36 +0100
Subject: [PATCH 50/69] zxpy: use `addBinToPathHook`

---
 pkgs/by-name/zx/zxpy/package.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/zx/zxpy/package.nix b/pkgs/by-name/zx/zxpy/package.nix
index 070c0d22ca25..f107171d1185 100644
--- a/pkgs/by-name/zx/zxpy/package.nix
+++ b/pkgs/by-name/zx/zxpy/package.nix
@@ -1,10 +1,12 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   deterministic-uname,
+  addBinToPathHook,
 }:
-python3.pkgs.buildPythonApplication rec {
+
+python3Packages.buildPythonApplication rec {
   pname = "zxpy";
   version = "1.6.4";
   pyproject = true;
@@ -16,18 +18,19 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-/VITHN517lPUmhLYgJHBYYvvlJdGg2Hhnwk47Mp9uc0=";
   };
 
-  build-system = [
-    python3.pkgs.setuptools
+  build-system = with python3Packages; [
+    setuptools
   ];
 
-  nativeCheckInputs = [
-    deterministic-uname
-    python3.pkgs.pytestCheckHook
-  ];
-
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      deterministic-uname
+      pytestCheckHook
+    ]
+    ++ [
+      addBinToPathHook
+    ];
 
   pythonImportsCheck = [ "zx" ];
 

From e5e4bdce665e01c0fcd17ff4e9032d384b94a4a2 Mon Sep 17 00:00:00 2001
From: Davis Schirmer <git@djds.dev>
Date: Tue, 4 Feb 2025 03:12:09 -0500
Subject: [PATCH 51/69] traefik: 3.3.2 -> 3.3.3

https://github.com/traefik/traefik/releases/tag/v3.3.3
---
 pkgs/by-name/tr/traefik/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index efa31c0d2b81..3367c32c25b7 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -7,12 +7,12 @@
 
 buildGo123Module rec {
   pname = "traefik";
-  version = "3.3.2";
+  version = "3.3.3";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
-    hash = "sha256-7qS+rOBYDyYI8t0rVNmM0sJjGSdtIVelaIJuW1jaL+g=";
+    hash = "sha256-R9fiCLqzrd9SS6LoQt3jOoEchRnPuhmJqIob8JhzqEU=";
     stripRoot = false;
   };
 

From a84be67ec3675e6ac74bd765df8a014ac95b53fa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 3 Feb 2025 23:05:36 +0100
Subject: [PATCH 52/69] cloud-hypervisor: 43.0 -> 44.0

---
 pkgs/by-name/cl/cloud-hypervisor/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
index 322ab3b48c42..a0d1304d52fc 100644
--- a/pkgs/by-name/cl/cloud-hypervisor/package.nix
+++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   rustPlatform,
   pkg-config,
   dtc,
@@ -11,25 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloud-hypervisor";
-  version = "43.0";
+  version = "44.0";
 
   src = fetchFromGitHub {
     owner = "cloud-hypervisor";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-drxJtlvBpkK3I7Ob3+pH4KLUq53GWXe1pmv7CI3bbP4=";
+    hash = "sha256-2nA8bhezmGa6Gu420nxDrgW0SonTQv1WoGYmBwm7/bI=";
   };
 
-  cargoPatches = [
-    (fetchpatch {
-      name = "kvm-ioctls-0.19.1.patch";
-      url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/eaa21946993276434403d41419a34e564935c8e9.patch";
-      hash = "sha256-G7B0uGl/RAkwub8x1jNNgBrC0dwq/Gv46XpbtTZWD5M=";
-    })
-  ];
-
   useFetchCargoVendor = true;
-  cargoHash = "sha256-F6ukvSwMHRHXoZKgXEFnTAN1B80GsQDW8iqZAvsREr4=";
+  cargoHash = "sha256-e2VbzBPfoy5+YrqZ5mkbxMLpQIOG0x5tIhNG6Tv+u0M=";
 
   separateDebugInfo = true;
 

From 0a9f9e1c61915d19091723d4355e6febdbb6043e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Feb 2025 17:23:19 +0100
Subject: [PATCH 53/69] precice: fix boost 1.87 compat

---
 pkgs/by-name/pr/precice/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index 2f5572a2eab7..115e9a0d68d7 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   gcc,
   boost,
@@ -24,6 +25,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0=";
   };
 
+  patches = lib.optionals (!lib.versionOlder "3.1.2" version) [
+    (fetchpatch {
+      name = "boost-187-fixes.patch";
+      url = "https://github.com/precice/precice/commit/23788e9eeac49a2069e129a0cb1ac846e8cbeb9f.patch";
+      hash = "sha256-Z8qOGOkXoCui8Wy0H/OeE+NaTDvyRuPm2A+VJKtjH4s=";
+    })
+  ];
+
   cmakeFlags = [
     "-DPRECICE_PETScMapping=OFF"
     "-DBUILD_SHARED_LIBS=ON"

From 2e71cf50505deb784d3d2e47226416e852b24f77 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Feb 2025 08:55:25 +0100
Subject: [PATCH 54/69] precice: use lib.cmake* for cmake flags

---
 pkgs/by-name/pr/precice/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index 115e9a0d68d7..215ffeb69804 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DPRECICE_PETScMapping=OFF"
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DPYTHON_LIBRARIES=${python3.libPrefix}"
-    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
+    (lib.cmakeBool "PRECICE_PETScMapping" false)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeFeature "PYTHON_LIBRARIES" python3.libPrefix)
+    (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
   ];
 
   env.NIX_CFLAGS_COMPILE = toString (

From 6daeb20f4b246c221f0cdfe410d4cf895b43e9bb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Feb 2025 09:24:17 +0100
Subject: [PATCH 55/69] precice: remove gcc

---
 pkgs/by-name/pr/precice/package.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index 215ffeb69804..c79c90475fe7 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  gcc,
   boost,
   eigen,
   libxml2,
@@ -40,19 +39,13 @@ stdenv.mkDerivation rec {
     (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.hostPlatform.isDarwin [ "-D_GNU_SOURCE" ]
-    # libxml2-2.12 changed const qualifiers
-    ++ [ "-fpermissive" ]
-  );
-
   nativeBuildInputs = [
     cmake
-    gcc
     pkg-config
     python3
     python3.pkgs.numpy
   ];
+
   buildInputs = [
     boost
     eigen

From 29e1160e514b286ea9af4de84eddf33f0d10ff8c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Feb 2025 08:56:02 +0100
Subject: [PATCH 56/69] python312Packages.pyprecice: cleanup and fix

---
 .../python-modules/pyprecice/default.nix      | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index c005eaaa23d3..48bf841129f8 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -1,15 +1,18 @@
 {
   lib,
   buildPythonPackage,
-  setuptools,
-  pip,
-  cython,
   fetchFromGitHub,
+
+  # build-system
+  cython,
+  pip,
+  pkgconfig,
+  setuptools,
+
+  # dependencies
   mpi4py,
   numpy,
   precice,
-  pkgconfig,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -17,8 +20,6 @@ buildPythonPackage rec {
   version = "3.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "precice";
     repo = "python-bindings";
@@ -26,14 +27,24 @@ buildPythonPackage rec {
     hash = "sha256-/atuMJVgvY4kgvrB+LuQZmJuSK4O8TJdguC7NCiRS2Y=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    pip
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=61,<72" "setuptools" \
+      --replace-fail "numpy<2" "numpy"
+  '';
+
+  build-system = [
     cython
+    pip
     pkgconfig
+    setuptools
   ];
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  dependencies = [
     numpy
     mpi4py
     precice
@@ -44,10 +55,11 @@ buildPythonPackage rec {
 
   # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
 
-  meta = with lib; {
+  meta = {
     description = "Python language bindings for preCICE";
     homepage = "https://github.com/precice/python-bindings";
-    license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ Scriptkiddi ];
+    changelog = "https://github.com/precice/python-bindings/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ Scriptkiddi ];
   };
 }

From efcfe26acbef90aa0d8879ff744ef4d015f1f8eb Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 4 Feb 2025 10:06:22 +0100
Subject: [PATCH 57/69] python3Packages.xgrammar: init at 0.1.11

---
 .../python-modules/xgrammar/default.nix       | 77 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/development/python-modules/xgrammar/default.nix

diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
new file mode 100644
index 000000000000..a06f11da928c
--- /dev/null
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+  python,
+  pythonOlder,
+  pythonAtLeast,
+  pydantic,
+  sentencepiece,
+  tiktoken,
+  torch,
+  transformers,
+  triton,
+}:
+
+let
+  pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
+  platforms = rec {
+    aarch64-darwin = "macosx_13_0_arm64";
+    x86_64-darwin = "macosx_10_15_x86_64";
+    x86_64-linux = "manylinux_2_27_x86_64.manylinux_2_28_x86_64";
+  };
+  platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
+  # hashes retrieved via the following command
+  # curl https://pypi.org/pypi/xgrammar/${version}/json | jq -r '.urls[] | "\(.digests.sha256)  \(.filename)"'
+  hashes = rec {
+    cp39-aarch64-darwin = "12dd579a7073c14981e01aeee566d20e60001bf90af23024e0e6692a770ff535";
+    cp39-x86_64-darwin = "035ec93306543b99bf2141dcc7f1a6dd0c255753fc8b5a2b5f3289a59fed8e37";
+    cp39-x86_64-linux = "3b3975dcf4b3ed7b16bbe3c068738b09847f841793e1c5e1b4a07dff36bbdc37";
+    cp310-aarch64-darwin = "93bb6c10cbdf1a2bda3b458d97b47436657d780f98dccf3d266e17e13568c0a9";
+    cp310-x86_64-darwin = "5ed31db2669dc499d9d29bb16f30b3395332ff9d0fb80b759697190a5ef5258b";
+    cp310-x86_64-linux = "9c6f571121e4af45e3b5dc55f3dadd751cffff1f85f1c6fc5c4276db2bbed222";
+    cp311-aarch64-darwin = "b293443725eddad31cf7b407bb24d5f3156c4b12a2c8041743cb7068a69fadcb";
+    cp311-x86_64-darwin = "b2106bceb2ce313628af915f2c2b1c9865612026dd3c9feddbfcc69e4ee6c971";
+    cp311-x86_64-linux = "7934c968371d55759cac35be3b218cdf4b13f323f535ea0faa233240bab803b9";
+    cp312-aarch64-darwin = "561f8d4307db8cf5d3c3b3ff46eda6d95379f6e801278dbf9153a9d5e8b6126c";
+    cp312-x86_64-darwin = "6ac3cbb0a82a3a9d07f0739f63b2e26cbef7855149d236057dcc7fee74b37970";
+    cp312-x86_64-linux = "1854d0fe6b908a3d2d42251a62e627224dbf6035a4322b844b1b5a277e3d0461";
+  };
+  hash =
+    hashes."${pyShortVersion}-${stdenv.system}"
+      or (throw "Unsupported Python version: ${python.pythonVersion}");
+in
+buildPythonPackage rec {
+  pname = "xgrammar";
+  version = "0.1.11";
+  format = "wheel";
+
+  disabled = pythonOlder "3.9" || pythonAtLeast "3.13";
+
+  src = fetchPypi {
+    inherit pname version format;
+    dist = pyShortVersion;
+    python = pyShortVersion;
+    abi = pyShortVersion;
+    platform = platform;
+    sha256 = hash;
+  };
+
+  pythonImportCheck = [ "xgrammar" ];
+
+  dependencies = [
+    pydantic
+    sentencepiece
+    tiktoken
+    torch
+    transformers
+    triton
+  ];
+
+  meta = with lib; {
+    description = "Efficient, Flexible and Portable Structured Generation";
+    homepage = "https://xgrammar.mlc.ai";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44590af9bad3..1590e800a702 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18357,6 +18357,8 @@ self: super: with self; {
     inherit (pkgs) xgboost;
   };
 
+  xgrammar = callPackage ../development/python-modules/xgrammar { };
+
   xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { };
 
   xiaomi-ble = callPackage ../development/python-modules/xiaomi-ble { };

From fc5c2c02c443eda14e410a5ec0f45fb4743ef93a Mon Sep 17 00:00:00 2001
From: Conroy Cheers <conroy@dromeda.com.au>
Date: Mon, 3 Feb 2025 18:51:49 +0100
Subject: [PATCH 58/69] python3Packages.vllm: 0.6.2 -> 0.7.1

Co-Authored-By: Ben Gamari <ben@smart-cactus.org>
Co-Authored-By: Pavol Rusnak <pavol@rusnak.io>
---
 ...setup.py-don-t-ask-for-hipcc-version.patch |  24 --
 .../vllm/0003-propagate-pythonpath.patch      |  12 +
 .../python-modules/vllm/0004-drop-lsmod.patch |  18 ++
 .../python-modules/vllm/default.nix           | 288 +++++++++++++++---
 4 files changed, 276 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch
 create mode 100644 pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch
 create mode 100644 pkgs/development/python-modules/vllm/0004-drop-lsmod.patch

diff --git a/pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch b/pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch
deleted file mode 100644
index edaebfce508c..000000000000
--- a/pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f6a7748bee79fc2e1898968fef844daacfa7860b Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else@someonex.net>
-Date: Wed, 31 Jul 2024 12:02:53 +0000
-Subject: [PATCH 1/2] setup.py: don't ask for hipcc --version
-
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index 72ef26f1..01e006f9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -279,6 +279,7 @@ def _install_punica() -> bool:
- 
- 
- def get_hipcc_rocm_version():
-+    return "0.0" # `hipcc --version` misbehaves ("unresolved paths") inside the nix sandbox
-     # Run the hipcc --version command
-     result = subprocess.run(['hipcc', '--version'],
-                             stdout=subprocess.PIPE,
--- 
-2.45.1
-
diff --git a/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch b/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch
new file mode 100644
index 000000000000..9edf6021f5d4
--- /dev/null
+++ b/pkgs/development/python-modules/vllm/0003-propagate-pythonpath.patch
@@ -0,0 +1,12 @@
+diff --git a/vllm/model_executor/models/registry.py b/vllm/model_executor/models/registry.py
+index f5a02a5b..e830f987 100644
+--- a/vllm/model_executor/models/registry.py
++++ b/vllm/model_executor/models/registry.py
+@@ -482,6 +482,7 @@ def _run_in_subprocess(fn: Callable[[], _T]) -> _T:
+         returned = subprocess.run(
+             [sys.executable, "-m", "vllm.model_executor.models.registry"],
+             input=input_bytes,
++            env={'PYTHONPATH': ':'.join(sys.path)},
+             capture_output=True)
+ 
+         # check if the subprocess is successful
diff --git a/pkgs/development/python-modules/vllm/0004-drop-lsmod.patch b/pkgs/development/python-modules/vllm/0004-drop-lsmod.patch
new file mode 100644
index 000000000000..3c80f8e24e65
--- /dev/null
+++ b/pkgs/development/python-modules/vllm/0004-drop-lsmod.patch
@@ -0,0 +1,18 @@
+--- a/setup.py
++++ b/setup.py
+@@ -340,14 +340,7 @@ def _is_hpu() -> bool:
+         out = subprocess.run(["hl-smi"], capture_output=True, check=True)
+         is_hpu_available = out.returncode == 0
+     except (FileNotFoundError, PermissionError, subprocess.CalledProcessError):
+-        if sys.platform.startswith("linux"):
+-            try:
+-                output = subprocess.check_output(
+-                    'lsmod | grep habanalabs | wc -l', shell=True)
+-                is_hpu_available = int(output) > 0
+-            except (ValueError, FileNotFoundError, PermissionError,
+-                    subprocess.CalledProcessError):
+-                pass
++        is_hpu_available = False
+     return is_hpu_available
+ 
+ 
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 4231983b0c5b..7441e5eeef3e 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -5,14 +5,21 @@
   buildPythonPackage,
   pythonRelaxDepsHook,
   fetchFromGitHub,
+  symlinkJoin,
+  autoAddDriverRunpath,
+
+  # build system
+  packaging,
+  setuptools,
+  wheel,
+
+  # dependencies
   which,
   ninja,
   cmake,
-  packaging,
-  setuptools,
+  setuptools-scm,
   torch,
   outlines,
-  wheel,
   psutil,
   ray,
   pandas,
@@ -21,43 +28,173 @@
   numpy,
   transformers,
   xformers,
+  xgrammar,
   fastapi,
   uvicorn,
   pydantic,
   aioprometheus,
+  pynvml,
   openai,
   pyzmq,
   tiktoken,
+  torchaudio,
   torchvision,
   py-cpuinfo,
   lm-format-enforcer,
   prometheus-fastapi-instrumentator,
   cupy,
-  writeShellScript,
+  gguf,
+  einops,
+  importlib-metadata,
+  partial-json-parser,
+  compressed-tensors,
+  mistral-common,
+  msgspec,
+  numactl,
+  tokenizers,
+  oneDNN,
+  blake3,
+  depyf,
 
   config,
 
   cudaSupport ? config.cudaSupport,
   cudaPackages ? { },
-
-  # Has to be either rocm or cuda, default to the free one
-  rocmSupport ? !config.cudaSupport,
+  rocmSupport ? config.rocmSupport,
   rocmPackages ? { },
   gpuTargets ? [ ],
 }@args:
 
 let
+  inherit (lib)
+    lists
+    strings
+    trivial
+    ;
+
+  inherit (cudaPackages) cudaFlags;
+
+  shouldUsePkg =
+    pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
+
+  # see CMakeLists.txt, grepping for GIT_TAG near cutlass
+  # https://github.com/vllm-project/vllm/blob/${version}/CMakeLists.txt
   cutlass = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
-    rev = "refs/tags/v3.5.0";
-    sha256 = "sha256-D/s7eYsa5l/mfx73tE4mnFcTQdYqGmXa9d9TCryw4e4=";
+    tag = "v3.7.0";
+    hash = "sha256-GUTRXmv3DiM/GN5Bvv2LYovMLKZMlMhoKv4O0g627gs=";
   };
+
+  vllm-flash-attn = stdenv.mkDerivation rec {
+    pname = "vllm-flash-attn";
+    version = "2.6.2";
+
+    # see CMakeLists.txt, grepping for GIT_TAG near vllm-flash-attn
+    # https://github.com/vllm-project/vllm/blob/${version}/CMakeLists.txt
+    src = fetchFromGitHub {
+      owner = "vllm-project";
+      repo = "flash-attention";
+      rev = "d4e09037abf588af1ec47d0e966b237ee376876c";
+      hash = "sha256-KFEsZlrwvCgvPzQ/pCLWcnbGq89mWE3yTDdtJSV9MII=";
+    };
+
+    dontConfigure = true;
+
+    # vllm-flash-attn normally relies on `git submodule update` to fetch cutlass
+    buildPhase = ''
+      rm -rf csrc/cutlass
+      ln -sf ${cutlass} csrc/cutlass
+    '';
+
+    installPhase = ''
+      cp -rva . $out
+    '';
+  };
+
+  cpuSupport = !cudaSupport && !rocmSupport;
+
+  # https://github.com/pytorch/pytorch/blob/v2.4.0/torch/utils/cpp_extension.py#L1953
+  supportedTorchCudaCapabilities =
+    let
+      real = [
+        "3.5"
+        "3.7"
+        "5.0"
+        "5.2"
+        "5.3"
+        "6.0"
+        "6.1"
+        "6.2"
+        "7.0"
+        "7.2"
+        "7.5"
+        "8.0"
+        "8.6"
+        "8.7"
+        "8.9"
+        "9.0"
+        "9.0a"
+      ];
+      ptx = lists.map (x: "${x}+PTX") real;
+    in
+    real ++ ptx;
+
+  # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
+  #   of the first list *from* the second list. That means:
+  #   lists.subtractLists a b = b - a
+
+  # For CUDA
+  supportedCudaCapabilities = lists.intersectLists cudaFlags.cudaCapabilities supportedTorchCudaCapabilities;
+  unsupportedCudaCapabilities = lists.subtractLists supportedCudaCapabilities cudaFlags.cudaCapabilities;
+
+  isCudaJetson = cudaSupport && cudaPackages.cudaFlags.isJetsonBuild;
+
+  # Use trivial.warnIf to print a warning if any unsupported GPU targets are specified.
+  gpuArchWarner =
+    supported: unsupported:
+    trivial.throwIf (supported == [ ]) (
+      "No supported GPU targets specified. Requested GPU targets: "
+      + strings.concatStringsSep ", " unsupported
+    ) supported;
+
+  # Create the gpuTargetString.
+  gpuTargetString = strings.concatStringsSep ";" (
+    if gpuTargets != [ ] then
+      # If gpuTargets is specified, it always takes priority.
+      gpuTargets
+    else if cudaSupport then
+      gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities
+    else if rocmSupport then
+      rocmPackages.clr.gpuTargets
+    else
+      throw "No GPU targets specified"
+  );
+
+  mergedCudaLibraries = with cudaPackages; [
+    cuda_cudart # cuda_runtime.h, -lcudart
+    cuda_cccl
+    libcusparse # cusparse.h
+    libcusolver # cusolverDn.h
+    cuda_nvtx
+    cuda_nvrtc
+    libcublas
+  ];
+
+  # Some packages are not available on all platforms
+  nccl = shouldUsePkg (cudaPackages.nccl or null);
+
+  getAllOutputs = p: [
+    (lib.getBin p)
+    (lib.getLib p)
+    (lib.getDev p)
+  ];
+
 in
 
 buildPythonPackage rec {
   pname = "vllm";
-  version = "0.6.2";
+  version = "0.7.1";
   pyproject = true;
 
   stdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
@@ -65,30 +202,54 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "vllm-project";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-zUkqAPPhDRdN9rDQ2biCl1B+trV0xIHXub++v9zsQGo=";
+    tag = "v${version}";
+    hash = "sha256-CImXKMEv+jHqngvcr8W6fQLiCo1mqmcZ0Ho0bfAgfbg=";
   };
 
   patches = [
-    ./0001-setup.py-don-t-ask-for-hipcc-version.patch
     ./0002-setup.py-nix-support-respect-cmakeFlags.patch
+    ./0003-propagate-pythonpath.patch
+    ./0004-drop-lsmod.patch
   ];
 
   # Ignore the python version check because it hard-codes minor versions and
   # lags behind `ray`'s python interpreter support
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail \
-        'set(PYTHON_SUPPORTED_VERSIONS' \
-        'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"'
-  '';
+  postPatch =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail \
+          'set(PYTHON_SUPPORTED_VERSIONS' \
+          'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"'
 
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pythonRelaxDepsHook
-    which
-  ] ++ lib.optionals rocmSupport [ rocmPackages.hipcc ];
+      # Relax torch dependency manually because the nonstandard requirements format
+      # is not caught by pythonRelaxDeps
+      substituteInPlace requirements*.txt pyproject.toml \
+        --replace-warn 'torch==2.5.1' 'torch==${lib.getVersion torch}' \
+        --replace-warn 'torch == 2.5.1' 'torch == ${lib.getVersion torch}'
+    ''
+    + lib.optionalString (nccl == null) ''
+      # On platforms where NCCL is not supported (e.g. Jetson), substitute Gloo (provided by Torch)
+      substituteInPlace vllm/distributed/parallel_state.py \
+        --replace-fail '"nccl"' '"gloo"'
+    '';
+
+  nativeBuildInputs =
+    [
+      cmake
+      ninja
+      pythonRelaxDepsHook
+      which
+    ]
+    ++ lib.optionals rocmSupport [
+      rocmPackages.hipcc
+    ]
+    ++ lib.optionals cudaSupport [
+      cudaPackages.cuda_nvcc
+      autoAddDriverRunpath
+    ]
+    ++ lib.optionals isCudaJetson [
+      cudaPackages.autoAddCudaCompatRunpath
+    ];
 
   build-system = [
     packaging
@@ -97,18 +258,22 @@ buildPythonPackage rec {
   ];
 
   buildInputs =
-    (lib.optionals cudaSupport (
-      with cudaPackages;
-      [
-        cuda_cudart # cuda_runtime.h, -lcudart
-        cuda_cccl
-        libcusparse # cusparse.h
-        libcusolver # cusolverDn.h
-        cuda_nvcc
-        cuda_nvtx
-        libcublas
-      ]
-    ))
+    [
+      setuptools-scm
+      torch
+    ]
+    ++ (lib.optionals cpuSupport ([
+      numactl
+      oneDNN
+    ]))
+    ++ (
+      lib.optionals cudaSupport mergedCudaLibraries
+      ++ (with cudaPackages; [
+        nccl
+        cudnn
+        libcufile
+      ])
+    )
     ++ (lib.optionals rocmSupport (
       with rocmPackages;
       [
@@ -123,6 +288,8 @@ buildPythonPackage rec {
   dependencies =
     [
       aioprometheus
+      blake3
+      depyf
       fastapi
       lm-format-enforcer
       numpy
@@ -138,27 +305,64 @@ buildPythonPackage rec {
       ray
       sentencepiece
       tiktoken
+      tokenizers
+      msgspec
+      gguf
+      einops
+      importlib-metadata
+      partial-json-parser
+      compressed-tensors
+      mistral-common
       torch
+      torchaudio
       torchvision
       transformers
       uvicorn
       xformers
+      xgrammar
     ]
     ++ uvicorn.optional-dependencies.standard
     ++ aioprometheus.optional-dependencies.starlette
     ++ lib.optionals cudaSupport [
       cupy
+      pynvml
     ];
 
   dontUseCmakeConfigure = true;
-  cmakeFlags = [ (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}") ];
+  cmakeFlags =
+    [
+      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}")
+      (lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn}")
+    ]
+    ++ lib.optionals cudaSupport [
+      (lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}")
+      (lib.cmakeFeature "CUTLASS_NVCC_ARCHS_ENABLED" "${cudaPackages.cudaFlags.cmakeCudaArchitecturesString
+      }")
+      (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${symlinkJoin {
+        name = "cuda-merged-${cudaPackages.cudaVersion}";
+        paths = builtins.concatMap getAllOutputs mergedCudaLibraries;
+      }}")
+      (lib.cmakeFeature "CAFFE2_USE_CUDNN" "ON")
+      (lib.cmakeFeature "CAFFE2_USE_CUFILE" "ON")
+      (lib.cmakeFeature "CUTLASS_ENABLE_CUBLAS" "ON")
+    ]
+    ++ lib.optionals cpuSupport [
+      (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONEDNN" "${lib.getDev oneDNN}")
+    ];
 
   env =
-    lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; }
+    lib.optionalAttrs cudaSupport {
+      VLLM_TARGET_DEVICE = "cuda";
+      CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}";
+    }
     // lib.optionalAttrs rocmSupport {
+      VLLM_TARGET_DEVICE = "rocm";
       # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing.
       PYTORCH_ROCM_ARCH = lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets;
       ROCM_HOME = "${rocmPackages.clr}";
+    }
+    // lib.optionalAttrs cpuSupport {
+      VLLM_TARGET_DEVICE = "cpu";
     };
 
   pythonRelaxDeps = true;
@@ -174,8 +378,8 @@ buildPythonPackage rec {
       happysalada
       lach
     ];
-    # RuntimeError: Unknown runtime environment
-    broken = true;
-    # broken = !cudaSupport && !rocmSupport;
+
+    # CPU support relies on unpackaged dependency `intel_extension_for_pytorch`
+    broken = cpuSupport;
   };
 }

From eb351ce517878d93e7321d8829050a45c2f2d1df Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 3 Feb 2025 07:03:09 +0100
Subject: [PATCH 59/69] why3: use zarith from 1.8.0

---
 pkgs/applications/science/logic/why3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 40547a2f664c..93cff7b35fde 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = with ocamlPackages; [
     camlzip
     menhirLib
-    num
+    (if lib.versionAtLeast version "1.8.0" then zarith else num)
     re
     sexplib
   ];

From 6c49e20fc017e92602c25b7b40793cba0d6fcc65 Mon Sep 17 00:00:00 2001
From: "[Assassin]" <ShyAssassin@assassin.dev>
Date: Mon, 3 Feb 2025 12:36:36 +0200
Subject: [PATCH 60/69] vrcx: 2025-01-27T00.10-0ee8137 -> 2025.01.31

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

diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix
index b55772ddc7f9..c850d25e382f 100644
--- a/pkgs/by-name/vr/vrcx/package.nix
+++ b/pkgs/by-name/vr/vrcx/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "vrcx";
-  version = "2025-01-27T00.10-0ee8137";
+  version = "2025.01.31";
   src = fetchurl {
-    url = "https://github.com/Natsumi-sama/VRCX/releases/download/${version}/VRCX_${version}.AppImage";
-    hash = "sha256-kaQOME3jBLr7QJjc7rubNqFu3z+LmiP+UHe2EWYC7ek=";
+    hash = "sha256-hrAsy/yv8GW0mIDA5PJLUs4EYNufPiOplLlmb9pFwX4=";
+    url = "https://github.com/vrcx-team/VRCX/releases/download/v${version}/VRCX_20250131.AppImage";
   };
   appimageContents = appimageTools.extract {
     inherit pname src version;
@@ -19,12 +19,13 @@ appimageTools.wrapType2 rec {
   inherit pname version src;
   extraPkgs = pkgs: [ dotnet-runtime ];
   extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/vrcx.desktop $out/share/applications/vrcx.desktop
+    install -m 444 -D ${appimageContents}/vrcx.desktop \
+      $out/share/applications/vrcx.desktop
     install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/256x256/apps/vrcx.png \
       $out/share/icons/hicolor/256x256/apps/vrcx.png
+
     substituteInPlace $out/share/applications/vrcx.desktop \
       --replace-fail 'Exec=AppRun' 'Exec=${pname}'
-    # Fix icon path
     substituteInPlace $out/share/applications/vrcx.desktop \
       --replace-fail 'Icon=VRCX' "Icon=$out/share/icons/hicolor/256x256/apps/vrcx.png"
   '';

From 92016f20e2b3a3d1d38e34ab204af1a2b957ee2f Mon Sep 17 00:00:00 2001
From: "[Assassin]" <ShyAssassin@assassin.dev>
Date: Tue, 4 Feb 2025 11:48:15 +0200
Subject: [PATCH 61/69] vrcx: Simplify update process

---
 pkgs/by-name/vr/vrcx/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix
index c850d25e382f..e7c618d6b28b 100644
--- a/pkgs/by-name/vr/vrcx/package.nix
+++ b/pkgs/by-name/vr/vrcx/package.nix
@@ -7,9 +7,10 @@
 let
   pname = "vrcx";
   version = "2025.01.31";
+  filename = builtins.replaceStrings [ "." ] [ "" ] version;
   src = fetchurl {
     hash = "sha256-hrAsy/yv8GW0mIDA5PJLUs4EYNufPiOplLlmb9pFwX4=";
-    url = "https://github.com/vrcx-team/VRCX/releases/download/v${version}/VRCX_20250131.AppImage";
+    url = "https://github.com/vrcx-team/VRCX/releases/download/v${version}/VRCX_${filename}.AppImage";
   };
   appimageContents = appimageTools.extract {
     inherit pname src version;

From 2cdb29d247616a7d05277d19bf6cc44039497603 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 10:44:56 +0000
Subject: [PATCH 62/69] azure-cli-extensions.storage-preview: 1.0.0b2 ->
 1.0.0b5

---
 pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index 254ad69d2c23..cf610094f78f 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -126,9 +126,9 @@
 
   storage-preview = mkAzExtension rec {
     pname = "storage-preview";
-    version = "1.0.0b2";
+    version = "1.0.0b5";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_preview-${version}-py2.py3-none-any.whl";
-    hash = "sha256-Lej6QhYikoowi7cASMP99AQAutOzSv1gHQs6/Ni4J2Q=";
+    hash = "sha256-gs4uQrnpXm03iPyP+i5DnFWvQ43+ZHN4wSZiNRVZU7g=";
     description = "Provides a preview for upcoming storage features";
     propagatedBuildInputs = with python3Packages; [ azure-core ];
     meta.maintainers = with lib.maintainers; [ katexochen ];

From dd74c154a0a5fb7f8ad64a034dded685f1c7a87a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2025 11:22:30 +0000
Subject: [PATCH 63/69] myks: 4.3.1 -> 4.4.2

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

diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index b8f1af9891cb..dd9cc91fd33f 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.3.1";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-KTz6Tip6kz8AcRW73+MUHUvwr/QT9Z2CvHQNyFXD054=";
+    hash = "sha256-95vqUViXUdLLnpsX81bwS1/EAiJA4XzOCIEd43E4wIQ=";
   };
 
   vendorHash = "sha256-cTRyQu3lXrIrBHtEYYQIdv0F705KrgyXgDS8meHVRJw=";

From cd1cf641441a2fab192f2cd3574a4924014184cf Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Tue, 4 Feb 2025 12:37:22 +0100
Subject: [PATCH 64/69] go-ethereum: fix incorrect license

Cf. upstream at https://github.com/ethereum/go-ethereum/blob/master/README.md#license
---
 pkgs/by-name/go/go-ethereum/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index bd9a740f73d4..abff2184e684 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -72,8 +72,8 @@ buildGoModule rec {
     homepage = "https://geth.ethereum.org/";
     description = "Official golang implementation of the Ethereum protocol";
     license = with licenses; [
-      lgpl3Plus
-      gpl3Plus
+      lgpl3Only
+      gpl3Only
     ];
     maintainers = with maintainers; [ RaghavSood ];
     mainProgram = "geth";

From 06817e8a54f4a1b0a9176feb5405f254ed6438c8 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 4 Feb 2025 12:45:22 +0100
Subject: [PATCH 65/69] python3Packages.mistral-common: add
 opencv-python-headless dependency

---
 pkgs/development/python-modules/mistral-common/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix
index 7c438e960d4d..a7ba7a675988 100644
--- a/pkgs/development/python-modules/mistral-common/default.nix
+++ b/pkgs/development/python-modules/mistral-common/default.nix
@@ -6,6 +6,7 @@
   numpy,
   pydantic,
   jsonschema,
+  opencv-python-headless,
   sentencepiece,
   typing-extensions,
   tiktoken,
@@ -37,6 +38,7 @@ buildPythonPackage rec {
     numpy
     pydantic
     jsonschema
+    opencv-python-headless
     sentencepiece
     typing-extensions
     tiktoken

From e70ebe98290f464f3020fb81844416d2350eae58 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 4 Feb 2025 12:46:10 +0100
Subject: [PATCH 66/69] python3Packages.vllm: add opencv-python-headless
 dependency

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

diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 7441e5eeef3e..2963db2c641b 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -55,6 +55,7 @@
   oneDNN,
   blake3,
   depyf,
+  opencv-python-headless,
 
   config,
 
@@ -294,6 +295,7 @@ buildPythonPackage rec {
       lm-format-enforcer
       numpy
       openai
+      opencv-python-headless
       outlines
       pandas
       prometheus-fastapi-instrumentator

From e8e3ded6c988dd6706128fe66171c5115aa5282b Mon Sep 17 00:00:00 2001
From: guylamar2006 <guychronister@outlook.com>
Date: Tue, 4 Feb 2025 06:34:11 -0600
Subject: [PATCH 67/69] astroterm: 1.0.4 -> 1.0.6 (#378908)

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

diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix
index 3cdde4b2e995..bc5e88b15479 100644
--- a/pkgs/by-name/as/astroterm/package.nix
+++ b/pkgs/by-name/as/astroterm/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "astroterm";
-  version = "1.0.4";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "da-luce";
     repo = "astroterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CYKW/RAQ3a5238cojbpGfTenMQApfaZOHnQMrZ6LWzA=";
+    hash = "sha256-BjqurPp0WI/wI5n2TibnyOqZ3NjRcLYB2MxqqNvTQtw=";
   };
 
   bsc5File = fetchurl {

From 639263e260482001281657bc7965c6f5ca0bbf7e Mon Sep 17 00:00:00 2001
From: mhpierre <max@tribupierre.net>
Date: Tue, 4 Feb 2025 14:35:47 +0100
Subject: [PATCH 68/69] openmpi: Fix upstream issue with shared memory backing
 file creation See: https://github.com/open-mpi/ompi/issues/12784

---
 pkgs/by-name/op/openmpi/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 719247b58a43..9baf7dd3b6c8 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   removeReferencesTo,
   gfortran,
   perl,
@@ -47,6 +48,17 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-vUGD/LxDR3wlR5m0Kd8abldsBC50otL4s31Tey/5gVc=";
   };
 
+  patches = [
+    # This patch can be removed with the next openmpi update (>5.0.6)
+    # See https://github.com/open-mpi/ompi/issues/12784 and https://github.com/open-mpi/ompi/pull/13003
+    # Fixes issue where the shared memory backing file cannot be created because directory trees are never created
+    (fetchpatch {
+      name = "fix-singletons-session-dir";
+      url = "https://github.com/open-mpi/ompi/commit/4d4f7212decd0d0ca719688b15dc9b3ee7553a52.patch";
+      hash = "sha256-Mb8qXtAUhAQ90v0SdL24BoTASsKRq2Gu8nYqoeSc9DI=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs ./
 

From f8a077696bd946a517830fc93993a43c717daa75 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 4 Feb 2025 14:56:19 +0100
Subject: [PATCH 69/69] vllm: create application from python package

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4973835d87..a79ba50dbb6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10746,6 +10746,8 @@ with pkgs;
     openexr = openexr_3;
   };
 
+  vllm = with python3Packages; toPythonApplication vllm;
+
   vte-gtk4 = vte.override {
     gtkVersion = "4";
   };