Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: 3e77e3962a5f571f739a7f0c9d2acb0e7a2afee9
https://github.com/NixOS/nixpkgs/commit/3e77e3962a5f571f739a7f0c9d2acb0e7a2afee9
Author: Bjørn Forsman <[email protected]>
Date: 2015-10-07 (Wed, 07 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.
(cherry picked from commit 67723df930d74ecda8c8a66740df7c5650da8e6a)
Commit: 53481fee51402dc61d998e373b7976a7067bf528
https://github.com/NixOS/nixpkgs/commit/53481fee51402dc61d998e373b7976a7067bf528
Author: Bjørn Forsman <[email protected]>
Date: 2015-10-07 (Wed, 07 Oct 2015)
Changed paths:
M nixos/modules/services/continuous-integration/jenkins/default.nix
Log Message:
-----------
nixos/jenkins: reduce default environment
Don't pull in all of environment.sessionVariables, only add what's
needed for nix and HTTPS to work (which was the point of the previous
patch).
(cherry picked from commit 04e748e61fd8613cc35a5966eb51cfaa2a633be2)
Compare: https://github.com/NixOS/nixpkgs/compare/b7d0730f66fa...53481fee5140_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
