diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2020-08-31 22:03:54 +0200 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2020-09-09 10:05:03 +0200 |
| commit | 8d9fadd3e0869d27a38890e6acd49eb2be08fd05 (patch) | |
| tree | 20c0cf84f1583e329f88396e1d107a409bec4991 /pkgs | |
| parent | f73b762aacbc4740432d88be11960d066e0087eb (diff) | |
| download | nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.tar nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.tar.gz nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.tar.bz2 nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.tar.lz nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.tar.xz nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.tar.zst nixpkgs-8d9fadd3e0869d27a38890e6acd49eb2be08fd05.zip | |
electron_10: init at 10.1.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/electron/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 14f9c209537..87cc5957828 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -59,4 +59,12 @@ in armv7l-linux = "cc098caebbed5022f26d12f9b5dc316a35dbae0bcf62b9fc72c3b385f93a32d5"; aarch64-linux = "ee39854d8e9ee06e9b94c457a52b0556f570316bbd755d7022e3eade4b5974d5"; }; + + electron_10 = mkElectron "10.1.1" { + x86_64-linux = "4147e88bdbec6893bf9927f0d4f3dd090d26705f5b7f688223bc65253a8b0220"; + x86_64-darwin = "5b6814ae1064cc337efcdb2ad01ab9daa003a6a1d6e05d79288ede0a3665b991"; + i686-linux = "d29682b7ea44dcdca5e7265bd1e28046275295a9ac23982af3d216a7f47a7a57"; + armv7l-linux = "341a2eacb0381c1f409b8e28cf2c0fe6f75a61410614baf80309f51dd4201a34"; + aarch64-linux = "d5e5b069f3173ed89f4cca7e9723f28a5f7a720637b7addac02972c5db042b6c"; + }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 92dd72533ae..f24358676dd 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -10,7 +10,7 @@ let license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; - knownVulnerabilities = optional (version < "6") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "6.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -34,7 +34,7 @@ let src = fetcher version (get tags platform) (get hashes platform); }; - electronLibPath = stdenv.lib.makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ stdenv.lib.optionals (version > "9") [ libdrm mesa ]); + electronLibPath = with stdenv.lib; makeLibraryPath ([ libuuid at-spi2-atk at-spi2-core ] ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ]); linux = { buildInputs = [ glib gtk3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8de40a13e7..06c506341e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10444,8 +10444,8 @@ in aws-adfs = with python3Packages; toPythonApplication aws-adfs; inherit (callPackages ../development/tools/electron { }) - electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9; - electron = electron_9; + electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9 electron_10; + electron = electron_10; autobuild = callPackage ../development/tools/misc/autobuild { }; |