mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity
27396 commits 346 branches 124 tags 6.9 GiB
Commit graph

938 commits

Author SHA1 Message Date
Vladimír Čunát 45f7b9c319 virtualbox: make guest additions use driver according to xserver version 2013-06-23 14:16:21 +02:00
aszlig 60ba4485b1
zabbix2: Add optional XMPP support using iksemel. 
This uses recurseForDerivations directly after using callPackage magic to ensure
that the input attributes can be overriden *and* nix-env shows the package as in
recurseIntoAttrs.

The reason for making this optional is because there probably is only a minority
of people who want to use XMPP and we don't want to introduce an additional
dependency for the majority, do we?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:56 +02:00
Jason "Don" O'Conal f4d648ed5c shishi: fix compilation on darwin 2013-06-20 09:08:09 +10:00
Evgeny Egorochkin 0e57725261 Merge pull request #633 from lovek323/httpd 
apacheHttpd: fix build on darwin
 2013-06-17 22:38:29 -07:00
Jason "Don" O'Conal 85f2674e22 apacheHttpd: minor modifications to meta attrs 
* add myself as a maintainer
* use reference to `stdenv.lib.licenses.asl20` rather than literal
  string
 2013-06-16 12:10:19 +10:00
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
aszlig ea87598a71
zabbix20: Update to version 2.0.6. 
Release notes for this version and 2.0.5:

http://www.zabbix.com/rn2.0.6.php
http://www.zabbix.com/rn2.0.5.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:35 +02:00
Eelco Dolstra 935a054de9 libXrender, libXvMC: Update 2013-06-14 14:53:36 +02:00
Jason "Don" O'Conal 2735e9c8d6 apacheHttpd: fix build on darwin 
* remove the gcc_s library from NIX_LDFLAGS (not available on darwin)
 2013-06-14 18:16:37 +10:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Malcolm Matalka ebaf0c01d3 Fixes rebar shebang, also fixes source of leveldb zip to be the canonical one from github 2013-06-13 14:45:41 +02:00
Michael Raskin 1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Peter Simons 2e618df532 bind: avoid build impurity by explicitly enabling/disabling features 
The BIND configure script finds extra dependencies in /usr/include and /usr/lib,
and activates additional features if it does. This may cause the build to fail
on systems that cannot use a chroot environment. Actively disabling those
additional features prevents this issue from occurring.
 2013-06-10 15:38:00 +02:00
Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Evgeny Egorochkin 604652f1da riak: this is really strange. Lets hope this hash difference isn't malicious :( 2013-06-10 08:19:18 +03:00
Evgeny Egorochkin cdc21b40bd Fix typo :( 2013-06-10 08:11:10 +03:00
Evgeny Egorochkin 009aa85060 Merge pull request #587 from orbitz/add-riak-1.3.1 
Add Riak 1.3.1
 2013-06-09 19:53:44 -07:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Vladimír Čunát ba6c764a51 xorg: intel driver bugfix update 2013-06-08 15:40:39 +00:00
Peter Simons bfa846cd6e bind: update to 9.9.3-P1 to fix CVE-2013-3919 2013-06-07 13:27:12 +02:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Vladimír Čunát 619b024600 X security updates 
http://www.x.org/wiki/Development/Security/Advisory-2013-05-23

Three libs not released yet and without commit activity for around two
weeks, so I took the current master heads.
 2013-06-05 21:24:19 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Malcolm Matalka 1a282dcae6 Fix up the description a bit 2013-06-04 17:17:54 +02:00
Malcolm Matalka 992f5b8d26 Add Riak 1.3.1 
This modifies how the `riak` and `riak-admin` scripts work such that one has to specify environment variables for where the data, log, and etc directories live.
 2013-06-04 04:12:06 +02:00
Sander van der Burg 4efc39eadd mysql-connector-java: Updated to 5.1.25 2013-06-02 23:40:18 +02:00
Vladimír Čunát 25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Vladimír Čunát 466ce40f0f xorg.xf86videointel: regression-fix update 
http://lists.freedesktop.org/archives/intel-gfx/2013-May/028277.html
 2013-05-27 20:43:02 +02:00
Vladimír Čunát e7b61ea77d xorg.xf86videointel: fix bad hash (from #556) 2013-05-27 12:24:04 +02:00
Vladimír Čunát ce456ab779 Merge pull request #556 from jcumming/x-updates.130523 
update Intel Graphics Stack Release
 2013-05-27 02:33:48 -07:00
Zef Hemel 8ca0c05859 Upgraded Redis version 2013-05-27 11:28:00 +02:00
Jack Cummings fc8f474a9c fix url and hash for intel x driver 2013-05-24 11:56:48 -07:00
Jack Cummings 800c467592 xf86-video-intel-2.21.7 2013-05-24 09:50:49 -07:00
Jack Cummings 253ee6f6a3 update to 2013Q1 Intel Graphics Stack Release 
This changeset updates to all of the versions in
https://01.org/linuxgraphics/downloads/2013/2013q1-intel-graphics-stack-release
(but does not regression from newer version).

I tried generating 'servers/x11/xorg/default.nix' with the perl script,
but unrelated packges changed, so I just manually updated the file.
 2013-05-23 16:25:21 -07:00
Vladimír Čunát e3ff0f116f vmware driver: depend on mesa_drivers to find libxatracker 2013-05-23 22:52:46 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Bjørn Forsman 1578fd3c1f munin: add missing dependencies 
* Add needed dependencies:
  coreutils, python, ruby, java and several Perl modules (Time::HiRes
  1.9.724 is no longer available, bump to 1.9725)
* Use sha256 instead of md5 (more secure)
* Wrap munin perl scripts so they find their dependencies at runtime
* Rework meta description attributes.

FIXME/TODO: munin is still not usable; it tries to write log files and
web graphs to its installation path.
 2013-05-20 19:10:44 +02:00
Domen Kozar c9bae2bcbe munin: add the package, WIP 2013-05-20 11:18:40 +02:00
Petr Rockai b5451c73b6 dictd-wiktionary: Let dictd serve an offline copy of wiktionary. 
@vcunat: add -O to python, as it takes lots of time to process
 2013-05-18 13:24:30 +02:00
Petr Rockai c7fbe02429 dictd-wordnet: Make wordnet available via local dictd. 2013-05-18 13:24:30 +02:00
Eelco Dolstra 2ce0e5ef4b mysql: Update to 5.1.69 2013-05-14 11:47:23 +02:00
Eelco Dolstra 602be839a4 mysql: Update to 5.5.31 
CVE-2013-1502, CVE-2013-1511, CVE-2013-1532, CVE-2013-1544,
CVE-2013-2375, CVE-2013-2376, CVE-2013-2389, CVE-2013-2391,
CVE-2013-2392, maybe others.
 2013-05-14 11:47:22 +02:00
Mathijs Kwik 3d5121233d mongodb: upgrade to 2.4.3 and use system libraries 2013-05-12 22:46:42 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Eelco Dolstra cd6da089a6 nginx: Update to 1.2.8 2013-05-07 17:33:51 +02:00
Shea Levy e39ddf321c nginx: Don't fetch the full WebDAV extension unless needed 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-05 15:48:07 -04:00
Russell O'Connor 9808445598 Add optional third party support for fullWebDAV. 
This follows the directions fom http://wiki.nginx.org/HttpDavModule.
 2013-05-05 15:19:03 -04:00