movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge recent 'staging' into closure-size

Browse source 
Let's get rid of those merge conflicts.
This commit is contained in:
Vladimír Čunát 2016-02-03 16:54:03 +01:00
commit ae74c356d9
637 changed files with 123880 additions and 83341 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/nix-daemon.nix
View file

@ -364,7 +364,7 @@ in
++ optionals cfg.distributedBuilds [ pkgs.gzip ];
environment = cfg.envVars
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
// config.networking.proxy.envVars;
serviceConfig =