From 72682e46546d6d024a29e2fde009372e03b45b9f Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 28 Aug 2019 10:37:52 -0700 Subject: [PATCH 1/4] tree: rename altcoins to blockchains Signed-off-by: William Casarin --- .../aeon/default.nix | 0 .../{altcoins => blockchains}/bitcoin-abc.nix | 0 .../bitcoin-classic.nix | 0 .../bitcoin-unlimited.nix | 0 .../{altcoins => blockchains}/bitcoin.nix | 0 .../{altcoins => blockchains}/btc1.nix | 0 .../{altcoins => blockchains}/clightning.nix | 0 .../cryptop/default.nix | 0 .../{altcoins => blockchains}/dashpay.nix | 0 .../{altcoins => blockchains}/dcrd.nix | 0 .../{altcoins => blockchains}/dcrwallet.nix | 0 .../{altcoins => blockchains}/default.nix | 0 .../{altcoins => blockchains}/dero.nix | 0 .../{altcoins => blockchains}/dogecoin.nix | 0 .../{altcoins => blockchains}/ethabi.nix | 0 .../exodus/default.nix | 0 .../fix-bitcoin-qt-build.patch | 0 .../{altcoins => blockchains}/freicoin.nix | 0 .../go-ethereum-classic/default.nix | 0 .../go-ethereum-classic/deps.nix | 0 .../{altcoins => blockchains}/go-ethereum.nix | 0 .../jormungandr/default.nix | 0 .../ledger-live-desktop/default.nix | 0 .../{altcoins => blockchains}/litecoin.nix | 0 .../{altcoins => blockchains}/lnd.nix | 0 .../{altcoins => blockchains}/masari.nix | 0 .../{altcoins => blockchains}/mist.nix | 0 .../monero-gui/default.nix | 0 .../monero-gui/move-log-file.patch | 0 .../monero/default.nix | 0 .../{altcoins => blockchains}/namecoin.nix | 0 .../nano-wallet/CMakeLists.txt.patch | 0 .../nano-wallet/default.nix | 0 .../parity-ui/default.nix | 0 .../parity-ui/env.nix | 0 .../{altcoins => blockchains}/parity/beta.nix | 0 .../parity/default.nix | 0 .../parity/parity.nix | 0 .../particl/particl-core.nix | 0 .../{altcoins => blockchains}/pivx.nix | 0 .../polkadot/default.nix | 0 .../stellar-core-dirty-version.patch | 0 .../stellar-core.nix | 0 .../{altcoins => blockchains}/sumokoin.nix | 0 .../wasabiwallet/default.nix | 0 .../{altcoins => blockchains}/wownero.nix | 0 .../zcash/default.nix | 0 .../zcash/librustzcash/default.nix | 0 pkgs/top-level/all-packages.nix | 35 ++++--------------- 49 files changed, 7 insertions(+), 28 deletions(-) rename pkgs/applications/{altcoins => blockchains}/aeon/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin-abc.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin-classic.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin-unlimited.nix (100%) rename pkgs/applications/{altcoins => blockchains}/bitcoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/btc1.nix (100%) rename pkgs/applications/{altcoins => blockchains}/clightning.nix (100%) rename pkgs/applications/{altcoins => blockchains}/cryptop/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dashpay.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dcrd.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dcrwallet.nix (100%) rename pkgs/applications/{altcoins => blockchains}/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dero.nix (100%) rename pkgs/applications/{altcoins => blockchains}/dogecoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/ethabi.nix (100%) rename pkgs/applications/{altcoins => blockchains}/exodus/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/fix-bitcoin-qt-build.patch (100%) rename pkgs/applications/{altcoins => blockchains}/freicoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/go-ethereum-classic/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/go-ethereum-classic/deps.nix (100%) rename pkgs/applications/{altcoins => blockchains}/go-ethereum.nix (100%) rename pkgs/applications/{altcoins => blockchains}/jormungandr/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/ledger-live-desktop/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/litecoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/lnd.nix (100%) rename pkgs/applications/{altcoins => blockchains}/masari.nix (100%) rename pkgs/applications/{altcoins => blockchains}/mist.nix (100%) rename pkgs/applications/{altcoins => blockchains}/monero-gui/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/monero-gui/move-log-file.patch (100%) rename pkgs/applications/{altcoins => blockchains}/monero/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/namecoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/nano-wallet/CMakeLists.txt.patch (100%) rename pkgs/applications/{altcoins => blockchains}/nano-wallet/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity-ui/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity-ui/env.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity/beta.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/parity/parity.nix (100%) rename pkgs/applications/{altcoins => blockchains}/particl/particl-core.nix (100%) rename pkgs/applications/{altcoins => blockchains}/pivx.nix (100%) rename pkgs/applications/{altcoins => blockchains}/polkadot/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/stellar-core-dirty-version.patch (100%) rename pkgs/applications/{altcoins => blockchains}/stellar-core.nix (100%) rename pkgs/applications/{altcoins => blockchains}/sumokoin.nix (100%) rename pkgs/applications/{altcoins => blockchains}/wasabiwallet/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/wownero.nix (100%) rename pkgs/applications/{altcoins => blockchains}/zcash/default.nix (100%) rename pkgs/applications/{altcoins => blockchains}/zcash/librustzcash/default.nix (100%) diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix similarity index 100% rename from pkgs/applications/altcoins/aeon/default.nix rename to pkgs/applications/blockchains/aeon/default.nix diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin-abc.nix rename to pkgs/applications/blockchains/bitcoin-abc.nix diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin-classic.nix rename to pkgs/applications/blockchains/bitcoin-classic.nix diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin-unlimited.nix rename to pkgs/applications/blockchains/bitcoin-unlimited.nix diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix similarity index 100% rename from pkgs/applications/altcoins/bitcoin.nix rename to pkgs/applications/blockchains/bitcoin.nix diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/blockchains/btc1.nix similarity index 100% rename from pkgs/applications/altcoins/btc1.nix rename to pkgs/applications/blockchains/btc1.nix diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/blockchains/clightning.nix similarity index 100% rename from pkgs/applications/altcoins/clightning.nix rename to pkgs/applications/blockchains/clightning.nix diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix similarity index 100% rename from pkgs/applications/altcoins/cryptop/default.nix rename to pkgs/applications/blockchains/cryptop/default.nix diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix similarity index 100% rename from pkgs/applications/altcoins/dashpay.nix rename to pkgs/applications/blockchains/dashpay.nix diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix similarity index 100% rename from pkgs/applications/altcoins/dcrd.nix rename to pkgs/applications/blockchains/dcrd.nix diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix similarity index 100% rename from pkgs/applications/altcoins/dcrwallet.nix rename to pkgs/applications/blockchains/dcrwallet.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/blockchains/default.nix similarity index 100% rename from pkgs/applications/altcoins/default.nix rename to pkgs/applications/blockchains/default.nix diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/blockchains/dero.nix similarity index 100% rename from pkgs/applications/altcoins/dero.nix rename to pkgs/applications/blockchains/dero.nix diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix similarity index 100% rename from pkgs/applications/altcoins/dogecoin.nix rename to pkgs/applications/blockchains/dogecoin.nix diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix similarity index 100% rename from pkgs/applications/altcoins/ethabi.nix rename to pkgs/applications/blockchains/ethabi.nix diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix similarity index 100% rename from pkgs/applications/altcoins/exodus/default.nix rename to pkgs/applications/blockchains/exodus/default.nix diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch similarity index 100% rename from pkgs/applications/altcoins/fix-bitcoin-qt-build.patch rename to pkgs/applications/blockchains/fix-bitcoin-qt-build.patch diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix similarity index 100% rename from pkgs/applications/altcoins/freicoin.nix rename to pkgs/applications/blockchains/freicoin.nix diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/blockchains/go-ethereum-classic/default.nix similarity index 100% rename from pkgs/applications/altcoins/go-ethereum-classic/default.nix rename to pkgs/applications/blockchains/go-ethereum-classic/default.nix diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/pkgs/applications/blockchains/go-ethereum-classic/deps.nix similarity index 100% rename from pkgs/applications/altcoins/go-ethereum-classic/deps.nix rename to pkgs/applications/blockchains/go-ethereum-classic/deps.nix diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix similarity index 100% rename from pkgs/applications/altcoins/go-ethereum.nix rename to pkgs/applications/blockchains/go-ethereum.nix diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix similarity index 100% rename from pkgs/applications/altcoins/jormungandr/default.nix rename to pkgs/applications/blockchains/jormungandr/default.nix diff --git a/pkgs/applications/altcoins/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix similarity index 100% rename from pkgs/applications/altcoins/ledger-live-desktop/default.nix rename to pkgs/applications/blockchains/ledger-live-desktop/default.nix diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix similarity index 100% rename from pkgs/applications/altcoins/litecoin.nix rename to pkgs/applications/blockchains/litecoin.nix diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/blockchains/lnd.nix similarity index 100% rename from pkgs/applications/altcoins/lnd.nix rename to pkgs/applications/blockchains/lnd.nix diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/blockchains/masari.nix similarity index 100% rename from pkgs/applications/altcoins/masari.nix rename to pkgs/applications/blockchains/masari.nix diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/blockchains/mist.nix similarity index 100% rename from pkgs/applications/altcoins/mist.nix rename to pkgs/applications/blockchains/mist.nix diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix similarity index 100% rename from pkgs/applications/altcoins/monero-gui/default.nix rename to pkgs/applications/blockchains/monero-gui/default.nix diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/blockchains/monero-gui/move-log-file.patch similarity index 100% rename from pkgs/applications/altcoins/monero-gui/move-log-file.patch rename to pkgs/applications/blockchains/monero-gui/move-log-file.patch diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix similarity index 100% rename from pkgs/applications/altcoins/monero/default.nix rename to pkgs/applications/blockchains/monero/default.nix diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix similarity index 100% rename from pkgs/applications/altcoins/namecoin.nix rename to pkgs/applications/blockchains/namecoin.nix diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch similarity index 100% rename from pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch rename to pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix similarity index 100% rename from pkgs/applications/altcoins/nano-wallet/default.nix rename to pkgs/applications/blockchains/nano-wallet/default.nix diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix similarity index 100% rename from pkgs/applications/altcoins/parity-ui/default.nix rename to pkgs/applications/blockchains/parity-ui/default.nix diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix similarity index 100% rename from pkgs/applications/altcoins/parity-ui/env.nix rename to pkgs/applications/blockchains/parity-ui/env.nix diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix similarity index 100% rename from pkgs/applications/altcoins/parity/beta.nix rename to pkgs/applications/blockchains/parity/beta.nix diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix similarity index 100% rename from pkgs/applications/altcoins/parity/default.nix rename to pkgs/applications/blockchains/parity/default.nix diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix similarity index 100% rename from pkgs/applications/altcoins/parity/parity.nix rename to pkgs/applications/blockchains/parity/parity.nix diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix similarity index 100% rename from pkgs/applications/altcoins/particl/particl-core.nix rename to pkgs/applications/blockchains/particl/particl-core.nix diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/blockchains/pivx.nix similarity index 100% rename from pkgs/applications/altcoins/pivx.nix rename to pkgs/applications/blockchains/pivx.nix diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix similarity index 100% rename from pkgs/applications/altcoins/polkadot/default.nix rename to pkgs/applications/blockchains/polkadot/default.nix diff --git a/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/pkgs/applications/blockchains/stellar-core-dirty-version.patch similarity index 100% rename from pkgs/applications/altcoins/stellar-core-dirty-version.patch rename to pkgs/applications/blockchains/stellar-core-dirty-version.patch diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix similarity index 100% rename from pkgs/applications/altcoins/stellar-core.nix rename to pkgs/applications/blockchains/stellar-core.nix diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix similarity index 100% rename from pkgs/applications/altcoins/sumokoin.nix rename to pkgs/applications/blockchains/sumokoin.nix diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix similarity index 100% rename from pkgs/applications/altcoins/wasabiwallet/default.nix rename to pkgs/applications/blockchains/wasabiwallet/default.nix diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/blockchains/wownero.nix similarity index 100% rename from pkgs/applications/altcoins/wownero.nix rename to pkgs/applications/blockchains/wownero.nix diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix similarity index 100% rename from pkgs/applications/altcoins/zcash/default.nix rename to pkgs/applications/blockchains/zcash/default.nix diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix similarity index 100% rename from pkgs/applications/altcoins/zcash/librustzcash/default.nix rename to pkgs/applications/blockchains/zcash/librustzcash/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31c35347800c..43fd7a32d4b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2975,7 +2975,7 @@ in exiftool = perlPackages.ImageExifTool; - exodus = callPackage ../applications/altcoins/exodus { }; + exodus = callPackage ../applications/blockchains/exodus { }; ext4magic = callPackage ../tools/filesystems/ext4magic { }; @@ -4480,7 +4480,7 @@ in leatherman = callPackage ../development/libraries/leatherman { }; - ledger-live-desktop = callPackage ../applications/altcoins/ledger-live-desktop { }; + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; ledmon = callPackage ../tools/system/ledmon { }; @@ -4906,7 +4906,7 @@ in namazu = callPackage ../tools/text/namazu { }; - nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; nasty = callPackage ../tools/security/nasty { }; @@ -6808,7 +6808,7 @@ in wal_e = callPackage ../tools/backup/wal-e { }; - wasabiwallet = callPackage ../applications/altcoins/wasabiwallet { }; + wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -17355,14 +17355,6 @@ in schismtracker = callPackage ../applications/audio/schismtracker { }; - altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); - - bitcoin = altcoins.bitcoin; - clightning = altcoins.clightning; - lnd = altcoins.lnd; - - cryptop = altcoins.cryptop; - jnetmap = callPackage ../applications/networking/jnetmap {}; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { @@ -17375,19 +17367,6 @@ in libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { }; - go-ethereum = res.altcoins.go-ethereum; - ethabi = res.altcoins.ethabi; - - parity = res.altcoins.parity; - parity-beta = res.altcoins.parity-beta; - parity-ui = res.altcoins.parity-ui; - - polkadot = res.altcoins.polkadot; - - stellar-core = res.altcoins.stellar-core; - - particl-core = res.altcoins.particl-core; - aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -19109,7 +19088,7 @@ in josm = callPackage ../applications/misc/josm { }; - jormungandr = callPackage ../applications/altcoins/jormungandr { }; + jormungandr = callPackage ../applications/blockchains/jormungandr { }; jbrout = callPackage ../applications/graphics/jbrout { }; @@ -19557,11 +19536,11 @@ in mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/altcoins/monero { + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; }; - monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost16x; }; From 8d6cb26e41287f986ea86a95d487f2c0546d27df Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 28 Aug 2019 10:48:13 -0700 Subject: [PATCH 2/4] all-packages: add blockchains section Signed-off-by: William Casarin --- pkgs/top-level/all-packages.nix | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43fd7a32d4b6..2b4eaa2c7fbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21792,6 +21792,94 @@ in zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS + + aeon = callPackage ../applications/blockchains/aeon { }; + + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; + + bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; + bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = false; }; + + bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ../applications/blockchains/bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; + + bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + + btc1 = callPackage ../applications/blockchains/btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; + + cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + + dashpay = callPackage ../applications/blockchains/dashpay.nix { }; + + dcrd = callPackage ../applications/blockchains/dcrd.nix { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet.nix { }; + + dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; + + dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; + dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + + + freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + go-ethereum-classic = callPackage ../applications/blockchains/go-ethereum-classic { + buildGoPackage = buildGo110Package; + }; + + litecoin = callPackage ../applications/blockchains/litecoin.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + litecoind = litecoin.override { withGui = false; }; + + lnd = callPackage ../applications/blockchains/lnd.nix { }; + + masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; + + mist = callPackage ../applications/blockchains/mist.nix { }; + + namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; + namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; + + pivx = libsForQt59.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + + ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + + stellar-core = callPackage ../applications/blockchains/stellar-core.nix { }; + + sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + + wownero = callPackage ../applications/blockchains/wownero.nix {}; + + zcash = callPackage ../applications/blockchains/zcash { + withGui = false; + }; + + parity = callPackage ../applications/blockchains/parity { }; + parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; + parity-ui = callPackage ../applications/blockchains/parity-ui { }; + + polkadot = callPackage ../applications/blockchains/polkadot { }; + + particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; From 04ef817479dfcef0a3a1453dc8ed0fe648d4e9d5 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 28 Aug 2019 10:49:04 -0700 Subject: [PATCH 3/4] blockchains: remove default.nix This is no longer needed Signed-off-by: William Casarin --- pkgs/applications/blockchains/default.nix | 90 ----------------------- 1 file changed, 90 deletions(-) delete mode 100644 pkgs/applications/blockchains/default.nix diff --git a/pkgs/applications/blockchains/default.nix b/pkgs/applications/blockchains/default.nix deleted file mode 100644 index 5b5bfb897cf3..000000000000 --- a/pkgs/applications/blockchains/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ callPackage, boost155, boost165, darwin, libsForQt5, libsForQt59, miniupnpc_2, python3, buildGo110Package }: - -rec { - - aeon = callPackage ./aeon { }; - - bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; - clightning = callPackage ./clightning.nix { }; - - bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; - bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - - bitcoin-unlimited = libsForQt5.callPackage ./bitcoin-unlimited.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = true; - }; - bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { - inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; - withGui = false; - }; - - bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - - btc1 = callPackage ./btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - - cryptop = python3.pkgs.callPackage ./cryptop { }; - - dashpay = callPackage ./dashpay.nix { }; - - dcrd = callPackage ./dcrd.nix { }; - dcrwallet = callPackage ./dcrwallet.nix { }; - - dero = callPackage ./dero.nix { boost = boost165; }; - - dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; }; - dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; }; - - - freicoin = callPackage ./freicoin.nix { boost = boost155; }; - go-ethereum = callPackage ./go-ethereum.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - go-ethereum-classic = callPackage ./go-ethereum-classic { - buildGoPackage = buildGo110Package; - }; - - litecoin = callPackage ./litecoin.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - litecoind = litecoin.override { withGui = false; }; - - lnd = callPackage ./lnd.nix { }; - - masari = callPackage ./masari.nix { boost = boost165; }; - - mist = callPackage ./mist.nix { }; - - namecoin = callPackage ./namecoin.nix { withGui = true; }; - namecoind = callPackage ./namecoin.nix { withGui = false; }; - - pivx = libsForQt59.callPackage ./pivx.nix { withGui = true; }; - pivxd = callPackage ./pivx.nix { withGui = false; }; - - ethabi = callPackage ./ethabi.nix { }; - - stellar-core = callPackage ./stellar-core.nix { }; - - sumokoin = callPackage ./sumokoin.nix { boost = boost165; }; - - wownero = callPackage ./wownero.nix {}; - - zcash = callPackage ./zcash { - withGui = false; - }; - - parity = callPackage ./parity { }; - parity-beta = callPackage ./parity/beta.nix { }; - parity-ui = callPackage ./parity-ui { }; - - polkadot = callPackage ./polkadot { }; - - particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; }; -} From 8f4216bd97a415df932ea74a9361dd991e635101 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Thu, 29 Aug 2019 05:05:24 -0700 Subject: [PATCH 4/4] move wallet software into the blockchains section --- pkgs/top-level/all-packages.nix | 35 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b4eaa2c7fbd..215f72c7a206 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2975,8 +2975,6 @@ in exiftool = perlPackages.ImageExifTool; - exodus = callPackage ../applications/blockchains/exodus { }; - ext4magic = callPackage ../tools/filesystems/ext4magic { }; extract_url = callPackage ../applications/misc/extract_url { }; @@ -4480,8 +4478,6 @@ in leatherman = callPackage ../development/libraries/leatherman { }; - ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - ledmon = callPackage ../tools/system/ledmon { }; leela = callPackage ../tools/graphics/leela { }; @@ -4906,8 +4902,6 @@ in namazu = callPackage ../tools/text/namazu { }; - nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; - nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; @@ -6808,8 +6802,6 @@ in wal_e = callPackage ../tools/backup/wal-e { }; - wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; - watchexec = callPackage ../tools/misc/watchexec { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -19088,8 +19080,6 @@ in josm = callPackage ../applications/misc/josm { }; - jormungandr = callPackage ../applications/blockchains/jormungandr { }; - jbrout = callPackage ../applications/graphics/jbrout { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -19536,14 +19526,6 @@ in mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/blockchains/monero { - inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; - }; - - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost16x; - }; - xmr-stak = callPackage ../applications/misc/xmr-stak { stdenvGcc6 = gcc6Stdenv; }; @@ -21833,6 +21815,7 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + exodus = callPackage ../applications/blockchains/exodus { }; freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { @@ -21843,6 +21826,10 @@ in buildGoPackage = buildGo110Package; }; + jormungandr = callPackage ../applications/blockchains/jormungandr { }; + + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; + litecoin = callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -21850,10 +21837,20 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { }; + monero = callPackage ../applications/blockchains/monero { + inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + }; + + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { + boost = boost16x; + }; + masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; }; mist = callPackage ../applications/blockchains/mist.nix { }; + nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; + namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; @@ -21866,6 +21863,8 @@ in sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; }; + wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; + wownero = callPackage ../applications/blockchains/wownero.nix {}; zcash = callPackage ../applications/blockchains/zcash {