dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #148182 from Artturin/electroneolchange

Browse Source 
switch packages away from electron_12
This commit is contained in:
Artturi 2021-12-04 16:13:54 +02:00 committed by GitHub
commit c156d60a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
, util-linux , util-linux
, bash , bash
, makeWrapper , makeWrapper
, electron_12 , electron
}: }:
let let
@ -23,8 +23,6 @@ let
"i686-linux" = "i386"; "i686-linux" = "i386";
}."${system}" or throwSystem; }."${system}" or throwSystem;
electron = electron_12;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

14
pkgs/top-level/all-packages.nix
View File

@ -1480,7 +1480,7 @@ with pkgs;
bic = callPackage ../development/interpreters/bic { }; bic = callPackage ../development/interpreters/bic { };
binance = callPackage ../applications/misc/binance { binance = callPackage ../applications/misc/binance {
electron = electron_12; electron = electron_13;
}; };
bit = callPackage ../applications/version-management/git-and-tools/bit { }; bit = callPackage ../applications/version-management/git-and-tools/bit { };
@ -3489,7 +3489,7 @@ with pkgs;
pn = callPackage ../tools/text/pn { }; pn = callPackage ../tools/text/pn { };
pocket-casts = callPackage ../applications/audio/pocket-casts { pocket-casts = callPackage ../applications/audio/pocket-casts {
electron = electron_12; electron = electron_14;
}; };
poweralertd = callPackage ../tools/misc/poweralertd { }; poweralertd = callPackage ../tools/misc/poweralertd { };
@ -5030,7 +5030,9 @@ with pkgs;
escrotum = callPackage ../tools/graphics/escrotum { }; escrotum = callPackage ../tools/graphics/escrotum { };
etcher = callPackage ../tools/misc/etcher { }; etcher = callPackage ../tools/misc/etcher {
electron = electron_14;
};
ethtool = callPackage ../tools/misc/ethtool { }; ethtool = callPackage ../tools/misc/ethtool { };
@ -10021,7 +10023,7 @@ with pkgs;
thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { };
thedesk = callPackage ../applications/misc/thedesk { thedesk = callPackage ../applications/misc/thedesk {
electron = electron_12; electron = electron_14;
}; };
theharvester = callPackage ../tools/security/theharvester { }; theharvester = callPackage ../tools/security/theharvester { };
@ -29146,7 +29148,7 @@ with pkgs;
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
whalebird = callPackage ../applications/misc/whalebird { whalebird = callPackage ../applications/misc/whalebird {
electron = electron_12; electron = electron_14;
}; };
wio = callPackage ../applications/window-managers/wio { }; wio = callPackage ../applications/window-managers/wio { };
@ -31878,7 +31880,7 @@ with pkgs;
geogebra = callPackage ../applications/science/math/geogebra { }; geogebra = callPackage ../applications/science/math/geogebra { };
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix {
electron = electron_12; electron = electron_14;
}; };
maxima = callPackage ../applications/science/math/maxima { maxima = callPackage ../applications/science/math/maxima {