Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/development/libraries/boost/generic.nix

pkgs/tools/system/pciutils/default.nix

@@ -8,11 +8,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "pciutils-3.2.1"; # with database from 2013-11-10
+  name = "pciutils-3.3.0"; # with database from 2014-11-10
 
   src = fetchurl {
-    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
-    sha256 = "1pnwwc4sq0q7zz3mw2rsrc9j5rxwpdvxirqjmxcd0brf0hcjpm8j";
+    url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
+    sha256 = "008kh33kbpkk1wr9srrapw93imqx7l4djglrdkfxwvy6ppa9acs1";
   };
 
   buildInputs = [ pkgconfig zlib kmod which ];
@@ -26,8 +26,12 @@ stdenv.mkDerivation rec {
   # Get rid of update-pciids as it won't work.
   postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";
 
-  meta = {
-    homepage = http://mj.ucw.cz/pciutils.shtml;
+  meta = with stdenv.lib; {
+    homepage = http://mj.ucw.cz/pciutils.html;
     description = "A collection of programs for inspecting and manipulating configuration of PCI devices";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it
   };
 }
+

pkgs/tools/system/safe-rm/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Tool intended to prevent the accidental deletion of important files.";
+    description = "Tool intended to prevent the accidental deletion of important files";
     homepage = https://launchpad.net/safe-rm;
     license = licenses.gpl3;
     platforms = platforms.all;