diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-07 14:17:16 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-07 14:17:16 +0100 |
| commit | 6690c9756960c15765e39994ba9ae26d989ffe69 (patch) | |
| tree | c0092c241133efc8ad4b2bd6b6511409a78dc95a /pkgs/applications/graphics | |
| parent | 7e9b24c8f1204b212a5c8b83f395e9be29ebe37e (diff) | |
| parent | 50493458bd0b4f3051cf200e165c007efe7dbade (diff) | |
| download | nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.tar nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.tar.gz nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.tar.bz2 nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.tar.lz nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.tar.xz nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.tar.zst nixlib-6690c9756960c15765e39994ba9ae26d989ffe69.zip | |
Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/graphicsmagick/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sxiv/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c02bc6024df1..1f795a800ff6 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libX11}: -let version = "1.3.13"; in +let version = "1.3.18"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5"; + sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x"; }; configureFlags = "--enable-shared"; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 26d910943efa..8500fa9faba2 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libX11, imlib2, giflib }: stdenv.mkDerivation { - name = "sxiv-1.1"; + name = "sxiv-1.1.1"; src = fetchurl { - url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz"; + url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz"; name = "sxiv-1.1.tar.gz"; - sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx"; + sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih"; }; buildInputs = [ libX11 imlib2 giflib ]; |