summary refs log tree commit diff
path: root/pkgs/servers
Commit message (Expand)AuthorAge
* 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
|/
* 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
| * | | | | | mariadb: 10.0.21 -> 10.1.8William A. Kennington III2015-10-17
| * | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-15
| |\ \ \ \ \ \
| * | | | | | | Revert "Merge pull request #9543 from NixOS/staging.post-15.06"Eelco Dolstra2015-10-06
| * | | | | | | Merge branch 'master.upstream' into staging.post-15.06William A. Kennington III2015-10-02
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-10-01
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-09-30
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-09-29
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | give xquartz impure deps to make it buildJude Taylor2015-09-28
| * | | | | | | | | | | Merge pull request #10028 from itkovian/elasticsearch-1.7.2Jaka Hudoklin2015-09-25
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | elasticsearch: 1.5.2 -> 1.7.2Andy Georges2015-09-24
| * | | | | | | | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-09-23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | work on making xquartz buildable in a pure environmentJude Taylor2015-09-22
* | | | | | | | | | | | | | xf86-video-intel: 2015-11-10 -> 2015-11-13William A. Kennington III2015-11-13
* | | | | | | | | | | | | | Merge pull request #10807 from joachifm/fix-hyperdex-hashesArseniy Seroka2015-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | hyperdex: blindly fix hashes of local dependenciesJoachim Fasting2015-11-03
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | nsd: 4.13 -> 4.16Christoph Hrdinka2015-11-12
* | | | | | | | | | | | | | gatling: fix meta evaluationVladimír Čunát2015-11-11
* | | | | | | | | | | | | | xf86-video-intel: 2015-07-22 -> 2015-11-10William A. Kennington III2015-11-10
* | | | | | | | | | | | | | unifi: 4.7.5 -> 4.7.6William A. Kennington III2015-11-10
* | | | | | | | | | | | | | gatling: Init at 0.13.Moritz Ulrich2015-11-10
* | | | | | | | | | | | | | Merge pull request #10620 from gebner/postfix-3.0.3Peter Simons2015-11-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | postfix: 2.11.5 -> 3.0.3Gabriel Ebner2015-10-26
* | | | | | | | | | | | | | | Merge pull request #10883 from k0ral/mpdArseniy Seroka2015-11-08
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | mpd: 0.19.9 -> 0.19.11koral2015-11-08
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | mariadb: 10.0.21 -> 10.0.22aszlig2015-11-06
* | | | | | | | | | | | | | Merge pull request #10056 from pmahoney/s6-rcDomen Kožar2015-11-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | s6: move to tools/systemPatrick Mahoney2015-09-24
* | | | | | | | | | | | | | pulseaudio: 7.0 -> 7.1William A. Kennington III2015-11-05
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10474 from abbradar/nginx-pam-modulesNikolay Amiantov2015-11-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |