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

1477 commits

Author SHA1 Message Date
Michael Raskin
2e33964a6a Fix leafnode by working around the check 2014-09-06 12:44:32 +04:00
aszlig
fd9c8fa3dc
pkgs/nsd: Allow to easily override the package. 
Allowing to use nixpkgs config to provide different defaults is not
going to help us here, so we would like to use nsd.override {} in order
to supply the correct options in the module.

Eventually removing the nixpkgs config option would make sense here as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-05 02:54:39 +02:00
Aristid Breitkreuz
559045d98c fix license for postgresql packages 2014-09-04 20:38:12 +02:00
Aristid Breitkreuz
73e569bf01 add postgresql 9.4beta2 2014-09-04 20:36:43 +02:00
Matthew Brown
82b4965b08 Removed mysql dependency as it does not pick up the header files on Linux, even when specified explicitly in the config params. 2014-09-04 13:21:28 +01:00
Michael Raskin
d3c5e960b4 Merge pull request #3878 from pmahoney/ngx_lua 
nginx: add lua module
 2014-09-03 21:37:18 +04:00
Rickard Nilsson
66ee6e03e7 pulseaudio: Use group audio instead of pulse-access 2014-09-03 13:24:47 +02:00
Luca Bruno
0f6d45f6b4 sphinxsearch: fix again... 2014-09-03 12:02:25 +02:00
Luca Bruno
428cb0ea7a sphinxsearch: fix evaluation error 2014-09-03 11:26:06 +02:00
Michael Raskin
07e9016f35 Merge pull request #3195 from ederoyd46/add-sphinx-search 
Added Sphinx Search package
 2014-09-03 11:22:47 +04:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02: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
Emery Hemingway
9aa9345a5a uhub: initial package for version 0.4.1 2014-09-01 10:53:19 +04:00
Domen Kožar
f70acd2584 munin: fix test 2014-08-31 16:54:09 +02:00
Patrick Mahoney
1e06594c0c mariadb: Patch to compile on OS X. 
* perl is required at build time on darwin. Copied from the
  mysql/5.5.x.nix

* CMake on darwin creates shared libraries with relative 'install_name'
  paths which are made absolute by fixDarwinDylibNames.

  See http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library/

* The asm patch was needed to compile on darwin, though I do not
  understand what is going on. Error before the patch:

  [ 15%] Building C object mysys/CMakeFiles/mysys.dir/my_context.c.o
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Unknown pseudo-op: .cfi_escape
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Rest of line ignored. 1st junk character valued 48 (0).
  make[2]: *** [mysys/CMakeFiles/mysys.dir/my_context.c.o] Error 1
 2014-08-30 14:41:51 -05:00
Patrick Mahoney
2559ea7138 nginx: add lua module 2014-08-30 12:08:58 -05:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Jaka Hudoklin
5a9cf40085 mongodb: add offline as maintainer 2014-08-29 17:56:07 +02:00
Jaka Hudoklin
ec9d2e6f2b mongodb: darwin support 2014-08-29 17:48:49 +02:00
Georges Dubus
a5143dd208 rabbitmq-server: updated to 3.3.5 2014-08-28 17:36:13 +02:00
Nathan Bijnens
ac90177cb1 Zookeeper 2014-08-27 13:01:30 +02:00
Andrew Morsillo
4933687885 Bump mongodb version from 2.6.0 to 2.6.4 2014-08-27 12:39:09 +02: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
2d6d43c02c Fix tarball build 2014-08-24 18:52:50 +02:00
Matthew Brown
5ef459fe2d Merge branch 'master' into add-sphinx-search 2014-08-24 11:21:41 +01:00
Matthew Brown
72df3f37e5 Updated definition file as per comments from the collaborator 2014-08-24 11:17:31 +01:00
Vladimír Čunát
0f6ae6403e xorg: fix typo from the last xorg commit 
Thanks to @falsifian for noticing it.
 2014-08-24 09:55:22 +02:00
Vladimír Čunát
99e300c4f8 xorg: add xf86-video-qxl 2014-08-23 18:55:30 +02:00
Rickard Nilsson
9bec5e1288 New package: riemann 0.2.6 2014-08-23 12:49:10 +02:00
Jaka Hudoklin
503b8afa3f Add neo4j database 2014-08-23 13:11:08 +04:00
Edward Tjörnhammar
1615be91ef Add mlmmj package and nixos module. 2014-08-23 12:30:45 +04:00
Patrick Mahoney
f254687071 s6: new package 
s6 is skarnet.org's small & secure supervision software suite.

The s6-log program is modified to call execlineb directly rather than
searching PATH.
 2014-08-22 23:42:13 -05:00
Eelco Dolstra
ce6b86cc68 Fix various evaluation problems 
http://hydra.nixos.org/build/13616685
 2014-08-22 11:57:40 +02:00
Luca Bruno
186589fdd1 leafnode: mark as broken for ZHF 2014-08-21 17:10:37 +02:00
Vladimír Čunát
59e3e06076 xorg: update probably unused modules 2014-08-21 15:13:22 +02:00
Vladimír Čunát
acf8919844 xorg.xrandr: minor bugfix update 2014-08-21 15:13:21 +02:00
Vladimír Čunát
c31c79f0dd xorg.xcb (lib+proto): update (seems mainly bug fixes) 2014-08-21 15:13:21 +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
Rickard Nilsson
bf0e265a61 diod: Update from 1.0.21 to 1.0.22 2014-08-20 16:10:20 +02:00
Austin Seipp
a8b59789d0 nagios-plugins: 2.0 -> 2.0.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:59:02 -05:00
Austin Seipp
53adb67395 nagios: 4.0.7 -> 4.0.8 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:58:50 -05:00
Austin Seipp
db2a37514d mariadb: 10.0.11 -> 10.0.13 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:48:42 -05: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
John Wiegley
8b13100710 Merge pull request #3658 from cstrahan/xquartz-cleanup 
Remove old comment, and delete confusing LaunchDaemon
 2014-08-18 16:17:23 -05:00
Vladimír Čunát
99b0271712 pulseaudio: fix CVE-2014-3970 by upstream patch 2014-08-18 17:56:26 +02:00
Charles Strahan
6f2bd70fd0 Remove old comment, and delete confusing LaunchDaemon 2014-08-18 11:36:34 -04: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
Jaka Hudoklin
953643bb0f elasticsearch: fix darwin, needs getopt 2014-08-16 12:55:23 +02:00
Daniel P. Wright
7f9eba573d Add taskserver package (close #3269) 2014-08-15 00:28:41 +02:00
John Wiegley
06a324f7dc Merge pull request #3101 from cstrahan/xquartz 
Use XQuartz on Darwin
 2014-08-14 16:33:46 -05:00
Vladimír Čunát
78118328b5 virtuoso7: disable i686-linux, as it's unsupported 2014-08-14 18:16:48 +02:00
Vladimír Čunát
b2a7b213be consul*: fix evaluation 
CC #2955.
 2014-08-14 14:36:34 +02:00
Vladimír Čunát
0cc668bc1a Merge master into PR 
Conflicts:
	pkgs/top-level/all-packages.nix
 2014-08-14 14:27:54 +02:00
Charles Strahan
5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Rickard Nilsson
629f7d055a mpd: Update from 0.18.11 to 0.18.12 2014-08-08 19:14:35 +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
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Rob Vermaas
9092499154 Merge pull request #3470 from tailhook/beanstalkd_1.10 
beanstalkd: upgrade to v1.10
 2014-08-06 17:03:54 +02:00
William A. Kennington III
ede3e60a3c unifi: Add wkennington as a maintainer 2014-08-05 21:48:19 -05:00
William A. Kennington III
0652ee16e4 unifi: Add derivation 2014-08-05 16:18:41 -05:00
Paul Colomiets
d2d4b8477f beanstalkd: upgrade to v1.10 2014-08-05 15:56:02 +03:00
Patrick Mahoney
b947cde3a5 bind: Expand to all unix platforms. 2014-08-04 15:09:07 -05: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
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	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-08-02 05:08:07 +02:00
Vladimír Čunát
91b53aaebc xorg.libXext: minor update 2014-08-02 04:43:19 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1." 
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-31 12:52:29 +02:00
Eelco Dolstra
e4e5502966 postgresql: Update to 9.0.18, 9.1.14, 9.2.9, 9.3.5 2014-07-30 18:13:51 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +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
Domen Kožar
c8cd4275a3 openfire: get rid of builderDefs 2014-07-27 13:54:37 +02:00
Domen Kožar
a219db3cb2 fix tarball job 2014-07-27 13:36:25 +02:00
Evgeny Egorochkin
8024d6ee3c RabbitMQ server: bump to 3.3.4 2014-07-26 14:33:53 +03:00
Jaka Hudoklin
b459a93533 Merge pull request #3364 from joelteon/mysql-ps 
On Darwin, add /bin/ps to path during MySQL build
 2014-07-26 02:34:10 +02:00
Jaka Hudoklin
b035be7b44 Merge pull request #3292 from offlinehacker/elasticsearch_plugins 
elasticsearch: add support for plugins
 2014-07-26 02:23:46 +02:00
William Roe
845d24d86c Update Serf to 0.6.3 2014-07-25 16:51:54 +01:00
Jaka Hudoklin
7eb4d306fb elasticsearch: add support for plugins 2014-07-25 17:28:59 +02:00
Joel Taylor
cafb12647f add ps to path for build 2014-07-24 14:19:16 -07: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
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging 
...in preparation for a merge to master
 2014-07-22 22:28:39 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Vladimír Čunát
f456abacb7 xorg.libXi: bugfix update 2014-07-20 08:38:06 +02:00
Pascal Wittmann
fc7fc7ce43 mpd: use pulseaudio in buildInputs if pulseaudioSupport is true not if zipSupport is true 2014-07-18 16:56:06 +02:00
Bjørn Forsman
f2d5fe86bd munin: simplify setting of PERL5PATH 
Use lib.makePerlPath instead of manually duplicating
"/lib/perl5/site_perl" all over.
 2014-07-18 12:37:36 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons
75bbad8abe Merge pull request #3285 from ehmry/polipo 
Polipo
 2014-07-16 18:29:11 +02:00
William Roe
3af919fb08 elasticsearch: update to 1.2.2 2014-07-15 16:57:16 +01:00
Emery Hemingway
0d781369c0 polipo: update to 1.1.1 2014-07-15 10:10:28 -04:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Vladimír Čunát
edec3719a6 xorg: update a few modules 2014-07-13 21:35:25 +02:00
Vladimír Čunát
5979d428b4 Merge recent master into x-updates 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
 2014-07-09 22:13:29 +02:00
Jaka Hudoklin
2cc11dd21a elasticsearch: fix darwin build 2014-07-08 00:30:20 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Matthew Brown
518daa9660 Added Sphinx Search package 2014-07-06 15:42:00 +01:00