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: 6141829459ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cf597f0926a5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 6, 2018

  1. nix: 2.1.1 -> 2.1.2 

    (cherry picked from commit 869f615)
    @edolstra @srhb
    edolstra authored and srhb committed Nov 6, 2018
    Copy the full SHA
    4a03292 View commit details

  2. nix: 2.1.2 -> 2.1.3 

    (cherry picked from commit 2c9265c)
    @edolstra @srhb
    edolstra authored and srhb committed Nov 6, 2018
    Copy the full SHA
    9f2e2ee View commit details

Commits on Nov 7, 2018

  1. Merge pull request #49820 from srhb/1809-backport-nix-213 

    18.09: backport nix 2.1.1 -> 2.1.2 -> 2.1.3
    @samueldr
    samueldr authored Nov 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cf597f0 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/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1";
i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1";
aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1";
x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1";
x86_64-linux = "/nix/store/cdcia67siabmj6li7vyffgv2cry86fq8-nix-2.1.3";
i686-linux = "/nix/store/6q3xi6y5qnsv7d62b8n00hqfxi8rs2xs-nix-2.1.3";
aarch64-linux = "/nix/store/2v93d0vimlm28jg0ms6v1i6lc0fq13pn-nix-2.1.3";
x86_64-darwin = "/nix/store/dkjlfkrknmxbjmpfk3dg4q3nmb7m3zvk-nix-2.1.3";
}
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
@@ -147,10 +147,10 @@ in rec {
}) // { perl-bindings = nix1; };

nixStable = (common rec {
name = "nix-2.1.1";
name = "nix-2.1.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b";
sha256 = "5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4";
};
}) // { perl-bindings = perl-bindings {
nix = nixStable;