Commit Graph

4324 Commits

Author SHA1 Message Date
Jude Taylor
f7cb16ff9b Revert "apple-sdk: add El Capitan impure-deps"
This reverts commit 3bf5d87f9efe19c441a796afc054a5f4be6e83b1.
2015-09-12 11:58:59 -07:00
William A. Kennington III
c6f689f951 Merge branch 'master.upstream' into staging.upstream 2015-09-04 12:05:11 -07:00
William A. Kennington III
0754a213c1 Merge pull request #9643 from dezgeg/pr-perf
linuxPackages_*.perf: Fix build after kernel 4.1
2015-09-03 20:24:11 -07:00
Yochai
6f3f5f536d rtl8812au: init at 4.2.2 2015-09-03 23:50:05 +02:00
Tuomas Tynkkynen
710c4c3c9d linuxPackages_*.perf: Fix build after kernel 4.1
In 4.1, the build system changed, and it now wants to execute ld like this:

ld -r -o util/scripting-engines/libperf-in.o util/scripting-engines/trace-event-perl.o util/scripting-engines/trace-event-python.o

The actual problem seems to be that `buildInputs = [elfutils ...]`
causes 'ld' to point to elfutils in PATH instead of the usual binutils.

So remove elfutils from buildInputs and set NIX_CFLAGS_* manually. This
is a slight hack, but there is some precedent:
0761f81da7/pkgs/tools/package-management/rpm/default.nix (L13)

Fixes #9095.
2015-09-03 23:37:15 +03:00
William A. Kennington III
86ebd3ee25 Merge branch 'master.upstream' into staging.upstream 2015-09-03 11:15:58 -07:00
Eelco Dolstra
90dc8da64d linux: Update to 3.18.21 2015-09-03 16:50:31 +02:00
Eelco Dolstra
38a74e27de Remove Linux 4.0
It's EOL.
2015-09-03 16:50:31 +02:00
William A. Kennington III
66563862ec zfs: Fix build for kernel 4.2 2015-09-01 08:57:02 -07:00
Luca Bruno
ffb8143cb1 lttng-modules: 2.6.0-5 -> 2.6.2-1, fixes build on kernel 3.18 2015-09-01 14:10:59 +02:00
Vladimír Čunát
1464a4de57 nvidia-x11: don't install libvdpau* that we have already
Besides being redundant to inject libvdpau via LD_LIBRARY_PATH,
currently the drivers come with a vulnerable version.
https://devtalk.nvidia.com/default/topic/873035
2015-09-01 13:27:12 +02:00
Tobias Geerinckx-Rice
d35d991028 phc-intel: 0.4.0-rev{17 -> 18} for Linux 4.2
Fix build failure: http://hydra.nixos.org/build/25314451/nixlog/1
2015-08-31 20:53:41 +02:00
William A. Kennington III
7735c6cb0e Merge branch 'master.upstream' into staging.upstream 2015-08-31 10:28:18 -07:00
Tobias Geerinckx-Rice
8a0a151d60 freefall: 3.19 -> 4.2 2015-08-31 17:17:30 +02:00
Austin Seipp
6e9b561a88 nixpkgs: trace-cmd 2.5.3 -> 2.6
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:18 -05:00
Austin Seipp
ce73dbd791 nixpkgs: pax-utils 1.0.5 -> 1.1.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:17 -05:00
Austin Seipp
5f5cc4e4f4 nixpkgs: musl 1.1.10 -> 1.1.11
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:17 -05:00
Daniel Fox Franke
ca673d66de policycoreutils: fix i686-linux compilation error, closes #9544
This adds a patch to quiet a compiler warning which would be harmless
except that it breaks the build due to use of -Werror.
See http://hydra.nixos.org/build/25151888/nixlog/1
2015-08-31 09:39:07 +02:00
William A. Kennington III
38e2c1586b zfs_git: 2015-07-21 -> 2015-08-30 2015-08-31 00:09:18 -07:00
William A. Kennington III
bdbe9fc172 spl_git: 2015-07-21 -> 2015-08-25 2015-08-31 00:09:02 -07:00
William A. Kennington III
5056267761 nvidia: Add 4.2 patch 2015-08-31 00:08:33 -07:00
William A. Kennington III
8e26a55dc4 linux: Add 4.2.0 2015-08-30 18:20:19 -07:00
Arseniy Seroka
582ed94aa2 Merge pull request #9559 from k0ral/conky
conky: 1.9.0 -> 1.10.0
2015-08-30 23:10:13 +03:00
William A. Kennington III
dc506110c1 nvidia: 352.30 -> 352.41 2015-08-30 10:57:16 -07:00
Cillian de Róiste
6e58e2307a xf86_input_wacom: update from 0.30.0 to 0.31.0 2015-08-30 17:37:36 +02:00
koral
7eb5b00d82 conky: 1.9.0 -> 1.10.0 2015-08-30 14:18:47 +00:00
William A. Kennington III
5ca1c32a9d Merge branch 'master.upstream' into staging.upstream 2015-08-28 17:55:20 -07:00
William A. Kennington III
b409331a5a ipset: 6.24 -> 6.26 2015-08-28 17:49:15 -07:00
William A. Kennington III
5a303519fa kernel: 3.12.46 -> 3.12.47 2015-08-28 15:46:34 -07:00
Robert Helgesson
ca11cb8288 reptyr: 0.5 -> 0.6.2 2015-08-27 10:11:11 +02:00
Jude Taylor
0d54f0de59 add new libs to impure-deps for CoreServices
affects nodejs, vim, etc.
2015-08-26 17:06:10 -07:00
Vladimír Čunát
8c2f7fcfed apparmor: don't depend on tetex
It seemed unused - no mention in the log, and builds without it.
/cc maintainers: @phreedom, @thoughtpolice.
2015-08-26 20:38:41 +02:00
Tobias Geerinckx-Rice
a94e8f24f2 mcelog: update 123 -> 124 2015-08-26 17:23:11 +02:00
Jude Taylor
e5fe8aab74 add reattach-to-user-namespace 2015-08-25 19:03:49 -07:00
Jude Taylor
557fa59042 libsecurity_generic: add El Capitan impure-deps 2015-08-25 17:13:35 -07:00
Jude Taylor
3bf5d87f9e apple-sdk: add El Capitan impure-deps 2015-08-25 17:13:35 -07:00
Jude Taylor
881fd7f589 disable libsystem_stats (temporarily?) 2015-08-25 11:12:10 -07:00
Jude Taylor
16a615a0f6 IOKit: add 10.11-only dependency 2015-08-25 11:12:09 -07:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Eelco Dolstra
e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
Eelco Dolstra
9c61317002 Put all firmware in $out/lib/firmware
This way, hardware.firmware can be a list of packages.
2015-08-25 00:40:34 +02:00
Bob van der Linden
5cdf3d4f8e can-utils: updated homepage url (close #9425) 2015-08-24 18:55:55 +02:00
Eelco Dolstra
3c114b827e systemd: Update URL to the NixOS fork 2015-08-24 14:16:59 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Charles Strahan
7408ede358 fanctl: fix state directory 2015-08-22 14:14:56 -04:00
Charles Strahan
648973d641 nixos: rename service 'ubuntu-fan' as 'fan' 2015-08-22 14:05:35 -04:00
Desmond O. Chang
5986ec0923 android-udev-rules: 20150301 -> 20150821 2015-08-22 18:24:20 +08:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Tobias Geerinckx-Rice
c757628f0a mcelog: 122 -> 123
Also flesh out descriptions and restrict to Linux platforms.
2015-08-21 13:42:51 +02:00
Eelco Dolstra
aba76f23a5 Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62c8f212150f791bf94ff3202bd7c4e2. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00