From 6017c6fa5b801f13173de7485856a07cd32a35c9 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Mon, 24 Sep 2018 17:46:33 +0200 Subject: [PATCH] *: remove DappHub projects DappHub maintains a separate overlay at https://github.com/dapphub/dapptools/blob/master/overlay.nix --- pkgs/applications/altcoins/dapp.nix | 33 ---------- pkgs/applications/altcoins/default.nix | 6 -- pkgs/applications/altcoins/ethrun.nix | 26 -------- .../applications/altcoins/ethsign/default.nix | 60 ------------------ pkgs/applications/altcoins/hevm.nix | 62 ------------------- pkgs/applications/altcoins/seth.nix | 33 ---------- pkgs/top-level/all-packages.nix | 5 -- 7 files changed, 225 deletions(-) delete mode 100644 pkgs/applications/altcoins/dapp.nix delete mode 100644 pkgs/applications/altcoins/ethrun.nix delete mode 100644 pkgs/applications/altcoins/ethsign/default.nix delete mode 100644 pkgs/applications/altcoins/hevm.nix delete mode 100644 pkgs/applications/altcoins/seth.nix diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix deleted file mode 100644 index a89725f6e30f..000000000000 --- a/pkgs/applications/altcoins/dapp.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, seth, git, solc, shellcheck, nodejs, hevm }: - -stdenv.mkDerivation rec { - name = "dapp-${version}"; - version = "0.5.7"; - - src = fetchFromGitHub { - owner = "dapphub"; - repo = "dapp"; - rev = "v${version}"; - sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0"; - }; - - nativeBuildInputs = [makeWrapper shellcheck]; - buildPhase = "true"; - doCheck = true; - checkPhase = "make test"; - makeFlags = ["prefix=$(out)"]; - postInstall = let path = lib.makeBinPath [ - nodejs solc git seth hevm - ]; in '' - wrapProgram "$out/bin/dapp" --prefix PATH : "${path}" - ''; - - meta = { - description = "Simple tool for creating Ethereum-based dapps"; - homepage = https://github.com/dapphub/dapp/; - maintainers = [stdenv.lib.maintainers.dbrock]; - license = lib.licenses.gpl3; - inherit version; - }; -} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index f075903332b4..e0a0dbef632c 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -50,7 +50,6 @@ rec { dogecoin = callPackage ./dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; }; - ethsign = callPackage ./ethsign { }; freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { @@ -78,11 +77,6 @@ rec { namecoind = callPackage ./namecoin.nix { withGui = false; }; ethabi = callPackage ./ethabi.nix { }; - ethrun = callPackage ./ethrun.nix { }; - seth = callPackage ./seth.nix { }; - dapp = callPackage ./dapp.nix { }; - - hevm = (haskellPackages.callPackage ./hevm.nix {}); stellar-core = callPackage ./stellar-core.nix { }; diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix deleted file mode 100644 index c58d9d8faf48..000000000000 --- a/pkgs/applications/altcoins/ethrun.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -with rustPlatform; - -buildRustPackage rec { - name = "ethrun-${version}"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "dapphub"; - repo = "ethrun"; - rev = "v${version}"; - sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn"; - }; - - cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0"; - - meta = with stdenv.lib; { - description = "Directly run Ethereum bytecode"; - homepage = https://github.com/dapphub/ethrun/; - maintainers = [ maintainers.dbrock ]; - license = licenses.gpl3; - broken = true; # mark temporary as broken - inherit version; - }; -} diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix deleted file mode 100644 index 8e89de4d6906..000000000000 --- a/pkgs/applications/altcoins/ethsign/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }: - -buildGoPackage rec { - name = "ethsign-${version}"; - version = "0.8.2"; - - goPackagePath = "github.com/dapphub/ethsign"; - hardeningDisable = ["fortify"]; - - src = fetchFromGitHub { - owner = "dapphub"; - repo = "ethsign"; - rev = "v${version}"; - sha256 = "1gd0bq5x49sjm83r2wivjf03dxvhdli6cvwb9b853wwcvy4inmmh"; - }; - - extraSrcs = [ - { - goPackagePath = "github.com/ethereum/go-ethereum"; - src = fetchFromGitHub { - owner = "ethereum"; - repo = "go-ethereum"; - rev = "v1.7.3"; - sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11"; - }; - } - { - goPackagePath = "gopkg.in/urfave/cli.v1"; - src = fetchFromGitHub { - owner = "urfave"; - repo = "cli"; - rev = "v1.19.1"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - src = fetchgit { - url = "https://go.googlesource.com/crypto"; - rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; - sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - src = fetchgit { - url = "https://go.googlesource.com/sys"; - rev = "53aa286056ef226755cd898109dbcdaba8ac0b81"; - sha256 = "1yd17ccklby099cpdcsgx6lf0lj968hsnppp16mwh9009ldf72r1"; - }; - } - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/dapphub/ethsign; - description = "Make raw signed Ethereum transactions"; - broken = stdenv.isDarwin; # test with CoreFoundation 10.11 - license = [licenses.gpl3]; - }; -} diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix deleted file mode 100644 index e7f47d0f2200..000000000000 --- a/pkgs/applications/altcoins/hevm.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base -, base16-bytestring, base64-bytestring, binary, brick, bytestring -, cereal, containers, cryptonite, data-dword, deepseq, directory -, filepath, ghci-pretty, here, HUnit, lens -, lens-aeson, memory, monad-par, mtl, optparse-generic, process -, QuickCheck, quickcheck-text, readline, rosezipper, scientific -, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text -, text-format, unordered-containers, vector, vty - -, restless-git - -, fetchFromGitHub, lib, makeWrapper -, zlib, bzip2, solc, coreutils -, bash -}: - -lib.overrideDerivation (mkDerivation rec { - pname = "hevm"; - version = "0.8.5"; - - src = fetchFromGitHub { - owner = "dapphub"; - repo = "hevm"; - rev = "v${version}"; - sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0"; - }; - - isLibrary = false; - isExecutable = true; - enableSharedExecutables = false; - - postInstall = '' - wrapProgram $out/bin/hevm \ - --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \ - --suffix PATH : "${lib.makeBinPath [bash coreutils]}" - ''; - - extraLibraries = [ - abstract-par aeson ansi-wl-pprint base base16-bytestring - base64-bytestring binary brick bytestring cereal containers - cryptonite data-dword deepseq directory filepath ghci-pretty lens - lens-aeson memory monad-par mtl optparse-generic process QuickCheck - quickcheck-text readline rosezipper scientific temporary text text-format - unordered-containers vector vty restless-git - ]; - executableHaskellDepends = [ - async readline zlib bzip2 - ]; - testHaskellDepends = [ - base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck - tasty tasty-hunit tasty-quickcheck text vector - ]; - - homepage = https://github.com/dapphub/hevm; - description = "Ethereum virtual machine evaluator"; - license = stdenv.lib.licenses.agpl3; - maintainers = [stdenv.lib.maintainers.dbrock]; - broken = true; # 2018-04-10 -}) (attrs: { - buildInputs = attrs.buildInputs ++ [solc]; - nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper]; -}) diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix deleted file mode 100644 index 334ec9277e1b..000000000000 --- a/pkgs/applications/altcoins/seth.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, makeWrapper, lib, fetchFromGitHub -, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which -, nodejs, ethsign -}: - -stdenv.mkDerivation rec { - name = "seth-${version}"; - version = "0.6.3"; - - src = fetchFromGitHub { - owner = "dapphub"; - repo = "seth"; - rev = "v${version}"; - sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk"; - }; - - nativeBuildInputs = [makeWrapper]; - buildPhase = "true"; - makeFlags = ["prefix=$(out)"]; - postInstall = let path = lib.makeBinPath [ - bc coreutils curl ethabi git gnused jshon perl solc which nodejs ethsign - ]; in '' - wrapProgram "$out/bin/seth" --prefix PATH : "${path}" - ''; - - meta = { - description = "Command-line client for talking to Ethereum nodes"; - homepage = https://github.com/dapphub/seth/; - maintainers = [stdenv.lib.maintainers.dbrock]; - license = lib.licenses.gpl3; - inherit version; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da1a81bdb085..dcfe65cda078 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15536,12 +15536,7 @@ with pkgs; go-ethereum = self.altcoins.go-ethereum; - ethsign = self.altcoins.ethsign; ethabi = self.altcoins.ethabi; - ethrun = self.altcoins.ethrun; - seth = self.altcoins.seth; - dapp = self.altcoins.dapp; - hevm = self.altcoins.hevm; parity = self.altcoins.parity; parity-beta = self.altcoins.parity-beta;