diff options
Diffstat (limited to 'release.nix')
| -rw-r--r-- | release.nix | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/release.nix b/release.nix index a6a745e27548..e27355c59365 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,5 @@ { nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; } +, nixpkgs ? { outPath = <nixpkgs>; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false }: @@ -76,7 +77,8 @@ let build = pkgs.lib.genAttrs systems (system: - with import <nixpkgs> { inherit system; }; + # FIXME: temporarily use a different branch for the Darwin build. + with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; }; releaseTools.nixBuild { name = "nix"; @@ -110,7 +112,8 @@ let binaryTarball = pkgs.lib.genAttrs systems (system: - with import <nixpkgs> { inherit system; }; + # FIXME: temporarily use a different branch for the Darwin build. + with import (if system == "x86_64-darwin" then <nixpkgs-darwin> else <nixpkgs>) { inherit system; }; let toplevel = builtins.getAttr system jobs.build; @@ -232,6 +235,26 @@ let touch $out/nix-support/hydra-build-products ''); # */ + tests.evalNixpkgs = + import <nixpkgs/pkgs/top-level/make-tarball.nix> { + inherit nixpkgs; + inherit pkgs; + nix = build.x86_64-linux; + officialRelease = false; + }; + + tests.evalNixOS = + pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; } + '' + export NIX_DB_DIR=$TMPDIR + export NIX_STATE_DIR=$TMPDIR + nix-store --init + + nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run + + touch $out + ''; + # Aggregate job containing the release-critical jobs. release = pkgs.releaseTools.aggregate { @@ -262,6 +285,8 @@ let tests.remoteBuilds tests.nix-copy-closure tests.binaryTarball + tests.evalNixpkgs + tests.evalNixOS ]; }; |