From 42bf0422e00e48c1620381e52b59adc36cd0f403 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 22 Jul 2022 17:16:21 +0200 Subject: [PATCH 1/2] operator: fix syntax error in description Fix error `Invalid XML` when running flake-info (nixos-search) . --- modules/operator.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/operator.nix b/modules/operator.nix index bbf5a85..173d2a4 100644 --- a/modules/operator.nix +++ b/modules/operator.nix @@ -12,7 +12,7 @@ let When using nix-bitcoin as part of a larger system config, it makes sense to set your main system user as the operator, by setting option - `nix-bitcoin.operator.name = "
";`. + `nix-bitcoin.operator.name = "MAIN_USER_NAME";`. ''; }; name = mkOption { From 9c5dbeaa833eaa764063d96562defb82a41d18d2 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 22 Jul 2022 17:33:49 +0200 Subject: [PATCH 2/2] test/nixos-search: fix wrong flake being tested Now the test targets the main nix-bitcoin flake instead of the nixos-search flake. Also remove `NIX_PATH`, which is no longer required. --- test/nixos-search/ci-test.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/nixos-search/ci-test.sh b/test/nixos-search/ci-test.sh index e719fb4..1cd0c72 100755 --- a/test/nixos-search/ci-test.sh +++ b/test/nixos-search/ci-test.sh @@ -17,7 +17,5 @@ if [[ ${CACHIX_SIGNING_KEY:-} ]]; then cachix push $cachixCache $(type -P flake-info); fi -# flake-info requires '' -export NIX_PATH=nixpkgs=$(nix eval --raw .#nixpkgsPath) echo "Running flake-info (nixos-search)" -flake-info flake ./. +flake-info flake ../..