summary refs log tree commit diff
path: root/pkgs/servers
Commit message (Collapse)AuthorAge
* Merge pull request #8985 from Beauhurst/newapachesEelco Dolstra2015-07-27
|\ | | | | apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
| * apache-httpd: update minor versions of both 2.2 and 2.4 for security-related ↵Robert Scott2015-07-25
| | | | | | | | fixes
* | postgresql: Move docs to separate outputEelco Dolstra2015-07-26
| | | | | | | | This cuts almost 15 MB.
* | mariadb: Don't install static librariesEelco Dolstra2015-07-26
| | | | | | | | Issue #8990.
* | Merge branch 'staging'Vladimír Čunát2015-07-24
|\ \
| * \ Merge branch 'master' into stagingVladimír Čunát2015-07-22
| |\ \
| * | | xkeyboard-config: updatesVladimír Čunát2015-07-19
| | | | | | | | | | | | | | | | | | | | | | | | Also drop Esperanto patch for now, as it doesn't apply anymore and there are some Esperanto variants inside. Discussed: https://github.com/NixOS/nixpkgs/commit/fa5a583098
| * | | xorg: driver updatesVladimír Čunát2015-07-19
| | | | | | | | | | | | | | | | | | | | Also fixup tarball list after e4316b8c171, and drop a patch integrated in the update.
* | | | xf86-video-intel: 2.99.917 -> 2015-07-22William A. Kennington III2015-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
| | | | | | | | | | | | | | | | | | This reverts commit eee8823c37c8d505a5448c7a414a17794039ded5. Wrong revert. Sorry.
* | | 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
| | | | | | | | | | | | This reverts commit be0f468926ff805b9fae4bba87a0fc8b628cbc1a.
* | | 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
|\ \ \ | | | | | | | | nfs-utils, rpcbind: Update packages to fix nfs3 test
| * | | 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
|/ / | | | | | | Signed-off-by: Austin Seipp <aseipp@pobox.com>
* | Merge branch 'staging', discussion #8844Vladimír Čunát2015-07-19
|\ \
| * \ Merge master into stagingVladimír Čunát2015-07-17
| |\ \ | | | | | | | | | | | | There are larger-rebuild changes: gnutls and samba.
| * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maybe it was just covered by #7524 until now. /cc #5061 and @echo-oddly.
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/libraries/wayland/default.nix
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/staging' into gcc-4.9Eelco Dolstra2015-06-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/development/libraries/wayland/default.nix pkgs/development/tools/build-managers/cmake/default.nix pkgs/top-level/all-packages.nix
| | * | | | | | | | | | | | | | | | | | | | Fix inputproto and probably other packagesEelco Dolstra2015-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "grep Requires" failed on *.pc files that had no Requires fields, due to pipefail. But this error was previously masked by #7524.
| * | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \