chore: nix 2.24 -> 2.25

devices/servivi/modules/binary-cache.nix

@@ -1,6 +1,7 @@
 {
   config,
   mainUser,
+  nix-eval-jobs,
   nix-fast-build,
   pkgs,
   ...
@@ -9,7 +10,7 @@
 
   nix-fast-build-pkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
     nix-eval-jobs =
-      pkgs.nix-eval-jobs.override {
+      nix-eval-jobs.packages.${pkgs.system}.default.override {
         nix = config.nix.package;
       }
       // {
@@ -46,6 +47,7 @@
 in {
   services.nix-serve = {
     enable = true;
+    package = pkgs.nix-serve-ng;
     secretKeyFile = secrets.binary-cache-key.path;
   };
 

flake.lock

@@ -349,28 +349,6 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-root": {
       "locked": {
         "lastModified": 1713493429,
@@ -1165,17 +1143,23 @@
     },
     "nix-eval-jobs": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "nix-github-actions": "nix-github-actions_2",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
-        "treefmt-nix": "treefmt-nix"
+          "nixpkgs"
+        ],
+        "treefmt-nix": [
+          "treefmt-nix"
+        ]
       },
       "locked": {
-        "lastModified": 1732631228,
+        "lastModified": 1733815740,
-        "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=",
+        "narHash": "sha256-63i7TgirD3FiJM1z8ZuOOcXWj4ZhgK357NHmf90WNig=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf",
+        "rev": "8e82a79fe9329f3be4836ad45d4edf2383e7723a",
         "type": "github"
       },
       "original": {
@@ -1285,7 +1269,6 @@
     "nix-github-actions_2": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs-wayland",
           "nix-eval-jobs",
           "nixpkgs"
         ]
@@ -1365,17 +1348,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1732342928,
+        "lastModified": 1732760430,
-        "narHash": "sha256-87zIj5gt1wY0UmRXHnf4ydCJoweOX4HCS/nEbvEF0b8=",
+        "narHash": "sha256-HC+kuzNIL5q87s5ISeJQk3Dv8pqg8U8wDyRSBrpFeFY=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "5507bb141efc11cf548e87e39b61da66dfbca9e5",
+        "rev": "f12e2f77094ac73c1b1101390c02ec5bcf69ad46",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "5507bb141efc11cf548e87e39b61da66dfbca9e5",
         "type": "github"
       }
     },
@@ -1464,7 +1446,9 @@
         "lib-aggregate": [
           "lib-aggregate"
         ],
-        "nix-eval-jobs": "nix-eval-jobs",
+        "nix-eval-jobs": [
+          "nix-eval-jobs"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1483,22 +1467,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1732238832,
-        "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nmd": {
       "inputs": {
         "nixpkgs": [
@@ -1725,6 +1693,7 @@
         "mpv-touch-gestures-src": "mpv-touch-gestures-src",
         "netdaemon-src": "netdaemon-src",
         "nh": "nh",
+        "nix-eval-jobs": "nix-eval-jobs",
         "nix-fast-build": "nix-fast-build",
         "nix-gaming": "nix-gaming",
         "nix-index-db": "nix-index-db",
@@ -1747,7 +1716,7 @@
         "spotifywebapi-src": "spotifywebapi-src",
         "systems": "systems",
         "trash-d-src": "trash-d-src",
-        "treefmt-nix": "treefmt-nix_2",
+        "treefmt-nix": "treefmt-nix",
         "ts-for-gir-src": "ts-for-gir-src",
         "tuya-local-src": "tuya-local-src",
         "vimplugin-easytables-src": "vimplugin-easytables-src",
@@ -1911,28 +1880,6 @@
       }
     },
     "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-wayland",
-          "nix-eval-jobs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723303070,
-        "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "14c092e0326de759e16b37535161b3cb9770cea3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"

flake.nix

@@ -273,6 +273,16 @@
       repo = "nh";
       type = "github";
     };
+    nix-eval-jobs = {
+      inputs = {
+        flake-parts.follows = "flake-parts";
+        nixpkgs.follows = "nixpkgs";
+        treefmt-nix.follows = "treefmt-nix";
+      };
+      owner = "nix-community";
+      repo = "nix-eval-jobs";
+      type = "github";
+    };
     nix-fast-build = {
       inputs = {
         flake-parts.follows = "flake-parts";
@@ -315,7 +325,6 @@
       };
       owner = "nix-community";
       repo = "nixd";
-      rev = "5507bb141efc11cf548e87e39b61da66dfbca9e5";
       type = "github";
     };
     nixpkgs = {
@@ -327,6 +336,7 @@
     nixpkgs-wayland = {
       inputs = {
         lib-aggregate.follows = "lib-aggregate";
+        nix-eval-jobs.follows = "nix-eval-jobs";
         nixpkgs.follows = "nixpkgs";
       };
       owner = "nix-community";

inputs/default.nix

@@ -9,6 +9,11 @@ let
       repo = "nix-fast-build";
     };
 
+    nix-eval-jobs = mkDep {
+      owner = "nix-community";
+      repo = "nix-eval-jobs";
+    };
+
     nix-index-db = mkDep {
       owner = "Mic92";
       repo = "nix-index-database";
@@ -55,9 +60,6 @@ let
     nixd = mkDep {
       owner = "nix-community";
       repo = "nixd";
-
-      # FIXME: stay on nix 2.24 for now
-      rev = "5507bb141efc11cf548e87e39b61da66dfbca9e5";
     };
   };
 

inputs/lib.nix

@@ -38,6 +38,7 @@ in rec {
       (mkOverride "flake-parts")
       (mkOverride "treefmt-nix")
       (mkOverride "lib-aggregate")
+      (mkOverride "nix-eval-jobs")
     ];
 
   mkDep = info: mkInput (recursiveUpdate info {inputs.nixpkgs.follows = "nixpkgs";});

lib/flake/default.nix

@@ -4,11 +4,17 @@ inputs: rec {
     system,
     nixpkgs,
     cfg ? {},
+    nix ? null,
     cudaSupport ? false,
   }:
     import nixpkgs {
       inherit system;
-      overlays = [inputs.self.overlays.build-failures] ++ (cfg.overlays or []);
+      overlays =
+        [
+          (inputs.self.overlays.nix-version {inherit nix;})
+          inputs.self.overlays.build-failures
+        ]
+        ++ (cfg.overlays or []);
       config =
         {
           inherit cudaSupport;
@@ -24,6 +30,7 @@ inputs: rec {
   }: ({config, ...}: let
     pkgs = mkPkgs {
       cfg = config.nixpkgs;
+      nix = config.nix.package;
       inherit system cudaSupport;
       inherit (inputs) nixpkgs;
     };

nixosModules/base/packages/default.nix

@@ -100,7 +100,7 @@ in {
           ;
       })
       ++ [
-        # This could help as well: nix derivation show -r /run/current-system
+        # TODO: `depOf` program that looks through `nix derivation show -r /run/current-system`
         (pkgs.writeShellApplication {
           name = "listDerivs";
           text = ''

overlays/default.nix

@@ -1,4 +1,5 @@
 {...}: {
   build-failures = import ./build-failures;
+  nix-version = import ./nix-version;
   xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde;
 }

overlays/nix-version/default.nix

@@ -0,0 +1,15 @@
+{nix ? null}: (
+  final: prev:
+    builtins.mapAttrs
+    (n: v:
+      if nix == null
+      then prev.${n}
+      else v)
+    {
+      inherit nix;
+
+      nix-serve-ng = prev.nix-serve-ng.override {
+        inherit nix;
+      };
+    }
+)

packages/librespot-auth/default.nix

@@ -1,4 +1,3 @@
-# FIXME: the source appears to be deprecated https://github.com/dspearson/librespot-auth
 {
   lib,
   fetchFromGitHub,
@@ -12,6 +11,7 @@ rustPlatform.buildRustPackage rec {
   pname = "librespot-auth";
   version = "0.1.1";
 
+  # deprecated https://github.com/dspearson/librespot-auth
   src = fetchFromGitHub {
     owner = "dspearson";
     repo = pname;