From d326fa896f612085d6d9337b1ec69fb31f50fec1 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 11:27:46 +0200 Subject: [PATCH] electrum: 4.5.5 -> 4.5.6 Release notes: https://github.com/spesmilo/electrum/blob/4.5.6/RELEASE-NOTES Beginning with this update, electrum includes its tests in its release tarballs, cf. https://github.com/spesmilo/electrum/issues/9207 https://github.com/spesmilo/electrum/commit/3ec16a08e5665014b882b1037be727faa6a11df6 https://github.com/spesmilo/electrum/blob/4.5.6/RELEASE-NOTES#L31 Therefore we drop the separate download of tests. --- pkgs/applications/misc/electrum/default.nix | 27 +++------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 8c277b05bb44..27b0ab659303 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchFromGitHub , protobuf , wrapQtAppsHook , python3 @@ -14,8 +13,6 @@ }: let - version = "4.5.5"; - python = python3.override { self = python; packageOverrides = self: super: { @@ -42,35 +39,17 @@ let else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; - # Not provided in official source releases, which are what upstream signs. - tests = fetchFromGitHub { - owner = "spesmilo"; - repo = "electrum"; - rev = version; - sha256 = "sha256-CbhI/q+zjk9odxuvdzpogi046FqkedJooiQwS+WAkJ8="; - - postFetch = '' - mv $out ./all - mv ./all/tests $out - ''; - }; - in -python.pkgs.buildPythonApplication { +python.pkgs.buildPythonApplication rec { pname = "electrum"; - inherit version; + version = "4.5.6"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1jiagz9avkbd158pcip7p4wz0pdsxi94ndvg5p8afvshb32aqwav"; + hash = "sha256-LO2ZUvbDJaIxrdgA+cM3sGgqJ+N+UlA9ObNINQcrorA="; }; - postUnpack = '' - # can't symlink, tests get confused - cp -ar ${tests} $sourceRoot/tests - ''; - nativeBuildInputs = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland;