Skip to content

Commit

Permalink
nix: 1.11.7 -> 1.11.8
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed Mar 21, 2017
1 parent e361bc4 commit 2cb25f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
{
x86_64-linux = "/nix/store/4ssykr786d0wp7y6m4xd4qwqs4nrry1z-nix-1.11.7";
i686-linux = "/nix/store/61ggxx2072y2g877m01asy0lsn7xpn06-nix-1.11.7";
x86_64-darwin = "/nix/store/pxf5ri5kdbfqkhd10sw4lpj8sn385ks5-nix-1.11.7";
x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8";
i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8";
x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8";
}
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
Expand Up @@ -103,10 +103,10 @@ in rec {
nix = nixStable;

nixStable = common rec {
name = "nix-1.11.7";
name = "nix-1.11.8";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d";
sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67";
};
};

Expand Down

6 comments on commit 2cb25f8

@copumpkin
Copy link
Member

Choose a reason for hiding this comment

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

@edolstra would you mind documenting how this works/holds onto references/etc.? Perhaps leave a comment next to nixStable so people know that they should update nix-fallback-paths.nix when they update it?

@copumpkin
Copy link
Member

Choose a reason for hiding this comment

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

@edolstra also a little concerned with stdenv changes (and other nix dep changes) changing those paths

@vcunat
Copy link
Member

@vcunat vcunat commented on 2cb25f8 Apr 7, 2017

Choose a reason for hiding this comment

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

Why are you concerned about that? It might be a lot to download if this fallback is used, but I can't see any other problems. I suppose Eelco makes some precautions so these paths don't fall out of the binary cache?

@copumpkin
Copy link
Member

Choose a reason for hiding this comment

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

Mostly curiosity. The process by which these appeared seemed fairly opaque and I don't understand what realizes these paths if they're not already there

@vcunat
Copy link
Member

@vcunat vcunat commented on 2cb25f8 Apr 8, 2017

Choose a reason for hiding this comment

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

It clearly relies on them being in the binary cache. Anyway, the main point is to avoid evaluating nixpkgs...

@edolstra
Copy link
Member Author

Choose a reason for hiding this comment

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

Please sign in to comment.