public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90154 from adisbladis/gimp-2_10_20

This commit is contained in:
Jan Tojnar 2020-06-12 11:29:25 +02:00 committed by GitHub
parent c60e2bee7c d7ffb5fa07
commit 3437d3c64f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/gimp/default.nix
View File

@ -50,13 +50,13 @@ let
inherit (python2Packages) pygtk wrapPython python; inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gimp"; pname = "gimp";
version = "2.10.18"; version = "2.10.20";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5"; sha256 = "4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/libraries/babl/default.nix
View File

@ -5,17 +5,18 @@
, pkgconfig , pkgconfig
, gobject-introspection , gobject-introspection
, lcms2 , lcms2
, vala
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "babl"; pname = "babl";
version = "0.1.74"; version = "0.1.78";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
gobject-introspection gobject-introspection
vala
]; ];
buildInputs = [ buildInputs = [

14
pkgs/development/libraries/gegl/4.0.nix
View File

@ -35,26 +35,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gegl"; pname = "gegl";
version = "0.4.22"; version = "0.4.24";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 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 = [ nativeBuildInputs = [
pkgconfig pkgconfig
gettext gettext