summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDima <dgoldin+github@protonmail.ch>2019-10-21 20:40:12 +0200
committerDima <dgoldin+github@protonmail.ch>2019-10-21 20:47:20 +0200
commit23edc9cf14d3a7c427abfb69fe8b542ed5bf0365 (patch)
tree84f1b5b03ed042b72828d3384e37a9149c3e79cc /pkgs
parent5955b96940c999bed5cb813b8bd2b2dc30189fcc (diff)
downloadnixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.tar
nixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.tar.gz
nixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.tar.bz2
nixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.tar.lz
nixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.tar.xz
nixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.tar.zst
nixpkgs-23edc9cf14d3a7c427abfb69fe8b542ed5bf0365.zip
pango: 1.43.0 -> 1.44.6, fixes CVE-2019-1010238
Bumping version to incorporate a security fix.

Addresses: https://github.com/NixOS/nixpkgs/issues/70120

Upstream fix:
https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54

Additional change required to build docs:
https://gitlab.gnome.org/GNOME/pango/commit/71461689b0e34d873018d46bff555475019fbf4a

The dropped patch is already incorporated into the version.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/pango/default.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 0f84b382f4d..05260ee427b 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -9,13 +9,13 @@ with stdenv.lib;
 
 let
   pname = "pango";
-  version = "1.43.0";
+  version = "1.44.6";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
+    sha256 = "0v7qq3fv1c0dl80d4qxsvd6cmhh4ngih3w0zc40f4dw7hfx427iy";
   };
 
   # FIXME: docs fail on darwin
@@ -36,16 +36,8 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ cairo glib libintl ] ++
     optional x11Support libXft;
 
-  patches = [
-    (fetchpatch {
-      # Add gobject-2 to .pc file
-      url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
-      sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
-    })
-  ];
-
   mesonFlags = [
-    "-Denable_docs=${if stdenv.isDarwin then "false" else "true"}"
+    "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
   ];
 
   enableParallelBuilding = true;