From 6823fe9fb0e7c5d53693f0d986d29c273b8919ce Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 16 Sep 2018 17:55:29 +0200
Subject: [PATCH 1/2] ipfs-migrator: 6 -> 7

New version is required to migrate existing ipfs repos to repo v7.
---
 pkgs/applications/networking/ipfs-migrator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index 6a4afdb1c17d..f070c5109376 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "ipfs-migrator-${version}";
-  version = "6";
+  version = "7";
 
   goPackagePath = "github.com/ipfs/fs-repo-migrations";
 
@@ -11,8 +11,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "fs-repo-migrations";
-    rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b";
-    sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn";
+    rev = "4e8e0b41d7348646c719d572c678c3d0677e541a";
+    sha256 = "1i6izncgc3wgabppglnnrslffvwrv3cazbdhsk4vjfsd66hb4d37";
   };
 
   patches = [ ./lru-repo-path-fix.patch ];

From f896867ae5319bfb49b31476e8352475666c748f Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 16 Sep 2018 20:18:41 +0200
Subject: [PATCH 2/2] ipfs-migrator: update dependencies in deps.nix

Most dependencies are vendored in the upstream source anyway,
deps.nix just contains the few that are not.
Dependencies were updated manually because go2nix doesn't
work correctly for this package - it produces an empty deps.nix.
---
 .../networking/ipfs-migrator/deps.nix           | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix
index 2d52ca0ef70a..1ad1c383c8c6 100644
--- a/pkgs/applications/networking/ipfs-migrator/deps.nix
+++ b/pkgs/applications/networking/ipfs-migrator/deps.nix
@@ -1,13 +1,4 @@
 [
-  {
-    goPackagePath = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = https://github.com/dustin/go-humanize;
-      rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa";
-      sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj";
-    };
-  }
   {
     goPackagePath = "github.com/jbenet/goprocess";
     fetch = {
@@ -40,8 +31,8 @@
     fetch = {
       type = "git";
       url = https://github.com/hashicorp/golang-lru;
-      rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
-      sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+      rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768";
+      sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
     };
   }
   {
@@ -49,8 +40,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "71a035914f99bb58fe82eac0f1289f10963d876c";
-      sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";
+      rev = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2";
+      sha256 = "17bqkd64zksi1578lb10ls4qf5lbqs7shfjcc6bi97y1qz5k31c4";
     };
   }
 ]