Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b119c0939780
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70717a337f7a
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 8, 2020

  1. nix: 2.3.6 -> 2.3.6 

    (cherry picked from commit aef2bc1)
    @edolstra
    edolstra committed Jun 8, 2020
    Copy the full SHA
    70717a3 View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 nixos/modules/installer/tools/nix-fallback-paths.nix
  2. +2 −2 pkgs/tools/package-management/nix/default.nix
8 changes: 4 additions & 4 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/xb0nl3z356n0sfrhswfli2g19a19slys-nix-2.3.5";
i686-linux = "/nix/store/k8kdd4yy1yap6lai5idyhmzcwsjh1fik-nix-2.3.5";
aarch64-linux = "/nix/store/dr86cbipxqjcb8pf2k0v8wvw0h0adfpz-nix-2.3.5";
x86_64-darwin = "/nix/store/n6dqdndkv9kac66kdr988kaiyavl44x8-nix-2.3.5";
x86_64-linux = "/nix/store/j8dbv5w6jl34caywh2ygdy88knx1mdf7-nix-2.3.6";
i686-linux = "/nix/store/9fqvbdisahqp0238vrs7wn5anpri0a65-nix-2.3.6";
aarch64-linux = "/nix/store/72pwn0nm9bjqx9vpi8sgh4bl6g5wh814-nix-2.3.6";
x86_64-darwin = "/nix/store/g37vk77m90p5zcl5nixjlzp3vqpisfn5-nix-2.3.6";
}
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -178,10 +178,10 @@ in rec {
nix = nixStable;

nixStable = callPackage common (rec {
name = "nix-2.3.5";
name = "nix-2.3.6";
src = fetchurl {
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "25445353c27d7c2703cd74216bce6458a02068965055d111765ac4186ed678c1";
sha256 = "05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89";
};

inherit storeDir stateDir confDir boehmgc;