mirror of
https://github.com/LnL7/nix-darwin.git
synced 2024-12-14 11:57:34 +00:00
treewide: use NIX_SSL_CERT_FILE instead of pkgs.cacert
This commit is contained in:
parent
f86f158efd
commit
5909f59691
6 changed files with 6 additions and 6 deletions
|
@ -3,7 +3,7 @@
|
||||||
let
|
let
|
||||||
environment = lib.concatStringsSep " "
|
environment = lib.concatStringsSep " "
|
||||||
[ "NIX_REMOTE=daemon"
|
[ "NIX_REMOTE=daemon"
|
||||||
"NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
|
"NIX_SSL_CERT_FILE=${config.environment.variables.NIX_SSL_CERT_FILE}"
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
# launchd.user.agents.fetch-nixpkgs-updates = {
|
# launchd.user.agents.fetch-nixpkgs-updates = {
|
||||||
# command = "/usr/bin/sandbox-exec -f ${config.security.sandbox.profiles.fetch-nixpkgs-updates.profile} ${pkgs.git}/bin/git -C ${toString ~/Code/nixos/nixpkgs} fetch origin master";
|
# command = "/usr/bin/sandbox-exec -f ${config.security.sandbox.profiles.fetch-nixpkgs-updates.profile} ${pkgs.git}/bin/git -C ${toString ~/Code/nixos/nixpkgs} fetch origin master";
|
||||||
# environment.HOME = "";
|
# environment.HOME = "";
|
||||||
# environment.NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
# environment = { inherit (config.environment.variables) NIX_SSL_CERT_FILE; };
|
||||||
# serviceConfig.KeepAlive = false;
|
# serviceConfig.KeepAlive = false;
|
||||||
# serviceConfig.ProcessType = "Background";
|
# serviceConfig.ProcessType = "Background";
|
||||||
# serviceConfig.StartInterval = 360;
|
# serviceConfig.StartInterval = 360;
|
||||||
|
|
|
@ -61,7 +61,7 @@ in {
|
||||||
path = [ config.nix.package pkgs.coreutils config.environment.systemPath ];
|
path = [ config.nix.package pkgs.coreutils config.environment.systemPath ];
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
|
||||||
USER = "root";
|
USER = "root";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -551,7 +551,7 @@ in
|
||||||
launchd.daemons.gitlab-runner = {
|
launchd.daemons.gitlab-runner = {
|
||||||
environment = { #config.networking.proxy.envVars // {
|
environment = { #config.networking.proxy.envVars // {
|
||||||
HOME = "${config.users.users.gitlab-runner.home}";
|
HOME = "${config.users.users.gitlab-runner.home}";
|
||||||
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
|
||||||
} // (if config.nix.useDaemon then { NIX_REMOTE = "daemon"; } else {});
|
} // (if config.nix.useDaemon then { NIX_REMOTE = "daemon"; } else {});
|
||||||
path = with pkgs; [
|
path = with pkgs; [
|
||||||
bash
|
bash
|
||||||
|
|
|
@ -27,7 +27,7 @@ in
|
||||||
|
|
||||||
path = [ config.nix.package config.environment.systemPath ];
|
path = [ config.nix.package config.environment.systemPath ];
|
||||||
environment = {
|
environment = {
|
||||||
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
|
||||||
};
|
};
|
||||||
|
|
||||||
serviceConfig.KeepAlive = true;
|
serviceConfig.KeepAlive = true;
|
||||||
|
|
|
@ -63,7 +63,7 @@ in
|
||||||
path = [ config.nix.package pkgs.bash pkgs.coreutils pkgs.curl pkgs.git ];
|
path = [ config.nix.package pkgs.bash pkgs.coreutils pkgs.curl pkgs.git ];
|
||||||
environment =
|
environment =
|
||||||
{ RUST_BACKTRACE = "1";
|
{ RUST_BACKTRACE = "1";
|
||||||
NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
inherit (config.environment.variables) NIX_SSL_CERT_FILE;
|
||||||
};
|
};
|
||||||
|
|
||||||
serviceConfig.KeepAlive = true;
|
serviceConfig.KeepAlive = true;
|
||||||
|
|
Loading…
Reference in a new issue