Commit Graph

4104 Commits

Author SHA1 Message Date
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Domen Kožar
f895960e84 Merge pull request #8256 from dezgeg/pr-i686-kconfig
kernel-config: Fix 4.0 build on 32-bit
2015-06-26 13:23:35 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
William A. Kennington III
59faa759da zfs_git: 2015-05-13 -> 2015-06-22 2015-06-24 23:41:46 -07:00
William A. Kennington III
6af1fe3519 spl_git: 2015-04-24 -> 2015-06-10 2015-06-24 23:41:45 -07:00
William A. Kennington III
2a8cf39952 zfs: Fix kernel 4.1 compat 2015-06-24 23:33:28 -07:00
William A. Kennington III
b08d384da8 kernel: 3.14.44 -> 3.14.45 2015-06-24 18:12:20 -07:00
William A. Kennington III
2f255eafd9 kernel: 4.0.5 -> 4.0.6 2015-06-24 18:11:25 -07:00
William A. Kennington III
16e0a98483 kernel: 3.10.80 -> 3.10.81 2015-06-24 18:09:40 -07:00
Cillian de Róiste
df92d1c711 xf86_input_wacom: update from 0.29.0 to 0.30.0 2015-06-24 17:23:23 +02:00
Tobias Geerinckx-Rice
97ae36691e radeontop 2015-05-28 -> 2015-06-24
New features:
- Make coloured output toggleable

Fixes:
- Release libpciaccess resources
- Make the check for quit case-insensitive
2015-06-24 16:43:04 +02:00
William A. Kennington III
c6e512b80c Merge branch 'master.upstream' into staging.upstream 2015-06-22 12:43:12 -07:00
William A. Kennington III
bd9433c90d kernel: Add version 4.1 latest 2015-06-22 12:41:23 -07:00
William A. Kennington III
c48433d575 kernel: 3.4.107 -> 3.4.108 2015-06-22 12:35:56 -07:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Vladimír Čunát
783af9a960 wpa_supplicant: disable TLS-1.2 for now (fixes #8332) 2015-06-22 17:33:49 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Jude Taylor
a4fbe26ec8 darwin purity: haskell-hfsevents 2015-06-20 15:29:55 -07:00
Robin Gloster
45be5244a4 Wrap the python scripts in lxc 2015-06-19 14:34:09 +02:00
Eelco Dolstra
fef6141662 Revert "procps-ng: Refactor a bit"
This reverts commit dceff137e1. It was
described as a "refactoring", but actually made procps depend on
systemd (which is a heavy dependency) and changed the name of the
package.
2015-06-19 14:14:52 +02:00
William A. Kennington III
ad9081411c kmod: 20 -> 21 2015-06-18 23:51:12 -07:00
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
Tuomas Tynkkynen
62b75c64d4 kernel-config: Fix 4.0 build on 32-bit
KVM_COMPAT apparently enables 32-bit compability syscalls for KVM, and
as such can be enabled only on a 64-bit system.

Resolves error http://hydra.nixos.org/build/23014132/nixlog/1/raw:
GOT: #
GOT: # configuration written to .config
GOT: #
GOT: make[1]: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/build'
GOT: make: Leaving directory '/tmp/nix-build-linux-config-4.0.5.drv-0/linux-4.0.5'
unused option: KVM_COMPAT
builder for ‘/nix/store/7kskdvmzs116f1fm55ghm0crjniw9q0a-linux-config-4.0.5.drv’ failed with exit code 255
2015-06-10 00:28:01 +03: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