From 445d554b9bfb8b4b5a12cc498602c7048481e0af Mon Sep 17 00:00:00 2001
From: Nathan Fish <lordcirth@gmail.com>
Date: Wed, 29 Apr 2020 16:57:30 +0000
Subject: ipfs: 0.4.23 -> 0.5.0

---
 pkgs/applications/networking/ipfs/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index b94fc1addb0b..037b94f9acf7 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,21 +2,26 @@
 
 buildGoModule rec {
   pname = "ipfs";
-  version = "0.4.23";
+  version = "0.5.0";
   rev = "v${version}";
 
+  buildPhase = ''
+    sed -i 'd#\$(d)/preload.sh > $@#' plugin/loader/Rules.mk
+    make install
+  '';
+
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm";
+    sha256 = "0dbyvs49wyqj46c8hvz0fr4vpgfrdj1h8blniwzjf0jabgvw8nik";
   };
 
   postPatch = ''
     rm -rf test/dependencies
   '';
 
-  modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
+  modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
 
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";
-- 
cgit 1.4.1


From e89ceffefbcbe36f6797e783053cbc4dcb092f62 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Thu, 7 May 2020 15:26:09 +0100
Subject: ipfs: patch shebang in builder script

---
 pkgs/applications/networking/ipfs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 037b94f9acf7..f8b229d21ac0 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -5,11 +5,6 @@ buildGoModule rec {
   version = "0.5.0";
   rev = "v${version}";
 
-  buildPhase = ''
-    sed -i 'd#\$(d)/preload.sh > $@#' plugin/loader/Rules.mk
-    make install
-  '';
-
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "go-ipfs";
@@ -19,6 +14,11 @@ buildGoModule rec {
 
   postPatch = ''
     rm -rf test/dependencies
+    patchShebangs plugin/loader/preload.sh
+  '';
+
+  buildPhase = ''
+    make install
   '';
 
   modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
-- 
cgit 1.4.1


From 3e6e4ce55c6cf923596f2f70e88e9310b3ec7bb0 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Fri, 8 May 2020 09:34:42 +0100
Subject: ipfs: reference tests

---
 pkgs/applications/networking/ipfs/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index f8b229d21ac0..f666ccb1f9ff 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "ipfs";
@@ -21,6 +21,8 @@ buildGoModule rec {
     make install
   '';
 
+  passthru.tests.ferm = nixosTests.ferm;
+
   modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1


From 11ace01cf28b1fff3584ef93537ba2ec2a8e5890 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Fri, 8 May 2020 10:49:10 +0100
Subject: ipfs: reference correct test

---
 pkgs/applications/networking/ipfs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index f666ccb1f9ff..cd96e5a0547e 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
     make install
   '';
 
-  passthru.tests.ferm = nixosTests.ferm;
+  passthru.tests.ipfs = nixosTests.ipfs;
 
   modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8";
 
-- 
cgit 1.4.1