diff options
author | Raghav Sood <r@raghavsood.com> | 2023-04-16 18:06:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-16 18:06:06 +0800 |
commit | bc6f8d48b9756114d9abc2b691d556972fd9d1f7 (patch) | |
tree | 4e8f0b60891d4f138fb4874ece4e423d1adc80a1 /pkgs/applications/blockchains | |
parent | 9fc18a93a319ba2deea68a4d3bdd73b4dc65a8b1 (diff) | |
parent | 140437c1298ddd0baaaa09a1363be5e1410af307 (diff) |
Merge pull request #225011 from emmanuelrosa/update-sparrow
sparrow: 1.7.3 -> 1.7.4
Diffstat (limited to 'pkgs/applications/blockchains')
-rw-r--r-- | pkgs/applications/blockchains/sparrow/default.nix | 16 | ||||
-rwxr-xr-x | pkgs/applications/blockchains/sparrow/update.sh | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index d7f1963a3c893..18f11af30e46f 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -16,15 +16,16 @@ , openimajgrabber , hwi , imagemagick +, gzip }: let pname = "sparrow"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "sha256-/tKct73v0zWAjY4kTllnb/+SB/8ENgVl8Yh/LErKTxY="; + sha256 = "08ircrc93gsf3vgqn07gjwmy4bs3jds9rg184pihyymm7g9girfb"; }; launcher = writeScript "sparrow" '' @@ -93,7 +94,7 @@ let sparrow-modules = stdenv.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them. @@ -143,9 +144,9 @@ let # Replace the embedded Tor binary (which is in a Tar archive) # with one from Nixpkgs. - cp ${torWrapper} ./tor - tar -cJf tor.tar.xz tor - cp tor.tar.xz modules/netlayer.jpms/native/linux/x64/tor.tar.xz + gzip -c ${torWrapper} > tor.gz + cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz + find modules ''; installPhase = '' @@ -158,7 +159,8 @@ let }; in stdenv.mkDerivation rec { - inherit pname version src; + inherit version src; + pname = "sparrow-unwrapped"; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; desktopItems = [ diff --git a/pkgs/applications/blockchains/sparrow/update.sh b/pkgs/applications/blockchains/sparrow/update.sh index bda8b0765aede..7a520b351aa4a 100755 --- a/pkgs/applications/blockchains/sparrow/update.sh +++ b/pkgs/applications/blockchains/sparrow/update.sh @@ -23,4 +23,4 @@ sha256sum -c --ignore-missing manifest.txt sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") popd -update-source-version sparrow "$version" "$sha256" +update-source-version sparrow-unwrapped "$version" "$sha256" |