diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-20 15:29:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 15:29:26 -0400 |
| commit | 1dd4b324bf52bd37842f4ea9cbe41914035634a8 (patch) | |
| tree | 4d05e8047e74c0e8275c04c26cea5ffba228c3de /pkgs/development | |
| parent | e3cba5aad991a0f355545fc0b069cbf987b577d0 (diff) | |
| parent | 149987489c3168ec5efc7a68965cde72d365a99e (diff) | |
Merge pull request #89758 from prusnak/electron-explicit
electron: mark insecure versions (3,4,5) and require explicit version of electron in packages
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/electron/generic.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/haskell/hyper-haskell/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 04b610dde1c5f..92dd72533aefd 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -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 { diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 7d99a5e9a573f..df889d43d4636 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -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"; |