From afbd8a3cad5d5341d201e32ec35ebbf0265b830e Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 15 Jan 2024 23:13:16 +0100 Subject: [PATCH] test: use `nixpkgs-unstable` flake input for nix-bitcoin pkgs By using the `default` flake module for tests, `pkgsUnstable` in `pkgs/default.nix` gets passed the `nixpkgs-unstable` flake input instead of falling back to importing `nixpkgsPinned.nixpkgs-unstable`. For some use cases this prevents importing `nixpkgs-unstable` twice (once via the `nixpkgs-unstable` flake input, once via `import nixpkgsPinned.nixpkgs-unstable`). --- flake.nix | 2 +- test/tests.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 71eb100..dfcf428 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ # "armv7l-linux" ]; - test = import ./test/tests.nix nixpkgs.lib; + test = import ./test/tests.nix nixpkgs.lib self.nixosModules.default; in { lib = { mkNbPkgs = { diff --git a/test/tests.nix b/test/tests.nix index 578a3f8..6ef7e46 100644 --- a/test/tests.nix +++ b/test/tests.nix @@ -1,6 +1,6 @@ # Integration tests, can be run without internet access. -lib: +lib: nixBitcoinModule: let # Included in all scenarios baseConfig = { config, pkgs, ... }: with lib; let @@ -9,7 +9,7 @@ let in { imports = [ ./lib/test-lib.nix - ../modules/modules.nix + nixBitcoinModule { # Features required by the Python test suite nix-bitcoin.secretsDir = "/secrets";