From cdfac76b72a4e7cd199923d63f6bce81407ff179 Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Tue, 8 Feb 2022 01:53:08 -0800 Subject: [PATCH] whirlpool-gui: remove whirlpool-gui depends on the very out dated Electron 7. Upstream does not appear to be tracking newer versions of Electron. https://code.samourai.io/whirlpool/whirlpool-gui --- .../blockchains/whirlpool-gui/default.nix | 104 ------------------ pkgs/development/tools/electron/default.nix | 18 --- pkgs/top-level/aliases.nix | 11 +- pkgs/top-level/all-packages.nix | 4 - 4 files changed, 7 insertions(+), 130 deletions(-) delete mode 100644 pkgs/applications/blockchains/whirlpool-gui/default.nix diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix deleted file mode 100644 index d36715bd3066..000000000000 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem -, nodejs, yarn, electron_7, jre8, tor }: - -let - system = stdenv.hostPlatform.system; - electron = electron_7; - -in stdenv.mkDerivation rec { - pname = "whirlpool-gui"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "Samourai-Wallet"; - repo = pname; - rev = version; - sha256 = "ru6WJQRulhnQCPY2E0x9M6xXtFdj/pg2fu4HpQxhImU="; - }; - - yarnCache = stdenv.mkDerivation { - name = "${pname}-${version}-${system}-yarn-cache"; - inherit src; - dontInstall = true; - nativeBuildInputs = [ yarn ]; - buildPhase = '' - export HOME=$NIX_BUILD_ROOT - - yarn config set yarn-offline-mirror $out - yarn --frozen-lockfile --ignore-scripts --ignore-platform \ - --ignore-engines --no-progress --non-interactive - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = { - x86_64-linux = "6fl4cSwHXWgQcYlqxCae0p1Ppcb9fI5fFrxm7y6wxTo="; - }.${system} or (throw "Unsupported platform ${system}"); - }; - - nativeBuildInputs = [ makeWrapper nodejs yarn ]; - - configurePhase = '' - # Yarn and bundler wants a real home directory to write cache, config, etc to - export HOME=$NIX_BUILD_ROOT - - # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnCache} - ''; - - buildPhase = '' - yarn install --offline --ignore-scripts --frozen-lockfile --no-progress --non-interactive - - patchShebangs node_modules/ - - yarn build - ''; - - installPhase = '' - mkdir -p $out/{bin,share,libexec/whirlpool-gui/app} - - # install production dependencies - yarn install \ - --offline --frozen-lockfile --ignore-scripts \ - --no-progress --non-interactive \ - --production --no-bin-links \ - --modules-folder $out/libexec/whirlpool-gui/node_modules - - # copy application - cp -r app/{dist,app.html,main.prod.js,main.prod.js.map,img} $out/libexec/whirlpool-gui/app - cp -r package.json resources $out/libexec/whirlpool-gui - - # make desktop item - ln -s "${desktopItem}/share/applications" "$out/share/applications" - - # wrap electron - makeWrapper '${electron}/bin/electron' "$out/bin/whirlpool-gui" \ - --add-flags "$out/libexec/whirlpool-gui" \ - --prefix PATH : "${jre8}/bin:${tor}/bin" - ''; - - desktopItem = makeDesktopItem { - name = "whirlpool-gui"; - exec = "whirlpool-gui"; - icon = "whirlpool-gui"; - desktopName = "Whirlpool"; - genericName = "Whirlpool"; - comment = meta.description; - categories = "Network;"; - extraEntries = '' - StartupWMClass=whrilpool-gui - ''; - }; - - passthru.prefetchYarnCache = lib.overrideDerivation yarnCache (d: { - outputHash = lib.fakeSha256; - }); - - meta = with lib; { - description = "Desktop GUI for Whirlpool by Samourai-Wallet"; - homepage = "https://www.samouraiwallet.com/whirlpool"; - license = licenses.unlicense; - maintainers = [ maintainers.offline ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b2204775f7ae..2b07543b9864 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -25,24 +25,6 @@ rec { electron = electron_17; - electron_7 = mkElectron "7.3.3" { - x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; - x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; - i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; - armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; - aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; - headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b"; - }; - - electron_8 = mkElectron "8.5.5" { - x86_64-linux = "8058442ab4a18d73ca644d4a6f001e374c3736bc7e37db0275c29011681f1f22"; - x86_64-darwin = "02bb9f672c063b23782bee6e336864609eed72cffeeea875a3b43c868c6bd8b3"; - i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; - armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; - aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; - headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; - }; - electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b101a32d2142..e5e2cc5637c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -273,10 +273,12 @@ mapAliases ({ elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 # Electron - electron_3 = throw "electron_3 has been removed in favor of newer versions"; # Added 2021-01-06 - electron_4 = throw "electron_4 has been removed in favor of newer versions"; # Added 2021-01-06 - electron_5 = throw "electron_5 has been removed in favor of newer versions"; # Added 2021-01-06 - electron_6 = throw "electron_6 has been removed in favor of newer versions"; # Added 2021-01-06 + electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06 + electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2022-01-06 + electron_5 = throw "electron_5 has been removed in favor of newer versions"; # added 2022-01-06 + electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2022-01-06 + electron_7 = throw "electron_7 has been removed in favor of newer versions"; # added 2022-02-08 + electron_8 = throw "electron_8 has been removed in favor of newer versions"; # added 2022-02-08 electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned."; # Added 2022-01-01 @@ -1249,6 +1251,7 @@ mapAliases ({ webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # Added 2019-12-05 weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # Added 2018-09-06 + whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron."; # added 2022-02-08 wicd = throw "wicd has been removed as it is abandoned."; # Added 2021-09-11 wineFull = winePackages.full; # Added 2017-05-27 wineMinimal = winePackages.minimal; # Added 2017-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751a4c1c4971..b342c864702a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14187,8 +14187,6 @@ with pkgs; inherit (callPackages ../development/tools/electron { }) electron - electron_7 - electron_8 electron_9 electron_10 electron_11 @@ -30369,8 +30367,6 @@ with pkgs; quorum = callPackage ../applications/blockchains/quorum { }; - whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; - saga = libsForQt5.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; };