From a01da8ff91acd94ae2c16f490c7d71264b4b04b3 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 17 Nov 2020 16:06:10 +0100 Subject: [PATCH 1/4] electron: 8.5.2 -> 8.5.5 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 1c024ee4e5b..c0b2ce25ae6 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -47,12 +47,12 @@ rec { aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; }; - electron_8 = mkElectron "8.5.2" { - x86_64-linux = "c5b8c95b410436066b06165e9759b31336c907268339433db4f8610ccf644a51"; - x86_64-darwin = "079d951a28cfb7d1e0d3660e0fcb2dab85bd9e9f6848df5a06a7ac88ab3aa14c"; - i686-linux = "0d108ac2420a437100f7a8d06aa019cd8138da4372fb94039b6d23c6253a6aea"; - armv7l-linux = "f06ed475d1b206c3aa31e768add3517a64aabce5e2946e4d9707e615e6f398c0"; - aarch64-linux = "e9765584bbedad8a806f96ac1381c114a357fdbed8c67573decefde2d15d9cd7"; + electron_8 = mkElectron "8.5.5" { + x86_64-linux = "8058442ab4a18d73ca644d4a6f001e374c3736bc7e37db0275c29011681f1f22"; + x86_64-darwin = "02bb9f672c063b23782bee6e336864609eed72cffeeea875a3b43c868c6bd8b3"; + i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; + armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; + aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; }; electron_9 = mkElectron "9.3.3" { From 4bfad39416a5eee21dba7abc9f292d9217c86ecd Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 17 Nov 2020 16:06:35 +0100 Subject: [PATCH 2/4] electron: 9.3.3 -> 9.3.4 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index c0b2ce25ae6..fa5631504bb 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -55,12 +55,12 @@ rec { aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; }; - electron_9 = mkElectron "9.3.3" { - x86_64-linux = "17f4db5e040ea20ce89d1d492ac575ed0b9ba451ef9cb0e8cd50918505c85243"; - x86_64-darwin = "bb6188178ed1250ddaf29a2f232758c0f7878f1541ddb2ae2a0d20298599c7f4"; - i686-linux = "e413b0879247b32bfbcc114e8d49109267137b2ece97db13eaf0ce3ac6187881"; - armv7l-linux = "313abeb91efbc29d4f807a01937640580940a5fb2699c70b1c303b184ac7bec4"; - aarch64-linux = "263eb89ccb47920baef43898d373531d369d2adc8b2f9e5ebc6429fe44b2fd5a"; + electron_9 = mkElectron "9.3.4" { + x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf"; + x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375"; + i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417"; + armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36"; + aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3"; }; electron_10 = mkElectron "10.1.5" { From 0c93e105099d0ec3674fafb24ae513c5a33fd1cd Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 19 Nov 2020 11:05:03 +0100 Subject: [PATCH 3/4] electron: 10.1.5 -> 10.1.6 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index fa5631504bb..2250c43d58a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -63,11 +63,11 @@ rec { aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3"; }; - electron_10 = mkElectron "10.1.5" { - x86_64-linux = "9db65dfe26d4fa9524b3005c6002d858ab256722cefb6a058de8e72e2d5c4083"; - x86_64-darwin = "30dc5d5a913c38c6ae7fa6913b1a907545f0230157efc066e2d5a7affd26cd1e"; - i686-linux = "bf8e1731e8b9b972c9054964b219d9b1b6baae9612afc8a5edf3503b815dd8c3"; - armv7l-linux = "e270eab1a87283d7ae25c8127d904a52f130d53cc399bd288af7f99563273f33"; - aarch64-linux = "03fa2418472f762377149fdd45d1e6ff0a324be3eb1b04e58c63d41df3dd0f16"; + electron_10 = mkElectron "10.1.6" { + x86_64-linux = "d538ed7bb632d213a4b88d13bb038de65b85ae7b28a574c9efac7dc5a502ebbf"; + x86_64-darwin = "7f24c666cc59935a49e5b82b4d4c1d008e4d6fac49c78d0645596f2cc8c7218d"; + i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e"; + armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; + aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; }; } From 8cde96396721ef55823be92c4f3e5722ef738d87 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 17 Nov 2020 16:03:53 +0100 Subject: [PATCH 4/4] electron_11: init at 11.0.2 make electron point to electron_11 --- pkgs/development/tools/electron/default.nix | 27 +++++++++++++++++++-- pkgs/development/tools/electron/generic.nix | 23 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 2250c43d58a..d394103cb70 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,11 +1,26 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }@args: +{ stdenv +, libXScrnSaver +, makeWrapper +, fetchurl +, wrapGAppsHook +, glib +, gtk3 +, unzip +, atomEnv +, libuuid +, at-spi2-atk +, at-spi2-core +, libdrm +, mesa +, libxkbcommon +}@args: let mkElectron = import ./generic.nix args; in rec { - electron = electron_10; + electron = electron_11; electron_3 = mkElectron "3.1.13" { x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark"; @@ -70,4 +85,12 @@ rec { armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; }; + + electron_11 = mkElectron "11.0.2" { + x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636"; + x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516"; + i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8"; + armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d"; + aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0"; + }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index f24358676dd..4e3f3511b96 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -1,4 +1,19 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core, libdrm, mesa }: +{ stdenv +, libXScrnSaver +, makeWrapper +, fetchurl +, wrapGAppsHook +, glib +, gtk3 +, unzip +, atomEnv +, libuuid +, at-spi2-atk +, at-spi2-core +, libdrm +, mesa +, libxkbcommon +}: version: hashes: let @@ -34,7 +49,11 @@ let src = fetcher version (get tags platform) (get hashes platform); }; - electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); + electronLibPath = with stdenv.lib; makeLibraryPath ( + [ libuuid at-spi2-atk at-spi2-core ] + ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] + ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] + ); linux = { buildInputs = [ glib gtk3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 817e475979d..8b61989dd25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10804,7 +10804,7 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; + electron electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10 electron_11; autobuild = callPackage ../development/tools/misc/autobuild { };