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

Commits on Nov 20, 2020

  1. gdk-pixbuf: 2.40.0 → 2.42.0 

    https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.0.news

xlib has been dropped, some build flags changed: https://mail.gnome.org/archives/distributor-list/2020-November/msg00000.html
Also corrected license.
    @jtojnar
    jtojnar committed Nov 20, 2020
    Copy the full SHA
    17eb317 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #104337 from jtojnar/gdk-pixbuf-2.42 

    gdk-pixbuf: 2.40.0 → 2.42.0
    @jtojnar
    jtojnar authored Nov 24, 2020
    Copy the full SHA
    2e110ba View commit details
Showing with 5 additions and 14 deletions.
  1. +5 −14 pkgs/development/libraries/gdk-pixbuf/default.nix
19 changes: 5 additions & 14 deletions pkgs/development/libraries/gdk-pixbuf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,31 +20,23 @@
, gobject-introspection
, doCheck ? false
, makeWrapper
, fetchpatch
, lib
}:

stdenv.mkDerivation rec {
pname = "gdk-pixbuf";
version = "2.40.0";
version = "2.42.0";

outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm";
sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k";
};

patches = [
# Move installed tests to a separate output
./installed-tests-path.patch

# Temporary until the fix is released.
(fetchpatch {
name = "tests-circular-table.patch";
url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/59.diff";
sha256 = "0kaflac3mrh6031hwxk7j9fhli775hc503818h8zfl6b28zyn93f";
})
];

nativeBuildInputs = [
@@ -71,9 +63,8 @@ stdenv.mkDerivation rec {
];

mesonFlags = [
"-Ddocs=true"
"-Dx11=false" # use gdk-pixbuf-xlib
"-Dgir=${lib.boolToString (gobject-introspection != null)}"
"-Dgtk_doc=true"
"-Dintrospection=${if gobject-introspection != null then "enabled" else "disabled"}"
"-Dgio_sniffing=false"
];

@@ -135,7 +126,7 @@ stdenv.mkDerivation rec {
description = "A library for image loading and manipulation";
homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf";
maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
license = licenses.lgpl21;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
};
}