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: 20c0730565a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 941859dadf36
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 12, 2019

  1. gtk3: 3.24.5 -> 3.24.7 

    http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.6.news
http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.7.news

Export symbols patch "actually" seems
to no longer be required, drop it.
    @dtzWill
    dtzWill committed Mar 12, 2019
    Copy the full SHA
    bf072fc View commit details

Commits on Mar 14, 2019

  1. Merge pull request #57541 from dtzWill/update/gtk-3.24.7 

    gtk3: 3.24.5 -> 3.24.7
    @dtzWill
    dtzWill authored Mar 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    941859d View commit details
Showing with 2 additions and 14 deletions.
  1. +2 −14 pkgs/development/libraries/gtk+/3.x.nix
16 changes: 2 additions & 14 deletions pkgs/development/libraries/gtk+/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
with stdenv.lib;

let
version = "3.24.5";
version = "3.24.7";
in
stdenv.mkDerivation rec {
name = "gtk+3-${version}";

src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj";
};

outputs = [ "out" "dev" ];
@@ -35,18 +35,6 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
})
(fetchpatch {
name = "fix-fribidi-linking.patch";
url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
})
(fetchpatch {
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged
# but isn't in 3.24.5
name = "export-missing-symbols.patch";
url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
})
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it