JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #98554 from Luflosi/update/ipfs

Browse Source 
ipfs: 0.6.0 -> 0.7.0
This commit is contained in:
zimbatm 2020-09-24 20:42:07 +00:00 committed by GitHub
commit f32bc5c953
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/ipfs/default.nix
View File

@ -2,19 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "ipfs"; pname = "ipfs";
version = "0.6.0"; version = "0.7.0";
rev = "v${version}"; rev = "v${version}";
# go-ipfs makes changes to it's source tarball that don't match the git source. # go-ipfs makes changes to it's source tarball that don't match the git source.
src = fetchurl { src = fetchurl {
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80"; sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3";
}; };
# tarball contains multiple files/directories # tarball contains multiple files/directories
postUnpack = '' postUnpack = ''
mkdir ipfs-src mkdir ipfs-src
mv * ipfs-src || true shopt -s extglob
mv !(ipfs-src) ipfs-src || true
cd ipfs-src cd ipfs-src
''; '';
@ -27,9 +28,9 @@ buildGoModule rec {
vendorSha256 = null; vendorSha256 = null;
postInstall = '' postInstall = ''
install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service
install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket
install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket
substituteInPlace $out/etc/systemd/system/ipfs.service \ substituteInPlace $out/etc/systemd/system/ipfs.service \
--replace /usr/bin/ipfs $out/bin/ipfs --replace /usr/bin/ipfs $out/bin/ipfs
''; '';

4
pkgs/top-level/all-packages.nix
View File

@ -4605,9 +4605,7 @@ in
iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf3 = callPackage ../tools/networking/iperf/3.nix { };
iperf = iperf3; iperf = iperf3;
ipfs = callPackage ../applications/networking/ipfs { ipfs = callPackage ../applications/networking/ipfs { };
buildGoModule = buildGo114Module;
};
ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
buildGoModule = buildGo114Module; buildGoModule = buildGo114Module;