From e6d382d3887e930ffe8733192ecb33ed63fe0925 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:38:22 +0200 Subject: [PATCH 1/5] electron_24-bin: init at 24.1.2 https://github.com/electron/electron/releases/tag/v24.0.0 https://github.com/electron/electron/releases/tag/v24.1.0 https://github.com/electron/electron/releases/tag/v24.1.1 https://github.com/electron/electron/releases/tag/v24.1.2 --- pkgs/development/tools/electron/binary/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 95f155914f8b..fd0cb76e9963 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -24,7 +24,7 @@ let in rec { - electron-bin = electron_23-bin; + electron-bin = electron_24-bin; electron_9-bin = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -168,4 +168,13 @@ rec { aarch64-darwin = "49b0357aa21f317832dd8f620ff18cbf6bcd9aef264113ac67b9d306186c8eef"; headers = "1jq77kqkcy234nsqlizkcmzqs3wsy53438r4cnhhyfr6zx50f5sb"; }; + + electron_24-bin = mkElectron "24.1.2" { + armv7l-linux = "dc190382e38e18851d37ff0f901a9737a3e59bf1b5f7171cb65d167f244e6712"; + aarch64-linux = "a66dc286a43e92ddcb1c03df9019ee8db19a3f27381ac9273bf3996f322fdab7"; + x86_64-linux = "a5b3c6d9847733e705b3c5cc7694f3bcb4996f7047bb8c02dd443ad27258f7f8"; + x86_64-darwin = "ffe6a7c23d360b31bbc4dc05e05eb15b4261e72f1aac7d98ca7fbbd29bbba5e7"; + aarch64-darwin = "3644b29ab2dde6cac0ac455fb5e965f739c4faaaad7e678bd4379c72723ea40a"; + headers = "1p5g6nj3lrv068gsfcr5nyiv1ayb7s4gximbkpvbv5znnrlsn9q6"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fadab0848d8c..77c003af0c38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17386,7 +17386,8 @@ with pkgs; electron_20-bin electron_21-bin electron_22-bin - electron_23-bin; + electron_23-bin + electron_24-bin; electron = electron-bin; electron_9 = electron_9-bin; @@ -17404,6 +17405,7 @@ with pkgs; electron_21 = electron_21-bin; electron_22 = electron_22-bin; electron_23 = electron_23-bin; + electron_24 = electron_24-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; From 6da5bbbe52d9b3ad2f5819fa2973d47a3d1dad30 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:39:28 +0200 Subject: [PATCH 2/5] electron_21: mark EOL Its support ended on April 4, 2023. --- pkgs/development/tools/electron/binary/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index caa0150d4b44..cc7f15572dd0 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -32,7 +32,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "21.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "22.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { From 069a804d326400f6601702824016f62e6bbe05f5 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:42:17 +0200 Subject: [PATCH 3/5] electron-bin: fix generated name in print-hashes script --- pkgs/development/tools/electron/binary/print-hashes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/print-hashes.sh b/pkgs/development/tools/electron/binary/print-hashes.sh index e43f1f922a94..37cd7d3c662b 100755 --- a/pkgs/development/tools/electron/binary/print-hashes.sh +++ b/pkgs/development/tools/electron/binary/print-hashes.sh @@ -24,7 +24,7 @@ headers="$(nix-prefetch-url "https://artifacts.electronjs.org/headers/dist/v${VE # Entry similar to the following goes in default.nix: -echo " electron_${VERSION%%.*} = mkElectron \"${VERSION}\" {" +echo " electron_${VERSION%%.*}-bin = mkElectron \"${VERSION}\" {" for S in "${!SYSTEMS[@]}"; do hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ' || :)" From c2114add0251c0691ba05b3d6d28a83a084b1ba2 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:45:22 +0200 Subject: [PATCH 4/5] electron_23-bin: 23.1.1 -> 23.2.4 https://github.com/electron/electron/releases/tag/v23.1.2 https://github.com/electron/electron/releases/tag/v23.1.3 https://github.com/electron/electron/releases/tag/v23.1.4 https://github.com/electron/electron/releases/tag/v23.2.0 https://github.com/electron/electron/releases/tag/v23.2.1 https://github.com/electron/electron/releases/tag/v23.2.2 https://github.com/electron/electron/releases/tag/v23.2.3 https://github.com/electron/electron/releases/tag/v23.2.4 --- pkgs/development/tools/electron/binary/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index fd0cb76e9963..22174558fe2f 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -160,13 +160,13 @@ rec { headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; }; - electron_23-bin = mkElectron "23.1.1" { - armv7l-linux = "0f2db28e672021b3c03309155e36d94ec59c7541497847140d500fdec45baf09"; - aarch64-linux = "5b5b6bf0a40d063e2a21e2868f3f97ce08a400690389355f2b68d606d4ae614f"; - x86_64-linux = "4e820dc1ca957fbe9dbd168925ddf496b9b14c2001bbe5362159411a6bed0cea"; - x86_64-darwin = "fb93e045e57410ecf046aee46a0baf413c55256ab7cf170f648a53b5d2e2a055"; - aarch64-darwin = "49b0357aa21f317832dd8f620ff18cbf6bcd9aef264113ac67b9d306186c8eef"; - headers = "1jq77kqkcy234nsqlizkcmzqs3wsy53438r4cnhhyfr6zx50f5sb"; + electron_23-bin = mkElectron "23.2.4" { + armv7l-linux = "5e01b087d0715dfa770edff0b3f7f5ca48236474b405faf83bb105ad1ce6e3fb"; + aarch64-linux = "2dec49bfdff22390ac965f3867384aa8a464f9a13a29c5bb757be328bb734964"; + x86_64-linux = "c2886b453dddd04ebd08462ce2fa521afd7c7a2df418d5b9d29f1836f5726aa7"; + x86_64-darwin = "cbf14eb732146f383be3282512c5d22960aa0ae208aacdccae96321a1de9944c"; + aarch64-darwin = "5aed024ef988a53325aa8a2ff715080ead6a8d2a9830a43e24d268bb658a4558"; + headers = "1yhz4q72a4sgr2aia9nfvnayq341dh4alwpmpkqnfa3iw9fc9wp6"; }; electron_24-bin = mkElectron "24.1.2" { From 3b70ab02668f6bde6b2d033847c1acae207bd345 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 15 Apr 2023 13:47:38 +0200 Subject: [PATCH 5/5] electron_22-bin: 22.1.0 -> 22.3.6 https://github.com/electron/electron/releases/tag/v22.2.0 https://github.com/electron/electron/releases/tag/v22.2.1 https://github.com/electron/electron/releases/tag/v22.3.0 https://github.com/electron/electron/releases/tag/v22.3.1 https://github.com/electron/electron/releases/tag/v22.3.2 https://github.com/electron/electron/releases/tag/v22.3.3 https://github.com/electron/electron/releases/tag/v22.3.4 https://github.com/electron/electron/releases/tag/v22.3.5 https://github.com/electron/electron/releases/tag/v22.3.6 --- pkgs/development/tools/electron/binary/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 22174558fe2f..5e22dc506a4c 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -151,13 +151,13 @@ rec { headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; }; - electron_22-bin = mkElectron "22.1.0" { - armv7l-linux = "9bad02cd8e8604400eb90d9bd8fa58b6e400321cea8db7e774908611f4fca2a2"; - aarch64-linux = "1d3e0011761f5ba05faf994a7f78cf518e49e0fef7e4528853e1bff9378d02cf"; - x86_64-linux = "543e5fa7f2b602c3cd7e62a358441faf6f490e738de9b0bd796ad65d6bbd35ee"; - x86_64-darwin = "969cad3fad6a03cbbc1658722cbf87547a8465c90dd4287fd5c03bd15bbf8a5b"; - aarch64-darwin = "4ebf838308e93ad9956f3ce3a14b8d41607ffec5cd2054818d0c91b79df101a2"; - headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; + electron_22-bin = mkElectron "22.3.6" { + armv7l-linux = "ecc7a4e793873bdafd581a812ec593113f4a8bf4c4c5aafbab8dba2a99a2f767"; + aarch64-linux = "ffe50eefa4440e7f6168c68901a6cd7dc23ce56c7cc0c1373b9b65add6a0d0ad"; + x86_64-linux = "63c88f21382c65771b214520f8caddaf663ec53945153792d653930dd71ddff8"; + x86_64-darwin = "002adcb1114a49bcfbdaa1e9d6e2850a568c199f319a8326133d34fc8f0367ee"; + aarch64-darwin = "72777700b5c3d02f3b0b5691b3621fcbdc391467bd6f1aa40974a1ea05a999f9"; + headers = "1m8a1n99fdy0fc06mwdj866b06dzp8plxh84ikgz0g9sdis6zcj7"; }; electron_23-bin = mkElectron "23.2.4" {