summary refs log tree commit diff
path: root/pkgs/servers
Commit message (Expand)AuthorAge
* net-snmp: fix references to openssl in multiple-outputsLuca Bruno2015-12-07
* apache modules: fix build problemsVladimír Čunát2015-12-05
* apache-httpd-2.2: fix buildVladimír Čunát2015-12-05
* apache*: don't change layout in $out WRT masterVladimír Čunát2015-12-04
* rename moveToOutput and propagatedBuildInputsLuca Bruno2015-12-02
* Merge branch 'master' into closure-sizeLuca Bruno2015-11-29
|\
| * opensmtpd: 5.7.1p1 -> 5.7.3p1Franz Pletz2015-11-29
| * html-tidy: unify with its drop-in replacement tidy-html5Vladimír Čunát2015-11-29
| * webfs: fix mime typeszimbatm2015-11-28
| * Merge pull request #11295 from mayflower/pkg/dovecotPeter Simons2015-11-27
| |\
| | * dovecot: 2.2.16 -> 2.2.19Franz Pletz2015-11-27
| * | Convert some *Flags from strings to listsTobias Geerinckx-Rice2015-11-26
| |/
* | Merge remote-tracking branch 'origin/master' into closure-sizeLuca Bruno2015-11-25
|\|
| * subsonic: 5.2.1 -> 5.3Robert Irelan2015-11-25
| * nixpkgs: plex 0.9.12.13.1464 -> 0.9.12.19.1537Austin Seipp2015-11-24
| * longview: Linode metrics collectorRodney Lorrimar2015-11-22
| * darkhttpd: init at 1.11Bob van der Linden2015-11-19
| * Merge pull request #11034 from zimbatm/webfs-1.21goibhniu2015-11-18
| |\
| | * webfs: init at 1.21zimbatm2015-11-16
| * | xkbcomp: 1.3.0 -> 1.3.1William A. Kennington III2015-11-18
| * | xinput: 1.6.1 -> 1.6.2William A. Kennington III2015-11-18
| * | Replace 'with plaforms; platform' with 'platforms.platform'Pascal Wittmann2015-11-18
| * | xorg: Fix hashesWilliam A. Kennington III2015-11-17
| * | xf86-video-ati: 7.5.0 -> 7.6.1William A. Kennington III2015-11-17
| * | xf86-input-synaptics: 1.8.2 -> 1.8.3William A. Kennington III2015-11-17
| * | xf86-input-libinput: 0.14.0 -> 0.15.0William A. Kennington III2015-11-17
| * | xf86-input-evdev: 2.9.2 -> 2.10.0William A. Kennington III2015-11-17
| * | Replace 'with plaforms; platform' with 'platforms.platform'Pascal Wittmann2015-11-17
| * | Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4Jaka Hudoklin2015-11-17
| |\ \
| | * | influxdb: 0.8.3 -> 0.9.4, fix moduleJaka Hudoklin2015-11-16
| | |/
| * | Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0Jaka Hudoklin2015-11-17
| |\ \
| | * | bosun: 0.3.0 -> 0.5.0-alphaJaka Hudoklin2015-11-16
| | |/
| * | Merge pull request #11061 from offlinehacker/nixos/heapster/addJaka Hudoklin2015-11-17
| |\ \
| | * | heapster: init at 3057a2c07061c8d9ffaf77e5442ffd7512ac0133Jaka Hudoklin2015-11-16
| | |/
| * | Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0Jaka Hudoklin2015-11-17
| |\ \
| | * | grafana: 2.0.0-beta1 -> 2.5.0Jaka Hudoklin2015-11-16
| | |/
| * | xf86-video-intel: 2015-11-13 -> 2015-11-14aszlig2015-11-17
| * | Merge pull request #11054 from makefu/acng_initPascal Wittmann2015-11-16
| |\ \
| | * | apt-cacher-ng: init at 0.8.6makefu2015-11-16
| | |/
| * / mariadb: fix missing CoreServices framework dependency on darwinRyan Trinkle2015-11-15
| |/
* | Merge staging into closure-sizeVladimír Čunát2015-11-20
|\|
| * Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""William A. Kennington III2015-11-14
| * Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III2015-11-13
| |\
| | * Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-07
| | |\
| | * \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-05
| | |\ \
| | * \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-11-04
| | |\ \ \
| | * \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-30
| | |\ \ \ \
| | * | | | | mariadb: build without snappy on 32-bitVladimír Čunát2015-10-27
| | * | | | | Merge master into stagingVladimír Čunát2015-10-23
| | |\ \ \ \ \
| | * | | | | | mariadb: Add extra dependencies for 10.1William A. Kennington III2015-10-17