diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/misc/ethminer/add-global-context.patch | 25 | ||||
-rw-r--r-- | pkgs/tools/misc/ethminer/default.nix | 94 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 0 insertions, 123 deletions
diff --git a/pkgs/tools/misc/ethminer/add-global-context.patch b/pkgs/tools/misc/ethminer/add-global-context.patch deleted file mode 100644 index f0891e5a2758..000000000000 --- a/pkgs/tools/misc/ethminer/add-global-context.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt -index 1a53de8..832e926 100644 ---- a/libethcore/CMakeLists.txt -+++ b/libethcore/CMakeLists.txt -@@ -7,7 +7,7 @@ set(SOURCES - include_directories(BEFORE ..) - - add_library(ethcore ${SOURCES}) --target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon) -+target_link_libraries(ethcore PUBLIC devcore ethash::ethash ethash-global-context PRIVATE hwmon) - - if(ETHASHCL) - target_link_libraries(ethcore PRIVATE ethash-cl) -diff --git a/libethcore/EthashAux.h b/libethcore/EthashAux.h -index d9aadc7..fe5c6cf 100644 ---- a/libethcore/EthashAux.h -+++ b/libethcore/EthashAux.h -@@ -22,6 +22,7 @@ - #include <libdevcore/Worker.h> - - #include <ethash/ethash.hpp> -+#include <ethash/global_context.hpp> - - namespace dev - { diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix deleted file mode 100644 index 32d1c5500b80..000000000000 --- a/pkgs/tools/misc/ethminer/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - stdenv, - fetchpatch, - fetchFromGitHub, - opencl-headers, - cmake, - jsoncpp, - boost16x, - makeWrapper, - cudatoolkit, - cudaSupport, - mesa, - ethash, - opencl-info, - ocl-icd, - openssl, - pkg-config, - cli11 -}: - -stdenv.mkDerivation rec { - pname = "ethminer"; - version = "0.19.0"; - - src = - fetchFromGitHub { - owner = "ethereum-mining"; - repo = "ethminer"; - rev = "v${version}"; - sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646"; - fetchSubmodules = true; - }; - - patches = [ - # global context library is separated from libethash - ./add-global-context.patch - - # CUDA 11 no longer support SM30 - (fetchpatch { - url = "https://github.com/ethereum-mining/ethminer/commit/dae359dff28f376d4ce7ddfbd651dcd34d6dad8f.patch"; - hash = "sha256-CJGKc0rXOcKDX1u5VBzc8gyBi1Me9CNATfQzKViqtAA="; - }) - ]; - - postPatch = '' - sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt - ''; - - # NOTE: dbus is broken - cmakeFlags = [ - "-DHUNTER_ENABLED=OFF" - "-DETHASHCUDA=ON" - "-DAPICORE=ON" - "-DETHDBUS=OFF" - "-DCMAKE_BUILD_TYPE=Release" - ] ++ (if cudaSupport then [ - "-DCUDA_PROPAGATE_HOST_FLAGS=off" - ] else [ - "-DETHASHCUDA=OFF" # on by default - ]); - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = [ - cli11 - boost16x # 1.7x support is broken, see https://github.com/ethereum-mining/ethminer/issues/2393 - opencl-headers - mesa - ethash - opencl-info - ocl-icd - openssl - jsoncpp - ] ++ lib.optionals cudaSupport [ - cudatoolkit - ]; - - postInstall = '' - wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib - ''; - - meta = with lib; { - description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support"; - homepage = "https://github.com/ethereum-mining/ethminer"; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ atemu ]; - license = licenses.gpl3Only; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a672f2e5a8..7e50142f8e3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5389,10 +5389,6 @@ with pkgs; ethash = callPackage ../development/libraries/ethash { }; - ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; }; - ethminer-cuda = ethminer.override { cudaSupport = true; }; - ethminer-free = ethminer.override { cudaSupport = false; }; - cuetools = callPackage ../tools/cd-dvd/cuetools { }; u3-tool = callPackage ../tools/filesystems/u3-tool { }; |