diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
commit | fda26c8476c1684f77bacacf2b5c46b1fbf65b41 (patch) | |
tree | 84752640ad3cf64ba372bdd4aab713c097023281 /pkgs/applications/altcoins | |
parent | 21976d1fbd612f67825473a7a2b05bb1387e5840 (diff) | |
parent | 6b8806dff7a2cd11e37944af1bbb276ceb870199 (diff) | |
download | nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.gz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.bz2 nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.lz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.xz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.zst nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.zip |
Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
Diffstat (limited to 'pkgs/applications/altcoins')
-rw-r--r-- | pkgs/applications/altcoins/dapp.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/altcoins/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/altcoins/hevm.nix (renamed from pkgs/applications/altcoins/hsevm.nix) | 35 | ||||
-rw-r--r-- | pkgs/applications/altcoins/zcash/default.nix | 4 |
4 files changed, 27 insertions, 22 deletions
diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix index 51de4d202e84..6ad66a24397f 100644 --- 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, 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}" ''; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index f83e565db919..c604a9370a84 100644 --- 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 { }; - hsevm = (haskellPackages.callPackage ./hsevm.nix {}); + hevm = (haskellPackages.callPackage ./hevm.nix {}); primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hevm.nix index 173ac83a6db4..51e5f6bcb298 100644 --- a/pkgs/applications/altcoins/hsevm.nix +++ b/pkgs/applications/altcoins/hevm.nix @@ -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]; diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index f453f76e9d27..aa912f04efb5 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55"; + sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s"; }; enableParallelBuilding = true; |