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

tests: move mkIfTest to nix-bitcoin.lib

Browse Source
This commit is contained in:
Erik Arvstedt 2022-10-22 19:37:56 +02:00 committed by Greg Shuflin
parent bd5d70813f
commit 32db35d1bf
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/nix-bitcoin.nix
View File

@ -12,7 +12,7 @@ with lib;
lib = mkOption { lib = mkOption {
readOnly = true; readOnly = true;
default = import ../pkgs/lib.nix lib pkgs; default = import ../pkgs/lib.nix lib pkgs config;
defaultText = "nix-bitcoin/pkgs/lib.nix"; defaultText = "nix-bitcoin/pkgs/lib.nix";
}; };

6
pkgs/lib.nix
View File

@ -1,4 +1,4 @@
lib: pkgs: lib: pkgs: config:
with lib; with lib;
@ -115,4 +115,8 @@ let self = {
(map (ip: "IP:${ip}") cert.extraIPs) (map (ip: "IP:${ip}") cert.extraIPs)
); );
test = {
mkIfTest = test: mkIf (config.tests.${test} or false);
};
}; in self }; in self

2
test/tests.nix
View File

@ -13,7 +13,7 @@ let
baseConfig = { pkgs, config, ... }: let baseConfig = { pkgs, config, ... }: let
cfg = config.services; cfg = config.services;
mkIfTest = test: mkIf (config.tests.${test} or false); inherit (config.nix-bitcoin.lib.test) mkIfTest;
in { in {
imports = [ imports = [
./lib/test-lib.nix ./lib/test-lib.nix