diff options
| author | Samuel Leathers <samuel.leathers@iohk.io> | 2019-08-31 06:53:44 -0400 |
|---|---|---|
| committer | Samuel Leathers <samuel.leathers@iohk.io> | 2019-08-31 06:53:44 -0400 |
| commit | 4b515cf6ef45299028b9c641c0cec3df006f8709 (patch) | |
| tree | 89c9bb3c922d32947d9e038f27b8ebfd71fecc53 /nixos | |
| parent | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (diff) | |
| parent | b4e1c45e4cfaf581f0c2b58bd82fc88837c0f487 (diff) | |
| download | nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.tar nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.tar.gz nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.tar.bz2 nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.tar.lz nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.tar.xz nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.tar.zst nixlib-4b515cf6ef45299028b9c641c0cec3df006f8709.zip | |
Merge remote-tracking branch 'upstream/master' into staging-next
* upstream/master:
vimPlugins: update (#67823)
mattermost-desktop: 4.2.0 -> 4.2.3 (#67717)
lightspark: init at 0.8.1 (#67425)
anki: 2.1.11 -> 2.1.14 (#67738)
nixos/{namecoind,bitcoind}: removing the altcoin prefix
rust-cbindgen: 0.8.7 -> 0.9.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/bitcoind.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/networking/namecoind.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index d3501636b41d..1439d739da9d 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -59,8 +59,8 @@ in { package = mkOption { type = types.package; - default = pkgs.altcoins.bitcoind; - defaultText = "pkgs.altcoins.bitcoind"; + default = pkgs.bitcoind; + defaultText = "pkgs.bitcoind"; description = "The package providing bitcoin binaries."; }; configFile = mkOption { diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index a569ca87e262..c8ee0a2f5647 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -175,7 +175,7 @@ in serviceConfig = { User = "namecoin"; Group = "namecoin"; - ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole"; + ExecStart = "${pkgs.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole"; ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Nice = "10"; |