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

2014-08-08 09:51:01 +02:00
parent 5c276c4f68 bdf5f45356
commit 9226fbf56a
143 changed files with 2128 additions and 476 deletions
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "cacert-20140704";
+  name = "cacert-20140715";

  src = fetchurl {
    url = "http://tarballs.nixos.org/${name}.pem.bz2";
-    sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza";
+    sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl";
  };

  unpackPhase = "true";