diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/by-name/el/electron-cash/package.nix similarity index 76% rename from pkgs/applications/misc/electron-cash/default.nix rename to pkgs/by-name/el/electron-cash/package.nix index e9854ac3ef94d..7707a6d93dbb8 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/by-name/el/electron-cash/package.nix @@ -1,15 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook -, secp256k1, qtwayland }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + qt5, + secp256k1, +}: python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.3.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = "refs/tags/${version}"; - sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo="; + sha256 = "sha256-4cKlDJRFHt+FQ1ycO1Jz/stdhj9omiLu2G2vk7WmsIc="; }; build-system = with python3Packages; [ @@ -49,21 +55,18 @@ python3Packages.buildPythonApplication rec { pysatochip ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland; postPatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle==2.6.8" "qdarkstyle<3" - substituteInPlace setup.py \ - --replace "(share_dir" "(\"share\"" + --replace-fail "(share_dir" "(\"share\"" ''; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electron-cash.desktop \ - --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" + --replace-fail "Exec=electron-cash" "Exec=$out/bin/electron-cash" ''; # If secp256k1 wasn't added to the library path, the following warning is given: @@ -83,7 +86,7 @@ python3Packages.buildPythonApplication rec { $out/bin/electron-cash help >/dev/null ''; - meta = with lib; { + meta = { description = "Bitcoin Cash SPV Wallet"; mainProgram = "electron-cash"; longDescription = '' @@ -93,8 +96,12 @@ python3Packages.buildPythonApplication rec { of the blockchain. ''; homepage = "https://www.electroncash.org/"; - platforms = platforms.unix; - maintainers = with maintainers; [ lassulus nyanloutre oxalica ]; - license = licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + lassulus + nyanloutre + oxalica + ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a166b3ed1e528..5ce4c69aa7673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28610,8 +28610,6 @@ with pkgs; oed = callPackage ../applications/editors/oed { }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; - electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum-grs = libsForQt5.callPackage ../applications/misc/electrum/grs.nix { };