Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 67723df930d74ecda8c8a66740df7c5650da8e6a
https://github.com/NixOS/nixpkgs/commit/67723df930d74ecda8c8a66740df7c5650da8e6a
Author: Bjørn Forsman <[email protected]>
Date: 2015-10-04 (Sun, 04 Oct 2015)
Changed paths:
M nixos/modules/services/continuous-integration/jenkins/default.nix
Log Message:
-----------
nixos/jenkins: rework environment handling
Jenkins gets (by default) an additional environment of
{ NIX_REMOTE = "daemon"; }
This has the following problems:
1. NIX_REMOTE disappears when users specify additional environment
variables, because defaults have low merge priority.
2. nix cannot be used without additional NIX_PATH envvar, which is
currently missing.
3. If you try to use HTTPS, you'll see that jenkins lacks
SSL_CERT_FILE envvar, causing it to fail.
This commit adds config.environment.sessionVariables and NIX_REMOTE to
the set of variables that are always there for jenkins, making nix and
HTTPS work out of the box.
services.jenkins.environment is now empty by default.
Commit: a61e26a63d03c4fd30efe61764fdb2fa8358480f
https://github.com/NixOS/nixpkgs/commit/a61e26a63d03c4fd30efe61764fdb2fa8358480f
Author: Domen Kožar <[email protected]>
Date: 2015-10-06 (Tue, 06 Oct 2015)
Changed paths:
M nixos/modules/services/continuous-integration/jenkins/default.nix
Log Message:
-----------
Merge pull request #10227 from bjornfor/jenkins-envvars
nixos/jenkins: rework environment handling
Compare: https://github.com/NixOS/nixpkgs/compare/5c66135b25cb...a61e26a63d03_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
