diff options
author | Bernardo Meurer <bernardo@meurer.org> | 2023-08-13 13:27:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-13 13:27:20 -0400 |
commit | 70dd76d94ff2348a1d471b4ec0afcf6e9a43360c (patch) | |
tree | 920862668e66a42a198c59e3fe99e8db7e21f063 | |
parent | 6198e6be7f7f29ea0b1ee0482b7f56f904c271cb (diff) | |
parent | fa774ca4e330470197c49e72c48008e652ea4080 (diff) |
Merge pull request #247475 from qowoz/nix217
-rw-r--r-- | nixos/modules/installer/tools/nix-fallback-paths.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/nurl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
4 files changed, 15 insertions, 11 deletions
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 582334a5aeaf5..10c37a46fdac1 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/ny9r65799s7xhp605bc2753sjvzkxrrs-nix-2.15.1"; - i686-linux = "/nix/store/ck55dz5klc7szi8rx9ghhm8gi2b5q5bw-nix-2.15.1"; - aarch64-linux = "/nix/store/cl0a02vr28913dgw98hrm45a4baqr3z1-nix-2.15.1"; - x86_64-darwin = "/nix/store/wq228jdbz16pp2lnxf32n8dv27pw53p8-nix-2.15.1"; - aarch64-darwin = "/nix/store/x11cpsjg4q236msfz5scc325pfp9xy64-nix-2.15.1"; + x86_64-linux = "/nix/store/3wqasl97rjiza3vd7fxjnvli2w9l30mk-nix-2.17.0"; + i686-linux = "/nix/store/z360xswxfx55pmm1fng3hw748rbs0kkj-nix-2.17.0"; + aarch64-linux = "/nix/store/9670sxa916xmv8n1kqs7cdvmnsrhrdjv-nix-2.17.0"; + x86_64-darwin = "/nix/store/2rdbky9j8hc3mbgl6pnda4hkjllyfwnn-nix-2.17.0"; + aarch64-darwin = "/nix/store/jl9qma14fb4zk9lq1k0syw2k9qm2gqjw-nix-2.17.0"; } diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/tools/misc/nurl/default.nix index 16fec1445a57d..e0af2ff638dd1 100644 --- a/pkgs/tools/misc/nurl/default.nix +++ b/pkgs/tools/misc/nurl/default.nix @@ -7,7 +7,7 @@ , darwin , gitMinimal , mercurial -, nixVersions +, nix }: rustPlatform.buildRustPackage rec { @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/nurl \ - --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nixVersions.unstable ]} + --prefix PATH : ${lib.makeBinPath [ gitMinimal mercurial nix ]} installManPage artifacts/nurl.1 installShellCompletion artifacts/nurl.{bash,fish} --zsh artifacts/_nurl ''; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ef383788d1f9c..1482931bf4dcf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -208,9 +208,9 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_15; + stable = self.nix_2_17; - unstable = self.nix_2_17; + unstable = self.stable; } // lib.optionalAttrs config.allowAliases { nix_2_4 = throw "nixVersions.nix_2_4 has been removed"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e36bbb199194..f16be7a341483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18344,7 +18344,9 @@ with pkgs; pylyzer = callPackage ../development/tools/language-servers/pylyzer { }; - rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { }; + rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { + nix = nixVersions.nix_2_15; + }; ruff-lsp = python3Packages.callPackage ../development/tools/language-servers/ruff-lsp { }; @@ -40442,7 +40444,9 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; - nixos-option = callPackage ../tools/nix/nixos-option { }; + nixos-option = callPackage ../tools/nix/nixos-option { + nix = nixVersions.nix_2_15; + }; nix-pin = callPackage ../tools/package-management/nix-pin { }; |