mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Code Issues Wiki Activity
49241 commits 319 branches 124 tags 6.6 GiB
Commit graph

1440 commits

Author SHA1 Message Date
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
Rok Garbas fac41b58ca couchdb: update to 1.6.0 2014-07-05 09:18:42 +01:00
Vladimír Čunát aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02: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
Michael Raskin 3471744cbb Add auto-updating meta for restund 2014-07-01 11:54:09 +04: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
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Vladimír Čunát db1afc01d2 samba: security-only updates 2.6.22 -> .24 
Fixes CVE-2014-{0244,3493} and CVE-2013-4496
 2014-06-26 22:23:09 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates 
Hydra eval: 1131611
 2014-06-26 22:05:15 +02:00
Charles Strahan 749e73afc7 consul: new package 2014-06-25 14:40:26 -04:00
John Wiegley dfd8247bc1 Merge pull request #3065 from cstrahan/nsq 
add nsq package
 2014-06-24 15:20:42 -07:00
John Wiegley 7fa6438281 Merge pull request #3064 from cstrahan/fleet 
add fleet package
 2014-06-24 15:20:30 -07:00
John Wiegley 6cc6b6f6ea Merge pull request #3062 from cstrahan/etcd 
add etcd package
 2014-06-24 15:20:10 -07:00
Charles Strahan 1091dde5bb add nsq package 2014-06-23 05:43:17 -04:00
Charles Strahan 693bc7d44e add fleet package 2014-06-23 05:20:41 -04:00
Charles Strahan b6df637e86 add etcd package 2014-06-23 04:55:46 -04:00
Charles Strahan 8ad3254ac5 update serfdom to v0.6.2 2014-06-23 04:45:24 -04:00
Bjørn Forsman 5082caa72d axis2: add meta.description 2014-06-22 22:38:27 +02:00
Vladimír Čunát 114b75ce97 mariadb: switch to a working download URL 2014-06-22 15:29:23 +02:00
Vladimír Čunát 3f15312b44 xorg: add xkbprint 
Suggested by @KoviRobi on ML.
 2014-06-22 10:04:10 +02:00
Austin Seipp 6cfa38ce7d nagios: significant upgrades 
- Upgrade Nagios Core to 4.x
 - Expose mainConfigFile and cgiConfigFile in module for finer
   configuration control.
 - Upgrade Plugins to 2.x
 - Remove default objectDefs, which users probably want to customize.
 - Systemd-ify Nagios module and simplify directory structure
 - Upgrade Nagios package with more modern patch, and ensure the
   statedir is set to /var/lib/nagios

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-22 00:22:10 -05:00
Vladimír Čunát 3ec2cea214 Merge master into x-updates 
Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-06-20 00:24:38 +02:00
lethalman 219e992519 Merge pull request #2976 from bluescreen303/nginx 
nginx: fix group, statedir permissions, add echo module, fix aio
 2014-06-17 14:23:15 +02:00
Vladimír Čunát c50f0e47e1 freetype: major update, including some CVE security 
- There's no fontconfig update yet, as I failed to debug it yet.
- Infinality patches are now taken from a different (maintained) source.
 2014-06-17 09:00:29 +02:00
Vladimír Čunát ff327554e9 xorg: maintenance updates of several modules 2014-06-17 09:00:29 +02:00
Mateusz Kowalczyk 43c6bfc0c9 mpd: clean up some flags 
Some changed, some are no longer used.
 2014-06-16 22:50:14 +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
Michael Raskin a5509026ec Add Squid 3.4.5 and enable its SSL features. 2014-06-13 17:41:42 +04:00
Rob Vermaas 2c918c6545 Revert "Revert "elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307"" 
This reverts commit 61384f5627.
 2014-06-13 14:00:26 +02:00
Rob Vermaas 61384f5627 Revert "elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307" 
Was accidentally pushed.

This reverts commit 1ecb9b8de8.
 2014-06-13 13:56:27 +02:00
Rob Vermaas 1ecb9b8de8 elasticsearch: update from 1.0.1 to 1.2.1, potentially fixes CVE-2013-5307 2014-06-13 13:27:53 +02:00
Christoph Hrdinka e59c465103 nsd: add package version 4.0.3 2014-06-12 11:14:44 +02:00
Sander van der Burg 094635257e mysql-connector-java: Bump to version 5.1.31 2014-06-09 19:11:33 +02:00
Rickard Nilsson c86d89639a postfix-211: Update from 2.11.0 to 2.11.1 2014-06-09 15:14:05 +02:00
Shaun Sharples c841db2aff whitespace 2014-06-07 15:00:19 +02:00
Shaun Sharples 0b62bef7f1 sabnzbd: fixed typo in url and updated to 0.7.17 2014-06-07 14:58:41 +02:00