From dc0f5ed6d20bef391a0bbc9986c24f1388a20c6b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Tue, 3 Nov 2020 20:13:06 +0100 Subject: [PATCH] btc1: remove --- nixos/doc/manual/release-notes/rl-2103.xml | 5 +++ pkgs/applications/blockchains/btc1.nix | 41 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ---- 4 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 pkgs/applications/blockchains/btc1.nix diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 2d0c5e39f7a..7fd7ff5c2a9 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -121,6 +121,11 @@ /var/lib/powerdns to /run/pdns. + + + btc1 has been abandoned upstream, and removed. + + riak-cs package removed along with services.riak-cs module. diff --git a/pkgs/applications/blockchains/btc1.nix b/pkgs/applications/blockchains/btc1.nix deleted file mode 100644 index 3442c9ba807..00000000000 --- a/pkgs/applications/blockchains/btc1.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 -, boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent -, AppKit -, withGui ? !stdenv.isDarwin -}: - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.15.1"; - - src = fetchurl { - url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz"; - sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; - }; - - nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; - buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ] - ++ optional stdenv.isDarwin AppKit; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - meta = { - description = "Peer-to-peer electronic cash system (btc1 client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - btc1 is an implementation of a Bitcoin full node with segwit2x hard fork - support. - ''; - homepage = "https://github.com/btc1/bitcoin"; - license = licenses.mit; - maintainers = with maintainers; [ sorpaas ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index defde7dcc0a..b87ce83fc9e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -65,6 +65,7 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e65aa28b25b..caea73eda84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24766,12 +24766,6 @@ in bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; - btc1 = callPackage ../applications/blockchains/btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };