Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 77641e8d1fa1ce9eee334b27e00d673ac5ccc66c
      
https://github.com/NixOS/nixpkgs/commit/77641e8d1fa1ce9eee334b27e00d673ac5ccc66c
  Author: Susan Potter <m...@susanpotter.net>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M nixos/modules/services/web-servers/nginx/default.nix
    A nixos/tests/nginx.nix

  Log Message:
  -----------
  nginx service: add commonHttpConfig option

(cherry picked from commit 251b9ca0e77963c48d9c198cec964f7a1cd91d4a)

cc #23279


  Commit: a535c14363ecf48d78077ed3a33306c9c4ee32f8
      
https://github.com/NixOS/nixpkgs/commit/a535c14363ecf48d78077ed3a33306c9c4ee32f8
  Author: Franz Pletz <fpl...@fnordicwalking.de>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M nixos/release.nix

  Log Message:
  -----------
  nixos: enable nginx test

cc #23279

(cherry picked from commit 7151e7488378e8b23de8623a11524139939a30fb)


  Commit: 5e4b43df13ccb07ea2365dee5aefcd964945a16d
      
https://github.com/NixOS/nixpkgs/commit/5e4b43df13ccb07ea2365dee5aefcd964945a16d
  Author: Franz Pletz <fpl...@fnordicwalking.de>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M nixos/modules/services/web-servers/nginx/default.nix
    M pkgs/servers/http/nginx/generic.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  nginx: explicitly use stable version

Also updates the documention of the NixOS option `services.nginx.package`
that upstream recommends using the mainline version instead.

Fixes #21665.

(cherry picked from commit c13922f0120d43f491ee286fd9362dd12833b9e5)


Compare: https://github.com/NixOS/nixpkgs/compare/9f4e6cda6778...5e4b43df13cc
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to