diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:36:23 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:36:23 +0100 |
| commit | e5381cdeceeb150535998cee5518e6fa678e4dc0 (patch) | |
| tree | f0ba4eaa3e0d2c5e2cdfd55e18c1953b1ad9a854 /pkgs/tools/networking | |
| parent | d84a33d85b621f4621f4e4da1c74b8ad896a349e (diff) | |
| parent | 7d864c6bd6391baa516118051ec5fb7e9836280e (diff) | |
| download | nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.gz nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.bz2 nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.lz nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.xz nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.tar.zst nixlib-e5381cdeceeb150535998cee5518e6fa678e4dc0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/offlineimap/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/stubby/default.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 50ed107bc20d..5ac64d36eaf9 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python2Packages, - asciidoc, libxml2, libxslt, docbook_xsl }: + asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { version = "7.2.2"; @@ -15,6 +15,9 @@ python2Packages.buildPythonApplication rec { postPatch = '' # Skip xmllint to stop failures due to no network access sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |" + + # Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured") + sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"' ''; doCheck = false; diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix index 2882ba217398..d8088918f449 100644 --- a/pkgs/tools/networking/stubby/default.nix +++ b/pkgs/tools/networking/stubby/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stubby"; name = "${pname}-${version}"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "getdnsapi"; repo = pname; rev = "v${version}"; - sha256 = "1n02dj1hvh0aml54asxj42f0j9wfgiyavbh0gr0j9lm4f2xcd60w"; + sha256 = "1c0jqbxcrwc8kvpx7v0bmdladf20myyi2672r2r87m2q0jvsmgpr"; }; nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; |