diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
| commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
| tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /pkgs/data/misc | |
| parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
| parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
| download | nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.gz nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.bz2 nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.lz nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.xz nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.zst nixpkgs-5effa4e0f98b317fe4607b1a6548811017c3325d.zip | |
Merge branch 'master' into staging-next
Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/cacert/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/misc/hackage/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index aa6a42badb7..a99df2e7bd6 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = https://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 140d6c6cec8..e6c8b1a388a 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/79e6c7e847ee9ff93fff64a4081251f3bbfb7ca7.tar.gz"; - sha256 = "19ypss73lb3zwhzpw9sxdmgy7dha798ism77vm3ccyxg66qav41n"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c400563a55894c34ae0d7dec415ac8994aa74aa0.tar.gz"; + sha256 = "0mqgfw8sc0h4p031gcs4m3n6rbd31zrqx2lh1xgplhxldhw5gg8p"; } |