Merge staging-next into staging

pkgs/misc/cups/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, removeReferencesTo
+{ stdenv, fetchurl, pkgconfig, removeReferencesTo
 , zlib, libjpeg, libpng, libtiff, pam, dbus, systemd, acl, gmp, darwin
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 , coreutils

pkgs/misc/cups/drivers/samsung/1.00.36/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript, perl }:
+{ stdenv, fetchurl, cups, libusb, libxml2, perl }:
 
 let
 

pkgs/misc/emulators/ccemux/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, makeWrapper, jre
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, jre
 , useCCTweaked ? true
 }:
 

pkgs/misc/emulators/citra/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost, curl, gtest }:
+{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }:
 
 stdenv.mkDerivation rec { 
   name = "citra-${version}";

pkgs/misc/emulators/wine/base.nix

@@ -114,8 +114,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
   passthru = { inherit pkgArches; };
   meta = {
     inherit version platforms;
-    homepage = http://www.winehq.org/;
-    license = "LGPL";
+    homepage = "https://www.winehq.org/";
+    license = with stdenv.lib.licenses; [ lgpl21Plus ];
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
     maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ];
   };

pkgs/misc/emulators/wine/fonts.nix

@@ -0,0 +1,22 @@
+{ stdenv, lib, callPackage }:
+let src = (callPackage ./sources.nix {}).stable;
+in
+stdenv.mkDerivation {
+  pname = "wine-fonts";
+  inherit (src) version;
+
+  sourceRoot = "wine-${src.version}/fonts";
+  inherit src;
+
+  installPhase = ''
+    install *.ttf -Dt $out/share/fonts/wine
+  '';
+
+  meta = {
+    description = "Microsoft replacement fonts by the Wine project";
+    homepage = "https://wiki.winehq.org/Create_Fonts";
+    license = with lib.licenses; [ lgpl21Plus ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ avnik raskin bendlas johnazoidberg ];
+  };
+}

pkgs/misc/lilypond/unstable.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }:
+{ fetchgit, lilypond, ghostscript, gyre-fonts }:
 
 let
 

pkgs/misc/lilypond/with-fonts.nix

@@ -1,6 +1,5 @@
 { stdenv, lndir, symlinkJoin, makeWrapper
 , lilypond, openlilylib-fonts
-, fonts ? openlilylib-fonts.all
 }:
 
 stdenv.lib.appendToName "with-fonts" (symlinkJoin {

pkgs/misc/screensavers/betterlockscreen/default.nix

@@ -1,5 +1,5 @@
 {
-  stdenv, makeWrapper, fetchFromGitHub, substituteAll,
+  stdenv, makeWrapper, fetchFromGitHub,
   imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh
 }:
 

pkgs/misc/themes/adwaita-qt/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, ninja, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "adwaita-qt";

pkgs/misc/vim-plugins/default.nix

@@ -1,5 +1,5 @@
 # TODO check that no license information gets lost
-{ callPackage, config, lib, stdenv, vimUtils, vim, darwin, llvmPackages }:
+{ callPackage, config, lib, vimUtils, vim, darwin, llvmPackages }:
 
 let