Merge remote-tracking branch 'upstream/master' into HEAD

4 files changed, 23 insertions, 21 deletions

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 2b24b93282f14..f1b992bea1a0c 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.19.3";
+  version = "2.20";
 
   src = fetchurl {
-    url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay";
+    url = "https://feh.finalrewind.org/${name}.tar.bz2";
+    sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b";
   };
 
   outputs = [ "out" "man" "doc" ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A light-weight image viewer";
-    homepage = https://derf.homelinux.org/projects/feh/;
+    homepage = "https://feh.finalrewind.org/";
     license = licenses.mit;
     maintainers = [ maintainers.viric maintainers.willibutz ];
     platforms = platforms.unix;
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index a3ca7fdd55df6..20d5629b83a90 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -1,13 +1,11 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.0.25";
+  version = "1.0.27";
   src = fetchurl {
-    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
+    sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9";
     urls = [
-      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz"
-      "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends-${version}.tar.gz"
     ];
-    curlOpts = "--insecure";
   };
 })
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index ff3ebfad484a2..3ef23142b2ed5 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -20,12 +20,13 @@ stdenv.mkDerivation {
   outputs = [ "out" "doc" "man" ];
 
   configureFlags = []
-    ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
+    ++ stdenv.lib.optional (avahi != null)   "--enable-avahi"
     ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
     ;
 
   buildInputs = [ avahi libusb1 libv4l net_snmp ];
   nativeBuildInputs = [ gettext pkgconfig ];
+  enableParallelBuilding = true;
 
   postInstall = let
 
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index a956db4005219..f6994db81e4b0 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
 
 stdenv.mkDerivation rec {
-  name = "sane-frontends-1.0.14";
+  name = "sane-frontends-${version}";
+  version = "1.0.14";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz";
+    url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
     sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
   };
 
@@ -12,15 +13,17 @@ stdenv.mkDerivation rec {
     sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
   '';
 
-  buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++
-	(if libusb != null then [libusb] else []);
+  buildInputs = [ sane-backends libX11 gtk2 ]
+    ++ stdenv.lib.optional (libusb != null) libusb;
+  nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
-    homepage = http://www.sane-project.org/;
-    description = "Scanner Access Now Easy";
-    license = stdenv.lib.licenses.gpl2Plus;
+  enableParallelBuilding = true;
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Scanner Access Now Easy";
+    homepage    = http://www.sane-project.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ peti ];
+    platforms   = platforms.linux;
   };
 }