about summary refs log tree commit diff
path: root/pkgs/tools/graphics
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-07-19 10:37:02 +0000
committerRobin Gloster <mail@glob.in>2016-07-19 10:37:02 +0000
commit203846b9de3bc67e77c93be9d111408286a17d5d (patch)
tree3306a68a635fad0de834440c25f7e1b69b1e4b10 /pkgs/tools/graphics
parent6539901c7f5eeb18cf5e9a493c230a912ff27f82 (diff)
parentb54009fdfb7951bb5423c4fabcb28b70581b5ba8 (diff)
downloadnixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar
nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.gz
nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.bz2
nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.lz
nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.xz
nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.tar.zst
nixlib-203846b9de3bc67e77c93be9d111408286a17d5d.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r--pkgs/tools/graphics/nip2/default.nix8
-rw-r--r--pkgs/tools/graphics/vips/default.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix
index e61488e202d3..fb88a8c37d4c 100644
--- a/pkgs/tools/graphics/nip2/default.nix
+++ b/pkgs/tools/graphics/nip2/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome,
-fftw, gsl, goffice_0_8, libgsf }:
+fftw, gsl, goffice, libgsf }:
 
 stdenv.mkDerivation rec {
-  name = "nip2-8.0";
+  name = "nip2-8.3.0";
 
   src = fetchurl {
     url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "10ybac0qrz63x1yk1d0gpv9z1vzpadyii2qhrai6lllplzw6jqx7";
+    sha256 = "0vr12gyfvhxx2a28y74lzfg379d1fk0g9isc69k0vdgpn4y1i8aa";
   };
 
   buildInputs =
   [ pkgconfig glib libxml2 flex bison vips
-    gnome.gtk fftw gsl goffice_0_8 libgsf
+    gnome.gtk fftw gsl goffice libgsf
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 7b0cbc16e11a..6ff2ee5cd442 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-8.2.2";
+  name = "vips-8.3.1";
 
   src = fetchurl {
     url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "12b319aicr129cpi5sixwd3q91y97vwwva6b044zy54px4s8ls0g";
+    sha256 = "01hh1baar2r474kny24fcq6ddshcvq104207mqxnkis0as6pzjq9";
   };
 
   buildInputs =