Commit Graph

4611 Commits

Author SHA1 Message Date
William A. Kennington III
284ea9295e kernel: 3.10.88 -> 3.10.89 2015-09-23 12:29:59 -07:00
Arseniy Seroka
c405f22266 Merge pull request #10016 from cleverca22/master
open-iscsi: 2.0-871 -> 2.0-873
2015-09-23 19:56:31 +03:00
michael bishop
efa5b92bfc open-iscsi: 2.0-871 -> 2.0-873
remove the kernel patch, since the package no longer builds the module, its already in the kernel
move it from the kernel function to the main all-packages list
2015-09-23 12:31:41 -03:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
William A. Kennington III
b3075b3087 pam_u2f: 0.0.1 -> 1.0.1 2015-09-22 23:25:55 -07:00
William A. Kennington III
9fbbbd5b68 linux-testing: Update to 4.3.0-rc2 2015-09-21 14:38:49 -07:00
Eelco Dolstra
01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
2015-09-21 12:57:30 +02:00
William A. Kennington III
3fcbd5a829 Merge branch 'master.upstream' into staging.upstream 2015-09-20 14:54:53 -07:00
Jude Taylor
8a1b8a5b0a alias libtool to darwin.cctools on darwin 2015-09-20 13:08:38 -07:00
Charles Strahan
f08fb6e6c7 broadcom-sta: fix build on kernel >= 4.2 (close #9953)
Also cherry-pick a licensing fix from torvalds/linux@7d3e2eb178
necessary for building broadcom-sta on kernel 4.2.

For more details, see:
https://github.com/longsleep/bcmwl-ubuntu/issues/6

Fixes #9948.
2015-09-20 08:01:37 +02:00
William A. Kennington III
d9fd037e88 zfs + zfs_git: 0.6.5 -> 0.6.5.1 2015-09-19 15:02:59 -07:00
William A. Kennington III
8b670fba26 Merge branch 'staging.upstream' into staging.post-15.06 2015-09-19 14:39:57 -07:00
William A. Kennington III
6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
William A. Kennington III
4a672c87cd zfs: Add a patch to fix discard data corruption 2015-09-18 14:55:36 -07:00
William A. Kennington III
ee867799b0 cgmanager: 0.37 -> 0.39 2015-09-18 14:52:51 -07:00
William A. Kennington III
24dabdfb98 iproute: 4.1.1 -> 4.2.0 2015-09-18 14:52:50 -07:00
Tobias Geerinckx-Rice
1e593edbf1 autofs: 5.0.8 -> 5.1.1 2015-09-18 05:02:02 +02:00
Jude Taylor
d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00
William A. Kennington III
2d5dd06fbb audit: 2.4.2 -> 2.4.4 2015-09-17 14:12:38 -07:00
William A. Kennington III
dec8e299f5 nftables: 0.4 -> 0.5 2015-09-17 14:12:38 -07:00
Vladimír Čunát
f2d03ee0d0 Merge #8897: AppArmor updates 2015-09-17 21:21:44 +02:00
Vladimír Čunát
a418096d6a Merge branch 'master' into staging 2015-09-17 20:07:20 +02:00
aszlig
389e654e03
systemd: Backport fix for detecting VirtualBox.
This is a backport of systemd/systemd@e32886e.

As noted by @ts468 in #9876, systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.

Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).

Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.

Fixes #9876.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
William A. Kennington III
84505bd36a grsecurity: Update patches 2015-09-16 13:35:41 -07:00
William A. Kennington III
871baf2278 kernel: 4.1.6 -> 4.1.7 2015-09-16 12:55:36 -07:00
William A. Kennington III
5975687f98 kernel: 3.14.51 -> 3.14.52 2015-09-16 12:55:36 -07:00
William A. Kennington III
72d22e3f4d kernel: 3.10.87 -> 3.10.88 2015-09-16 12:55:36 -07:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
William A. Kennington III
3000e55b06 syslinux: Use gcc 4.8 until a proper fix for 5 is made 2015-09-15 12:14:12 -07:00
William A. Kennington III
8dc7073546 Merge branch 'master.upstream' into staging.upstream 2015-09-15 12:04:41 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Tobias Geerinckx-Rice
193319ce03 "Parallel Tools" -> Parallels Tools 2015-09-15 08:51:02 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Jude Taylor
9be2c355be remove 3 more outdated impure-deps 2015-09-14 17:54:15 -07:00
Tobias Geerinckx-Rice
133a31f71f mcelog: 125 -> 126
Adds --is-cpu-supported command line option.
2015-09-15 00:17:18 +02:00
Tobias Geerinckx-Rice
cb363c1033 dstat: add python-wifi dependency for --wifi
This is limited to kernels with the (legacy) Wireless Extensions,
and supported wireless cards. Also add myself as a maintainer.

CC maintainer @jgeerds
2015-09-14 23:53:21 +02:00
Tomasz Kontusz
135fc6a769 lttng-modules: 2.6.2-1-g7a88f8b -> 2.6.3
This also drops the assertion about kernel.version - we don't have
anything older than 3.4 in nixpkgs anyway.
2015-09-14 21:45:37 +02:00
William A. Kennington III
70b6b6a735 dmidecode: 2.12 -> 3.0 2015-09-13 15:55:49 -07:00
Mathnerd314
87012187b2 kmod-debian-aliases: init at 21-1 2015-09-13 10:55:44 +02:00
Jude Taylor
b3b2928ca6 Revert "libsecurity_generic: add El Capitan impure-deps"
This reverts commit 557fa59042.
2015-09-12 11:59:08 -07:00
Jude Taylor
f7cb16ff9b Revert "apple-sdk: add El Capitan impure-deps"
This reverts commit 3bf5d87f9e.
2015-09-12 11:58:59 -07:00
Domen Kožar
54e430a689 blcr: drop support for kernel 3.12 2015-09-12 13:17:01 +02:00
William A. Kennington III
6727f76739 zfs: Update to 0.6.5 2015-09-11 17:45:38 -07:00
William A. Kennington III
9cb93e7966 spl: Update to 0.6.5 2015-09-11 17:45:38 -07:00
Tobias Geerinckx-Rice
5d50acceeb htop: also touch headers in subdirectories 2015-09-11 05:12:06 +02:00
Tobias Geerinckx-Rice
eb6b290ab3 conntrack_tools: 1.4.2 -> 1.4.3; maintain 2015-09-10 23:01:30 +02:00
Tobias Geerinckx-Rice
c5bd6fff36 mcelog: 124 -> 125 2015-09-10 00:59:07 +02:00
Tobias Geerinckx-Rice
9eca1376b8 htop: fix version suffix
It may be an improvement, but it's still a downgrade.
2015-09-09 18:46:41 +02:00
Eelco Dolstra
af82c983fc upower: Update to 0.99.3 2015-09-09 11:44:14 +02:00
Eelco Dolstra
a6a73a1429 upower: Remove unused dependencies 2015-09-09 11:44:14 +02:00
Eelco Dolstra
2a2cb8354e Remove upower-old 2015-09-09 11:44:14 +02:00
William A. Kennington III
4f00183685 htop: 8f07868f -> 229d0058
This fixes sopme of the strange rendering issues as well as some
intermittent crashes.
2015-09-08 22:33:20 -07:00
Eelco Dolstra
2a8e86bb05 upower: Use libgudev 2015-09-08 20:19:37 +02:00
Eelco Dolstra
a6de3feb97 systemd: Update to 226 2015-09-08 18:18:52 +02:00
Eelco Dolstra
023c12bc9a udisks2: Propagated inputs considered harmful 2015-09-08 14:53:14 +02:00
Eelco Dolstra
5dde1a9752 udisks2: Add libgudev dependency
http://hydra.nixos.org/build/25640910
2015-09-08 14:51:14 +02:00
Eelco Dolstra
c34953ed24 systemd: Backport some journalctl performance improvements
Before:

$ time journalctl > /dev/null

real    6m12.470s
user    5m51.439s
sys     0m19.265s

After:

real    0m40.067s
user    0m37.717s
sys     0m2.383s

Before:

$ time journalctl --since '2015-08-01' _TRANSPORT=kernel

real    1m9.817s
user    0m13.318s
sys     0m56.626s

After:

real    0m0.689s
user    0m0.521s
sys     0m0.221s
2015-09-08 14:25:55 +02:00
Eelco Dolstra
d242e59fc4 systemd: Apply sbin patch 2015-09-08 14:07:05 +02:00
Eelco Dolstra
3609007b7c systemd: Use our systemd repo directly
Since upstream no longer provides an autoconfed tarball, we may as
well use our own repo and drop the patch.
2015-09-08 13:08:41 +02:00
William A. Kennington III
d51d63fcf1 linux-firmware: 2015-07-23 -> 2015-09-07 2015-09-07 23:10:53 -07:00
Eelco Dolstra
ecbe04b4c6 systemd: Update to 225 2015-09-08 00:02:26 +02:00
Bryan Gardiner
3d93890c7e
wpa_supplicant: enable AP mode for NetworkManager connection sharing 2015-09-07 14:04:34 -07:00
Eelco Dolstra
3ebe5f802b Remove references to /root/test-firmware
This is no longer supported by systemd.
2015-09-07 22:55:16 +02:00
Eelco Dolstra
916793cf13 Merge branch 'master' into systemd-219
Conflicts:
	nixos/modules/system/boot/systemd.nix
	pkgs/applications/networking/p2p/transmission/default.nix
	pkgs/development/libraries/libseccomp/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
Tobias Geerinckx-Rice
1102018a00 htop: touch all headers
Fix the following build failure:

```
config.status: executing libtool commands
building
make flags: SHELL=/nix/store/548wfw1i43glkx8lkyjmbg59h6127qky-bash-4.3-p39/bin/bash
./scripts/MakeHeader.py ColumnsPanel.c
/usr/bin/env: python: No such file or directory
Makefile:2164: recipe for target 'ColumnsPanel.h' failed
make: *** [ColumnsPanel.h] Error 127
builder for ‘/nix/store/6rai1vs6jsw8y5z5jff98f0f8jzfa12n-htop-1.0.3-584-8f07868f.drv’ failed with exit code 2
```
2015-09-07 02:09:48 +02: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
Joachim Fasting
fdb4633e4b apparmor-utils: wrap python and perl scripts
This allows all utilties to at least run, though most still fail
because they expect to be able to read a non-existent config file.

Also, aa-notify refuses to run due to a self-check on the filename,
which cannot be preceded by a '.'. This has to be patched or we
need to set PERL5LIB some other way.
2015-08-26 22:58:12 +02:00
Joachim Fasting
ed5f6be317 apparmor: use standard phase hooks 2015-08-26 22:58:12 +02:00
Joachim Fasting
1dd8dd4ca8 apparmor: 2.9.1 -> 2.10
An incremental release, including several fixes to the parser, library, and
userspace management tools. See [1] for a comprehensive changelog.

[1]: http://wiki.apparmor.net/index.php/ReleaseNotes_2_10
2015-08-26 22:58:12 +02:00
Austin Seipp
9c0f3d8829 nixpkgs: apparmor - remove dbus dependency
This was untested and didn't function without a dbus patch which wasn't
applied to the system dbus package, so it wasn't used at all.

Also, it creates a weird cyclic dependency if we want systemd to depend
on libapparmor (for AppArmorProfiles= support), because libapparmor then
wants dbus, and dbus wants systemd. Oof.

Luckily, this feature and whatnot will probably all be irrelevant in the
glorious kdbus-based future, and the dbus patches aren't even upstream I
think. So we can just drop it.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-26 22:58:11 +02:00
Austin Seipp
cbacab73ed nixpkgs: default to apparmor 2.9 (#7220)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-26 22:58:00 +02: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
zimbatm
5bf732bf4b Restore the listing of Darwin packages.
`nix-env -qaP -A pkgs.darwin`

pkgs.darwin.libutil:
  Commented-out because the package definition doesn't exist. The source
  doesn't even provide a Makefile...

pkgs.darwin.objc4_pure:
  Commented-out because the package is broken and referencing unknown
  applefetchsource and libc_old names. It doesn't seem to be used by any
  other packages too.
2015-08-23 13:58:32 +01: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 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
William A. Kennington III
b3fb6dc5aa htop: Update to fix issues with ncurses 6.0
```
william@exodus ~> htop

htop 1.0.3 aborting. Please report bug at http://hisham.hm/htop

 Please include in your report the following backtrace:
 htop(CRT_handleSIGSEGV+0x32)[0x4177b2]
 /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(+0x33460)[0x7f9fb9157460]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(+0x33f91)[0x7f9fb97faf91]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(doupdate_sp+0xc1d)[0x7f9fb97fe0ad]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wrefresh+0x39)[0x7f9fb97ecf09]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(_nc_wgetch+0x12a)[0x7f9fb97e583a]
 /nix/store/bdnzh93qibc3cimdw8fj94wwa4wjpw5f-ncurses-6.0/lib/libncursesw.so.6(wgetch+0x25)[0x7f9fb97e6555]
 htop(ScreenManager_run+0x15a)[0x40ee8a]
 htop(main+0x487)[0x4069b7]
 /nix/store/xaz2f0mxklh0kh231h6spzbiblq1fm5b-glibc-2.21/lib/libc.so.6(__libc_start_main+0xf5)[0x7f9fb9144995]
 htop(_start+0x29)[0x406af9]

 Additionally, in order to make the above backtrace useful,
 please also run the following command to generate a disassembly of your
 binary:

    objdump -d `which htop` > ~/htop.objdump

    and then attach the file ~/htop.objdump to your bug report.

    Thank you for helping to improve htop!

    fish: “htop” terminated by signal SIGABRT (Abort)
```
2015-08-20 15:32:47 -07:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
aszlig
710f8a7170
Merge pull request #9271 from @Profpatsch.
Not sure whether this was broken in the first place (8cd6d53) or if it
went broken afterwards (due to the version bump in 04e39bd), but it
isn't included in the store path at current master.

So I've tested the commit and kbd now correctly includes the Neo layout.
2015-08-19 18:46:41 +02:00
aszlig
50e9dd7da1
uclibc: Provide a more stable location for source.
At the upstream URL at http://git.uclibc.org/uClibc/snapshot/, older
versions are dropped at a regular basis. Unfortunately the tarball
"uClibc-20150131.tar.bz2" has already been deleted from that directory
and I didn't find a mirror providing the same file.

So I've switched it to use fetchzip from the cgit site instead of using
fetchgit directly. The reason why I didn't use fetchgit is that we'd
need need git, which depends (indirectly? not sure, haven't checked) on
libiconv and that in turn triggers an assertion if we're on Linux and
are cross-building using uclibc.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-19 18:43:24 +02:00
William A. Kennington III
d70c01daec grsecurity: Update patches 2015-08-18 21:06:45 -07:00
William A. Kennington III
429d4beaa2 lvm2: 2.02.124 -> 2.02.128 2015-08-18 17:01:13 -07:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
William A. Kennington III
5ec252e7ca kbd: 2.0.2 -> 2.0.3 2015-08-18 11:35:50 -07:00
William A. Kennington III
31a27c44c8 lxc: 1.1.2 -> 1.1.3 2015-08-18 11:33:37 -07:00
William A. Kennington III
74a885d13e bluez5: 5.32 -> 5.33 2015-08-18 11:33:23 -07:00
William A. Kennington III
c4dc3aa97f acpid: 2.0.23 -> 2.0.25 2015-08-18 11:32:29 -07:00
William A. Kennington III
0b907d875c procps-ng: 3.3.10 -> 3.3.11 2015-08-18 11:12:34 -07:00
William A. Kennington III
eb859dc816 kernel: 4.1.5 -> 4.1.6 2015-08-18 11:12:34 -07:00
William A. Kennington III
e4fa08711c kernel: 3.14.50 -> 3.14.51 2015-08-18 11:12:34 -07:00
William A. Kennington III
109ff7ddee kernel: 3.10.86 -> 3.10.87 2015-08-18 11:12:34 -07:00
Peter Simons
93b830f111 htop: use a version number that corresponds to the output from "git describe --tags"
This approach avoids potential problems with "nix-env --update" when
we'll go back to a release version. Kindly suggested by @vcunat in
https://github.com/NixOS/nixpkgs/pull/9307#issuecomment-132112840.
2015-08-18 12:18:19 +02:00
Tobias Geerinckx-Rice
54916ba657 htop: 1.0.3 -> (git) 2015-08-12
Temporarily update to git HEAD for the "display program basename"
functionality it provides.
2015-08-18 01:13:59 +02:00
Profpatsch
c34d852ea1 kbd: really do include neo layout 2015-08-16 01:46:50 +02:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Charles Strahan
c1ee8fefd4 nixos: add support for Ubuntu Fan Networking
This provides support for Ubuntu Fan Networking [1].

This includes:

* The fanctl package, and a corresponding NixOS service.
* iproute patches.
* kernel patches.

closes #9188

1: https://wiki.ubuntu.com/FanNetworking
2015-08-13 14:27:14 -04:00
Vladimír Čunát
e2e21ef320 nvidia-x11-legacy{340,304}: fix build with linux-3.18
Close #9218.
It's our default kernel (now and for the upcoming release).
- 304 won't build with 4.1,
- 173 didn't even build with 3.14 due to other issues (3.12 is OK ATM)
- all legacy drivers are up-to-date with upstream releases.
2015-08-13 14:11:06 +02:00
Jude Taylor
ef95107ddc make isClang work the way a user might expect 2015-08-12 11:27:54 -07:00
Charles Strahan
963e70a7e8 iproute: remove unused patch
In f18efaf26e, the "patches" attribute was erroneously renamed to
"patch". If you follow the original bug report[1], you'll see that this
has long since been fixed upstream (using a different patch).

1: https://bugs.gentoo.org/show_bug.cgi?id=331447
2015-08-11 17:47:53 -04:00
William A. Kennington III
52e55d85cb kernel: 3.14.49 -> 3.14.50 2015-08-10 23:35:43 -07:00
William A. Kennington III
2cec29f646 linux-3.19: Remove stale nix file 2015-08-10 23:34:32 -07:00
William A. Kennington III
974b9cc8cc kernel: 4.1.4 -> 4.1.5 2015-08-10 23:34:31 -07:00
William A. Kennington III
9f79c1e6eb kernel: 3.18.19 -> 3.18.20 2015-08-10 23:34:31 -07:00
William A. Kennington III
5e33890995 kernel: 3.12.45 -> 3.12.46 2015-08-10 23:31:07 -07:00
William A. Kennington III
5fe578d706 kernel: 3.10.85 -> 3.10.86 2015-08-10 23:30:59 -07:00
Charles Strahan
8b91812de6 pipework: init at 2015-07-30
Pipework lets you connect together containers in arbitrarily complex
scenarios. Pipework uses cgroups and namespace and works with "plain"
LXC containers (created with lxc-start), and with the awesome Docker.
2015-08-10 15:01:34 -04:00
Vladimír Čunát
6cf49480a6 Merge #9094: ati-drivers: 14.12 -> 15.7, fix builds
... with newer kernels up to 4.1 (including).
2015-08-10 08:43:49 +02:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Michael Raskin
eee6f2801f sysdig: 0.1.101 -> 0.1.102 2015-08-08 21:01:31 +03:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Tobias Geerinckx-Rice
a849b16052 radeontop: 2015-06-24 -> 2015-08-06
Adds support for Topaz, Tonga, and Carrizo + new R600 PCI IDs.
2015-08-06 16:21:59 +02:00
William A. Kennington III
926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Jonathan Rudenberg
921055b4a8 kernel: Enable DRM_LOAD_EDID_FIRMWARE
This allows specifying drm_kms_helper.edid_firmware to work around displays
that provide bad EDID data.

Documentation: https://www.osadl.org/Single-View.111+M5ec938a7b3b.0.html
2015-08-04 16:38:38 -04:00
William A. Kennington III
04f1b451d7 kernel: 3.14.48 -> 3.14.49 2015-08-04 13:30:08 -07:00
William A. Kennington III
79fb844213 kernel: 4.0.8 -> 4.0.9 2015-08-04 13:28:46 -07:00
William A. Kennington III
a5d6e61c2f grsecurity: Push testing from 4.0 -> 4.1 2015-08-04 13:28:16 -07:00
Daniel Fox Franke
d7443ffb89 Only use underscored versions of read_cr4 and write_cr4 in 3.18 and above.
I'm not sure precisely in what micro-version the API change was made, so
the check for 3.18.0 and above may not be quite correct. But it's at
least sufficient for every version currently included in NixOS.
2015-08-03 21:42:08 -04:00
ts468
5ef9a427cf Merge pull request #9107 from ts468/upstream.ima
ima-evm-utils: init at 1.0.0
2015-08-04 01:38:46 +02:00
Thomas Strobel
c31dc22aa2 ima-evm-utils: init at 1.0.0 2015-08-04 01:10:13 +02:00
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
Daniel Fox Franke
17fb7ac352 ati-drivers: give the patch file a more sensible name
It makes several API fixes for several kernel versions so stop trying to
enumerate them all in the filename.
2015-08-03 00:46:29 -04:00
Daniel Fox Franke
6f2db8fe44 ati-drivers: Fixes for kernel 4.1.
* IRQF_DISABLED was already a no-op in recent kernels, has now been
  removed.
* strnicmp is renamed to strncasecmp.
2015-08-03 00:36:30 -04:00
Daniel Fox Franke
1d3207b27b ati-drivers: update to Catalyst 15.7 and fix build with recent kernels 2015-08-03 00:14:36 -04: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
Jude Taylor
7024b4dc62 add Darwin's flavor of lsof 2015-07-31 11:35:42 -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 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
Eelco Dolstra
bc1773fe16 Merge remote-tracking branch 'origin/staging' into systemd-219
Conflicts:
	pkgs/os-specific/linux/kernel/linux-3.4.nix
	pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +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
William A. Kennington III
3284b216a4 kernel: 4.0.7 -> 4.0.8 2015-07-11 20:15:05 -07:00
William A. Kennington III
75b7938ba2 kernel: 4.1.1 -> 4.1.2 2015-07-11 20:15:05 -07:00
William A. Kennington III
680e2ced04 kernel: 3.18.17 -> 3.18.18 2015-07-11 20:15:05 -07:00
William A. Kennington III
4529105271 kernel: 3.10.82 -> 3.10.84 2015-07-11 20:15:05 -07:00
Jude Taylor
d3a4fe374f update framework impure deps 2015-07-11 16:05:04 -07:00
Jude Taylor
5f308b50e4 add system keychains to security-tool's propagated inputs 2015-07-11 16:05:04 -07:00
Jude Taylor
066412c7b0 clean up propagated stuff for x509-system 2015-07-10 10:41:08 -07:00
Jude Taylor
630bff3b7d remove unused security-tool deps file 2015-07-10 10:41:07 -07:00
Jude Taylor
0f763a12bf update PCSC dependencies 2015-07-10 10:41:07 -07:00
Jude Taylor
7851df4454 fix input propagation on security-tool 2015-07-10 10:41:07 -07:00
Jude Taylor
43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00
Jude Taylor
f72beea75e darwin purity: nodejs-0.10 2015-07-10 10:28:27 -07:00