diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:30:15 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:34:58 +0200 |
| commit | 55932c1beca26c7b5b7c259d95f6eb80644150a7 (patch) | |
| tree | a2faafd73c3dcda7418278961a6ddf41d6d33d5c /pkgs/applications/version-management | |
| parent | 23562aad59048e8e1202e618fcf402079f1593b8 (diff) | |
| download | nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.gz nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.bz2 nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.lz nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.xz nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.tar.zst nixlib-55932c1beca26c7b5b7c259d95f6eb80644150a7.zip | |
Don't statically depend on cacert for certificates
This reverts commit cd52c044568bdf1108428698048a9af92dc0b625 and others. Managing certificates (including revoking certificates and adding custom certificates) becomes extremely painful if every package in the system potentially depends on a different copy of cacert. Also, it makes updating cacert rather expensive.
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index c3b238eeb0aa..28406cecbb00 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, cacert }: +{ stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { version = "2.6"; @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { patches = [ ./add_certificates.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt" + --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt ''; - installPhase = '' python setup.py install --prefix=$out wrapPythonPrograms diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 4d8b2fe27c60..12f3c8f11d86 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich -, guiSupport ? false, tk ? null, curses, cacert - +, guiSupport ? false, tk ? null, curses , ApplicationServices }: let @@ -48,7 +47,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/mercurial cat >> $out/etc/mercurial/hgrc << EOF [web] - cacerts = ${cacert}/etc/ssl/certs/ca-bundle.crt + cacerts = /etc/ssl/certs/ca-certificates.crt EOF # copy hgweb.cgi to allow use in apache |