Commit Graph

4082 Commits

Author SHA1 Message Date
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
2f63137a44 lvm2: 2.02.118 -> 2.02.120 2015-06-18 21:50:53 -07:00
William A. Kennington III
af178cbc4e bluez: 5.30 -> 5.31 2015-06-18 21:50:39 -07:00
William A. Kennington III
1bb39e282d nvidia-x11: 346 -> 352.21 2015-06-18 21:45:51 -07:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
ee951a92d3 relocate adv_cmds 2015-06-18 12:37:42 -07:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Daiderd Jordan
f119508140 darwin os-specific: rez and derez packages 2015-06-18 11:34:05 +02:00
William A. Kennington III
8f63b5e89e Merge pull request #8359 from NixOS/fix-CVE-2015-4143
wpa_supplicant: fix CVE-2015-4143
2015-06-17 20:35:41 -07:00
Tobias Geerinckx-Rice
98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
William A. Kennington III
8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
Pascal Wittmann
7c4a0eaa53 wpa_supplicant: fix CVE-2015-4143
see http://www.openwall.com/lists/oss-security/2015/05/09/6
2015-06-16 17:28:35 +02:00
William A. Kennington III
046ba6b7db linux-testing: 4.1-rc7 -> 4.1-rc8 2015-06-15 11:37:05 -07:00
William A. Kennington III
2fd74f43b5 kernel: 3.18.14 -> 3.18.16 2015-06-15 11:32:46 -07:00
William A. Kennington III
b325c1556a kernel: 3.12.43 -> 3.12.44 2015-06-15 11:32:46 -07:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Tuomas Tynkkynen
2c9b93b01c i2c-tools: New package at version 3.1.1 2015-06-15 17:49:35 +02:00
Tuomas Tynkkynen
7233ca0488 read-edid: New package at version 3.0.2 2015-06-15 17:49:35 +02:00
Michael Raskin
14e7d5440b Update Sysdig, adding new dependencies 2015-06-14 11:23:56 +03:00
Michael Raskin
59cbed7a02 Update eudev 2015-06-14 11:21:44 +03:00
William A. Kennington III
8f60f45eb6 mdadm: add gcc5 compat 2015-06-12 15:40:38 -07:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Tobias Geerinckx-Rice
cbbefbdabb mcelog -> 120
Fix potential NULL reference while parsing kernel efi files
2015-06-12 13:11:38 +02:00
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Ricardo M. Correia
e26bfbe26f grsecurity: Update stable and test patches
stable: 3.1-3.14.43-201506021902 -> 3.1-3.14.44-201506082249
test:   3.1-4.0.4-201506021902   -> 3.1-4.0.5-201506082251
2015-06-10 18:33:28 +02:00
Tobias Geerinckx-Rice
b229cfc894 mcelog -> 119
- Fix clobbered status variable in server_ping
- Avoid prefilling memory database when DMI is disabled
2015-06-09 20:22:26 +02:00
William A. Kennington III
6c00f2105a iw: 3.15 -> 4.1 2015-06-08 17:41:10 -07:00
aszlig
87b9cceefd
linux-testing: Update to new version 4.1-rc7.
Includes fixes for DRM, MIPS, iSCSI, ALSA, USB, bna and wireless and
more. Full diff can be found here:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.1-rc7&id2=v4.1-rc6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-08 15:12:47 +02:00
Pascal Wittmann
c46889ea42 ipsec-tools: apply debians patch to fix CVE-2015-4047 2015-06-08 13:56:42 +02:00
Vladimír Čunát
9f7d7adb05 Revert "kmod-blacklist-ubuntu: update to Vivid"
This reverts commit 0307c27219.

The only change was blacklisting bochs-drm, but that breaks our VM setup
and I don't see a good reason to do that on the Ubuntu issue
(just some PowerPC failure).

Defaulting to qxl driver might be better anyway, but I'm not venturing
such changes now.
2015-06-08 12:34:24 +02:00
William A. Kennington III
514a9fdf87 Merge pull request #8173 from dezgeg/pr-kernel-config
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
2015-06-07 10:14:51 -07:00
William A. Kennington III
4991e62285 musl: 1.1.9 -> 1.1.10 2015-06-06 12:56:10 -07:00
William A. Kennington III
0a8e830196 kernel: 4.0.4 -> 4.0.5 2015-06-06 12:32:58 -07:00
William A. Kennington III
24042f3803 kernel: 3.14.43 -> 3.14.44 2015-06-06 12:32:58 -07:00
William A. Kennington III
1adef3db3d kernel: 3.10.79 -> 3.10.80 2015-06-06 12:32:58 -07:00
Arseniy Seroka
70b5e51456 Merge pull request #8178 from jagajaga/fix/versions
fix: add missing versions
2015-06-06 00:22:10 +03:00
Arseniy Seroka
daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Ricardo M. Correia
3afae4037b zfs: Fix systemd warning
The `zfs-share` service was trying to execute the `rm` binary, but it
was providing an invalid `/bin` path.

This should fix #8171.
2015-06-04 17:35:39 +02:00
Eelco Dolstra
5b7c6d0440 audit: Update to 2.4.2 2015-06-04 14:54:53 +02:00
Eelco Dolstra
4c16c271f6 Revert "audit: 2.9.1 -> 2.9.2"
This reverts commit 7e126ac83e.
2015-06-04 14:54:50 +02:00
Eelco Dolstra
3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa19.
2015-06-04 14:54:48 +02:00
Tobias Geerinckx-Rice
ac5d849ff6 Merge pull request #8153 from nckx/update-libnl
libnl 3.2.25 -> 3.2.26
2015-06-04 13:11:16 +02:00
Eelco Dolstra
cdeb271101 zfs: Nuke references to linux.dev in *.ko files
This prevents linux.dev being included in the installation CD.
2015-06-04 11:06:44 +02:00
Tuomas Tynkkynen
6be70d17c0 kernel-config: Enable IKCONFIG so ARM gets /proc/config.gz
IKCONFIG must be enabled so IKCONFIG_PROC can be set. On x86 IKCONFIG
gets implicitly enabled by kernelAutoModules in platforms.nix. But ARM
doesn't use kernelAutoModules, so IKCONFIG_PROC won't get enabled
without this patch.
2015-06-04 11:28:35 +03:00
Tuomas Tynkkynen
9c2f2bc893 kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE
Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.

Other distros have similar defaults, at least on Arch:
    CONFIG_FB_VESA=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
    CONFIG_FB_VESA=m
    CONFIG_FRAMEBUFFER_CONSOLE=y

Fixes #8139
2015-06-04 11:26:20 +03:00
Tobias Geerinckx-Rice
33ad641be9 libnl 3.2.25 -> 3.2.26
Changes (also in project hosting):
<http://lists.infradead.org/pipermail/libnl/2015-March/001865.html>
2015-06-03 22:41:30 +02:00
Ricardo M. Correia
07c26ee680 grsecurity: Update stable and test patches
stable: 3.1-3.14.43-201505272112 -> 3.1-3.14.43-201506021902
test:   3.1-4.0.4-201505272113   -> 3.1-4.0.4-201506021902
2015-06-03 19:38:05 +02:00
Vladimír Čunát
0307c27219 kmod-blacklist-ubuntu: update to Vivid 2015-06-02 20:17:01 +02:00
William A. Kennington III
2f96621b6a linux-testing: 4.1-rc5 -> 4.1-rc6 2015-06-02 11:03:53 -07:00
Patrick Mahoney
9835f18fbd Add myself as maintainer for skarnet software 2015-06-01 15:20:56 -05:00