From 24e4d4d76ac16002d02e8432b502d2e9a77f0d8e Mon Sep 17 00:00:00 2001
From: Maximilian Güntner <code@klandest.in>
Date: Thu, 27 Oct 2016 18:46:40 +0200
Subject: ipfs: i20160112 -> 0.4.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- switched from rev to official release
- added preBuild to install gx dependencies
- removed broken flag

Signed-off-by: Maximilian Güntner <code@klandest.in>
---
 pkgs/applications/networking/ipfs/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications/networking/ipfs')

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 79e2185f04e..7f598378d75 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, gx, gx-go }:
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "i20160112--${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
+  version = "0.4.4";
+  rev = "d905d485192616abaea25f7e721062a9e1093ab9";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
@@ -11,12 +11,18 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
+    sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l";
   };
 
+  buildInputs = [ gx gx-go ];
+
+  # Extra build step for gx dependecies
+  preBuild = ''
+    (cd "go/src/${goPackagePath}"; gx install)
+  '';
+
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";
     license = licenses.mit;
-    broken = true;
   };
 }
-- 
cgit 1.4.1