cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #89758 from prusnak/electron-explicit

Browse source 
electron: mark insecure versions (3,4,5) and require explicit version of electron in packages
This commit is contained in:
worldofpeace 2020-07-20 15:29:26 -04:00 committed by GitHub
commit 1dd4b324bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/blockchains/whirlpool-gui/default.nix
View file

@ -3,6 +3,7 @@
let
system = stdenv.hostPlatform.system;
electron = electron_7;
in stdenv.mkDerivation rec {
pname = "whirlpool-gui";
@ -71,7 +72,7 @@ in stdenv.mkDerivation rec {
ln -s "${desktopItem}/share/applications" "$out/share/applications"
# wrap electron
makeWrapper '${electron_7}/bin/electron' "$out/bin/whirlpool-gui" \
makeWrapper '${electron}/bin/electron' "$out/bin/whirlpool-gui" \
--add-flags "$out/libexec/whirlpool-gui" \
--prefix PATH : "${jre8}/bin:${tor}/bin"
'';

5
pkgs/applications/editors/typora/default.nix
View file

@ -12,6 +12,9 @@
, pandoc
}:
let
electron = electron_8;
in
stdenv.mkDerivation rec {
pname = "typora";
version = "0.9.89";
@ -52,7 +55,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
makeWrapper ${electron_8}/bin/electron $out/bin/typora \
makeWrapper ${electron}/bin/electron $out/bin/typora \
--add-flags $out/share/typora \
"''${gappsWrapperArgs[@]}" \
${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \

4
pkgs/applications/misc/obinskit/default.nix
View file

@ -16,7 +16,7 @@ let
genericName = "Obinskit keyboard configurator";
categories = "Utility";
};
electron = electron_3;
in
stdenv.mkDerivation rec {
pname = "obinskit";
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
makeWrapper ${electron_3}/bin/electron $out/bin/${pname} \
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/opt/obinskit/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
'';

5
pkgs/applications/misc/stretchly/default.nix
View file

@ -1,8 +1,11 @@
{ stdenv, lib, fetchurl, makeWrapper, wrapGAppsHook, electron
{ stdenv, lib, fetchurl, makeWrapper, wrapGAppsHook, electron_7
, common-updater-scripts
, writeShellScript
}:
let
electron = electron_7;
in
stdenv.mkDerivation rec {
pname = "stretchly";
version = "0.21.1";

5
pkgs/applications/misc/teleprompter/default.nix
View file

@ -1,5 +1,8 @@
{ lib, stdenv, fetchurl, electron, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}:
{ lib, stdenv, fetchurl, electron_4, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}:
let
electron = electron_4;
in
stdenv.mkDerivation rec {
pname = "teleprompter";
version = "2.3.4";

5
pkgs/applications/networking/instant-messengers/rambox/pro.nix
View file

@ -1,5 +1,8 @@
{ autoPatchelfHook, electron, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }:
{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }:
let
electron = electron_4;
in
stdenv.mkDerivation rec {
pname = "rambox-pro";
version = "1.3.2";

5
pkgs/applications/networking/openbazaar/client.nix
View file

@ -8,6 +8,9 @@
, electron_6
}:
let
electron = electron_6;
in
stdenv.mkDerivation rec {
pname = "openbazaar-client";
version = "2.4.6";
@ -42,7 +45,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
makeWrapper ${electron_6}/bin/electron $out/bin/${pname} \
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
'';

1
pkgs/development/tools/electron/generic.nix
View file

@ -10,6 +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";
};
fetcher = vers: tag: hash: fetchurl {

4
pkgs/development/tools/haskell/hyper-haskell/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, jshon, electron
{ stdenv, fetchFromGitHub, jshon, electron_3
, runtimeShell, hyper-haskell-server, extra-packages ? [] }:
let
binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
electron = electron_3;
in stdenv.mkDerivation rec {
pname = "hyper-haskell";
version = "0.1.0.2";

4
pkgs/tools/misc/etcher/default.nix
View file

@ -21,6 +21,8 @@ let
"i686-linux" = "i386";
}."${stdenv.system}";
electron = electron_7;
in
stdenv.mkDerivation rec {
@ -69,7 +71,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
makeWrapper ${electron_7}/bin/electron $out/bin/${pname} \
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}"
'';

7
pkgs/top-level/all-packages.nix
View file

@ -10145,7 +10145,7 @@ in
inherit (callPackages ../development/tools/electron { })
electron_3 electron_4 electron_5 electron_6 electron_7 electron_8 electron_9;
electron = electron_4;
electron = electron_9;
autobuild = callPackage ../development/tools/misc/autobuild { };
@ -22536,10 +22536,7 @@ in
stp = callPackage ../applications/science/logic/stp { };
stretchly = callPackage ../applications/misc/stretchly {
# Error on launch w/electron_8
electron = electron_7;
};
stretchly = callPackage ../applications/misc/stretchly { };
stumpish = callPackage ../applications/window-managers/stumpish {};