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

1356 commits

Author SHA1 Message Date
Mathijs Kwik
b6d8955199 mongodb: upgrade to 2.6.0 2014-05-05 07:32:36 +02:00
Austin Seipp
b10f4af8f9 nginx: upgrade to 1.6.0, expose many more modules 
By default, we now build all the optional nginx modules, including the
out-of-band ones like moreheaders and rtmp support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-02 01:24:38 -05:00
Austin Seipp
e67cc9ba07 nginx: build http_stub_status module 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-02 00:42:40 -05:00
Eelco Dolstra
a986bbf4ba postgresql: Update to latest versions 2014-05-01 13:49:31 +02:00
Eelco Dolstra
65a78e16f1 httpd: Update to 2.2.27 
CVE-2013-6438, CVE-2014-0098
 2014-05-01 11:48:56 +02:00
Jaka Hudoklin
ca3c2b7b2a rabbitmq_server: enable builds on darwin 2014-04-29 22:06:54 +02:00
Vladimír Čunát
d76b5d5ce3 Merge branch 'x-updates': mesa 10.0.* -> 10.1.1 
Also minor xorg bumps.
 2014-04-28 16:22:55 +02:00
Sander van der Burg
ff48fce0cf Merge pull request #2381 from linquize/axis2 
axis2: Remove the extra slash in URL
 2014-04-25 10:29:52 +02:00
Linquize
7d5a5354d8 axis2: Remove the extra slash in URL 2014-04-25 07:32:23 +08:00
Rickard Nilsson
7336218a9e postfix: Add version 2.11.0 as nixpkgs.postfix211 
I think this version should replace the current nixpkgs.postfix,
but it could potentially break stuff since the version jump is
big (2.8 -> 2.11).
 2014-04-24 11:56:54 +02:00
Rickard Nilsson
0f9499887e pulseaudio: Update from 4.0 to 5.0 2014-04-21 23:22:10 +02:00
aszlig
cdd1c9caa5
Merge branch 'chromium-refactor', closes #1798. 
This implements some longstanding work of getting the Chromium
derivation more modular. Unfortunately, I didn't manage to decrease the
compile time, which was one of the primary goal for doing the refactor.
A main reason this didn't work out well was the fact that most bundled
libraries are so heavily patched that it's not possible within a limited
time frame to decouple it from the main derivation.

However, it should now be easier to build other derivations that build
upon Chromium, like libcef. Also, it finally adds support for the
non-free PepperAPI Flash and PDF plugins and support for fetching the
corresponding versions through the updater.
 2014-04-21 09:50:50 +02:00
Eelco Dolstra
4e8c2f0ff9 Merge branch 'systemd-update' 2014-04-20 19:31:01 +02:00
Vladimír Čunát
9e9f282309 xorg-server: go back to 1.14.6 due to intel problems 
Again, stable releases not compiling together :-/
 2014-04-19 23:42:54 +02:00
Vladimír Čunát
5d850ba9d3 xorg: revert fontsproto update, as it breaks libXfont 
This partially reverts commit 30ac332563.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ

It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
 2014-04-19 22:15:32 +02:00
Vladimír Čunát
f66e5664e0 xorg-server: major update 1.14.5 -> 1.15.1 2014-04-19 14:31:14 +02:00
Vladimír Čunát
30ac332563 xorg: minor updates of three packages 2014-04-19 14:30:48 +02:00
aszlig
4c8ec5e12e
v8: Bring back old version 3.14. 
The current version of v8 breaks builds of nodejs, mongodb and
rethinkdb. So let's bring back the old package with annoying _3_14
version suffix so hopefully the corresponding maintainers will get rid
of that dependency :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-04-19 03:58:44 +02:00
Eelco Dolstra
1c21456a67 xorg-server: Update to 1.14.6 2014-04-18 21:50:00 +02:00
Domen Kožar
3a9f28ee08 Merge pull request #2185 from lethalman/gnome3 
tracker, licenses.cc-by-30, gnome-user-docs, upgrade sushi, gnome-keyring service, gnome-user-share, gnome-tweak-tool, gnome-shell-extensions, xdg-user-dirs
 2014-04-16 18:08:00 +02:00
John Wiegley
8ee52f3856 Add leafnode for unix systems 2014-04-15 02:54:58 -05:00
Luca Bruno
e08861a4cd mod_dnssd: new apache httpd 2.2 module 
Provide Zeroconf support via DNS-SD using Avahi

http://0pointer.de/lennart/projects/mod_dnssd
 2014-04-14 09:58:03 +02:00
Bjørn Forsman
1d896c47c9 apcupsd: add missing assert 2014-04-13 20:29:33 +02:00
Bjørn Forsman
694eb12f5f apcupsd: bump 3.14.11 -> 3.14.12 (latest stable) 
Release notes:
http://sourceforge.net/p/apcupsd/svn/HEAD/tree/tags/Release-3_14_12/ReleaseNotes
 2014-04-13 20:29:33 +02:00
Jaka Hudoklin
88691049ae postgresql93: fix darwin builds 
ossp-uuid does not build on darwin
 2014-04-10 21:00:26 +02:00
Peter Simons
2d4919dbb4 apacheHttpd_2_4: update from 2.4.7 to 2.4.9 2014-04-09 12:41:11 +02:00
Domen Kožar
d2efe82eaa munin: 2.0.19 -> 2.0.20 2014-04-09 11:29:47 +02:00
Shea Levy
ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs 
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
 2014-04-05 14:23:29 -04:00
Domen Kožar
80a03f665d Merge branch 'x-updates' 2014-04-02 15:30:52 +02:00
Shea Levy
90cf41c0d7 mariadb: Bump 2014-04-02 09:05:01 -04:00
Vladimír Čunát
44f4862041 xorg.xtrans: maintenance update 2014-04-01 10:53:34 +02:00
Vladimír Čunát
6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00
Peter Simons
f06bcd84bf Merge pull request #2082 from cpages/update 
Updates for maintained packages
 2014-03-31 23:13:38 +02:00
Eelco Dolstra
6167da54ea gpsd: Disable the tests 
They bind to TCP ports and fail randomly:

http://hydra.nixos.org/build/9905518
 2014-03-31 11:23:44 +02:00
Carles Pagès
5d098e8206 qpid-cpp: update to 0.26 
Also, remove a workaround that's no longer needed.
 2014-03-30 19:23:01 +02:00
Emery Hemingway
6c77690b28 rippled: initial pkg and module expressions 
rippled is the Ripple P2P payment network reference server
https://ripple.com
 2014-03-29 15:31:37 -04:00
Vladimír Čunát
22c04a2fe1 shishi: minor update to fix build with new libtasn1 2014-03-29 19:44:30 +01:00
Vladimír Čunát
bd1abb36dd xorg: minor updates of xrandr and util-macros 2014-03-29 16:15:13 +01:00
Shea Levy
23fee1cd78 Merge branch 'shellinabox-fix' of git://github.com/grwlf/nixpkgs 
shellinabox: unhardcode /bin/login, apply vt100 '-' fixup
 2014-03-28 21:38:30 -04:00
Sergey Mironov
0f2d7fa6f6 shellinabox: unhardcode /bin/login, apply vt100 '-' fixup 2014-03-28 14:58:10 +04:00
Vladimir Kirillov
1aabffdea2 mysql upgrade to 5.5.37 2014-03-28 11:12:20 +08:00
Vladimír Čunát
9ddc57cbea xorg.xf86-video-vmware: minor update 
Patch no longer needed to build.
 2014-03-27 22:14:51 +01:00
Vladimír Čunát
576e9289dd Merge master into x-updates 2014-03-27 21:34:06 +01:00
Evgeny Egorochkin
431ff0f769 nginx: update from 1.4.6 to 1.4.7 2014-03-26 19:15:04 +02:00
Evgeny Egorochkin
fa49cba237 net_snmp: update from 5.7.2 to 5.7.2.1, potentially fixes CVE-2014-2284, change source to .zip because tar.gz is broken 2014-03-26 13:43:51 +02:00
Jaka Hudoklin
72d8c4225b Add seyren, an alerting dashboard for Graphite 2014-03-25 23:45:11 +00:00
Lluís Batlle i Rossell
fa5a583098 Bringing back the xkeyboard-config eo patch 2014-03-24 10:42:00 +01:00
Vladimír Čunát
11492176d5 xorg: add "intel-testing" video driver, currently 2.99.911 2014-03-23 22:10:56 +01:00
Vladimír Čunát
1941168c3d Merge branch master into x-updates (fix eval) 2014-03-21 13:46:56 +01:00
Rob Vermaas
5f27ed59f0 rabbitmq_server: update from 3.2.1 to 3.2.4, potentially fixes CVE-2012-3582, CVE-2013-4674 2014-03-21 13:13:11 +01:00
Rob Vermaas
94990a5935 tomcat6: update from 6.0.37 to 6.0.39, potentially fixes CVE-2013-4286, CVE-2013-4322, CVE-2013-4590, CVE-2014-0033 2014-03-21 13:12:52 +01:00
Rob Vermaas
f2026c16fd elasticsearch: update from 1.0.0 to 1.0.1, potentially fixes CVE-2013-5307, CVE-2013-6804 2014-03-21 13:11:38 +01:00
Vladimír Čunát
150102ce30 xorg.libFS: maintenance update 1.0.5 -> .6 2014-03-21 10:34:20 +01:00
Vladimír Čunát
eac9324034 xorg: fixup after the update 
All that built before update builds now again (and glamor-egl is new).
 2014-03-21 10:34:19 +01:00
Vladimír Čunát
23682d02d0 xorg: update, regenerate (new: glamor-egl) 
Updates caught by nixpkgs monitor.
 2014-03-21 10:34:19 +01:00
Vladimír Čunát
4f50a0917e xorg: add xf86-video-modesetting 2014-03-21 10:08:31 +01:00
Shea Levy
608f436da3 Add ngircd IRC server 2014-03-19 21:03:19 -04:00
Shea Levy
4216e42ca8 Merge branch 'openafs' of git://github.com/errge/nixpkgs 
Openafs fixes
 2014-03-19 05:21:28 -04:00
Bjørn Forsman
2ce7902059 gpsd: fix build in chroot 
Fixes this when building with nix.useChroot = true in configuration.nix:

  sh: ./test_maidenhead.py: /usr/bin/env: bad interpreter: No such file or directory
  scons: *** [maidenhead-locator-regress] Error 126
  scons: building terminated because of errors.
 2014-03-16 00:05:58 +01:00
Bjørn Forsman
395618890b gpsd: update meta attributes 
* Don't repeat package name in description
* longDescription re-copied from homepage (gpsd now supports AIS...)
* The homepage has moved
* Add platforms and maintainers
 2014-03-15 17:35:55 +01:00
Bjørn Forsman
c54b9b7b60 gpsd: update 2.95 -> 3.10 
Build system is changed, gpsd uses scons now.

The expressions needs some more work, TODO comments added. (xgps didn't
work before this change either.)

I added an option for the gpsd group, which is set to upstream default:
"dialout". Note that our default gpsd user is "gpsd", while upstream
uses "nobody" by default.
 2014-03-15 17:35:55 +01:00
Matthew Sackman
89f0c9a8b6 Update serfdom to 0.5.0. 2014-03-15 10:57:27 +00:00
Shea Levy
6da2d89016 Merge branch 'postgresql93-ossp-uuid-clean' of git://github.com/basvandijk/nixpkgs 
Configure postgresql-9.3 with support for the ossp-uuid module

Conflicts:
	pkgs/servers/sql/postgresql/9.3.x.nix
 2014-03-14 19:52:43 -04:00
Gergely Risko
d23e7fdfc3 OpenAFS client update 2014-03-14 11:52:06 +01:00
Rickard Nilsson
191bd1c26a dovecot22: Update from 2.2.6 to 2.2.12 2014-03-14 10:34:21 +01:00
Shea Levy
02583ff4f3 memcached: Bump 2014-03-13 08:38:23 -04:00
Rickard Nilsson
040df9c41a New package: solr 4.7.0, a Java search platform 2014-03-12 23:14:09 +01:00
Rickard Nilsson
ec3dbdf93d New package: winstone 0.9.10, a Java Servlet container 2014-03-12 23:14:09 +01:00
Bjørn Forsman
f191aa32ba lighttpd: add enableMysql option, to build 'mod_mysql_vhost' 
Now we have options to build all available modules/plugins.
 2014-03-12 23:04:03 +01:00
Bjørn Forsman
37ad2a7d28 lighttpd: bump 1.4.34 -> 1.4.35 (security fixes) 
From http://www.lighttpd.net/:

  Important changes
  -----------------
  This release contains a lot of bug fixes, many detected by scan.coverity.com
  (and more to come). The main reason for the release is a fix for an SQL
  injection (and path traversal) bug triggered by specially crafted (and
  invalid) Host: headers.

  Security fixes
  --------------
  http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2014_01.txt (no CVE yet)

NOTE: We (nixpkgs) currently don't build the mod_mysql_vhost module mentioned
above.
 2014-03-12 22:49:47 +01:00
Rickard Nilsson
bd76470d9b opensmtpd: Update to 5.4.2p1 2014-03-06 11:31:29 +01:00
Evgeny Egorochkin
db1e1d134f mpd: update from 0.18.8 to 0.18.9 2014-03-05 05:23:59 +02:00
Evgeny Egorochkin
20a2b1af93 nginx: update from 1.4.5 to 1.4.6 2014-03-05 05:10:32 +02:00
Shea Levy
15d6da8740 psql: Use less as the default pager 
less is more common and better than more

Fixes #1681
 2014-03-04 14:52:43 -05:00
Peter Simons
b0c2354809 bind: update to version 9.9.5-W1 (fixes CVE-2013-6230 and CVE 2014-0591) 2014-03-03 13:10:05 +01:00
Peter Simons
65cce5c38b opensmtpd: update from 201307151923p1 to 201402281146p1 2014-03-03 11:10:25 +01:00
Matthew Sackman
5e09175765 add serfdom (close #1672) 2014-02-27 19:18:28 +01:00
Evgeny Egorochkin
6ef0c3220e mpd: update from 0.18.5 to 0.18.8 2014-02-27 18:48:22 +02:00
Rok Garbas
a6a3b22bc0 removing unused couchdb files 2014-02-27 13:34:11 +01:00
Rok Garbas
62438c09f7 update couchdb to 1.5.0(current latest) and add service for it 2014-02-27 13:34:11 +01:00
Shea Levy
1ce6fff4e2 Merge mysql55 module into mysql 
This also removes the default for services.mysql.package, as this should
not generally be updated automatically if we change the mysql attribute
 2014-02-26 07:54:12 -05:00
Shea Levy
a0a9430869 Add mariadb 2014-02-24 15:34:57 -05:00
Peter Simons
b05d3e77f1 spamassassin: update from 3.3.2 to 3.4.0 2014-02-24 21:17:55 +01:00
Oliver Charles
3f95f39bab postgresql: Build all versions on Hydra (Linux) 
Additionally, add @ocharles to the list of maintainers.

I am only building these on Linux environments in Hydra for now, as
that's the only environment I can be a maintainer for.
 2014-02-23 11:25:18 +01:00
Vladimír Čunát
88d490588d xorg: add some modules 
I was testing whether 10.1 mesa might solve the LLVM RTTI problems,
and it seems mesa will need these (and the problems aren't solved).
 2014-02-22 18:37:05 +01:00
Oliver Charles
a188cfd37d postgresql: Update to latest releases 2014-02-22 18:13:28 +01:00
Vladimír Čunát
5a8a3195a0 xorg.xcb-util-wm: minor update 0.4.0 -> .1 2014-02-22 17:40:01 +01:00
Vladimír Čunát
ae5d8f6768 Merge master into x-updates 2014-02-20 20:55:31 +01:00
Domen Kožar
aea043aec0 Revert "upgrade video-intel stack to 2.99.906" 
This reverts commit 89f710f18e.

Reported by others for xorg-server to crash on different kernel
versions.
 2014-02-19 12:37:49 +01:00
Sander van der Burg
44a9ebac47 axis2: bump to version 1.6.2 2014-02-18 18:07:24 +01:00
Evgeny Egorochkin
c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
Domen Kožar
89f710f18e upgrade video-intel stack to 2.99.906 2014-02-16 20:36:44 +01:00
Vladimír Čunát
96f07fa74e Merge master into x-updates 2014-02-16 11:45:02 +01:00
Vladimír Čunát
9a86ad2f7f xorg.xkeyboard-config: commit forgotten fixups 
Without these there was also a mysterious collision in nixos etc generation.
 2014-02-16 11:25:49 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Petr Rockai
ae4e0ce73a libmpdclient: Update to latest upstream (2.9). 2014-02-15 10:27:38 +01:00
Oliver Charles
5cd0a886fe elasticsearch: Update to 1.0.0 
close #1746
 2014-02-14 18:35:21 +02:00
Bjørn Forsman
8bc5ee71e3 apcupsd: update 3.14.10 -> .11 (stable) 2014-02-13 22:52:29 +01:00
Eelco Dolstra
2ea4ec798b zabbix: Update from 2.2.1 to 2.2.2 
Potentially fixes CVE-2012-0031, CVE-2012-0053, CVE-2012-0883,
CVE-2012-2687, CVE-2012-3499, CVE-2012-4558, CVE-2013-1862,
CVE-2013-1896, CVE-2013-2249, CVE-2013-1034, CVE-2013-5143.
 2014-02-13 18:34:01 +01:00
Eelco Dolstra
5dfff3a970 zabbix: Update from 2.0.10 to 2.0.11 2014-02-13 18:34:01 +01:00
Eelco Dolstra
da60b53242 zabbix: Update from 1.8.19 to 1.8.20 2014-02-13 18:34:01 +01:00
Domen Kožar
aa6ddfb119 nginx: 1.4.4 -> 1.4.5 2014-02-12 19:13:36 +01:00
Vladimír Čunát
6e2d3b9847 Merge master into x-updates 2014-02-02 10:05:25 +01:00
Petr Rockai
cdac4b69c9 Revert "Revert "dictd: Update to latest upstream (0.12.1)."" and add the 
missing libmaa.nix.

This reverts commit d59778678a.
 2014-01-31 13:18:06 +01:00
Eelco Dolstra
d59778678a Revert "dictd: Update to latest upstream (0.12.1)." 
This reverts commit 8162222071 since it
breaks evaluation (libmaa.nix is missing).
 2014-01-31 13:07:25 +01:00
Vladimír Čunát
546bd7738d xorg xkeyboard-config: update, unify with the other expression 2014-01-30 13:46:02 +01:00
Vladimír Čunát
b27477054f xorg xcb-util-wm: minor update 2014-01-30 09:12:51 +01:00
Petr Rockai
8162222071 dictd: Update to latest upstream (0.12.1). 2014-01-29 22:13:32 +01:00
Petr Rockai
83acdb6f87 dictd-wiktionary: Update to a more recent dump. 2014-01-29 22:13:32 +01:00
Bas van Dijk
91c9027691 Configure postgresql-9.3 with support for the ossp-uuid module 2014-01-29 01:12:41 +01:00
Vladimír Čunát
908ce109f9 Merge master into x-updates (the binutils change) 2014-01-28 18:00:29 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Vladimír Čunát
edb1e2996f xorg.xtrans: update to 1.3.3 
Another forgotten X lib; we had ~2 years without updating it.
 2014-01-28 12:11:35 +01:00
Vladimír Čunát
69b4bef3f3 Merge master into x-updates 2014-01-28 02:32:27 +01:00
Vladimír Čunát
7d5c6ab5f3 Merge #1388: update rabbitmq-server and add lib 2014-01-26 14:21:34 +01:00
Vladimír Čunát
01b0d1c926 rabbitmq: move docs: $out/docs -> $out/share/docs 
As pointed out by @bjornfor, we mostly have it under share.
 2014-01-26 14:15:10 +01:00
Vladimír Čunát
5fb366d1e5 xorg: move nouveau driver here, some updates of modules 
It seems that most of the modules is rarely used, but still.

Some of the updated modules don't build, just as they didn't before.
 2014-01-26 09:03:01 +01:00
Vladimír Čunát
7e4709247d Merge master into x-updates 2014-01-26 09:01:25 +01:00
Peter Simons
b3fe70a5e8 popa3d: disown this package 2014-01-25 20:59:31 +01:00
Peter Simons
f6e18d1d43 popa3d: update from 1.0.2 to 1.0.3 2014-01-25 20:58:49 +01:00
Vladimír Čunát
7e0b78f7b2 Merge master into x-updates 
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
 2014-01-23 22:52:18 +01:00
Evgeny Egorochkin
9b538a96f1 nagios-plugins: change source location and homepage since the original site has been hijacked. https://bugzilla.redhat.com/show_bug.cgi?id=1054340 2014-01-22 08:42:35 +02:00
Domen Kožar
0c9f4cb22a evolution-data-server: upgrade and move to gnome3 namespace 2014-01-21 14:11:19 +01:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Bas van Dijk
9068ba2bb4 postgresql: Add version 9.3 2014-01-20 14:58:09 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Rok Garbas
a39490d709 fixing munin (broken by latest version update) also switch to fetchgit 2014-01-16 18:07:16 +00:00
Vladimír Čunát
fcb9e031f8 xorg.xf86-video-ati: update 7.2.0 -> 7.1.0 
Proposed by @kosmikus.
 2014-01-16 14:36:42 +01:00
Peter Simons
1671054702 mod_wsgi: update from 3.3 to 3.4 2014-01-15 17:29:14 +01:00
Peter Simons
ed25859f07 mailman: update from 2.1.16 to 2.1.17 2014-01-15 17:29:14 +01:00
Peter Simons
6603ef3bf8 bind: update to version 9.9.4-P2 2014-01-14 15:55:24 +01:00
Nixpkgs Monitor
36c0702156 munin: update from 2.0.17 to 2.0.19, potentially fixes CVE-2013-6048, CVE-2013-6359 2014-01-14 11:59:41 +01:00
Nixpkgs Monitor
0c6ebeb734 lighttpd: update from 1.4.33 to 1.4.34, potentially fixes CVE-2013-4508 2014-01-14 11:55:48 +01:00
Thomas Bereknyei
57e3feda74 Adds kippo SSH honeypot 2014-01-14 10:32:26 +00:00
Vladimír Čunát
1cb146f3e1 Merge master into x-updates 
Llvm refactorings from ae0c9b626f included.
Mesa is the only package using llvm_34 ATM.

Conflicts:
	pkgs/development/compilers/llvm/default.nix
 2014-01-13 22:00:31 +01:00
Eelco Dolstra
6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Vladimír Čunát
91b7fa9169 Merge master into x-updates 2014-01-11 18:44:55 +01:00
Evgeny Egorochkin
e8a9e30cc7 Add meta.branch to some packages 2014-01-08 18:06:18 +02:00
Nixpkgs Monitor
e148a016f5 xlibs.xf86videointel: update from 2.21.9 to 2.21.15 2014-01-08 16:17:32 +01:00
Peter Simons
0266ac9c30 apache-httpd-2.4: revert "enable building the 'event'-based mpm worker" 
Commit 0c3d910cd027a926ffc8538ea60cf2da099d7808 didn't have any effect.
The 'event' MPM module isn't built because our version of APR is too old.
 2014-01-08 13:17:40 +01:00
Vladimír Čunát
e01af040ed xorg.libXfont: bugfix update, CVE-2013-6462 
This lib is deprecated and almost unused, but still...
 2014-01-07 17:51:22 +01:00
Rob Vermaas
0d54426794 Add zabbix 2.2.1 2014-01-07 13:11:32 +01:00
Eelco Dolstra
9d3d42406b samba: Update to 3.6.22 
CVE-2012-6150, CVE-2013-4408.
 2014-01-06 17:48:39 +01:00
Shea Levy
139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master 
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-05 07:13:19 -05:00
Vladimír Čunát
552143224a net_snmp: fix build by autoreconfing 2014-01-05 11:19:07 +01:00
Shea Levy
a589bfae17 Update and fix kernel packages to new kernel build 
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-04 21:17:04 -05:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Eelco Dolstra
e9211e60ac postgresql-jdbc: Fix build 2014-01-03 14:33:17 +01:00
Eelco Dolstra
e1f7144aa8 postgresql-jdbc: Update to 9.3-1100 2014-01-03 11:56:41 +01:00