From 121c5cb92cba3594cbe4743ff80e46b6e85aeb4d Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Oct 2016 14:07:29 +0200 Subject: m 2 default: use ca-bundle for CURL GIT, PIP --- makefu/2configs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'makefu/2configs/default.nix') diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index cb6fe55b8..bbe108074 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -90,9 +90,14 @@ with import ; "d /tmp 1777 root root - -" ]; nix.nixPath = [ "/var/src" ]; - environment.variables = { + environment.variables = let + ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + in { NIX_PATH = mkForce "/var/src"; EDITOR = mkForce "vim"; + CURL_CA_BUNDLE = ca-bundle; + GIT_SSL_CAINFO = ca-bundle; + SSL_CERT_FILE = ca-bundle; }; environment.systemPackages = with pkgs; [ -- cgit v1.2.3 From 09fac6376315022edb27d53974d9c31eb672badb Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 30 Oct 2016 19:59:12 +0100 Subject: m 2 retiolum: only use prism cache if in retiolum --- makefu/2configs/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'makefu/2configs/default.nix') diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index bbe108074..db69be2fa 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -10,7 +10,6 @@ with import ; } ./vim.nix ./binary-cache/nixos.nix - ./binary-cache/lass.nix ]; nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name); -- cgit v1.2.3