Merge pull request #22708 from mguentner/ipfs_0_4_5

ipfs: 0.4.4 -> 0.4.5 // ipfsapi: 0.4.0 -> 0.4.5-pre
This commit is contained in:
Franz Pletz 2017-02-13 02:10:01 +01:00 committed by GitHub
commit 12ebd6c058
2 changed files with 10 additions and 9 deletions

View File

@ -2,15 +2,15 @@
buildGoPackage rec { buildGoPackage rec {
name = "ipfs-${version}"; name = "ipfs-${version}";
version = "0.4.4"; version = "0.4.5";
rev = "d905d485192616abaea25f7e721062a9e1093ab9"; rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064";
goPackagePath = "github.com/ipfs/go-ipfs"; goPackagePath = "github.com/ipfs/go-ipfs";
extraSrcPaths = [ extraSrcPaths = [
(fetchgx { (fetchgx {
inherit name src; inherit name src;
sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb"; sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d";
}) })
]; ];
@ -18,7 +18,7 @@ buildGoPackage rec {
owner = "ipfs"; owner = "ipfs";
repo = "go-ipfs"; repo = "go-ipfs";
inherit rev; inherit rev;
sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l"; sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -7733,15 +7733,16 @@ in {
ipfsapi = buildPythonPackage rec { ipfsapi = buildPythonPackage rec {
name = "ipfsapi-${version}"; name = "ipfsapi-${version}";
version = "0.4.0"; version = "0.4.5-pre";
disabled = isPy26 || isPy27; disabled = isPy26 || isPy27;
src = pkgs.fetchurl { src = pkgs.fetchFromGitHub {
url = "mirror://pypi/i/ipfsapi/${name}.tar.gz"; owner = "ipfs";
sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3"; repo = "py-ipfs-api";
rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f";
sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126";
}; };
buildInputs = with self; [ pkgs.pandoc ];
propagatedBuildInputs = with self; [ six requests2 ]; propagatedBuildInputs = with self; [ six requests2 ];
meta = { meta = {