mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 19:26:02 +00:00
Code Issues Wiki Activity
107394 commits 182 branches 125 tags 7.8 GiB
Commit graph

532 commits

Author SHA1 Message Date
Domen Kožar 0adf2b25a1 4store: 1.1.5 -> 1.1.6 (convert from builderDefsPackage) 2016-05-08 18:29:40 +01:00
Tobias Geerinckx-Rice ab6e0861d4
nginx: restore .upstream files 
07d9de713a
 2016-05-06 15:37:22 +02:00
Tobias Geerinckx-Rice b0f8349d95
nginxUnstable: alias to nginx until next unstable release 2016-05-06 13:47:36 +02:00
Tobias Geerinckx-Rice 07d9de713a
nginx: remove .upstream files 2016-05-06 13:47:12 +02:00
Tobias Geerinckx-Rice 959472a824
nginx: 1.8.1 -> 1.10.0 
Changes: http://nginx.org/en/CHANGES-1.10
 2016-05-03 20:05:57 +02:00
Franz Pletz 669cd2adbf lighttpd: 1.4.37 -> 1.4.39 2016-05-03 16:15:20 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Michael Raskin e59151f3ef nix-binary-cache: take into account Nix split (mulitple-outputs) 2016-04-22 00:57:43 +02:00
Eelco Dolstra b4bf432709 nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs 
Note: I ignored the C++ libraries, but it appears we're not currently
using them. Once we do, we'll probably want to put them in a separate
output as well (to prevent non-C++ users from depending on Boost).
 2016-04-18 21:13:18 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Michael Raskin c82272fdc0 nginxUnstable: 1.9.11 -> 1.9.14 2016-04-13 14:47:04 +02:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Florian Steinel 2486191f39 thttpd: 2.26 -> 2.27 
from http://www.acme.com/software/thttpd/#releasenotes
 New in version 2.27:
-   Stats syslogs changed from LOG_INFO to LOG_NOTICE.
-   Use memmove() for self-overlapping string copies instead of strcpy().
-   Couple of subroutine name changes for consistency.
 2016-04-09 19:28:50 +02:00
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Allan Espinosa 16b12fbd87 apt-cacher-ng: disable on OSX 
fmemopen() doesn't exist on OSX. This causes the builds to fail.
 2016-04-07 11:57:12 -05:00
Robin Gloster bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00:00
Peter Simons 8e0f0776aa mini-httpd: update to version 1.6 2016-04-04 15:06:32 +02:00
Tomasz Kontusz 36135033b6 mini-httpd: add -ansi to CFLAGS 2016-04-03 00:46:23 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Joachim Fasting c6d3a23cf6 apt-cacher-ng: 0.8.9 -> 0.9.1 
Tested by doing sandboxed build & running the resulting
exectuable.

Note that sources for 0.8.9 are no longer available on
the Debian mirrors.
 2016-03-17 15:59:39 +01:00
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
zimbatm eac89788da apacheHttpd: add support for HTTP/2 
In NixOS you can enable HTTP/2 like this:

    services.httpd.extraModules = [ "http2" ];
    services.httpd.extraConfig = ''
      Protocols h2 http/1.1
    '';
 2016-03-12 15:31:23 +00:00
Luca Bruno dcfca100ec Merge pull request #12525 from knupfer/ngx_brotli 
add nginxModules.brotli
 2016-03-11 11:05:21 +01:00
Allan Espinosa 59e12df957 apt-cacher-ng: 0.8.6 -> 0.8.9 2016-03-11 02:49:38 -06:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz fedf31660d nginx: Rmove custom hardening, now enabled by default 2016-03-08 00:39:07 +01:00
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Franz Pletz c686f03305 tomcat: 6.0.44 -> 6.0.45, 7.0.62 -> 7.0.68, 8.0.23 -> 8.0.32 
Fixes at least CVE-2015-5174, CVE-2015-5345, CVE-2015-5351, CVE-2016-0706,
CVE-2016-0714, CVE-2016-0763.
 2016-03-07 03:34:44 +01:00
Franz Pletz cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Michael Raskin 708c6094c5 nginx, nginxUnstable: hardening: only use when the compiler is gcc 2016-03-04 16:57:47 +01:00
Michael Raskin 7b9684a5b5 nginx, nginxUnstable: enable hardening. Flags as recommended by @arno01 (Andrey Arapov) in #7190 2016-03-04 16:54:37 +01:00
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Michael Raskin a08c8b12f0 Add Apache Jena Fuseki instead of obsolete and unavailable Jena Joseki 2016-02-28 10:39:33 +01:00
Robin Gloster 310fa56788 nginx: enable pie hardening 2016-02-26 16:38:26 +00:00
Michael Raskin 9e7c28cb56 nginxUnstable: 1.9.10 -> 1.9.11 2016-02-14 21:17:07 +01:00
Vladimír Čunát 54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings 
... to refer to correct outputs
 2016-02-03 17:25:22 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen 13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00
Tuomas Tynkkynen 5f4a8de754 treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output 2016-02-01 20:45:57 +02:00
Rok Garbas cf40e86fb0 nginx: 1.8.0->1.8.1, 1.9.9->1.9.10 2016-01-26 18:12:01 +01:00
obadz 3a9983b45d couchdb: add platform, remove maintainer that was added accidentally, fixes #12502 2016-01-24 14:39:47 +01:00
Benjamin Staffin 9bad9c8bf3 nginx: add statsd to the available modules 2016-01-23 17:25:49 -05:00
knupfer 8e604f7937 nginxModules.brotli: init at 788615e 2016-01-21 22:14:39 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice 3f10b2874f Merge pull request #12450 from eduarrrd/pshs 
pshs: 0.2.6 -> 0.3
 2016-01-18 04:55:25 +01:00
Eduard Bachmakov f3ae60295f pshs: 0.2.6 -> 0.3 2016-01-17 22:44:48 -05:00
Christoph Hrdinka a3e3b76363 nginxModules.lua: 0.9.19 -> 0.10.0 2016-01-16 16:35:07 +01:00
Jakob Gillich ff02a4e3c2 axis2: 1.6.3 -> 1.6.4 
fixes CVE-2013-0248
 2016-01-07 05:59:15 +01:00
Michael Raskin ab3277e68a nginxUnstable: 1.9.7 -> 1.9.9 2016-01-01 12:30:17 +03:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Robin Gloster 566c06c5a7 apacheHttpd: 2.4.17 -> 2.4.18 2015-12-27 21:31:30 +00:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Teo Klestrup Röijezon 53441bcc93 nginx: 1.9.4 -> 1.9.7, fixes #11515 2015-12-07 14:56:27 +01:00
Vladimír Čunát 6cc57be289 apache modules: fix build problems 
pkgs.mod_evasive was removed, because that combination isn't supported
(according to an assertion).
 2015-12-05 13:16:55 +01:00
Vladimír Čunát 2709a815e5 apache-httpd-2.2: fix build 
It was broken by interaction with b81515c2.
I should've tested both versions before pushing 34b5d193c0.
 2015-12-05 11:59:10 +01:00
Vladimír Čunát 34b5d193c0 apache*: don't change layout in $out WRT master 2015-12-04 15:27:32 +01:00
Christoph Hrdinka 1391ca3af1 nginxModules.lua: 0.9.16 -> 0.9.19 2015-12-02 23:06:34 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
zimbatm 138a42dd11 webfs: fix mime types 
Unfortunately the shared_mime_info format is not compatible with webfs.

Instead of pulling the whole httpd package I opted for just fetching the
mime.types file from the apache httpd project.
 2015-11-28 14:24:21 +00:00
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Bob van der Linden f65ebd022d darkhttpd: init at 1.11 2015-11-19 14:51:14 +01:00
goibhniu e9c31d9368 Merge pull request #11034 from zimbatm/webfs-1.21 
webfs: init at 1.21
 2015-11-18 19:19:28 +01:00
zimbatm 6a0ed9361b webfs: init at 1.21 2015-11-16 17:29:40 +01:00
makefu 8db9408ac6 apt-cacher-ng: init at 0.8.6 2015-11-16 14:45:21 +01:00
Vladimír Čunát dd71ccef28 gatling: fix meta evaluation 
/cc maintainer @the-kenny.
 2015-11-11 08:31:56 +01:00
Moritz Ulrich af73b4cc2e gatling: Init at 0.13. 2015-11-10 23:59:38 +01:00
Nikolay Amiantov 9265cc58c3 Merge pull request #10474 from abbradar/nginx-pam-modules 
nginx: factor out modules into a separate file, add new "pam" module
 2015-11-02 01:05:54 +03:00
Sander van der Burg b054207813 axis2: bump to version 1.6.3 2015-10-28 10:24:29 +00:00
Tuomas Tynkkynen f302d78d6c apacheHttpd_2_4: Port multiple-output changes from 2.2 2015-10-28 10:23:03 +01:00
Tuomas Tynkkynen 7a68c25baf apacheHttpd_2_2: Remove obsolete cruft 2015-10-28 10:23:02 +01:00
Tuomas Tynkkynen b81515c2d4 apacheHttpd_2_2: Fix setting installbuilddir 
Otherwise mod_dnssd doesn't build.

Also move apxs to $dev.
 2015-10-28 10:23:02 +01:00
Jude Taylor f35f421d60 apache-httpd: add libiconv for darwin 2015-10-23 10:57:43 -07:00
aszlig f15420b0fe
thttpd: Fix SHA256 of the upstream tarball. 
It's a bit unfortunate to see this, but while looking online to download
the old version of the file I found that MacPorts and FreeBSD had the
same issue:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199562

I've checked the diff as well and found no big functional changes,
except a function rename, copyright updates and changed syslog
priorities:

https://bz-attachments.freebsd.org/attachment.cgi?id=155775

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-10-21 17:15:18 +02:00
Nikolay Amiantov d2fc6e6a02 nginxModules.pam: init at 1.4 2015-10-19 16:46:09 +03:00
Nikolay Amiantov 9424238d14 nginx: factor out modules in a separate file 2015-10-19 16:46:02 +03:00
Robin Gloster 8521bc097c apacheHttpd: 2.4.16 -> 2.4.17 2015-10-18 17:42:55 +00:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +02:00
Tuomas Tynkkynen 7cd13b9003 apache-httpd: Enable SSL via buildInputs 
The old approach doesn't seem to work with multiple outputs.
 2015-10-03 14:08:53 +02:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Peter Simons 3018739223 mini-httpd: update to version 1.5 2015-10-02 22:13:49 +02:00
Arseniy Seroka b752952a33 Merge pull request #10132 from matthiasbeyer/update-jetty 
jetty: 5.1.4 -> 6.1.4
 2015-10-01 14:21:38 +03:00
Jaka Hudoklin ea4850ca64 Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add 
modsecurity: add modsecurity, and create nginx plugin
 2015-09-30 00:19:38 +02:00
Matthias Beyer e547393fac jetty: 5.1.4 -> 6.1.4 2015-09-29 10:41:26 +02:00
Jaka Hudoklin 46828582ab nginx: add support for modescurity 2015-09-23 20:35:28 +02:00
Hoang Xuan Phu 4ac4f2dcd9 nginx: add an option to build the stream module 2015-09-22 13:09:11 +08:00
Hoang Xuan Phu 942d2798c5 nginx: bump lua module to fix build error 
(https://github.com/openresty/lua-nginx-module/pull/500)
 2015-09-22 13:08:42 +08:00
Bjørn Forsman 0b9d83737c lighttpd: 1.4.35 -> 1.4.37 2015-09-16 07:46:34 +02:00
William A. Kennington III b68e45dfa7 mini-httpd: Boost 1.59 compat 2015-09-04 11:21:37 -07:00
Austin Seipp 4068869d62 nixpkgs: openresty 1.7.10.1 -> 1.9.3.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:18:13 -05:00
Austin Seipp 860d720940 nixpkgs: nginxUnstable 1.9.3 -> 1.9.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-31 03:17:17 -05:00
Cillian de Róiste f63fd63eb1 yaws: update from 1.99 to 2.0 2015-08-05 10:29:47 +02:00
Eelco Dolstra 277a85b15c Merge pull request #8985 from Beauhurst/newapaches 
apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
 2015-07-27 17:30:18 +02:00
Robert Scott 1dca2fba7f apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes 2015-07-25 15:40:29 +01:00
Austin Seipp 131e41191b nixpkgs: nginxUnstable 1.9.2 -> 1.9.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:33 -05:00
Rickard Nilsson 7e021a0fd6 nginx package: Allow adding arbitrary modules 2015-07-12 00:49:18 +02:00
Rickard Nilsson ef5dafd66d lua-nginx-module: Update from v0.9.16rc1 to v0.9.16 2015-07-12 00:49:18 +02:00
Michael Raskin 7c5129706f nginx unstable: update 1.9.1 -> 1.9.2 2015-07-05 00:32:53 +03:00
Shea Levy 145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
Pascal Wittmann f4d7b23a68 tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111 
Using the prerelease version, because there was no response on when a
new official release will happen, see
http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html
 2015-06-15 11:07:02 +02:00
Michael Raskin ed145cb07f Update Nginx unstable 2015-06-14 11:22:23 +03:00
Rickard Nilsson 8a7c23456d jetty: Update from 9.2.5 to 9.2.11 2015-06-11 13:33:32 +02:00
Pascal Wittmann 62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
Pascal Wittmann 023be72082 tomcat8: update from 8.0.9 to 8.0.23, fixes CVE-2014-7810 2015-06-09 14:28:39 +02:00
Pascal Wittmann 9b417df916 tomcat7: update from 7.0.55 to 7.0.62, fixes CVE-2014-7810 2015-06-09 14:27:13 +02:00
Pascal Wittmann bd62b7cd00 tomcat: update from 6.0.39 to 6.0.44 
potentially fixes CVE-2014-0227, CVE-2014-0119, CVE-2014-0099, CVE-2014-0096, CVE-2014-0075
 2015-05-31 16:55:26 +02:00
Dan Peebles 4d12ea8311 Add micro-httpd package 2015-05-28 03:16:46 +00:00
Rickard Nilsson a92271f195 lua-nginx-module: Update from 0.9.15 to 0.9.16rc1 
This fixes the build that has been broken since nginx was bumped to 1.8.0
 2015-05-26 08:05:26 +02:00
Arseniy Seroka 54be459b7f Merge pull request #7988 from johbo/fix-mod-python 
mod_python: Avoid that git is called to generate a version
 2015-05-25 21:23:35 +03:00
Johannes Bornhold 2ed4587b61 mod_python: Avoid that git is called to generate a version 
This failed when building mod_python and resulted in a broken
value being included in the file "version.py".
 2015-05-25 18:24:22 +02:00
John Wiegley 5ac9e87b1b nginx: Fix build for Darwin (no AIO there) 2015-05-21 12:42:06 -05:00
Michael Raskin f6e852554c Update Nginx 2015-05-10 13:36:43 +03:00
Vladimír Čunát 3b9ef2c71b fix "libc}/lib" and similar references 
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
 2015-05-05 11:52:08 +02:00
Vladimír Čunát 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
William A. Kennington III 6e2dde7b78 nginx: 1.6.3 -> 1.8.0 2015-04-22 15:28:10 -07:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Rickard Nilsson c61dff28ae nginx: Add fluentd module 2015-04-15 13:12:32 +02:00
Austin Seipp 2c4a005549 nixpkgs: openresty 1.7.7.1 -> 1.7.10.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-12 11:35:37 -05:00
William A. Kennington III 9ca0d6ecf8 nginx: 1.6.2 -> 1.6.3 2015-04-08 13:17:42 -07:00
Austin Seipp 6a41d14686 nixpkgs: nginxUnstable 1.7.10 -> 1.7.11 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:51 -05:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Michael Raskin 09e74005b0 update nginx unstable 2015-03-09 01:03:01 +03:00
Eelco Dolstra b1ec8e6c64 apache-httpd: Update to 2.4.12 
CVE-2014-3583, CVE-2014-3581, CVE-2014-8109, CVE-2013-5704.
 2015-02-24 16:10:55 +01:00
Rickard Nilsson c7c917dfff nginx: Add set-misc-nginx-module 2015-01-21 12:38:34 +01:00
Domen Kožar 48bae0e685 Merge pull request #5821 from eduarrrd/pshs 
pshs: 0.2.5 -> 0.2.6
 2015-01-18 10:32:50 +01:00
Eduard Bachmakov 2a338357f3 pshs: 0.2.5 -> 0.2.6 2015-01-17 21:00:41 -05:00
Vincent Laporte 4361a7a597 couchdb: fix build 2015-01-16 08:51:22 +01:00
Eduard Bachmakov f9a5ad039b Add package pshs-0.2.5 
Announcement blog post:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/
 2015-01-14 22:56:54 -05:00
aszlig c5354fafce
lighttpd: Fix building with magnet support. 
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-13 08:37:56 +01:00
Jaka Hudoklin a6fd4673b0 Merge pull request #5555 from offlinehacker/pkgs/nginx/syslog_fix_rev 
nginx: syslog extension, fix git revision
 2015-01-05 13:25:00 +01:00
Jaka Hudoklin 9e766dcc6b nginx: syslog extension, fix git revision 2015-01-03 20:08:33 +01:00
Michael Raskin 187646f071 Return proper 404 when path is missing 2015-01-03 16:56:05 +03:00
Michael Raskin d64160ec99 Add optional IPv6 support for nix-binary-cache 2015-01-03 03:05:26 +03:00
Cillian de Róiste e75f0a7f86 yaws: update from 1.98 to 1.99 2015-01-02 23:49:15 +01:00
Michael Raskin b51dec7b77 Nginx unstable: 1.7.8 -> 1.7.9 2014-12-31 20:53:58 +03:00
Austin Seipp 5eba046b5d nixpkgs: openresty 1.7.4.1rc2 -> 1.7.7.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-27 12:43:52 -06:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Michael Raskin 90b05b8d0e Nginx-unstable: 1.7.7 → 1.7.8 2014-12-21 11:14:25 +03:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Michael Raskin eff240d9d9 Fix missing paths 2014-12-20 21:49:02 +03:00
Michael Raskin 6c91f23ca5 Try to defend against chroot paths in store matching derivation paths 2014-12-17 21:49:18 +03:00
Shea Levy 2db4171978 Add jetty 9.2.5 2014-11-23 19:27:11 -05:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra db4053fb59 httpd-2.2: Enable building of mod_cache and friends 2014-11-11 10:39:24 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Domen Kožar 824879cfd4 tomcat-connectors: 1.2.32 -> 1.2.40 2014-11-08 19:48:54 +01:00