diff options
| author | Shea Levy <shea@shealevy.com> | 2012-07-14 14:24:27 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-07-14 14:24:27 -0400 |
| commit | c514ee974a14856ccabe0463e812c6bf2b7175a8 (patch) | |
| tree | 368562bed1d4cde7e30a431ba60cc796e7c10538 /pkgs/data/misc | |
| parent | 41840af6894bf718a1038ba1045adef26a687919 (diff) | |
| parent | 8ff20e5b77b7aea77b5bd22da3d2c10a99481b74 (diff) | |
| download | nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.gz nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.bz2 nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.lz nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.xz nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.tar.zst nixlib-c514ee974a14856ccabe0463e812c6bf2b7175a8.zip | |
Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/cacert/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 4db1e84b4853..7349ab3e9828 100644 --- 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-20110902"; + name = "cacert-20120628"; src = fetchurl { url = "http://nixos.org/tarballs/${name}.pem.bz2"; - sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi"; + sha256 = "0xg9f1w2pmsv221lgc60c07bs0xf2rr189a2yp2y9an95h3gx7ir"; }; unpackPhase = "true"; |