diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-10 12:01:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 12:01:57 +0000 |
| commit | 96189869554ac1f3cca278216955e07a81c68526 (patch) | |
| tree | 41f48fca287901c0b88e6793c57cdd357d1b5845 /nixos | |
| parent | 23e4049dcd871d5ec4331df3a805c715ad711647 (diff) | |
| parent | 84d856a651004949bacd679bdbbb66a1191a5586 (diff) | |
| download | nixlib-96189869554ac1f3cca278216955e07a81c68526.tar nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.gz nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.bz2 nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.lz nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.xz nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.zst nixlib-96189869554ac1f3cca278216955e07a81c68526.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/hledger-web.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/misc.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix index 9c66589dffd1..4f6a34e6d2fe 100644 --- a/nixos/modules/services/web-apps/hledger-web.nix +++ b/nixos/modules/services/web-apps/hledger-web.nix @@ -118,7 +118,7 @@ in { ++ extraOptions); in { description = "hledger-web - web-app for the hledger accounting tool."; - documentation = [ https://hledger.org/hledger-web.html ]; + documentation = [ "https://hledger.org/hledger-web.html" ]; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; serviceConfig = mkMerge [ diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index fb19b7060562..0587912c9a22 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -50,17 +50,18 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { def get_path_info(path): - result = machine.succeed(f"nix path-info --json {path}") + result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") parsed = json.loads(result) return parsed with subtest("nix-db"): info = get_path_info("${foo}") + print(info) if ( info[0]["narHash"] - != "sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5" + != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" ): raise Exception("narHash not set") |