From df2284ebbc5ae55b34379dd1cc35ec989f59380f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 18 May 2022 20:47:11 +0200 Subject: [PATCH 01/23] =?UTF-8?q?webkitgtk:=202.36.1=20=E2=86=92=202.36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/05/18/webkitgtk2.36.2-released.html (cherry picked from commit 191443a545ad2439dde1ef36767a5bb112f28da7) --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d5a804963585..05989257db6e 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.36.1"; + version = "2.36.2"; outputs = [ "out" "dev" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-AUnqX7HSDyqZgWd9RclSoEczAAHqJKjcKQNSOfEsDI8="; + sha256 = "/pO920oCwONvkm77boHSiv0oi4gk9sXPanXPQCKOAI4="; }; patches = lib.optionals stdenv.isLinux [ From 5c26aa860ae517c0781b0af8a1b973ca03249a37 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 19 May 2022 03:20:04 +0200 Subject: [PATCH 02/23] webkitgtk: re-enable WPE_RENDERER Build with WPE renderer is no longer tested upstream https://bugs.webkit.org/show_bug.cgi?id=238513#c10 and that configuration is extremely buggy since 2.36.0: https://github.com/NixOS/nixpkgs/issues/169201 Previously it was disabled in c0d053ea0ee2a1ff35f3251376fbca44e33a37c3. (cherry picked from commit 303f80a9b4748439729e590b36585f9c14555420) --- pkgs/development/libraries/webkitgtk/default.nix | 13 ++++++++++++- .../libraries/webkitgtk/fdo-backend-path.patch | 11 +++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/webkitgtk/fdo-backend-path.patch diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 05989257db6e..c4991417b71d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -18,6 +18,8 @@ , gtk3 , wayland , libwebp +, libwpe +, libwpe-fdo , enchant2 , xorg , libxkbcommon @@ -81,7 +83,15 @@ stdenv.mkDerivation rec { inherit (builtins) storeDir; inherit (addOpenGLRunpath) driverLink; }) + ./libglvnd-headers.patch + + # Hardcode path to WPE backend + # https://github.com/NixOS/nixpkgs/issues/110468 + (substituteAll { + src = ./fdo-backend-path.patch; + wpebackend_fdo = libwpe-fdo; + }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -163,6 +173,8 @@ stdenv.mkDerivation rec { libseccomp systemd wayland + libwpe + libwpe-fdo xdg-dbus-proxy ] ++ lib.optional enableGeoLocation geoclue2; @@ -175,7 +187,6 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_WPE_RENDERER=OFF" "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" diff --git a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch new file mode 100644 index 000000000000..9ddef67f1c1d --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch @@ -0,0 +1,11 @@ +--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp ++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +@@ -89,7 +89,7 @@ + #if PLATFORM(WAYLAND) + if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { + #if USE(WPE_RENDERER) +- wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); ++ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); + if (AcceleratedBackingStoreWayland::checkRequirements()) { + parameters.hostClientFileDescriptor = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt)); + parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name())); From 49a807d14f3c268c712e7f0e2f4872a6194e2802 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 19 May 2022 03:25:15 +0200 Subject: [PATCH 03/23] libwpe: inherit maintainers from webkitgtk (cherry picked from commit 26d7d7b5b2a21091f506507e0bf9f79c523433c4) --- pkgs/development/libraries/libwpe/default.nix | 6 ++++-- pkgs/development/libraries/libwpe/fdo.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 66de5847d78e..18134f18d992 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -6,7 +6,9 @@ , libxkbcommon , libGL , ninja -, libX11 }: +, libX11 +, webkitgtk +}: stdenv.mkDerivation rec { pname = "libwpe"; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { description = "General-purpose library for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index a711fab63143..df6a57d2d7f7 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -10,7 +10,9 @@ , libwpe , libxkbcommon , libGL -, libX11 }: +, libX11 +, webkitgtk + }: stdenv.mkDerivation rec { pname = "wpebackend-fdo"; @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { description = "Freedesktop.org backend for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); platforms = platforms.linux; }; } From 3d6f1c7c5d0e7ad93c53c9b7fb5d3d4057dc953d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:50:49 +0200 Subject: [PATCH 04/23] linux: 4.14.278 -> 4.14.280 (cherry picked from commit 3431806dfa89c6bc26230e3519c40b8db190ad95) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 942be8bf6d64..4c4d7c932450 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.278"; + version = "4.14.280"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1glb6z3nicd2lzhvwcqj54642agk0bbg022wnc3ckld5ngpd9miw"; + sha256 = "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr"; }; } // (args.argsOverride or {})) From 65558079cbd689540e24b60198c4a3843252ba71 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:51:03 +0200 Subject: [PATCH 05/23] linux: 4.19.242 -> 4.19.244 (cherry picked from commit a7d95e31bc4fae38dd12e16ccb17313f046a8d00) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2db4ec01e72d..ea79db67ed75 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.242"; + version = "4.19.244"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18k5fbzclk7g657bs8idwqjk7hakzx6256b1a3506sy29q4zvg2r"; + sha256 = "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79"; }; } // (args.argsOverride or {})) From d97bc24d3c21afb8f14866eeff36e46209c7df16 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:51:12 +0200 Subject: [PATCH 06/23] linux: 4.9.313 -> 4.9.315 (cherry picked from commit 4072349a31d8fbdc1bad9c0fe78021f14e235d88) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9de95b245a1c..9f82f1805e90 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.313"; + version = "4.9.315"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p3vr1h01ph6x0pxrr6y6k5c4nrhvq650dfngv5mkrgsc5w7ffz0"; + sha256 = "1171p90s00jxg1clyz8kp81ilmdzygg131mxysr6lpkaisahkjg6"; }; } // (args.argsOverride or {})) From 266151f95e4420364baa329d6e60097213b02c8a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:51:23 +0200 Subject: [PATCH 07/23] linux: 5.10.115 -> 5.10.117 (cherry picked from commit 1b81fcd6780ea47873512dc97c488a1a0a2b264d) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 4cba62d8e621..daeabc538370 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.115"; + version = "5.10.117"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0w9gwizyqjgsj93dqqvlh6bqkmpzjajhj09319nqncc95yrigr7m"; + sha256 = "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh"; }; } // (args.argsOverride or {})) From 12083feadec31025bc617db003deb6421aeb59b1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:51:34 +0200 Subject: [PATCH 08/23] linux: 5.15.39 -> 5.15.41 (cherry picked from commit 8935b4d5334c1c43793f7137c22664edfcf6ee9d) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index a217d3da90f3..215073eea422 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.39"; + version = "5.15.41"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bfpiyccjggysd04flaana0x69n1lcpckzpw1v6kh3ly9xil31l8"; + sha256 = "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w"; }; } // (args.argsOverride or { })) From 9a18d25fb16bc29f9eea75056e9127c1a99cf8d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:51:47 +0200 Subject: [PATCH 09/23] linux: 5.17.7 -> 5.17.9 (cherry picked from commit cfb71b715e561785c8178b9ce2d2fdcbed63cdaf) --- pkgs/os-specific/linux/kernel/linux-5.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix index 5bd54a59533a..46384061684d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.17.7"; + version = "5.17.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "16ccf7n6fns9z93c65lchn5v3fgl9c5vkr1v6p0c1xifn7v7xxi2"; + sha256 = "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p"; }; } // (args.argsOverride or { })) From 9def96eb65dfe5ef2d9febc282c68f171511e088 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:51:59 +0200 Subject: [PATCH 10/23] linux: 5.4.193 -> 5.4.195 (cherry picked from commit d56829b5febff16f60880244b6a6e9244769c2fa) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4f23f695afe7..1d5bbc07832f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.193"; + version = "5.4.195"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "187jfk9hf52n5z9yv56vq1knp3kdcbyk5w5k98ziwcbdjm1x65hd"; + sha256 = "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj"; }; } // (args.argsOverride or {})) From 98d4af3ffd0c16815b9f2989812c7025ed38643a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:52:15 +0200 Subject: [PATCH 11/23] linux-rt_5_10: 5.10.109-rt65 -> 5.10.115-rt67 (cherry picked from commit c49791b3261b94a72b0e0b87a42822452d8f0bf9) --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 7162fe8ac198..b4f80d11380f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.109-rt65"; # updated by ./update-rt.sh + version = "5.10.115-rt67"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; + sha256 = "0w9gwizyqjgsj93dqqvlh6bqkmpzjajhj09319nqncc95yrigr7m"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0w7bs5kmwvbyfy5js218ys42s8i51m8v0mbkfhiynlpm3iph357q"; + sha256 = "16igpdqq8nqzf98pkrs9v692d1r1fpnwrh3qxrkja0fgzswdwc0j"; }; }; in [ rt-patch ] ++ kernelPatches; From c8019c3a1357464ee52ed4781b891f1a9c84f3ff Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:52:30 +0200 Subject: [PATCH 12/23] linux-rt_5_4: 5.4.188-rt73 -> 5.4.193-rt74 (cherry picked from commit 1f98b560c8ffec12d100ae1e7c498eeda6eb0e26) --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index bb404fc59e98..7ee37c5b261a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.188-rt73"; # updated by ./update-rt.sh + version = "5.4.193-rt74"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1g7xf2jx1hx580f42yirfgv9v0f9f88wzxxx0wiwx7wcqbyqpg4z"; + sha256 = "187jfk9hf52n5z9yv56vq1knp3kdcbyk5w5k98ziwcbdjm1x65hd"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "17qx5xrchgss7zxg9lg91mqh0v3irx355003g7rj12h8y5r16l58"; + sha256 = "1gn4ii5pr0870ba481nqbd5rxk7ajrarv1p5mipfi42x07rpn7c2"; }; }; in [ rt-patch ] ++ kernelPatches; From ba85b143db5bd1a5404187164b9d38a948e1138c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:52:48 +0200 Subject: [PATCH 13/23] linux_latest-libre: 18713 -> 18738 (cherry picked from commit 3edcbfce898010ded1b2a97fca2a699d21952e68) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 78646dddf960..971847a895ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18713"; - sha256 = "10744jp1i7z3jwpc42vrmdfpq1yblf3vy17yb04xdfhimkflw77p"; + rev = "18738"; + sha256 = "024iw4352h8b1kbbimqgid95h868swiw45wn91sjkpmwr612v6kd"; } , ... }: From f327ca9de0fd8a5fca55da0286a851b55ca9b81a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:53:11 +0200 Subject: [PATCH 14/23] linux/hardened/patches/4.14: 4.14.278-hardened1 -> 4.14.280-hardened1 (cherry picked from commit eea0f09983cfa986de0d8e057e5c55db5b021793) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index b7e783b73b72..1d43719f1c36 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.278-hardened1.patch", - "sha256": "10sihdsfc7zcn2n70gym790ql5lkgiy1q7lv7vavyxbg3j6yzayb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.278-hardened1/linux-hardened-4.14.278-hardened1.patch" + "name": "linux-hardened-4.14.280-hardened1.patch", + "sha256": "0hkn7rbgvnv9v7pzrg5g6ygmdzlrjl3yama9kp9aw0xw2akghmb4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.280-hardened1/linux-hardened-4.14.280-hardened1.patch" }, - "sha256": "1glb6z3nicd2lzhvwcqj54642agk0bbg022wnc3ckld5ngpd9miw", - "version": "4.14.278" + "sha256": "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr", + "version": "4.14.280" }, "4.19": { "patch": { From 50c8d60f7278e77327ac6bd7fa24121f66936ccf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:53:21 +0200 Subject: [PATCH 15/23] linux/hardened/patches/4.19: 4.19.242-hardened1 -> 4.19.244-hardened1 (cherry picked from commit 28a954cabf6a9d9b52776cb977653fe9f8cb0133) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1d43719f1c36..d1bd6c3a248a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.242-hardened1.patch", - "sha256": "05fmppfvimppvqi1ghvg43jz8sdd56dffvy9sazpl53vpz3bysy6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.242-hardened1/linux-hardened-4.19.242-hardened1.patch" + "name": "linux-hardened-4.19.244-hardened1.patch", + "sha256": "063q4vd0spk602s4if751341jaansh0764qq7fhy764j31678n0j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.244-hardened1/linux-hardened-4.19.244-hardened1.patch" }, - "sha256": "18k5fbzclk7g657bs8idwqjk7hakzx6256b1a3506sy29q4zvg2r", - "version": "4.19.242" + "sha256": "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79", + "version": "4.19.244" }, "5.10": { "patch": { From 36d890f081527b03d72db5c2d2edc51c91b3aecb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:53:34 +0200 Subject: [PATCH 16/23] linux/hardened/patches/5.10: 5.10.115-hardened1 -> 5.10.117-hardened1 (cherry picked from commit 240e2247834fbd3188ed0be96f50b0826187a55f) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d1bd6c3a248a..70bde99cbd91 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.115-hardened1.patch", - "sha256": "09sgj4wrsi5j5hz8k3zs8zxq4g0a27dnhpjs1nxvqdz6b8f4xkap", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.115-hardened1/linux-hardened-5.10.115-hardened1.patch" + "name": "linux-hardened-5.10.117-hardened1.patch", + "sha256": "1l53sjknm8q76r1jljm321cmh6ic36pc9w5rmi68lbds19ndfpx3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.117-hardened1/linux-hardened-5.10.117-hardened1.patch" }, - "sha256": "0w9gwizyqjgsj93dqqvlh6bqkmpzjajhj09319nqncc95yrigr7m", - "version": "5.10.115" + "sha256": "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh", + "version": "5.10.117" }, "5.15": { "patch": { From cc9a1644131b727f108d65266bc7fbe4e6edc7c5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:53:46 +0200 Subject: [PATCH 17/23] linux/hardened/patches/5.15: 5.15.39-hardened1 -> 5.15.41-hardened1 (cherry picked from commit 7f512f715339d6a197d3b093d09f10e0eafa0da8) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 70bde99cbd91..fdbbd3306578 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.39-hardened1.patch", - "sha256": "137zp9z15adf464awh5cl371qvhv2c79yfnva3k31zp0ivjb7kgg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.39-hardened1/linux-hardened-5.15.39-hardened1.patch" + "name": "linux-hardened-5.15.41-hardened1.patch", + "sha256": "1y98rvn4qyx8w8bjchfzsd7g9gkhfm20cwaj3p88sgq7q81kyz8s", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.41-hardened1/linux-hardened-5.15.41-hardened1.patch" }, - "sha256": "1bfpiyccjggysd04flaana0x69n1lcpckzpw1v6kh3ly9xil31l8", - "version": "5.15.39" + "sha256": "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w", + "version": "5.15.41" }, "5.17": { "patch": { From 995a70f455650930ec5221d1f0825e46420e139d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:53:59 +0200 Subject: [PATCH 18/23] linux/hardened/patches/5.17: 5.17.7-hardened1 -> 5.17.9-hardened1 (cherry picked from commit 5c9571087e7ec83d9bf6f30b0a1c98417dec5843) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fdbbd3306578..ec9f000582be 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.17": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.17.7-hardened1.patch", - "sha256": "0p2s6blyzi0ynfrqm5l8ayh41kjkrmznlly6znh3djc1k3l5fc8v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.7-hardened1/linux-hardened-5.17.7-hardened1.patch" + "name": "linux-hardened-5.17.9-hardened1.patch", + "sha256": "0n7zz04vnajpsfn662fxx75jinnr0kpqwzyypgwn99v4lmsxvza1", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.9-hardened1/linux-hardened-5.17.9-hardened1.patch" }, - "sha256": "16ccf7n6fns9z93c65lchn5v3fgl9c5vkr1v6p0c1xifn7v7xxi2", - "version": "5.17.7" + "sha256": "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p", + "version": "5.17.9" }, "5.4": { "patch": { From 18618ba38b3af450a4e58d5892690f7c51b5d555 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 May 2022 17:54:10 +0200 Subject: [PATCH 19/23] linux/hardened/patches/5.4: 5.4.193-hardened1 -> 5.4.195-hardened1 (cherry picked from commit 82273adfcd53a9f3ba5401ae642a6b11c5ffa065) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ec9f000582be..e66a432836da 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.193-hardened1.patch", - "sha256": "1c24chfjkv5yk3gzawxygfl6l58i7a6l2swdk35g5sv8s6p0a9jl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.193-hardened1/linux-hardened-5.4.193-hardened1.patch" + "name": "linux-hardened-5.4.195-hardened1.patch", + "sha256": "1q7a211jw22nl1yz3k3cv6g4h7csir0wwyypzij54xbg3k7by0p9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.195-hardened1/linux-hardened-5.4.195-hardened1.patch" }, - "sha256": "187jfk9hf52n5z9yv56vq1knp3kdcbyk5w5k98ziwcbdjm1x65hd", - "version": "5.4.193" + "sha256": "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj", + "version": "5.4.195" } } From ab19261c41b8fbf830d2dba5453ea50cddbb98a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 May 2022 14:08:29 +0200 Subject: [PATCH 20/23] =?UTF-8?q?jasmin-compiler:=2021.0=20=E2=86=92=20202?= =?UTF-8?q?2.04.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit aee00ac405cbafc234e6b8f0b5e60f9cb5d9914e) --- pkgs/development/compilers/jasmin-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7642ae4aff26..92885419854e 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "21.0"; + version = "2022.04.0"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - sha256 = "sha256:1px17fpc00gca5ayfcr4k008srkyw120c25rnyf7cgzfs1gpylj2"; + sha256 = "sha256:0yf3lp469m8jdpqmqq3sw3h8l3psrzdp134wp3l1q31j3akskn2s"; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; From ba4ab43ce2dea309a61675da85671d245f31ba8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Tue, 3 May 2022 12:37:59 +0100 Subject: [PATCH 21/23] matrix-synapse: 1.57.0 -> 1.58.0 Closes #169534 (cherry picked from commit 7f1ddd2da55978274f012cd05a3b803050cabb40) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 235d1895e152..c81800a35617 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.57.0"; + version = "1.58.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s="; + sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA="; }; buildInputs = [ openssl ]; From 5645cdb8c557fd4dbab5f0578d1bf5d329a87174 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 17 May 2022 08:01:00 -0600 Subject: [PATCH 22/23] matrix-synapse: 1.58.0 -> 1.59.1 (cherry picked from commit 2836ac6b83a443f06cc7b851618aec92edaa4c08) --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c81800a35617..ce2009c4ed79 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.58.0"; + version = "1.59.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA="; + sha256 = "sha256-EASd+tlPIYQpQP2OOHJSPDzgJZyVoigVfcC2b2c2A2o="; }; buildInputs = [ openssl ]; From 2857b73e5cd7be95aa075a7a4e2d2cacb4203b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 May 2022 21:08:31 +0000 Subject: [PATCH 23/23] imagemagick: 7.1.0-34 -> 7.1.0-35 (cherry picked from commit 6501ee65b0493c880ba2e2b9d62766d6bb10cbca) --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 4e80356bac84..41a991587037 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-34"; + version = "7.1.0-35"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-eASmIOTYupK5di3lggJ/8O5pkG88ZpFuvaYK23AWsq4="; + hash = "sha256-KLS7gKUVeOAA89Kfrk07JzSXEF6TH6AgfheECbWi0lE="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big