mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Code Issues Wiki Activity
70269 commits 288 branches 124 tags 6.2 GiB
Commit graph

339 commits

Author SHA1 Message Date
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
Luca Bruno 83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Eelco Dolstra 2819063c37 mod_evasive: Add Apache version check 2014-11-07 11:42:43 +01:00
Eelco Dolstra 690154993d mod_fastcgi: Fix building against Apache 2.4 2014-11-07 11:38:50 +01:00
Eelco Dolstra bad2955079 mod_python: Update to 3.5.0 
This fixes building against Apache 2.4.
 2014-11-07 11:31:04 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging 
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
 2014-11-04 14:30:43 +01:00
Michael Raskin b7f7341169 Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03:00
Bjørn Forsman e8dc583eb4 tomcat: set meta.platforms 2014-10-27 18:44:25 +01:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Aristid Breitkreuz 7a9bf3540e thttpd: update from 2.25b to 2.26, potentially fixes CVE-2013-0348 2014-10-08 20:23:26 +02:00
Aristid Breitkreuz 4d133363d4 couchdb: update from 1.6.0 to 1.6.1 2014-10-06 22:03:42 +02:00
Eelco Dolstra 8e40703f6c apache-httpd: Update to 2.2.29 
CVE-2014-0118, CVE-2014-0231, CVE-2014-0226, CVE-2013-5704.
 2014-09-24 21:04:24 +02:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
William A. Kennington III f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
Austin Seipp 9f15333589 openresty: 1.7.4.1rc1 -> 1.7.4.1rc2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-09-20 08:21:11 -05:00
William A. Kennington III 0001e4819e nginx: 1.6.1 -> 1.6.2 
Additionally, update all extensions and convert them to fetchFromGitHub
 2014-09-19 16:42:04 -07:00
Pascal Wittmann 7bcd577bd1 mod-wsgi: update from 3.4 to 3.5, fixes CVE-2014-0240 2014-09-13 20:32:26 +02:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Michael Raskin d3c5e960b4 Merge pull request #3878 from pmahoney/ngx_lua 
nginx: add lua module
 2014-09-03 21:37:18 +04:00
Michael Raskin 3ad91106f1 Merge pull request #3704 from sfultong/upstream-master 
tomcat: update to upstream master
 2014-09-02 02:09:18 +04:00
Patrick Mahoney 2559ea7138 nginx: add lua module 2014-08-30 12:08:58 -05:00
Bjørn Forsman c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Eelco Dolstra ce6b86cc68 Fix various evaluation problems 
http://hydra.nixos.org/build/13616685
 2014-08-22 11:57:40 +02:00
Michael Raskin b6a2f8eaa8 Fix a strange openresty build error 2014-08-21 08:42:00 +04:00
Sam Griffin 219983d6ad adding tomcat version 8 2014-08-20 23:23:44 -04:00
sfultong c54a8ed1d0 Merge pull request #1 from sfultongv/sfultong-14.04 
updating tomcat to version 7
 2014-08-20 23:08:39 -04:00
Austin Seipp 47c443bede nixpkgs: openresty 1.7.4.1rc1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 00:38:49 -05:00
Austin Seipp ec42370aee nginx: 1.6.0 -> 1.6.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-17 06:35:40 -05:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Marc Weber ba154ec9d4 apache 2_4 update, fixes some CVE's 
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
 2014-07-24 18:10:10 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Rok Garbas fac41b58ca couchdb: update to 1.6.0 2014-07-05 09:18:42 +01:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Michael Raskin 54586a77e7 Adding a minimal script set to serve store as a dynamical binary cache 2014-06-30 00:39:54 +04:00
Bjørn Forsman 5082caa72d axis2: add meta.description 2014-06-22 22:38:27 +02:00
Mathijs Kwik 76c2c0c499 nginx: add echo module, fix aio on linux&freebsd 2014-06-16 22:43:58 +02:00
Ricky Elrod 379c2731b2 update spawn-fcgi to 1.6.4 
Signed-off-by: Ricky Elrod <ricky@elrod.me>
 2014-06-13 23:01:47 -04:00
Rok Garbas eb8a331510 couchdb: update to 1.5.1 2014-06-01 15:01:22 +01:00
Charles Strahan 6d173e2a81 spawn-fcgi: Add package 2014-05-25 15:27:58 +02:00
Austin Seipp 008dc39ca3 Merge pull request #2518 from jwiegley/nginx 
Add -Wno-error=deprecated-declarations for nginx, required to build on Darwin
 2014-05-17 14:48:27 -05:00
Jaka Hudoklin eabfc509ef nginx: fix syslog module 2014-05-07 23:54:57 +02:00
John Wiegley 622aa834b7 Add -Wno-error=deprecated-declarations for nginx, required to build on Darwin 2014-05-05 02:18:47 -05:00
Austin Seipp b10f4af8f9 nginx: upgrade to 1.6.0, expose many more modules 
By default, we now build all the optional nginx modules, including the
out-of-band ones like moreheaders and rtmp support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-02 01:24:38 -05:00
Austin Seipp e67cc9ba07 nginx: build http_stub_status module 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-02 00:42:40 -05:00
Eelco Dolstra 65a78e16f1 httpd: Update to 2.2.27 
CVE-2013-6438, CVE-2014-0098
 2014-05-01 11:48:56 +02:00
Linquize 7d5a5354d8 axis2: Remove the extra slash in URL 2014-04-25 07:32:23 +08:00
Luca Bruno e08861a4cd mod_dnssd: new apache httpd 2.2 module 
Provide Zeroconf support via DNS-SD using Avahi

http://0pointer.de/lennart/projects/mod_dnssd
 2014-04-14 09:58:03 +02:00
Peter Simons 2d4919dbb4 apacheHttpd_2_4: update from 2.4.7 to 2.4.9 2014-04-09 12:41:11 +02:00
Evgeny Egorochkin 431ff0f769 nginx: update from 1.4.6 to 1.4.7 2014-03-26 19:15:04 +02:00
Rob Vermaas 94990a5935 tomcat6: update from 6.0.37 to 6.0.39, potentially fixes CVE-2013-4286, CVE-2013-4322, CVE-2013-4590, CVE-2014-0033 2014-03-21 13:12:52 +01:00
Rickard Nilsson ec3dbdf93d New package: winstone 0.9.10, a Java Servlet container 2014-03-12 23:14:09 +01:00
Bjørn Forsman f191aa32ba lighttpd: add enableMysql option, to build 'mod_mysql_vhost' 
Now we have options to build all available modules/plugins.
 2014-03-12 23:04:03 +01:00
Bjørn Forsman 37ad2a7d28 lighttpd: bump 1.4.34 -> 1.4.35 (security fixes) 
From http://www.lighttpd.net/:

  Important changes
  -----------------
  This release contains a lot of bug fixes, many detected by scan.coverity.com
  (and more to come). The main reason for the release is a fix for an SQL
  injection (and path traversal) bug triggered by specially crafted (and
  invalid) Host: headers.

  Security fixes
  --------------
  http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2014_01.txt (no CVE yet)

NOTE: We (nixpkgs) currently don't build the mod_mysql_vhost module mentioned
above.
 2014-03-12 22:49:47 +01:00
Evgeny Egorochkin 20a2b1af93 nginx: update from 1.4.5 to 1.4.6 2014-03-05 05:10:32 +02:00
Rok Garbas a6a3b22bc0 removing unused couchdb files 2014-02-27 13:34:11 +01:00
Rok Garbas 62438c09f7 update couchdb to 1.5.0(current latest) and add service for it 2014-02-27 13:34:11 +01:00
Sander van der Burg 44a9ebac47 axis2: bump to version 1.6.2 2014-02-18 18:07:24 +01:00
Evgeny Egorochkin c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
Domen Kožar aa6ddfb119 nginx: 1.4.4 -> 1.4.5 2014-02-12 19:13:36 +01:00
Peter Simons 1671054702 mod_wsgi: update from 3.3 to 3.4 2014-01-15 17:29:14 +01:00
Nixpkgs Monitor 0c6ebeb734 lighttpd: update from 1.4.33 to 1.4.34, potentially fixes CVE-2013-4508 2014-01-14 11:55:48 +01:00
Peter Simons 0266ac9c30 apache-httpd-2.4: revert "enable building the 'event'-based mpm worker" 
Commit 0c3d910cd0 didn't have any effect.
The 'event' MPM module isn't built because our version of APR is too old.
 2014-01-08 13:17:40 +01:00
Peter Simons cdfd953ffa apache-httpd-2.4: enable building the 'event'-based mpm worker 
Adding "LoadModule mpm_event_module modules/mod_mpm_event.so" to httpd.conf
enables that worker instead of the default choice.
 2013-12-29 12:52:54 +01:00
Nixpkgs Monitor 3f39947054 jetty61: update from 6.1.21 to 6.1.26 2013-12-18 18:18:33 +02:00
Domen Kožar b239c3f3ee Merge pull request #1370 from offlinehacker/pkgs/nginx/module_moreheaders 
nginx: add headers more nginx module
 2013-12-13 02:45:45 -08:00
Jaka Hudoklin 1b019fe39f nginx: enable ipv6 and spdy 2013-12-13 09:42:06 +01:00
Jaka Hudoklin 698860bf7c nginx: add headers more nginx module 2013-12-13 09:38:34 +01:00
Nixpkgs Monitor 6996067dcf apacheHttpd_2_4: update from 2.4.6 to 2.4.7 2013-12-09 10:49:00 +02:00
Nixpkgs Monitor e523fdfc47 apacheHttpd: update from 2.2.25 to 2.2.26 2013-12-09 10:47:10 +02:00
Nixpkgs Monitor e72352761c tomcat6: update from 6.0.32 to 6.0.37, potentially fixes CVE-2012-0022, CVE-2012-2733, CVE-2012-3544, CVE-2012-3546, CVE-2012-4431, CVE-2012-4534, CVE-2012-5568, CVE-2012-5885, CVE-2012-5886, CVE-2012-5887, CVE-2013-2067 2013-12-04 05:07:47 +02:00
Michael Raskin 2f53f6c82d Fixing automatic update of Nginx 2013-11-25 10:59:39 +04:00
Michael Raskin 980c7929ab Updating Nginx to 1.4.4 2013-11-25 10:59:39 +04:00
Rok Garbas 174f5813ef nginx: rtmp module - commited to fast. now it works. 2013-11-18 17:04:30 +01:00
Rok Garbas f73185d596 nginx: adding rtmp module 2013-11-18 16:02:33 +01:00
Bjørn Forsman 9c0e95663a lighttpd: update 1.4.32 -> 1.4.33 
Changes in this version: http://www.lighttpd.net/2013/9/27/1-4-33/
 2013-11-17 23:06:25 +01:00
Moritz Ulrich 6937e0a99b yaws: Update to 1.98. 
This fixes the build when compiled with Erlang 16B01 (default).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-12 20:04:26 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra 01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00