diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-09 12:38:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-09 12:38:13 -0400 |
commit | 2c70240e843a2572693e6d9b9ebba9f34c6af56c (patch) | |
tree | 8e6dd8ba6183b10843ceaa7789d215588eaab7a2 | |
parent | c270c0ce6a9c9b61598fa20ea31ded4b295e7fba (diff) | |
parent | 0bf5907aa9494bb341ce65fa526e7b831ae26f10 (diff) | |
download | nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.tar nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.tar.gz nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.tar.bz2 nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.tar.lz nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.tar.xz nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.tar.zst nixlib-2c70240e843a2572693e6d9b9ebba9f34c6af56c.zip |
Merge pull request #68159 from rvolosatovs/update/ipfs
ipfs: 0.4.21 -> 0.4.22, use Go 1.12
-rw-r--r-- | pkgs/applications/networking/ipfs/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 54943533b85f..db325cf13877 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "ipfs"; - version = "0.4.21"; + version = "0.4.22"; rev = "v${version}"; - goPackagePath = "github.com/ipfs/go-ipfs"; - src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "0jlj89vjy4nw3x3j45r16y8bph5ss5lp907pjgqvad0naxbf99b0"; + sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2"; }; - modSha256 = "0d9rq0hig9jwv9jfajfyj2111arikqzdnyhf5aqkwahcblpx54iy"; + modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd2c3cbe3e4c..3e7d7639ec13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4000,7 +4000,12 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { }; + ipfs = callPackage ../applications/networking/ipfs { + # Version 0.4.22 fails to build with go 1.13 due to version validation: + # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) + # This is fixed in master, but release containing the fix does not exist yet. + buildGoModule = buildGo112Module; + }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; |