From c52baeabe2296f53d61397fb7f5f56ac95edc3bb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 21 Sep 2021 00:27:46 +0200 Subject: [PATCH 1/3] webkitgtk: 2.32.3 -> 2.32.4 https://webkitgtk.org/security/WSA-2021-0005.html (cherry picked from commit 7e7a4021e87fd18b575864ad1d539825d5e4787d) --- 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 563c13b26f2..bfc75d6a4e3 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.3"; + version = "2.32.4"; outputs = [ "out" "dev" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw="; + sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"; }; patches = lib.optionals stdenv.isLinux [ From 328e22af3981c23ff458a97d0e9a88d3ee40ccff Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 29 Sep 2021 17:48:06 +0200 Subject: [PATCH 2/3] exim: 4.94.2 -> 4.95 (cherry picked from commit cc9e7f0b047cbf2d9928edc387754c0bccfc525c) --- pkgs/servers/mail/exim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 122d00c5f0a..ced1134fb70 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "exim"; - version = "4.94.2"; + version = "4.95"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz"; - sha256 = "0x4j698gsawm8a3bz531pf1k6izyxfvry4hj5wb0aqphi7y62605"; + sha256 = "0rzi0kc3qiiaw8vnv5qrpwdvvh4sr5chns026xy99spjzx9vd76c"; }; nativeBuildInputs = [ pkg-config ]; From f3cbc8160802fe91771993f1a9f32fe3c0bfb140 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 2 Oct 2021 23:24:44 +0300 Subject: [PATCH 3/3] [Backport release-21.05] analog: Fix substitution so it can find its language files (#140313) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Co-authored-by: Philippe Hürlimann Co-authored-by: Artturi --- pkgs/tools/admin/analog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index d85e5365d63..e2e790a7f66 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ - -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" + -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g" substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" '';