MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/servers/http/nginx
History
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
..
default.nix Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 2014-10-09 10:57:57 +02:00
default.upstream Fixing automatic update of Nginx 2013-11-25 10:59:39 +04:00
unstable.nix Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03:00
unstable.upstream Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03:00