Commit Graph

1446 Commits

Author SHA1 Message Date
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
Jaka Hudoklin
f8284a083f seyren: udpate to 1.1.0 2014-09-17 18:33:51 +02:00
Rickard Nilsson
155053bcd9 diod: Update from 1.0.22 to 1.0.23 2014-09-16 13:53:18 +02: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
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Jaka Hudoklin
be2fe360db elasticsearchPlugins.elasticsearch_http_basic: set platform to build on 2014-09-13 02:24:48 +02:00
Jaka Hudoklin
f5e5815236 elasticsearchPlugins: add elasticsearch_http_basic, plugin for basic http authentication 2014-09-13 02:22:26 +02:00
William A. Kennington III
65f103175e consul: 0.3.0 -> 0.4.0 2014-09-11 15:40:41 -07:00
Jaka Hudoklin
dbae0b628e influxdb: update 0.7.0 -> 0.8.2 2014-09-11 18:06:06 +02:00
Rob Vermaas
75f8d6a19e ircdHybrid: update from 7.2.2 to 7.2.3, potentially fixes CVE-2013-0238 2014-09-11 13:37:45 +02:00
Domen Kožar
33ce850b82 fix a bunch of packages with lua5_1 2014-09-10 17:24:56 +02:00
Joel Taylor
afa1db198b fix even more clang builds 2014-09-09 13:54:57 -07:00
Joel Taylor
374648deaa X11 build purity 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Luca Bruno
ac724e7bbc Added TORQUE package and nixos module
Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids

http://www.adaptivecomputing.com/products/open-source/torque
2014-09-09 18:24:46 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Nixpkgs Monitor
43fdbc0bd7 mysql: update from 5.1.72 to 5.1.73, potentially fixes CVE-2013-5908, CVE-2014-0401, CVE-2014-0412, CVE-2014-0437 2014-09-06 18:20:17 +02:00
Nixpkgs Monitor
7694fcf524 mysql55: update from 5.5.37 to 5.5.39, potentially fixes CVE-2014-2494, CVE-2014-4207, CVE-2014-4258, CVE-2014-4260 2014-09-06 18:18:21 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
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