Revert "hsevm: project was renamed to hevm"

This reverts commit 743a1d5. needs haskell dependency only on master
NixOS · Sep 28, 2017 · 06cf955 · 06cf955
1 parent ec24d2b
commit 06cf955
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 28 deletions.
diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
@@ -1,15 +1,15 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper
-, seth, git, solc, shellcheck, nodejs, hevm }:
+, seth, git, solc, shellcheck, nodejs, hsevm }:
 
 stdenv.mkDerivation rec {
   name = "dapp";
-  version = "0.5.7";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dapphub";
     repo = "dapp";
     rev = "v${version}";
-    sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
+    sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
   };
 
   nativeBuildInputs = [makeWrapper shellcheck];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   checkPhase = "make test";
   makeFlags = ["prefix=$(out)"];
   postInstall = let path = lib.makeBinPath [
-    nodejs solc git seth hevm
+    nodejs solc git seth hsevm
   ]; in ''
     wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
   '';

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
@@ -46,7 +46,7 @@ rec {
   seth = callPackage ./seth.nix { };
   dapp = callPackage ./dapp.nix { };
 
-  hevm = (haskellPackages.callPackage ./hevm.nix {});
+  hsevm = (haskellPackages.callPackage ./hsevm.nix {});
 
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };

diff --git a/pkgs/applications/altcoins/hevm.nix → pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hevm.nix → pkgs/applications/altcoins/hsevm.nix
@@ -1,38 +1,33 @@
-{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
+{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, 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, time, unordered-containers, vector, vty
-
-, restless-git
-
+, 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
 , fetchFromGitHub, lib, makeWrapper
 , ncurses, zlib, bzip2, solc, coreutils
-, bash
 }:
 
 lib.overrideDerivation (mkDerivation rec {
-  pname = "hevm";
-  version = "0.8.5";
+  pname = "hsevm";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "dapphub";
-    repo = "hevm";
+    repo = "hsevm";
     rev = "v${version}";
-    sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
+    sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9";
   };
 
   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]}"
+    rm -rf $out/{lib,share}
+    wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS'
   '';
 
   extraLibraries = [
@@ -41,17 +36,17 @@ lib.overrideDerivation (mkDerivation rec {
     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
+    unordered-containers vector vty
   ];
   executableHaskellDepends = [
-    async readline zlib bzip2
+    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;
+  homepage = https://github.com/dapphub/hsevm;
   description = "Ethereum virtual machine evaluator";
   license = stdenv.lib.licenses.agpl3;
   maintainers = [stdenv.lib.maintainers.dbrock];

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -913,6 +913,4 @@ self: super: {
   # This needs cleanup before those builds can succeed.
   yi = markBroken super.yi;
 
-  # test suite requires git and does a bunch of git operations
-  restless-git = dontCheck super.restless-git;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -13524,7 +13524,7 @@ with pkgs;
   ethrun = self.altcoins.ethrun;
   seth = self.altcoins.seth;
   dapp = self.altcoins.dapp;
-  hevm = self.altcoins.hevm;
+  hsevm = self.altcoins.hsevm;
 
   stellar-core = self.altcoins.stellar-core;