diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/gimp/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/remove-cc-reference.patch | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/gegl/4.0.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/mypaint-brushes/1.0.nix | 13 |
4 files changed, 18 insertions, 22 deletions
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index d3950c06c339..e9223b1453e2 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.14"; + version = "2.10.16"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz"; + sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb"; }; nativeBuildInputs = [ @@ -155,6 +155,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-webkit" # old version is required + "--disable-check-update" "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" "--with-icc-directory=/run/current-system/sw/share/color/icc" # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index 0d6a87000ccd..e37351cfd463 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -1,13 +1,15 @@ diff --git a/app/gimp-version.c b/app/gimp-version.c -index 12605c6..a9083da 100644 +index 0f7bfb9bf9..1679624b8e 100644 --- a/app/gimp-version.c +++ b/app/gimp-version.c -@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose, - lib_versions = gimp_library_versions (localized); - verbose_info = g_strdup_printf ("git-describe: %s\n" - "C compiler:\n%s\n%s", -- GIMP_GIT_VERSION, CC_VERSION, -+ GIMP_GIT_VERSION, "@cc_version@", +@@ -228,9 +228,9 @@ + "# Libraries #\n%s", + GIMP_GIT_VERSION, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM, +- CC_VERSION, ++ "@cc_version@", lib_versions); g_free (lib_versions); 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 |