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: 91c9062877f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 274831839c4f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 27, 2020

  1. nixUnstable: 2.4pre7805_984e5213 -> 2.4pre20200719_a79b6dd 

    (cherry picked from commit 38880a5)
    @edolstra
    edolstra committed Jul 27, 2020
    Copy the full SHA
    5e30b3a View commit details

  2. nixUnstable: 2.4pre20200719_a79b6dd -> 2.4pre20200721_ff314f1 

    Fixes errors like this for me:

```
error: --- Error ------------------------------- nix-build
Nix daemon out of memory
(use '--show-trace' to show detailed location information)
```

(cherry picked from commit 85819d4)
    @Ma27 @edolstra
    Ma27 authored and edolstra committed Jul 27, 2020
    Copy the full SHA
    2748318 View commit details
Showing with 4 additions and 16 deletions.
  1. +4 −16 pkgs/tools/package-management/nix/default.nix
20 changes: 4 additions & 16 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -186,30 +186,18 @@ in rec {

nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre7805_984e5213";
suffix = "pre20200721_ff314f1";

src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "984e521392b3f41f7cdab203e5c00f3e00e27a28";
sha256 = "1dch48018dwzx9cysnfxrdpszav87s0d635zqw810mgmqpm25fw8";
rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940";
hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0=";
};

inherit storeDir stateDir confDir boehmgc;
});

nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20200622_334e26b";

src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221";
sha256 = "14a2yyn1ygymlci6hl5d308fs3p3m0mgcfs5dc8dn0s3lg5qvbmp";
};

inherit storeDir stateDir confDir boehmgc;
});
nixFlakes = nixUnstable;

}