diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-17 12:50:46 +0200 |
| commit | 67c73b4e64b01657ce9ea9bb2d8c015754ef3150 (patch) | |
| tree | 7358277e028232ad5f37da0892ee2bb6860373b5 /pkgs/data | |
| parent | 5ab499d2c753209381e721a66204fe7869d6dac9 (diff) | |
| parent | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (diff) | |
| download | nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.gz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.bz2 nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.lz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.xz nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.tar.zst nixlib-67c73b4e64b01657ce9ea9bb2d8c015754ef3150.zip | |
Merge commit '2e56ba' from staging into master
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/cacert/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/misc/cacert/setup-hook.sh | 5 | ||||
| -rw-r--r-- | pkgs/data/misc/iana-etc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/misc/tzdata/tzdata-setup-hook.sh | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 275ae6dc2d86..91af84c42245 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { cp -v ca-bundle.crt $out/etc/ssl/certs ''; + setupHook = ./setup-hook.sh; + meta = { homepage = https://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh new file mode 100644 index 000000000000..b704a6a919e0 --- /dev/null +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -0,0 +1,5 @@ +cacertHook() { + export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +} + +addEnvHooks "$targetOffset" cacertHook diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 249f0e5dcb91..6b1abad02d74 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iana-etc-${version}"; - version = "20171106"; + version = "20180108"; src = fetchurl { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0pbmq95gdkp66cljwklv4gzh8lvl30l4k77hfwvrxz5mfqia6qdd"; + sha256 = "1x4jacrvjwcsan88rg2wf2a8bajsglg6w4396vbr18zh0sya84a2"; }; installPhase = '' diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh index 9ae9b46d85c5..9975d0aec31a 100644 --- a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh +++ b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh @@ -2,5 +2,4 @@ tzdataHook() { export TZDIR=@out@/share/zoneinfo } -envHooks+=(tzdataHook) -crossEnvHooks+=(tzdataHook) +addEnvHooks "$targetOffset" tzdataHook |