cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
55244 commits 1 branch 0 tags 3.7 GiB
Commit graph

289 commits

Author SHA1 Message Date
Domen Kožar
9b7b2ce8eb Revert "Introduce patchShebangsPhase ran in preConfigurePhases" 
This reverts commit 512fbb280f.

See #5368
 2015-01-08 10:26:49 +01:00
Domen Kožar
512fbb280f Introduce patchShebangsPhase ran in preConfigurePhases 
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-01-02 02:58:32 +01: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