From 821f8bf5a09dca93154a9ae46f4c94a936fdbf67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 22 May 2018 12:21:23 +0200
Subject: [PATCH] release.nix: Use fetchGit to get Nixpkgs
---
release.nix | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/release.nix b/release.nix
index 1bdb222e..e29d8c91 100644
--- a/release.nix
+++ b/release.nix
@@ -1,13 +1,14 @@
{ hydraSrc ? { outPath = ./.; revCount = 1234; rev = "abcdef"; }
+, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-18.03"; }
, officialRelease ? false
, shell ? false
}:
-with import <nixpkgs/lib>;
+with import (nixpkgs + "/lib");
let
- pkgs = import <nixpkgs> {};
+ pkgs = import nixpkgs {};
genAttrs' = genAttrs [ "x86_64-linux" /* "i686-linux" */ ];
@@ -37,7 +38,7 @@ rec {
build = genAttrs' (system:
- with import <nixpkgs> { inherit system; };
+ with import nixpkgs { inherit system; };
let
@@ -170,7 +171,7 @@ rec {
'';
tests.install = genAttrs' (system:
- with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
+ with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; };
simpleTest {
machine = hydraServer build.${system};
testScript =
@@ -185,7 +186,7 @@ rec {
});
tests.api = genAttrs' (system:
- with import <nixpkgs/nixos/lib/testing.nix> { inherit system; };
+ with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; };
simpleTest {
machine = hydraServer build.${system};
testScript =
@@ -214,7 +215,7 @@ rec {
/*
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}
simpleTest {
machine =