diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-12-01 15:01:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 15:01:50 -0500 |
| commit | 831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c (patch) | |
| tree | a688cb70ef013408f16e4b8f10872d53249647ea | |
| parent | e84520c22833d695417023ed28a42313e9cfcc42 (diff) | |
| parent | 34386263f796ee8bc5367a65af726afd0e9ad16a (diff) | |
| download | nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.tar nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.tar.gz nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.tar.bz2 nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.tar.lz nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.tar.xz nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.tar.zst nixpkgs-831b9b4c3628f1c2858b4ec82e1de4a2ecba2c9c.zip | |
Merge pull request #203818 from qowoz/nix
| -rw-r--r-- | nixos/modules/installer/tools/nix-fallback-paths.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 4700895cec8..675674cf5b4 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/nmq5zcd93qb1yskx42rs910ff0247nn2-nix-2.11.0"; - i686-linux = "/nix/store/ja6im1sw9a8lzczi10lc0iddffl9kzmn-nix-2.11.0"; - aarch64-linux = "/nix/store/myr6fcqa9y4y2fb83zz73dck52vcn81z-nix-2.11.0"; - x86_64-darwin = "/nix/store/2pfjz9b22k9997gh7cb0hjk1qa4lxrvy-nix-2.11.0"; - aarch64-darwin = "/nix/store/lr32i0bdarx1iqsch4sy24jj1jkfw9vf-nix-2.11.0"; + x86_64-linux = "/nix/store/xdlpraypxdimjyfrr4k06narrv8nmfgh-nix-2.11.1"; + i686-linux = "/nix/store/acghbpn3aaj2q64mz3ljipsgf9d9qxlp-nix-2.11.1"; + aarch64-linux = "/nix/store/0lrf6danhdqjsrhala134ak8vn0b9ghj-nix-2.11.1"; + x86_64-darwin = "/nix/store/60sx4c6xflgqk11gvijwzlsczbxgxgwh-nix-2.11.1"; + aarch64-darwin = "/nix/store/dmk5m3nlqp1awaqrp1f06qhhkh3l102n-nix-2.11.1"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c2d016a1bc3..e6ee3ffe1d8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -106,8 +106,8 @@ in lib.makeExtensible (self: { }; nix_2_11 = common { - version = "2.11.0"; - sha256 = "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ="; + version = "2.11.1"; + sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk="; patches = [ ./patches/flaky-tests.patch (fetchpatch { |