public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #144296: firefox*: major updates (into release-21.05)

Browse Source
This commit is contained in:
Vladimír Čunát
2021-11-07 17:51:45 +01:00
parent ba289f32b5 8d2920fcaf
commit 046e1d6c92
5 changed files with 80 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -1
View File
@@ -11654,6 +11654,10 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvm_12 = llvmPackages_12.libllvm;
};
rust_1_55 = callPackage ../development/compilers/rust/1_55.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
llvm_12 = llvmPackages_12.libllvm;
};
rust = rust_1_52;
mrustc = callPackage ../development/compilers/mrustc { };
@@ -11662,6 +11666,7 @@ in
rustPackages_1_45 = rust_1_45.packages.stable;
rustPackages_1_52 = rust_1_52.packages.stable;
rustPackages_1_55 = rust_1_55.packages.stable;
rustPackages = rustPackages_1_52;
inherit (rustPackages) cargo clippy rustc rustPlatform;
@@ -23704,7 +23709,7 @@ in
firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; };
firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { };
firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { };
firefox-esr = firefox-esr-78;
firefox-esr = firefox-esr-91;
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
channel = "release";