MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38506 commits 253 branches 124 tags 5.9 GiB
Commit graph

1128 commits

Author SHA1 Message Date
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
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
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 0c3d910cd0 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
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Peter Simons
cdfd953ffa apache-httpd-2.4: enable building the 'event'-based mpm worker 
Adding "LoadModule mpm_event_module modules/mod_mpm_event.so" to httpd.conf
enables that worker instead of the default choice.
 2013-12-29 12:52:54 +01:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Vladimír Čunát
50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Vladimír Čunát
4f8809a091 libXtst: forgotten security update 2013-12-23 18:24:24 +01:00
Mathijs Kwik
82d02565fc rethinkdb: /usr/bin/env is not available in chroot builds 2013-12-23 15:48:36 +01:00
Mathijs Kwik
e2e923644f add rethinkdb 2013-12-23 10:21:20 +01:00
Nixpkgs Monitor
751e111a87 squids.latest: update from 3.2.2 to 3.2.13, potentially fixes CVE-2012-5643, CVE-2013-0189, CVE-2013-1839, CVE-2013-4123 2013-12-23 05:18:34 +02:00
Vladimír Čunát
2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor
335cfe188d zabbix20.agent: update from 2.0.9 to 2.0.10 2013-12-21 02:28:26 +02:00
Nixpkgs Monitor
156ff88ed2 zabbix.agent: update from 1.8.18rc1 to 1.8.19, potentially fixes CVE-2013-6824 2013-12-21 02:28:26 +02:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
 2013-12-18 23:21:29 +01:00
Nixpkgs Monitor
3f39947054 jetty61: update from 6.1.21 to 6.1.26 2013-12-18 18:18:33 +02:00
Nixpkgs Monitor
6b0e77f8b5 dovecot: update from 2.1.8 to 2.1.17 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
01a474bce4 bird: update from 1.3.11 to 1.4.0 2013-12-18 18:18:19 +02:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Michael Raskin
397721b870 Merge pull request #1360 from tomberek/add_shellinabox 
Add shellinabox
 2013-12-14 22:50:47 -08:00
Vladimír Čunát
095949bdc8 xorg server: maintenance update 1.14.4 -> .5 
Also drop dri-path patch which wasn't needed for several months,
and now it no longer applied. I tested that drivers are still found.
 2013-12-14 23:17:15 +01:00
Domen Kožar
b239c3f3ee Merge pull request #1370 from offlinehacker/pkgs/nginx/module_moreheaders 
nginx: add headers more nginx module
 2013-12-13 02:45:45 -08:00
Jaka Hudoklin
1b019fe39f nginx: enable ipv6 and spdy 2013-12-13 09:42:06 +01:00
Jaka Hudoklin
698860bf7c nginx: add headers more nginx module 2013-12-13 09:38:34 +01:00
Evgeny Egorochkin
4c1981c4e0 Revert "virtuoso: update from 6.1.6 to 6.1.7" 
Upstream KDE advises against 6.1.7 for now

This reverts commit 7c19a2213f.
 2013-12-12 09:33:57 +02:00
Thomas Bereknyei
b7a9e1a998 Add shellinabox 2013-12-11 03:52:30 -05:00