Merge master into staging-next

2018-07-21 19:43:53 +02:00
parent 8213ff161c cc218fc915
commit ad47d658d1
2090 changed files with 4329 additions and 3730 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
-, libXdmcp, libXau, lib, openssl, zlib }:
+, libXdmcp, libXau, lib, openssl }:
 let
  version = "2.0.0";
 in
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
+{ stdenv, fetchurl, cmake, imagemagick }:

 stdenv.mkDerivation rec {
  name = "cuneiform-${version}";
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
+{ stdenv, fetchurl, cmake, ninja, pkgconfig
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
 , withGimpPlugin ? true, gimp ? null}:

@@ -2,7 +2,6 @@
 , cairo, gd, libcerf, pango, readline, zlib
 , withTeXLive ? false, texlive
 , withLua ? false, lua
-, emacs ? null
 , libX11 ? null
 , libXt ? null
 , libXpm ? null
@@ -7,7 +7,7 @@
 assert stdenv.isDarwin -> ApplicationServices != null;

 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 in

 stdenv.mkDerivation rec {
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
+{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:

 stdenv.mkDerivation {
  name = "jbig2enc-0.28";
@@ -1,4 +1,4 @@
-{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }:
+{ lib, python3Packages, imagemagick, feh }:

 python3Packages.buildPythonApplication rec {
  pname = "pywal";
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat,
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat,
  fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
-  python27, libpng, matio ? null, cfitsio ? null, libwebp ? null
+  python27, libpng ? null
 }:

 stdenv.mkDerivation rec {
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {

    name = "yafaray-core-${version}";
-    version = "v3.3.0";
+    version = "3.3.0";

    src = fetchFromGitHub {
      owner  = "YafaRay";
      repo   = "Core";
-      rev    = "${version}";
+      rev    = "v${version}";
      sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6";
    };