From 9aca532b780e47a2f49e13d6e5c59a5f1c594f53 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 10 Dec 2024 22:28:26 -0500
Subject: [PATCH] chore: nix 2.24 -> 2.25

---
 devices/servivi/modules/binary-cache.nix |   4 +++-
 flake.lock                               | Bin 57153 -> 55624 bytes
 flake.nix                                | Bin 11143 -> 11402 bytes
 inputs/default.nix                       |   8 +++++---
 inputs/lib.nix                           |   1 +
 lib/flake/default.nix                    |   9 ++++++++-
 nixosModules/base/packages/default.nix   |   2 +-
 overlays/default.nix                     |   1 +
 overlays/nix-version/default.nix         |  15 +++++++++++++++
 packages/librespot-auth/default.nix      |   2 +-
 10 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 overlays/nix-version/default.nix

diff --git a/devices/servivi/modules/binary-cache.nix b/devices/servivi/modules/binary-cache.nix
index 49570294..484d0264 100644
--- a/devices/servivi/modules/binary-cache.nix
+++ b/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;
   };
 
diff --git a/flake.lock b/flake.lock
index a8c27d9323258f4e981baed2daf895afb3e4461d..2a162e2be455585fa01923e2e2832567f962aacf 100644
GIT binary patch
delta 337
zcmV-X0j~bRz5~dz1F*g%v-T#)Pm>>hF_YVNJ(ECHDwCCYX$3ejH8(VqQPdtPHZy5A
zRA*^&L^DQdN=-3(I9hd2Ph(hDYBXACXG=3RH%>@xW;rldPHB^YmOGQZcovf%cnBtC
zI5J^3Ic8-!Gcq}5Gh$^lI5Re3WHdEoG-YIFGBY?cWj8l6Gm{Y_ZIkeP1hc+)_X(3A
zC1A5MgNp|PH#RVnPt+hQNJA@Yb$U)oOf_*hH*+;fQ)Nm~YcoW4IB;=iI8``zM0rwE
zLUM3MWky+(flU^ZpkpDE?TZ&DW-&5lGG;e7FgY|~V>dHnF=8<>FflVZFk>(>Wn(pB
zV`ervVPrIu5eQ6^pkpDE?TZkT?Tst5V~kb_lVubTlOQDvle1AQk|Rp9G?se-vuK%M
j8k4P+DYM73kpq*g%nY+;w@nh0-~<bk51}}-BFrBX!rypA

delta 829
zcmb7?%}-NV7{-G*MTZ3<DiIXN+E|&YoR53H{77s%e50i(1xyUybMHCO7D_1<+HOR5
zBRUx0u+tC|7rMfDmnO<A#<-be<}Vmnt8wkZWEdF#0GIFL$@|Omd)~jQ{ryet%Qq2N
z5B~tS7u(@uxE0Q=G{MHR5WHTzxrY$O7)J=69y=NvO{Q}GfNS%*qo6WbA#|lHmHoxC
zX_gwBQko2PX3~kNM6B$<=GA6cJ8>Z@9f7S;$n_}|u0+ByiV4k?=Q=(@QV}ev!Vq7H
z0E)K<<B{lKL)cEaIdi7q7E5#EBn&S~{q^B|rd-HPY~K$T4(|<@ipJRK(izzI=Rx?Z
zc(RUgiV2b1s2yUYGFd>VV!YwYgIB6TO>|!`WM}4Na-e56Y5mN|NN>tskK@a*xqJ>9
z=G#tM#wl~OP!1;!mr63Mi7&ZFJc9^Qo+mBxpytLvusVO_M_5np{?=9SdhtVDh&n{=
z{Qp^sYHyZJl<>kB8lD~+?a5oG;wSoM7EE%~=}BDe$am`b&Mu^3WBELs{q?{p#*ok&
zJJ?tcW6v^28Yv7_nq%MP+_&0um0@tFu^(3FBi|R=Oe1)^R2MYfOYen$){es3?gOxK
zw?Fs-)f!k|3PIy>x`z@%rKDuL!?{%XR^PNN_KXo!p5^h$SocEjaIQ<S(nz*@$j76y
z+!Y(l<*3}!eFz30HNkRC2rmBC5|zfch->3A?P+6>B)-L3P_C?1f@+01mRfFW-?)D%
zv?CX?OX*;4<z`Fpb?ss8u5l7P2*&n*D|u&-lp>16e}immFLqx^$0@25N|m9R{LEx3
zmQh~5KbEkGg7GJKmCjaY(|z7G*gV|~pQEkt{9RiVJ04QRAWFDz1XBicO$DQDi%C;Y
iD<P0)TyTFH_&?JOpVAR{@<;s^68!!6PSF1DSku3zAQ~qC

diff --git a/flake.nix b/flake.nix
index 71ef55f08c87faa9388deb6c2d9dc678338ed127..1d9edbe447ed8e7ad1dfee2cea4215bfdf6daca7 100644
GIT binary patch
delta 107
zcmZn<?~2^eBFT|jmYAcPm7g^EJfHmJHIn_4Kk&%$=4Dps!X%0(8?vfyZje-EnS5J8
mX7W$jJ4y&Sy|nzCoc!`)1zQCrWKEOLN;!f|+N>&{!~+1BfhXnw

delta 85
zcmeB*Y!BbiBDuLwN|8msD78$%Rzb<s)WAF`$<V|wH7(iDFgeZC#3I$gJk{7T$;>b%
p(abC*Eh#zCGSzglqP))JOLA8y-<DLEoW&<J`2&yKW(|cT9sq|b8)5(e

diff --git a/inputs/default.nix b/inputs/default.nix
index a79702d2..ea723e08 100644
--- a/inputs/default.nix
+++ b/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";
     };
   };
 
diff --git a/inputs/lib.nix b/inputs/lib.nix
index e3eb2105..e7d85372 100644
--- a/inputs/lib.nix
+++ b/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";});
diff --git a/lib/flake/default.nix b/lib/flake/default.nix
index 79d23ee4..9ec48036 100644
--- a/lib/flake/default.nix
+++ b/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;
     };
diff --git a/nixosModules/base/packages/default.nix b/nixosModules/base/packages/default.nix
index 0a606c71..5441586a 100644
--- a/nixosModules/base/packages/default.nix
+++ b/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 = ''
diff --git a/overlays/default.nix b/overlays/default.nix
index 47acc1ef..11060335 100644
--- a/overlays/default.nix
+++ b/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;
 }
diff --git a/overlays/nix-version/default.nix b/overlays/nix-version/default.nix
new file mode 100644
index 00000000..762bfe9f
--- /dev/null
+++ b/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;
+      };
+    }
+)
diff --git a/packages/librespot-auth/default.nix b/packages/librespot-auth/default.nix
index a0bd5362..80ca6bb5 100644
--- a/packages/librespot-auth/default.nix
+++ b/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;