diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-12 11:29:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 11:29:25 +0200 |
| commit | 3437d3c64fd7578651d2695f9c43b4c972dfa9a5 (patch) | |
| tree | 2eb1f62e114c2fc660b96314de74389b44de1bc1 /pkgs | |
| parent | c60e2bee7c514a422ebf74c766e9e18c936ad845 (diff) | |
| parent | d7ffb5fa07fa67d69aeb763a4ca10c34ed30e5d2 (diff) | |
| download | nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.tar nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.tar.gz nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.tar.bz2 nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.tar.lz nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.tar.xz nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.tar.zst nixlib-3437d3c64fd7578651d2695f9c43b4c972dfa9a5.zip | |
Merge pull request #90154 from adisbladis/gimp-2_10_20
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/babl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 14 |
3 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 56135c4bd3db..9e448fa23a43 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -50,13 +50,13 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.18"; + version = "2.10.20"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5"; + sha256 = "4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index dbf7afd596fb..12547bcb4c75 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -5,17 +5,18 @@ , pkgconfig , gobject-introspection , lcms2 +, vala }: stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.74"; + version = "0.1.78"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; + sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo="; }; nativeBuildInputs = [ @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection + vala ]; buildInputs = [ diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 3b48a0968ea1..85699a8828b0 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -35,26 +35,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.22"; + version = "0.4.24"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; + sha256 = "d2VJnyc0Gw0WAy5mUxnLwSh2SD/2qUT83ySpxY4+JUo="; }; - patches = [ - # Prevent deadlock making tests time-out - # https://gitlab.gnome.org/GNOME/gegl/issues/226 - # https://gitlab.gnome.org/GNOME/glib/issues/1941 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch"; - sha256 = "1d8nhrzvwq35c5ws00xy9y6bfd9wsj3dm0301hiwkfi4niq59ygh"; - }) - ]; - nativeBuildInputs = [ pkgconfig gettext |