Use Nix 2.25.2, which now doesn't need a patch.

noamraph · Nov 17, 2024 · 81605db · 81605db
1 parent d4b9523
commit 81605db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -16,8 +16,6 @@ nixsa/bin/nix profile install nixpkgs#ponysay
 nixsa/bin/ponysay 'Hi Nixsa!'
 ```
 
-Note: Nixsa currently uses a patched version of Nix, which supports environment variables like NIX_STATE_HOME. The [pull request](https://github.com/NixOS/nix/pull/11351) was merged, so hopefully when the next major Nix version is released, Nixsa will ship with the standard Nix version.
-
 [![asciicast](https://github.com/user-attachments/assets/f8e1919f-0f63-4ef1-8a54-57b385b1b6de)](https://asciinema.org/a/672748)
 
 One more feature: run `nixsa/bin/nixsa` to start a shell where `/nix` is binded to `nixsa/nix`, and where all the commands in the Nix profile (in `nixsa/state/profile`) are in the PATH.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -17,8 +17,7 @@
     };
 
     nix = {
-      url = "github:noamraph/nix/add-nix-state-home-2.24.4";
-      # url = "https://flakehub.com/f/DeterminateSystems/nix/=2.23.3.tar.gz";
+      url = "github:NixOs/nix/2.25.2";
     };
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,8 +17,7 @@ @@
         };
         nix = {
-          url = "github:noamraph/nix/add-nix-state-home-2.24.4";
-          # url = "https://flakehub.com/f/DeterminateSystems/nix/=2.23.3.tar.gz";
+          url = "github:NixOs/nix/2.25.2";
         };
       };
@@ Expand Down @@