nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-22.05 into staging-next-22.05

Browse Source
This commit is contained in:
github-actions[bot]
2022-12-15 00:15:18 +00:00
committed by GitHub
parent e8ff2570b5 9264e62367
commit 86d926f453
7 changed files with 1189 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-53";
version = "7.1.0-54";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-U111mor498zAyoYKqCerb9cnxUUOlXKYPfaIzKxZiUM=";
hash = "sha256-aQipCcqOS9viOLPHEx21MrJHdxYKZl++3DIKMz97Ukw=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

786
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

786
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -220,7 +220,7 @@ buildStdenv.mkDerivation ({
"profilingPhase"
];
patches = lib.optionals (lib.versionOlder version "103") [
patches = lib.optionals (lib.versionOlder version "102.6.0") [
(fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
name = "rust-cbindgen-0.24.2-compat.patch";
@@ -235,7 +235,7 @@ buildStdenv.mkDerivation ({
postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu
patchShebangs mach
patchShebangs mach build
''
+ extraPostPatch;

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "107.0.1";
version = "108.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea";
sha512 = "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e";
};
meta = {
@@ -29,10 +29,10 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr";
version = "102.5.0esr";
version = "102.6.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13";
sha512 = "c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308";
};
meta = {

4
pkgs/development/libraries/wolfssl/default.nix
View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "wolfssl";
version = "5.5.2";
version = "5.5.3";
src = fetchFromGitHub {
owner = "wolfSSL";
repo = "wolfssl";
rev = "v${version}-stable";
sha256 = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0=";
hash = "sha256-36L7kZ9Dqp3pDjodqELBdSBFwrf+GnRP7KNFYrRUCuU=";
};
postPatch = ''