Merge 'staging' into closure-size

This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
parent 056b5a1a5f c55cfe0cb3
commit d1df28f8e5
89 changed files with 1475 additions and 397 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "hwinfo-${version}";
-  version = "21.12";
+  version = "21.23";

  src = fetchurl {
    url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz";
-    sha256 = "01y5jk2jns0a3mgsgmvmpvi5yyc0df7b3yqsg32hn5r2nv17i47p";
+    sha256 = "1a8815zp3a7n2jx0cn0hcr69rfr6vmw8r8grbn5mv61g90bbcj6p";
  };

  patchPhase = ''