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.
This commit is contained in:
parent
3b7c68615e
commit
74edd2c5db
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, seth, git, solc, shellcheck, nodejs, hsevm }:
|
||||
, seth, git, solc, shellcheck, nodejs, hevm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dapp";
|
||||
version = "0.5.3";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dapphub";
|
||||
repo = "dapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
|
||||
sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
|
||||
};
|
||||
|
||||
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 hsevm
|
||||
nodejs solc git seth hevm
|
||||
]; in ''
|
||||
wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
|
||||
'';
|
||||
|
|
|
@ -43,7 +43,7 @@ rec {
|
|||
seth = callPackage ./seth.nix { };
|
||||
dapp = callPackage ./dapp.nix { };
|
||||
|
||||
hsevm = (haskellPackages.callPackage ./hsevm.nix {});
|
||||
hevm = (haskellPackages.callPackage ./hevm.nix {});
|
||||
|
||||
primecoin = callPackage ./primecoin.nix { withGui = true; };
|
||||
primecoind = callPackage ./primecoin.nix { withGui = false; };
|
||||
|
|
|
@ -1,24 +1,28 @@
|
|||
{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, base
|
||||
{ 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
|
||||
, 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
|
||||
|
||||
, fetchFromGitHub, lib, makeWrapper
|
||||
, ncurses, zlib, bzip2, solc, coreutils
|
||||
, bash
|
||||
}:
|
||||
|
||||
lib.overrideDerivation (mkDerivation rec {
|
||||
pname = "hsevm";
|
||||
version = "0.6.4";
|
||||
pname = "hevm";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dapphub";
|
||||
repo = "hsevm";
|
||||
repo = "hevm";
|
||||
rev = "v${version}";
|
||||
sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9";
|
||||
sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
|
||||
};
|
||||
|
||||
isLibrary = false;
|
||||
|
@ -26,8 +30,9 @@ lib.overrideDerivation (mkDerivation rec {
|
|||
enableSharedExecutables = false;
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/{lib,share}
|
||||
wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS'
|
||||
wrapProgram $out/bin/hevm \
|
||||
--add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \
|
||||
--suffix PATH : "${lib.makeBinPath [bash coreutils]}"
|
||||
'';
|
||||
|
||||
extraLibraries = [
|
||||
|
@ -36,17 +41,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
|
||||
unordered-containers vector vty restless-git
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
readline zlib bzip2
|
||||
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/hsevm;
|
||||
homepage = https://github.com/dapphub/hevm;
|
||||
description = "Ethereum virtual machine evaluator";
|
||||
license = stdenv.lib.licenses.agpl3;
|
||||
maintainers = [stdenv.lib.maintainers.dbrock];
|
|
@ -957,4 +957,6 @@ self: super: {
|
|||
protolude = super.protolude_0_2;
|
||||
};
|
||||
|
||||
# test suite requires git and does a bunch of git operations
|
||||
restless-git = dontCheck super.restless-git;
|
||||
}
|
||||
|
|
|
@ -13542,7 +13542,7 @@ with pkgs;
|
|||
ethrun = self.altcoins.ethrun;
|
||||
seth = self.altcoins.seth;
|
||||
dapp = self.altcoins.dapp;
|
||||
hsevm = self.altcoins.hsevm;
|
||||
hevm = self.altcoins.hevm;
|
||||
|
||||
stellar-core = self.altcoins.stellar-core;
|
||||
|
||||
|
|
Loading…
Reference in a new issue