release.nix: Use fetchGit to get Nixpkgs

This commit is contained in:
Eelco Dolstra 2018-05-22 12:21:23 +02:00
parent 7f6d52f4c3
commit 821f8bf5a0
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -1,13 +1,14 @@
{ hydraSrc ? { outPath = ./.; revCount = 1234; rev = "abcdef"; } { hydraSrc ? { outPath = ./.; revCount = 1234; rev = "abcdef"; }
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03"; }
, officialRelease ? false , officialRelease ? false
, shell ? false , shell ? false
}: }:
with import <nixpkgs/lib>; with import (nixpkgs + "/lib");
let let
pkgs = import <nixpkgs> {}; pkgs = import nixpkgs {};
genAttrs' = genAttrs [ "x86_64-linux" /* "i686-linux" */ ]; genAttrs' = genAttrs [ "x86_64-linux" /* "i686-linux" */ ];
@ -37,7 +38,7 @@ rec {
build = genAttrs' (system: build = genAttrs' (system:
with import <nixpkgs> { inherit system; }; with import nixpkgs { inherit system; };
let let
@ -170,7 +171,7 @@ rec {
''; '';
tests.install = genAttrs' (system: tests.install = genAttrs' (system:
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; };
simpleTest { simpleTest {
machine = hydraServer build.${system}; machine = hydraServer build.${system};
testScript = testScript =
@ -185,7 +186,7 @@ rec {
}); });
tests.api = genAttrs' (system: tests.api = genAttrs' (system:
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; };
simpleTest { simpleTest {
machine = hydraServer build.${system}; machine = hydraServer build.${system};
testScript = testScript =
@ -214,7 +215,7 @@ rec {
/* /*
tests.s3backup = genAttrs' (system: tests.s3backup = genAttrs' (system:
with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; };
let hydra = build.${system} let hydra = build.${system}
simpleTest { simpleTest {
machine = machine =