Commit Graph

4111 Commits

Author SHA1 Message Date
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
William A. Kennington III
ce6b96db6e kernel-testing: 4.2.0-rc2 -> 4.2.0-rc5 2015-08-03 13:06:22 -07:00
William A. Kennington III
102cfc53bc kernel: 4.1.3 -> 4.1.4 2015-08-03 12:58:12 -07:00
William A. Kennington III
678efd6df0 kernel: 3.12.44 -> 3.12.45 2015-08-03 12:58:12 -07:00
William A. Kennington III
1684ec0bfc kernel: 3.10.84 -> 3.10.85 2015-08-03 12:58:12 -07:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
William A. Kennington III
85e2c8ff23 lxc: Cleanup 2015-07-31 17:11:11 -07:00
William A. Kennington III
7a6b3bf688 cgmanager: 0.36 -> 0.37 2015-07-31 17:11:11 -07:00
William A. Kennington III
c53a13fe0e policycoreutils: 2.3 -> 2.4 2015-07-31 17:11:11 -07:00
William A. Kennington III
3ada013455 setools: 3.3.8 -> 2015-02-12 2015-07-31 17:11:11 -07:00
William A. Kennington III
f6e554f288 selinux: Use fstack-protector=all 2015-07-31 17:11:11 -07:00
William A. Kennington III
c06b1d84f1 sepolgen: 1.2.1 -> 1.2.2 2015-07-31 17:11:11 -07:00
William A. Kennington III
f23406c0e2 libsemanage: 2.3 -> 2.4 2015-07-31 17:11:11 -07:00
William A. Kennington III
0b191e565b checkpolicy: 2.3 -> 2.4 2015-07-31 17:11:10 -07:00
William A. Kennington III
b18a354c88 libselinux: 2.3 -> 2.4 2015-07-31 17:11:10 -07:00
William A. Kennington III
ffa1782688 libsepol: 2.3 -> 2.4 2015-07-31 17:11:10 -07:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Vladimír Čunát
374210aece nvidia-x11: maintenance update
Strange as it is, nvidia seems to drop UVM kernel module on 32-bit.
Basic driver usage shows no problems for me.
2015-07-30 15:35:02 +02:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
viric
982ce5ed58 Merge pull request #8978 from dezgeg/pr-arm-images
ARM SD card image expressions
2015-07-29 14:13:57 +02:00
Tobias Geerinckx-Rice
c71d93c519 mcelog: 121 -> 122
Enable IMC status bank for Haswell-E, as described in Intel SDM Vol.3C
Table 35-27.
2015-07-28 23:19:35 +02:00
Vladimír Čunát
0c4e4e6849 Merge branch 'master' into staging
There was a mass-rebuild due to expat CVE.
2015-07-28 13:09:43 +02:00
Spencer Janssen
ebe67d3c85 nvidia-x11: add a symlink for libGLESv2.so.2 (close #9024)
nvidia's EGL stack looks for libGLESv2.so.2 at runtime (confirmed by
watching strace), however builder.sh only provides a libGLESv2.so.1
symlink.

@vcunat ported to legacy_340; older ones don't produce GLES.
2015-07-28 12:43:58 +02:00
Vladimír Čunát
ff219393ca nvidia_x11_beta: fix build by syncing with default
/cc author @wkennington.
2015-07-28 12:41:13 +02:00
Edward Tjörnhammar
e6bdca625a iproute: prefix CONFDIR so that all files are not directly under /etc 2015-07-28 11:44:18 +02:00
Nikolay Amiantov
c40e9abc93 android-udev-rules: update package 2015-07-28 12:33:30 +03:00
William A. Kennington III
6b55ca513d Merge branch 'master.upstream' into staging.upstream 2015-07-27 16:11:03 -07:00
William A. Kennington III
5792b1345a iproute: Actually don't install docs 2015-07-27 09:24:49 -07:00
William A. Kennington III
fa0b84c446 iproute: Fix reference to /etc instead of /etc at runtime 2015-07-27 09:24:33 -07:00
William A. Kennington III
bd5f2c9638 Merge branch 'master.upstream' into staging.upstream 2015-07-27 08:17:19 -07:00
Eelco Dolstra
165406e1af nvidia-x11: Remove runtime dependency on linux.dev 2015-07-26 22:45:39 +02:00
Vladimír Čunát
b875ea5d29 Merge branch 'master' into staging 2015-07-26 17:57:46 +02:00
Eelco Dolstra
a951f11021 Move some more gtk-docs to the doc output 2015-07-26 13:43:49 +02:00
Edward Tjörnhammar
80533a5043 iproute: 4.0.0 -> 4.1.1 2015-07-26 00:17:22 +02:00
Nathaniel Baxter
6bff6eec67 v4l2loopback: update 0.8.0 -> 0.9.1 2015-07-25 11:59:09 +10:00
Austin Seipp
61e0e56839 nixpkgs: perf-tools 20150704 -> 20150723
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-24 00:31:45 -05:00
Vladimír Čunát
af2ab0b911 remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc4dc047fae97bdffa0725bc7fd38f2e)
2015-07-23 11:53:18 +02:00
William A. Kennington III
24c13dfa81 kernel: 4.1.2 -> 4.1.3 2015-07-22 13:14:27 -07:00
William A. Kennington III
612d19e8b4 kernel: 3.18.18 -> 3.18.19 2015-07-22 13:14:27 -07:00
William A. Kennington III
17b924bb9f linux-firmware: 2015-07-12 -> 2015-07-23 2015-07-22 12:33:27 -07:00
William A. Kennington III
c034e966bf zfs_git: 2015-05-13 -> 2015-07-21 2015-07-22 12:22:15 -07:00
William A. Kennington III
b6cd7e754b spl_git: 2015-06-29 -> 2015-07-21 2015-07-22 12:22:15 -07:00
Vladimír Čunát
3064b6a0cc remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
2015-07-22 19:40:12 +02:00
Tuomas Tynkkynen
82d0acaf37 kernel-config: Explicitly enable NAMESPACES
Namespace support is required by the `unshare` tool used in
`nixos-install`. It's enabled by the x86 defconfig, but not by
e.g. multi_v7_defconfig. So enable it here so that `nixos-install`
can work on ARM.
2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
ec43c69b5d linux-rpi: Fix modDirVersion
This causes build breakage on staging due to #7524.
2015-07-22 16:08:17 +03:00
Eelco Dolstra
9a75bafcda systemd-timesyncd: Use NTP servers from our own ntp.org pool
(cherry picked from commit 01dc343c2c613c263a2180d1850847f33653f94f)

Conflicts:
	pkgs/os-specific/linux/systemd/default.nix
2015-07-22 12:27:50 +02:00
Eelco Dolstra
069b4a8a57 Remove Linux 3.2 and 3.4
These are not supported by systemd so no reason to keep them around.

(cherry picked from commit ee10e165dcc23f7b1855072f5a1f208dcdeead93)

Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
2015-07-22 12:25:32 +02:00
Eelco Dolstra
bb5647ea0f Remove unused file
(cherry picked from commit 58ef0eea0c2d79fbe41f0cb09d93aaec8251fe61)
2015-07-22 12:25:11 +02:00
Eelco Dolstra
2c48ab4390 Remove ancient version of udev
(cherry picked from commit ab91aaaeb85b78623bfdb91d87f5d94d378c1e74)
2015-07-22 12:24:24 +02:00