From 1fd8d571edc62ca2a13b6557a4f7bfab078a6ea5 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Mon, 30 Nov 2020 03:13:01 +0000 Subject: [PATCH] cpp_ethereum: remove --- nixos/doc/manual/release-notes/rl-2103.xml | 5 ++ .../misc/cpp-ethereum/default.nix | 85 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 7 insertions(+), 87 deletions(-) delete mode 100644 pkgs/applications/misc/cpp-ethereum/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 3186eb7449f..aabddb6f6d7 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -160,6 +160,11 @@ btc1 has been abandoned upstream, and removed. + + + cpp_ethereum (aleth) has been abandoned upstream, and removed. + + riak-cs package removed along with services.riak-cs module. diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix deleted file mode 100644 index aed44d1213c..00000000000 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, jsoncpp -, libjson-rpc-cpp -, curl -, boost -, leveldb -, cryptopp -, libcpuid -, opencl-headers -, ocl-icd -, miniupnpc -, libmicrohttpd -, gmp -, libGLU, libGL -, extraCmakeFlags ? [] -}: -stdenv.mkDerivation rec { - pname = "cpp-ethereum"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "ethereum"; - repo = "cpp-ethereum"; - rev = "62ab9522e58df9f28d2168ea27999a214b16ea96"; - sha256 = "1fxgpqhmjhpv0zzs1m3yf9h8mh25dqpa7pmcfy7f9qiqpfdr4zq9"; - }; - - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" extraCmakeFlags ]; - - configurePhase = '' - export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.out}/lib - - mkdir -p Build/Install - pushd Build - - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install $cmakeFlags - ''; - - enableParallelBuilding = true; - - runPath = with stdenv.lib; makeLibraryPath ([ stdenv.cc.cc ] ++ buildInputs); - - installPhase = '' - make install - - mkdir -p $out - - for f in Install/lib/*.so* $(find Install/bin -executable -type f); do - patchelf --set-rpath $runPath:$out/lib $f - done - - cp -r Install/* $out - ''; - - buildInputs = [ - cmake - jsoncpp - libjson-rpc-cpp - curl - boost - leveldb - cryptopp - libcpuid - opencl-headers - ocl-icd - miniupnpc - libmicrohttpd - gmp - libGLU libGL - ]; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Ethereum C++ client"; - homepage = "https://github.com/ethereum/cpp-ethereum"; - license = licenses.gpl3; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b7cc3067761..28b5614a80c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -41,6 +41,7 @@ mapAliases ({ ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 alienfx = throw "alienfx has been removed."; # added 2019-12-08 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 @@ -92,6 +93,7 @@ mapAliases ({ coprthr = throw "coprthr has been removed."; # added 2019-12-08 corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fc30afcfba..a0af82b8b14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20617,8 +20617,6 @@ in python3Packages = python37Packages; }; - cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; - crun = callPackage ../applications/virtualization/crun {}; csdp = callPackage ../applications/science/math/csdp { };