Skip to content

Commit

Permalink
nix: 2.3.10 -> 2.3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed May 14, 2021
1 parent 4628449 commit 6f6b2cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/iwfs2bfcy7lqwhri94p2i6jc87ih55zk-nix-2.3.10";
i686-linux = "/nix/store/a3ccfvy9i5n418d5v0bir330kbcz3vj8-nix-2.3.10";
aarch64-linux = "/nix/store/bh5g6cv7bv35iz853d3xv2sphn51ybmb-nix-2.3.10";
x86_64-darwin = "/nix/store/8c98r6zlwn2d40qm7jnnrr2rdlqviszr-nix-2.3.10";
x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11";
i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11";
aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11";
x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11";
}
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/nix/default.nix
Expand Up @@ -199,7 +199,7 @@ in rec {
version = "2.3.10";
src = fetchurl {
url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab";
sha256 = "89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128";
};

patches = [(
Expand Down

4 comments on commit 6f6b2cd

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@edolstra, you pushed a commit directly to master/release branch
instead of going through a Pull Request.

That's highly discouraged beyond the few exceptions listed
on #118661

@arianvp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@edolstra why did the hash of 2.3.10 change silently?

@deviant
Copy link
Member

@deviant deviant commented on 6f6b2cd May 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like version should have been bumped as well: https://github.com/NixOS/nix/releases/tag/2.3.11

@alyssais
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted by 1872bbd.

Please sign in to comment.