diff options
| author | Tom Barrett <tom@tombarrett.xyz> | 2023-10-08 14:41:42 +0200 |
|---|---|---|
| committer | tom barrett <thomas.barrett@karcher.com> | 2023-10-31 15:29:17 +0100 |
| commit | a4b31637b5f340363cad86d95320e614ec1d27b1 (patch) | |
| tree | 87e12b40d1bb82f3a5040bd78bd6e68b26a8d255 /nixos | |
| parent | 08f237546122aa8adb63605c485e78187b6fbd0c (diff) | |
| download | nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.tar nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.tar.gz nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.tar.bz2 nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.tar.lz nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.tar.xz nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.tar.zst nixlib-a4b31637b5f340363cad86d95320e614ec1d27b1.zip | |
bitcoind: only use enabled services
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/bitcoind.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 9b4323292236..94859f30969c 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -381,6 +381,8 @@ The module update takes care of the new config syntax and the data itself (user - `fusuma` now enables the following plugins: [appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher), [keypress](https://github.com/iberianpig/fusuma-plugin-keypress), [sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey), [tap](https://github.com/iberianpig/fusuma-plugin-tap) and [wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl). +- `services.bitcoind` now properly respects the `enable` option. + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index a86d52b7202d..a48066b43b16 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -3,8 +3,7 @@ with lib; let - - eachBitcoind = config.services.bitcoind; + eachBitcoind = filterAttrs (bitcoindName: cfg: cfg.enable) config.services.bitcoind; rpcUserOpts = { name, ... }: { options = { |