From a12249c541dbc06c723d62f5a45961ec8577e323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Apr 2023 08:26:44 -0700 Subject: [PATCH 1/5] imagemagick: 7.1.1-6 -> 7.1.1-7 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-6...7.1.1-7 (cherry picked from commit f63627aaafb38eda3ab70404478495baa9c969e9) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index bd886d4b8e31..fd457387fd0a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-6"; + version = "7.1.1-7"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-D1ZKTL3c+engyvBwCdjYqeoHx2v/6gwmK8UfaAxjnWI="; + hash = "sha256-PeXWtD8AX9VEJruZu/TO1Bpaoa1XNKIFGfGK+TpQEMs="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From d4e440735c0df8b81e3d07789caac063ec84e09a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Apr 2023 14:38:18 +0200 Subject: [PATCH 2/5] firefox-esr-102-unwrapped: Drop obsolete rust-cbindgen patch We don't have any consumer with a version older than 102.6.0 anymore. (cherry picked from commit 55aa1bc36226e88765b700e16132365f269d9c67) --- pkgs/applications/networking/browsers/firefox/common.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 74ab2ba2d9ad..28174b95bf15 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -222,14 +222,7 @@ buildStdenv.mkDerivation ({ "profilingPhase" ]; - 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"; - url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch"; - hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; - }) - ] + patches = [ ] ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch From 2e9847243ac8e474ec6142bcbf6bb721ef6f27d3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Apr 2023 14:39:58 +0200 Subject: [PATCH 3/5] firefox-unwrapped: Apply patch for mozbz#1803016 https://bugzilla.mozilla.org/show_bug.cgi?id=1803016 Resolves crashes on wayland, when the either component of the window size wouldn't be divisible by the desktop scaling. Unfortunately marked wontfix for Firefox 112, so we apply this patch instead. Closes: #226539 (cherry picked from commit b979f3be1f956228058179315d56203e05fd679b) --- .../networking/browsers/firefox/common.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 28174b95bf15..ca3b9398bfe3 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -222,7 +222,15 @@ buildStdenv.mkDerivation ({ "profilingPhase" ]; - patches = [ ] + patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [ + (fetchpatch { + # Crash when desktop scaling does not divide window scale on Wayland + # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016 + name = "mozbz1803016.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb"; + hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA="; + }) + ] ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch From 35971c39739266b347be245281d3d1dc024617df Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 19 Apr 2023 14:21:15 +0000 Subject: [PATCH 4/5] nixosTests.power-profiles-daemon: enable polkit I think this is required for the gdbus invocations used to implement the test, rather than for power-profiles-daemon itself. Fixes: a813be071ce ("nixos/polkit: don't enable by default") (cherry picked from commit e6c0587ee5f64bf515a69b6b2ae760008db8fb5f) --- nixos/tests/power-profiles-daemon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/power-profiles-daemon.nix b/nixos/tests/power-profiles-daemon.nix index 278e94711830..c887cde4b829 100644 --- a/nixos/tests/power-profiles-daemon.nix +++ b/nixos/tests/power-profiles-daemon.nix @@ -6,6 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: maintainers = [ mvnetbiz ]; }; nodes.machine = { pkgs, ... }: { + security.polkit.enable = true; services.power-profiles-daemon.enable = true; environment.systemPackages = [ pkgs.glib ]; }; From 2db3afdc24acee0abbd0088e865b0dab1d12388a Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 17 Apr 2023 23:24:33 -0700 Subject: [PATCH 5/5] librewolf: 112.0-1 -> 112.0.1-1 (cherry picked from commit cd2bd78ea5c919000c571c72f412ddc632787d16) --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 6b32c4d80251..472bbbe27142 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "112.0-1", + "packageVersion": "112.0.1-1", "source": { - "rev": "112.0-1", - "sha256": "1qjckchx20bf20z05g8m7hqm68v4hpn20fbs52l19z87irglmmfk" + "rev": "112.0.1-1", + "sha256": "0bk3idpl11n4gwk8rgfi2pilwx9n56s8dpp7y599h17mlrsw8az4" }, "firefox": { - "version": "112.0", - "sha512": "6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39" + "version": "112.0.1", + "sha512": "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50" } }