49 files changed, 7 insertions, 28 deletions

diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix
index 5a09641c70d16..5a09641c70d16 100644
--- a/pkgs/applications/altcoins/aeon/default.nix
+++ b/pkgs/applications/blockchains/aeon/default.nix
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 479d175020b7d..479d175020b7d 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix
index ddce5c3f71503..ddce5c3f71503 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/blockchains/bitcoin-classic.nix
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix
index a75b20b39109f..a75b20b39109f 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index b1d84f91251e2..b1d84f91251e2 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/blockchains/btc1.nix
index 3241148aee123..3241148aee123 100644
--- a/pkgs/applications/altcoins/btc1.nix
+++ b/pkgs/applications/blockchains/btc1.nix
diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index 481e19c66cdc6..481e19c66cdc6 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix
index 01c47b320de58..01c47b320de58 100644
--- a/pkgs/applications/altcoins/cryptop/default.nix
+++ b/pkgs/applications/blockchains/cryptop/default.nix
diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix
index b2f2a457a99d6..b2f2a457a99d6 100644
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/pkgs/applications/blockchains/dashpay.nix
diff --git a/pkgs/applications/altcoins/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix
index cc3e83befa64a..cc3e83befa64a 100644
--- a/pkgs/applications/altcoins/dcrd.nix
+++ b/pkgs/applications/blockchains/dcrd.nix
diff --git a/pkgs/applications/altcoins/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
index 8d966684b23c5..8d966684b23c5 100644
--- a/pkgs/applications/altcoins/dcrwallet.nix
+++ b/pkgs/applications/blockchains/dcrwallet.nix
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/blockchains/default.nix
index 5b5bfb897cf3b..5b5bfb897cf3b 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/blockchains/default.nix
diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/blockchains/dero.nix
index 8405ea8f842b9..8405ea8f842b9 100644
--- a/pkgs/applications/altcoins/dero.nix
+++ b/pkgs/applications/blockchains/dero.nix
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix
index e5f149a0efe76..e5f149a0efe76 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/blockchains/dogecoin.nix
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index 21d69f14d7f3f..21d69f14d7f3f 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index bc354a5213ead..bc354a5213ead 100644
--- a/pkgs/applications/altcoins/exodus/default.nix
+++ b/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
index c49bbc4325192..c49bbc4325192 100644
--- a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
+++ b/pkgs/applications/blockchains/fix-bitcoin-qt-build.patch
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix
index 664159be20134..664159be20134 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/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
index 7461e4c376ab6..7461e4c376ab6 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/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
index 0aa6755ee9603..0aa6755ee9603 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix
+++ b/pkgs/applications/blockchains/go-ethereum-classic/deps.nix
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 740ecfa228fd1..740ecfa228fd1 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
diff --git a/pkgs/applications/altcoins/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 8c276d6bb8058..8c276d6bb8058 100644
--- a/pkgs/applications/altcoins/jormungandr/default.nix
+++ b/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
index 0417d2913de58..0417d2913de58 100644
--- a/pkgs/applications/altcoins/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix
index 33ac2be183228..33ac2be183228 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/blockchains/litecoin.nix
diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index 27f10c963c0f8..27f10c963c0f8 100644
--- a/pkgs/applications/altcoins/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/blockchains/masari.nix
index 02a6d25df5164..02a6d25df5164 100644
--- a/pkgs/applications/altcoins/masari.nix
+++ b/pkgs/applications/blockchains/masari.nix
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/blockchains/mist.nix
index 2990b44c7f4c1..2990b44c7f4c1 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/blockchains/mist.nix
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index aaff39f1c6bef..aaff39f1c6bef 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/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
index e540f1960d6cd..e540f1960d6cd 100644
--- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch
+++ b/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
index f351c9fa50432..f351c9fa50432 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix
index 4b8dc5525dc46..4b8dc5525dc46 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/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
index 5bbec1d39bea2..5bbec1d39bea2 100644
--- a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
+++ b/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
index 58ab367c020f2..58ab367c020f2 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/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
index c59b2ccb8ac3e..c59b2ccb8ac3e 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/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
index a878bbf2e3e39..a878bbf2e3e39 100644
--- a/pkgs/applications/altcoins/parity-ui/env.nix
+++ b/pkgs/applications/blockchains/parity-ui/env.nix
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
index 4b6a88fd410a5..4b6a88fd410a5 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/blockchains/parity/beta.nix
diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 873f83190fde7..873f83190fde7 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
index 79831f3304df4..79831f3304df4 100644
--- a/pkgs/applications/altcoins/parity/parity.nix
+++ b/pkgs/applications/blockchains/parity/parity.nix
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix
index f5efa0bb52c2f..f5efa0bb52c2f 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/blockchains/particl/particl-core.nix
diff --git a/pkgs/applications/altcoins/pivx.nix b/pkgs/applications/blockchains/pivx.nix
index e2cf8aa182f33..e2cf8aa182f33 100644
--- a/pkgs/applications/altcoins/pivx.nix
+++ b/pkgs/applications/blockchains/pivx.nix
diff --git a/pkgs/applications/altcoins/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 26c9192ee6fad..26c9192ee6fad 100644
--- a/pkgs/applications/altcoins/polkadot/default.nix
+++ b/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
index 57d66ce5919a6..57d66ce5919a6 100644
--- a/pkgs/applications/altcoins/stellar-core-dirty-version.patch
+++ b/pkgs/applications/blockchains/stellar-core-dirty-version.patch
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix
index 4c3f9fe0760bb..4c3f9fe0760bb 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/blockchains/stellar-core.nix
diff --git a/pkgs/applications/altcoins/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix
index 026008b2761a9..026008b2761a9 100644
--- a/pkgs/applications/altcoins/sumokoin.nix
+++ b/pkgs/applications/blockchains/sumokoin.nix
diff --git a/pkgs/applications/altcoins/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 7185b35106019..7185b35106019 100644
--- a/pkgs/applications/altcoins/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
diff --git a/pkgs/applications/altcoins/wownero.nix b/pkgs/applications/blockchains/wownero.nix
index 7aed32978326b..7aed32978326b 100644
--- a/pkgs/applications/altcoins/wownero.nix
+++ b/pkgs/applications/blockchains/wownero.nix
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 6a8fba3c2bb70..6a8fba3c2bb70 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 3aeee7e6972f7..3aeee7e6972f7 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c35347800c1..43fd7a32d4b6f 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;
   };