Commit graph

1153 commits

Author SHA1 Message Date
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
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
Eelco Dolstra
0c93c758bf postgresql: Update to 8.4.19, 9.0.15, 9.1.11, 9.2.6
This is a critical update fixing several data corruption issues:

  http://www.postgresql.org/about/news/1492/
2014-01-03 11:54:52 +01:00
Eelco Dolstra
ca8de63797 postgresql-8.3: Remove
The 8.3 branch is no longer maintained so it shouldn't be used.
2014-01-03 11:51:02 +01:00
Mathijs Kwik
adffa870cf xf86-video-vmware: xatracker2 patch to build with mesa 10 2014-01-03 09:14:22 +01:00