From 3c35508df52b49b234d4e31c58d5573bba27cfb7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 20:29:18 +0200 Subject: [PATCH 1/6] geogebra6: switch to electron_14 arch uses electron_14 for their package electron_12 is eol --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d21ad89c5a3..c89b3fb67f35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31923,7 +31923,7 @@ with pkgs; geogebra = callPackage ../applications/science/math/geogebra { }; geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { - electron = electron_12; + electron = electron_14; }; maxima = callPackage ../applications/science/math/maxima { From 53ded9e4caff98ec61f95ed88ccf1d6ff4c3ed6d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 20:58:22 +0200 Subject: [PATCH 2/6] etcher: switch to electron_14 --- pkgs/tools/misc/etcher/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 51123f55b60b..7f746b9a49bb 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -5,7 +5,7 @@ , util-linux , bash , makeWrapper -, electron_12 +, electron }: let @@ -23,8 +23,6 @@ let "i686-linux" = "i386"; }."${system}" or throwSystem; - electron = electron_12; - in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c89b3fb67f35..deb596da38a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5017,7 +5017,9 @@ with pkgs; escrotum = callPackage ../tools/graphics/escrotum { }; - etcher = callPackage ../tools/misc/etcher { }; + etcher = callPackage ../tools/misc/etcher { + electron = electron_14; + }; ethtool = callPackage ../tools/misc/ethtool { }; From 58546a5f78f5a4dd90d08b4a3a09a70bec15158a Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:04:08 +0200 Subject: [PATCH 3/6] thedesk: switch to electron-14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb596da38a8..bf2f1c44f31c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10008,7 +10008,7 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; thedesk = callPackage ../applications/misc/thedesk { - electron = electron_12; + electron = electron_14; }; theharvester = callPackage ../tools/security/theharvester { }; From 77fd7e9d37f27a50e396cc5051b3eeb395b604ce Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:07:53 +0200 Subject: [PATCH 4/6] whalebird: switch to electron_14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf2f1c44f31c..e26c8e8ce745 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29193,7 +29193,7 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; whalebird = callPackage ../applications/misc/whalebird { - electron = electron_12; + electron = electron_14; }; wio = callPackage ../applications/window-managers/wio { }; From df22f8eeae0ae77b41ad5e6f54c3b8a136f4eaf5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:15:15 +0200 Subject: [PATCH 5/6] binance: switch to electron_13 electron-14 resulted in blank screen on start --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e26c8e8ce745..dbe28c7dd14b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1478,7 +1478,7 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; binance = callPackage ../applications/misc/binance { - electron = electron_12; + electron = electron_13; }; bit = callPackage ../applications/version-management/git-and-tools/bit { }; From 50d7facb9b15f61f67455925211dcfda9587e145 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 1 Dec 2021 21:20:15 +0200 Subject: [PATCH 6/6] pocket-casts: switch to electron_14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbe28c7dd14b..61bdeef78b81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3479,7 +3479,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_12; + electron = electron_14; }; poweralertd = callPackage ../tools/misc/poweralertd { };