diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-21 13:08:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 13:08:02 +0100 |
| commit | 0c4755b420c2b7c2a9922f6e5beda48d58528bae (patch) | |
| tree | f21460904bf6372e352987854a8dbe7f694a9c57 /pkgs/development | |
| parent | 41944946de3a9ddb9dbe7c091bf6bc1d92f9c34b (diff) | |
| parent | 75132e6eb54b826b4ecab37f2ecd0159c77e40d9 (diff) | |
| download | nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.gz nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.bz2 nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.lz nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.xz nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.tar.zst nixlib-0c4755b420c2b7c2a9922f6e5beda48d58528bae.zip | |
Merge pull request #80715 from jtojnar/gimp-2.10.16
gimp: 2.10.14 → 2.10.16
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/mypaint-brushes/1.0.nix | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 639ad8d0e51a..803cf853be14 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -18,6 +18,7 @@ , netsurf , pango , poly2tri-c +, poppler , bzip2 , json-glib , gettext @@ -34,14 +35,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.20"; + version = "0.4.22"; 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 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93"; + sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; }; patches = [ @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { netsurf.libnsgif pango poly2tri-c + poppler bzip2 libraw libwebp diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix index 115d818d9365..c66329fa633a 100644 --- a/pkgs/development/libraries/mypaint-brushes/1.0.nix +++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix @@ -1,5 +1,4 @@ { stdenv -, fetchpatch , autoconf , automake , fetchFromGitHub @@ -8,23 +7,15 @@ stdenv.mkDerivation rec { pname = "mypaint-brushes"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mypaint"; repo = pname; rev = "v${version}"; - sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0"; + sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j"; }; - patches = [ - # build with automake 1.16 - (fetchpatch { - url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch; - sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9"; - }) - ]; - nativeBuildInputs = [ autoconf automake |