Commit Graph

4092 Commits

Author SHA1 Message Date
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 3064b6a0cc)
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 01dc343c2c)

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 ee10e165dc)

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 58ef0eea0c)
2015-07-22 12:25:11 +02:00
Eelco Dolstra
2c48ab4390 Remove ancient version of udev
(cherry picked from commit ab91aaaeb8)
2015-07-22 12:24:24 +02:00
Luca Bruno
6f5aa25e89 Revert "zfs_git: 2015-06-22 -> 2015-07-01"
This reverts commit 54022375eb.

Revert "zfs_git: 2015-05-13 -> 2015-06-22"

This reverts commit 59faa759da.

Closes #8941
2015-07-22 10:31:28 +02:00
Luca Bruno
f50e327510 gradm: fix download (ZHF) 2015-07-22 10:04:00 +02:00
Austin Seipp
d2986a9398 nixpkgs: remove linuxPackages.ktap
It's been broken on the latest 3 major kernels, and it seems development
has stalled unfortunately, so this should be pulled.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-21 18:27:58 -05:00
Austin Seipp
a5e1b8db8f nixpkgs: pax-utils 1.0.4 -> 1.0.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-21 17:00:19 -05:00
Edward Tjörnhammar
bed11354e9 Merge pull request #8902 from dezgeg/pr-nfs
nfs-utils, rpcbind: Update packages to fix nfs3 test
2015-07-21 16:48:38 +02:00
Austin Seipp
b81c21428c nixpkgs: pax-utils 1.0.3 -> 1.0.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Austin Seipp
71d4b4baae nixpkgs: lockdep 3.19.1 -> 4.1.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Vladimír Čunát
e4fcddf177 statifier: fix meta.platforms syntax 2015-07-20 12:32:01 +02:00
Tuomas Tynkkynen
4f928f3550 nfs-utils: 1.2.5 -> 1.3.2, potentially fixes CVE-2013-1923 2015-07-20 12:20:42 +03:00
William A. Kennington III
70a1e7afd8 pam: 1.2.0 -> 1.2.1
Fixes CVE-2015-3238
2015-07-19 12:22:51 -07:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
William A. Kennington III
52b78864a8 firmware-linux-nonfree: 2015-06-30 -> 2015-07-12 2015-07-13 23:53:13 -07:00
aszlig
45135c0256
linux-testing: Update to version 4.2.0-rc2.
Upstream diff of changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.2-rc2&id2=v4.2-rc1&dt=2

Not tested on my machine right now (well, it's "testing" after all), but
verified the SHA256 from two different connections.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-14 07:31:18 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Arseniy Seroka
c01539790b Merge pull request #8555 from fpletz/pkg/jool
jool: init at 3.3.2
2015-07-12 22:20:18 +03:00
Tuomas Tynkkynen
91cbd8a3b2 firejail: Fix source URL
This particular sf.net mirror is down.
2015-07-12 21:12:06 +02:00
Tuomas Tynkkynen
5fbd08968b can-utils: Source is now hosted at GitHub
Gitorious doesn't exist any more.
2015-07-12 21:01:57 +02:00
Franz Pletz
a21ead3d62 jool: init at 3.3.2
Jool is a SIIT and a NAT64 implementation for Linux.
2015-07-12 07:25:44 +02:00
William A. Kennington III
0245b28796 kernel: 3.14.47 -> 3.14.48 2015-07-11 20:15:05 -07:00