hsevm: project was renamed to hevm

This also upgrades the hsevm package from v0.6.4 to v0.8.5.

The project `dapp` which depends on hsevm was also updated to use the
new name, so I have also upgraded that package from version v0.5.3 to
v0.5.7.

I also added a `dontCheck` to a Hackage dependency because its test
suite depends on Git and runs a bunch of Git repository manipulations.

+28 -21
+4 -4
pkgs/applications/altcoins/dapp.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, makeWrapper 2 - , seth, git, solc, shellcheck, nodejs, hsevm }: 2 + , seth, git, solc, shellcheck, nodejs, hevm }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "dapp"; 6 - version = "0.5.3"; 6 + version = "0.5.7"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "dapphub"; 10 10 repo = "dapp"; 11 11 rev = "v${version}"; 12 - sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird"; 12 + sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0"; 13 13 }; 14 14 15 15 nativeBuildInputs = [makeWrapper shellcheck]; ··· 18 18 checkPhase = "make test"; 19 19 makeFlags = ["prefix=$(out)"]; 20 20 postInstall = let path = lib.makeBinPath [ 21 - nodejs solc git seth hsevm 21 + nodejs solc git seth hevm 22 22 ]; in '' 23 23 wrapProgram "$out/bin/dapp" --prefix PATH : "${path}" 24 24 '';
+1 -1
pkgs/applications/altcoins/default.nix
··· 43 43 seth = callPackage ./seth.nix { }; 44 44 dapp = callPackage ./dapp.nix { }; 45 45 46 - hsevm = (haskellPackages.callPackage ./hsevm.nix {}); 46 + hevm = (haskellPackages.callPackage ./hevm.nix {}); 47 47 48 48 primecoin = callPackage ./primecoin.nix { withGui = true; }; 49 49 primecoind = callPackage ./primecoin.nix { withGui = false; };
+20 -15
pkgs/applications/altcoins/hsevm.nix pkgs/applications/altcoins/hevm.nix
··· 1 - { mkDerivation, abstract-par, aeson, ansi-wl-pprint, base 1 + { mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base 2 2 , base16-bytestring, base64-bytestring, binary, brick, bytestring 3 3 , cereal, containers, cryptonite, data-dword, deepseq, directory 4 - , filepath, ghci-pretty, here, HUnit, lens, lens-aeson, memory 5 - , monad-par, mtl, optparse-generic, process, QuickCheck 6 - , quickcheck-text, readline, rosezipper, scientific, stdenv, tasty, tasty-hunit 7 - , tasty-quickcheck, temporary, text, text-format 8 - , unordered-containers, vector, vty 4 + , filepath, ghci-pretty, here, HUnit, lens 5 + , lens-aeson, memory, monad-par, mtl, optparse-generic, process 6 + , QuickCheck, quickcheck-text, readline, rosezipper, scientific 7 + , stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text 8 + , text-format, time, unordered-containers, vector, vty 9 + 10 + , restless-git 11 + 9 12 , fetchFromGitHub, lib, makeWrapper 10 13 , ncurses, zlib, bzip2, solc, coreutils 14 + , bash 11 15 }: 12 16 13 17 lib.overrideDerivation (mkDerivation rec { 14 - pname = "hsevm"; 15 - version = "0.6.4"; 18 + pname = "hevm"; 19 + version = "0.8.5"; 16 20 17 21 src = fetchFromGitHub { 18 22 owner = "dapphub"; 19 - repo = "hsevm"; 23 + repo = "hevm"; 20 24 rev = "v${version}"; 21 - sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9"; 25 + sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0"; 22 26 }; 23 27 24 28 isLibrary = false; ··· 26 30 enableSharedExecutables = false; 27 31 28 32 postInstall = '' 29 - rm -rf $out/{lib,share} 30 - wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' 33 + wrapProgram $out/bin/hevm \ 34 + --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \ 35 + --suffix PATH : "${lib.makeBinPath [bash coreutils]}" 31 36 ''; 32 37 33 38 extraLibraries = [ ··· 36 41 cryptonite data-dword deepseq directory filepath ghci-pretty lens 37 42 lens-aeson memory monad-par mtl optparse-generic process QuickCheck 38 43 quickcheck-text readline rosezipper scientific temporary text text-format 39 - unordered-containers vector vty 44 + unordered-containers vector vty restless-git 40 45 ]; 41 46 executableHaskellDepends = [ 42 - readline zlib bzip2 47 + async readline zlib bzip2 43 48 ]; 44 49 testHaskellDepends = [ 45 50 base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck 46 51 tasty tasty-hunit tasty-quickcheck text vector 47 52 ]; 48 53 49 - homepage = https://github.com/dapphub/hsevm; 54 + homepage = https://github.com/dapphub/hevm; 50 55 description = "Ethereum virtual machine evaluator"; 51 56 license = stdenv.lib.licenses.agpl3; 52 57 maintainers = [stdenv.lib.maintainers.dbrock];
+2
pkgs/development/haskell-modules/configuration-common.nix
··· 957 957 protolude = super.protolude_0_2; 958 958 }; 959 959 960 + # test suite requires git and does a bunch of git operations 961 + restless-git = dontCheck super.restless-git; 960 962 }
+1 -1
pkgs/top-level/all-packages.nix
··· 13542 13542 ethrun = self.altcoins.ethrun; 13543 13543 seth = self.altcoins.seth; 13544 13544 dapp = self.altcoins.dapp; 13545 - hsevm = self.altcoins.hsevm; 13545 + hevm = self.altcoins.hevm; 13546 13546 13547 13547 stellar-core = self.altcoins.stellar-core; 13548 13548