From 2f3eb5e0eff9958999245fb8ae9f2702480cf6c6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 23 Sep 2015 23:22:17 -0700
Subject: [PATCH] ipfs: 2015-08-29 -> 2015-09-23

---
 pkgs/top-level/all-packages.nix | 2 ++
 pkgs/top-level/go-packages.nix  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d63c5d67a8d..0607bc27851 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1886,6 +1886,8 @@ let
   iperf3 = callPackage ../tools/networking/iperf/3.nix { };
   iperf = iperf3;
 
+  ipfs = goPackages.ipfs.bin // { outputs = [ "bin" ]; };
+
   ipmitool = callPackage ../tools/system/ipmitool {
     static = false;
   };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 056d8d8fb3f..2bf0a96a5aa 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1592,11 +1592,11 @@ let
   };
 
   ipfs = buildFromGitHub{
-    rev = "ff26c312000da12d395c9cdba05c43f29b68b456";
+    rev = "9c6ec296e396cc6be551c9807ae220fb50dd07d4";
+    date   = "2015-09-23";
     owner  = "ipfs";
     repo   = "go-ipfs";
-    sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg";
-    disabled = !isGo14;
+    sha256 = "0lmj2s9ihl1a5r8yn6w0lvb8z3n6c9b8wi1yvi77vgzm6b6lfl3a";
   };
 
   ldap = buildGoPackage rec {