Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03df08ae6b9a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd5d488d7bb3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 21, 2019

  1. pango: 1.43.0 -> 1.44.6, fixes CVE-2019-1010238 

    Bumping version to incorporate a security fix.

Addresses: #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.
    @d-goldin
    d-goldin committed Oct 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fritzy Nathan Fritz
    GPG key ID: 4A3E59B5DE56B9E0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    23edc9c View commit details

  2. pulling PangoFontsetSimple patch and propagating harfbuzz

    @d-goldin
    d-goldin committed Oct 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fritzy Nathan Fritz
    GPG key ID: 4A3E59B5DE56B9E0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    db17467 View commit details

Commits on Oct 22, 2019

  1. Merge pull request #71571 from d-goldin/bump_pango 

    pango: 1.43.0 -> 1.44.6, fixes CVE-2019-1010238
    @7c6f434c
    7c6f434c authored Oct 22, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    fritzy Nathan Fritz
    GPG key ID: 4A3E59B5DE56B9E0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd5d488 View commit details
Showing with 14 additions and 13 deletions.
  1. +14 −13 pkgs/development/libraries/pango/default.nix
27 changes: 14 additions & 13 deletions pkgs/development/libraries/pango/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,15 +9,24 @@ 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";
};

# 1.44.6-2 is not available from the usual mirrors yet,
# so applying from gitlab
patches = [
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/pango/commit/8a408d4f25ddb0e3d6020cdde0cd8f8a19ee8db2.patch";
sha256 = "0l0hxwbijqrfvka302ijgih9jafc2ffs3d6d4v7bwynpn54lmza7";
})
];

# FIXME: docs fail on darwin
outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc";

@@ -26,26 +35,18 @@ in stdenv.mkDerivation rec {
pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [
harfbuzz fribidi
fribidi
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
Carbon
CoreGraphics
CoreText
]);
propagatedBuildInputs = [ cairo glib libintl ] ++
propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++
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;