ipfs: refactor {0.6, 0.7} -> 0.7

Sync with `master` branch to avoid 20.09 having multiple versions of IPFS.
NixOS · Nov 2, 2020 · 307d27c · 307d27c
1 parent faee35a
commit 307d27c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 52 deletions.
diff --git a/pkgs/applications/networking/ipfs/0.6.nix b/pkgs/applications/networking/ipfs/0.6.nix
diff --git a/pkgs/applications/networking/ipfs/0.7.nix → .../applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/0.7.nix → .../applications/networking/ipfs/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -4556,13 +4556,7 @@ in
   iperf3 = callPackage ../tools/networking/iperf/3.nix { };
   iperf = iperf3;
 
-  ipfs = ipfs_0_6;
-  ipfs_latest = ipfs_0_7;
-  ipfs_0_6 = callPackage ../applications/networking/ipfs/0.6.nix {
-    buildGoModule = buildGo114Module;
-  };
-  ipfs_0_7 = callPackage ../applications/networking/ipfs/0.7.nix { };
-
+  ipfs = callPackage ../applications/networking/ipfs { };
   ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
   ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
     buildGoModule = buildGo114Module;