summary refs log tree commit diff
path: root/pkgs/servers
Commit message (Expand)AuthorAge
* make changes needed to build mongodbJude Taylor2015-07-23
* Merge branch 'master' into stagingVladimír Čunát2015-07-22
|\
| * hbase: 0.98.8 -> 0.98.13. Fixes download (ZHF)Luca Bruno2015-07-22
| * samba: drop heimdal compat patch to fix the build (ZHF)Luca Bruno2015-07-21
| * Revert "Revert "samba: 4.2.1 -> 4.2.3""Luca Bruno2015-07-21
| * spamassassin: fix rules installation (ZHF)Luca Bruno2015-07-21
| * sipwitch: 1.6.1 -> 1.9.8. Fixes build (ZHF)Luca Bruno2015-07-21
| * Revert "samba: 4.2.1 -> 4.2.3"Luca Bruno2015-07-21
| * qpid-cpp: 0.26 -> 0.34. Fixes build (ZHF)Luca Bruno2015-07-21
| * Merge pull request #8902 from dezgeg/pr-nfsEdward Tjörnhammar2015-07-21
| |\
| | * rpcbind: 0.2.3 -> 1.0.7Tuomas Tynkkynen2015-07-20
| * | riak-2.1.1: new packageCharles Strahan2015-07-21
| * | nixpkgs: nginxUnstable 1.9.2 -> 1.9.3Austin Seipp2015-07-20
| |/
* | xkeyboard-config: updatesVladimír Čunát2015-07-19
* | xorg: driver updatesVladimír Čunát2015-07-19
|/
* Merge branch 'staging', discussion #8844Vladimír Čunát2015-07-19
|\
| * Merge master into stagingVladimír Čunát2015-07-17
| |\
| * \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-13
| |\ \
| * \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-08
| |\ \ \
| * \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-06
| |\ \ \ \
| * \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-01
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-27
| |\ \ \ \ \ \ \ \
| * | | | | | | | | xwayland: fix buildVladimír Čunát2015-06-27
| * | | | | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-27
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingThomas Tuegel2015-06-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | mariadb: Fix for darwinWilliam A. Kennington III2015-06-18
| * | | | | | | | | | | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge #8363: pure-darwin stdenvVladimír Čunát2015-06-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | xorg-server: 1.16.4 -> 1.17.2William A. Kennington III2015-06-16
| * | | | | | | | | | | | | | | | | xorgserver: Add gcc5 compat patchWilliam A. Kennington III2015-06-16
| * | | | | | | | | | | | | | | | | Merge branch 'master' into stagingLuca Bruno2015-06-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix Samba buildEelco Dolstra2015-06-11
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/gcc-4.9' into stagingEelco Dolstra2015-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/staging' into gcc-4.9Eelco Dolstra2015-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Fix inputproto and probably other packagesEelco Dolstra2015-05-13
| * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2015-06-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into stagingDomen Kožar2015-06-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingWilliam A. Kennington III2015-05-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into stagingVladimír Čunát2015-05-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | xcompmgr: generate along with xorg stuffVladimír Čunát2015-05-26
| * | | | | | | | | | | | | | | | | | | | | | | | | xorg.x11perf: larger updateVladimír Čunát2015-05-26
| * | | | | | | | | | | | | | | | | | | | | | | | | xorg {xorg-docs,kbproto}: minor updatesVladimír Čunát2015-05-26