greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use pinned nixpkgs-unstable for the test driver

Browse Source
This commit is contained in:
Erik Arvstedt 2020-01-13 10:39:19 +01:00 committed by Jonas Nick
parent 6fe647ecc4
commit 83863c03e5
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/make-test.nix
View File

@ -2,20 +2,14 @@ testArgs:
let let
pkgs = import <nixpkgs> { config = {}; overlays = []; }; pkgs = import <nixpkgs> { config = {}; overlays = []; };
unstable = (import ../pkgs/nixpkgs-pinned.nix).nixpkgs-unstable;
# Stable nixpkgs doesn't yet include the Python testing framework. # Stable nixpkgs doesn't yet include the Python testing framework.
# Use unstable nixpkgs and patch it so that it uses stable nixpkgs for the VM # Use unstable nixpkgs and patch it so that it uses stable nixpkgs for the VM
# machine configuration. # machine configuration.
testingPkgs = let testingPkgs =
# unstable as of 2020-01-09
rev = "9beb0d1ac2ebd6063efbdc4d3631f8ce137bbf90";
src = builtins.fetchTarball {
url = "https://github.com/nixos/nixpkgs-channels/archive/${rev}.tar.gz";
sha256 = "1v95779di35qhrz70p2v27kmwm09h8pgh74i1wc72v0zp3bdrf50";
};
in
pkgs.runCommand "nixpkgs-testing" {} '' pkgs.runCommand "nixpkgs-testing" {} ''
cp -r ${src} $out cp -r ${unstable} $out
cd $out cd $out
chmod +w -R . chmod +w -R .
patch -p1 < ${./use-stable-pkgs.patch} patch -p1 < ${./use-stable-pkgs.patch}

5
test/run-tests.sh
View File

@ -24,10 +24,7 @@ memoryMiB=${memoryMiB:-2048}
scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd)
getPkgs() { export NIX_PATH=nixpkgs=$(nix eval --raw -f "$scriptDir/../pkgs/nixpkgs-pinned.nix" nixpkgs)
nix eval --raw -f "$scriptDir/../pkgs/nixpkgs-pinned.nix" $1
}
export NIX_PATH=nixpkgs=$(getPkgs nixpkgs):nixpkgs-unstable=$(getPkgs nixpkgs-unstable)
# Run the test. No temporary files are left on the host system. # Run the test. No temporary files are left on the host system.
run() { run() {