Merge branch 'master' into staging

Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix

pkgs/development/tools/misc/intltool/default.nix

@@ -1,33 +1,21 @@
-{ stdenv, fetchurl, perl, perlXMLParser, gettext }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="intltool";
-    version="0.51.0";
-    name="${baseName}-${version}";
-    hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
-    url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";
-    sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
-  };
-  propagatedBuildInputs = [perl perlXMLParser];
-  buildInputs = [];
-  in
-stdenv.mkDerivation {
-  inherit (s) name version;
+{ stdenv, fetchurl, gettext, perl, perlXMLParser }:
+
+stdenv.mkDerivation rec {
+  name = "intltool-${version}";
+  version = "0.51.0";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7";
   };
-  inherit buildInputs;
 
-  # not needed by intltool itself but (probably) needed for its usage
-  propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ];
+  propagatedBuildInputs = [ gettext perl perlXMLParser ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Translation helper tool";
-    homepage = "http://launchpad.net/intltool/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
-    inherit (s) version;
+    homepage = http://launchpad.net/intltool/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.unix;
   };
 }

pkgs/development/tools/misc/intltool/default.upstream

@@ -1,2 +0,0 @@
-attribute_name intltool
-url https://launchpad.net/intltool/+download