about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoman Volosatovs <rvolosatovs@riseup.net>2019-09-05 20:00:19 +0200
committerRoman Volosatovs <rvolosatovs@riseup.net>2019-09-09 13:54:51 +0200
commit0bf5907aa9494bb341ce65fa526e7b831ae26f10 (patch)
tree1f01a11251bf8ebff2349cda7583b345b6e46659
parent362c2f67f9e24771f6634cec90111ab7992b5cfa (diff)
downloadnixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.tar
nixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.tar.gz
nixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.tar.bz2
nixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.tar.lz
nixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.tar.xz
nixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.tar.zst
nixlib-0bf5907aa9494bb341ce65fa526e7b831ae26f10.zip
ipfs: 0.4.21 -> 0.4.22, use Go 1.12
-rw-r--r--pkgs/applications/networking/ipfs/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix7
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 d27cccbc9c9a..e831241181fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4001,7 +4001,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 { };