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/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 421f1f44931d
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9cf52dd1cc8c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2020

  1. Disable the evalNixpkgs test 

    It constantly OOMs.

https://hydra.nixos.org/build/105784912
(cherry picked from commit 35732a9)
    @edolstra
    edolstra committed Jan 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5526f72 View commit details

  2. Disable the evalNixOS test 

    It also OOMs.

https://hydra.nixos.org/build/105942679
(cherry picked from commit 99af822)
    @edolstra
    edolstra committed Jan 4, 2020
    Copy the full SHA
    9cf52dd View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 release.nix
6 changes: 4 additions & 2 deletions release.nix
View file
Original file line number Diff line number Diff line change
@@ -271,6 +271,7 @@ let
umount /nix
''); # */

/*
tests.evalNixpkgs =
import (nixpkgs + "/pkgs/top-level/make-tarball.nix") {
inherit nixpkgs;
@@ -289,6 +290,7 @@ let
touch $out
'';
*/


installerScript =
@@ -326,8 +328,8 @@ let
tests.remoteBuilds
tests.nix-copy-closure
tests.binaryTarball
tests.evalNixpkgs
tests.evalNixOS
#tests.evalNixpkgs
#tests.evalNixOS
installerScript
];
};