git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #98554 from Luflosi/update/ipfs

ipfs: 0.6.0 -> 0.7.0

commitf32bc5c95377782a7d00bd1834459d0a157e7274 authorzimbatm <zimbatm@zimbatm.com> dateThu 24 Sep 2020, 20:42 (6 years ago) parent2f3cee6b75e431
2 files changed+8−9
pkgs/applications/networking/ipfs/default.nix+7−6 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/networking/ipfs/default.nix+7−6
@@ -2,19 +2,20 @@
22
33buildGoModule rec {
44 pname = "ipfs";
5− version = "0.6.0";
5+ version = "0.7.0";
66 rev = "v${version}";
77
88 # go-ipfs makes changes to it's source tarball that don't match the git source.
99 src = fetchurl {
1010 url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
11− sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80";
11+ sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3";
1212 };
1313
1414 # tarball contains multiple files/directories
1515 postUnpack = ''
1616 mkdir ipfs-src
17− mv * ipfs-src || true
17+ shopt -s extglob
18+ mv !(ipfs-src) ipfs-src || true
1819 cd ipfs-src
1920 '';
2021
@@ -27,9 +28,9 @@ buildGoModule rec {
2728 vendorSha256 = null;
2829
2930 postInstall = ''
30− install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
31− install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
32− install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
31+ install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
32+ install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
33+ install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
3334 substituteInPlace $out/etc/systemd/system/ipfs.service \
3435 --replace /usr/bin/ipfs $out/bin/ipfs
3536 '';
pkgs/top-level/all-packages.nix+1−3
@@ -4605,9 +4605,7 @@ in
46054605 iperf3 = callPackage ../tools/networking/iperf/3.nix { };
46064606 iperf = iperf3;
46074607
4608− ipfs = callPackage ../applications/networking/ipfs {
4609− buildGoModule = buildGo114Module;
4610− };
4608+ ipfs = callPackage ../applications/networking/ipfs { };
46114609 ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
46124610 ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
46134611 buildGoModule = buildGo114Module;