Branch: refs/heads/release-17.03
Home: https://github.com/NixOS/nixpkgs
Commit: 6448a3e113580be2f123d62edbda679979fe9e04
https://github.com/NixOS/nixpkgs/commit/6448a3e113580be2f123d62edbda679979fe9e04
Author: Evan Danaher <[email protected]>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M nixos/modules/services/web-servers/nginx/default.nix
M nixos/modules/services/web-servers/nginx/location-options.nix
M nixos/modules/services/web-servers/nginx/vhost-options.nix
Log Message:
-----------
nginx: Add alias configuration option for hosts and locations.
It's like root, but doesn't keep the prefix.
(cherry picked from commit ff2e2e82ccc2eebc36220613b332efa475dcca51)
Commit: 4bea988a7e05b9c1ad986e41de9f8c4a97a45dfb
https://github.com/NixOS/nixpkgs/commit/4bea988a7e05b9c1ad986e41de9f8c4a97a45dfb
Author: Evan Danaher <[email protected]>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M nixos/modules/services/web-servers/nginx/default.nix
Log Message:
-----------
nginx: Assert that either root or alias is null.
If both are set, nginx won't start. More error checking is certainly in
order, but this seems like a reasonable start.
(cherry picked from commit e7358b192a3cdfc7d64fa2a21321df03b2256345)
Commit: 84561b005c4dcd8cdb686916ef655c1b9254e1e6
https://github.com/NixOS/nixpkgs/commit/84561b005c4dcd8cdb686916ef655c1b9254e1e6
Author: Evan Danaher <[email protected]>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M nixos/modules/services/web-servers/nginx/default.nix
M nixos/modules/services/web-servers/nginx/vhost-options.nix
Log Message:
-----------
nginx: disallow alias directive on server level; it doesn't work.
(cherry picked from commit a09246948cafb7672ea1e5590688e7eb6a16cef3)
Commit: 5acae6d484af748de22041fa6794597f084c373d
https://github.com/NixOS/nixpkgs/commit/5acae6d484af748de22041fa6794597f084c373d
Author: Eelco Dolstra <[email protected]>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M pkgs/tools/virtualization/nixos-container/default.nix
M pkgs/tools/virtualization/nixos-container/nixos-container.pl
Log Message:
-----------
Revert "nixos-container: Use machinectl shell (#18825)"
This reverts commit
c37e76b4d2ac59139df8956cc2b1ec6921bea11d. Unfortunately, using
"machinectl shell" has two bad side effects:
* It sends the command's stderr to stdout.
* It doesn't propagate the command's exit status.
This broke NixOps.
PR #18825.
(cherry picked from commit cb49c1432417f9576ed12613f0374b3bc23587c2)
Commit: 47051c876a6ee7e7b3e161ad6dd74cf6e06ac574
https://github.com/NixOS/nixpkgs/commit/47051c876a6ee7e7b3e161ad6dd74cf6e06ac574
Author: HeeL <[email protected]>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M pkgs/build-support/fetchgx/default.nix
Log Message:
-----------
Fix mkdir for fetchgx to not throw an exception
(cherry picked from commit cd2627da0dabdb5e856c43299bbf4e1b2fd28bdf)
Compare: https://github.com/NixOS/nixpkgs/compare/a0134b962254...47051c876a6e_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
