Commit graph

4520 commits

Author SHA1 Message Date
William A. Kennington III 64e262dd91 util-linux: 2.27 -> 2.27.1 2015-11-07 18:51:07 -08:00
William A. Kennington III 37a5b16588 ipset: 6.26 -> 6.27 2015-11-07 16:28:14 -08:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
William A. Kennington III d33c63c19d kernel: 3.12.49 -> 3.12.50 2015-11-07 15:44:53 -08:00
Domen Kožar 07405ee187 Merge pull request #9463 from khumba/nm-connection-sharing
Fix NetworkManager connection sharing
2015-11-06 11:16:50 +01:00
William A. Kennington III 1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III 7cd13a21af cryptsetup: 1.6.7 -> 1.7.0 2015-11-05 18:21:43 -08:00
William A. Kennington III 168220741d bluez5: 5.35 -> 5.36 2015-11-05 18:21:43 -08:00
William A. Kennington III 2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Eelco Dolstra 3e44182487 Merge remote-tracking branch 'origin/systemd-219' into staging 2015-11-04 15:37:28 +01:00
Eelco Dolstra 827adff712 linux: Update to 3.18.24 2015-11-04 13:22:22 +01:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
William A. Kennington III 0bb3e0b325 iproute: 4.2.0 -> 4.3.0 2015-11-04 00:58:28 -08:00
William A. Kennington III 4b7f374b7d linux: Add 4.3 2015-11-02 11:01:17 -08:00
William A. Kennington III f6361bc096 zfs: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
William A. Kennington III e57217d874 spl: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
Robin Gloster 4ebfd41fa7 lxc: 1.1.3 -> 1.1.4 (security)
fixes CVE-2015-1335
2015-11-01 12:16:33 +00:00
William A. Kennington III ea49c910a5 kernel: 3.18.22 -> 3.18.23 2015-10-30 17:17:14 -07:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
William A. Kennington III a7d573f224 kernel: 3.18.22 -> 3.18.23 2015-10-30 16:08:13 -07:00
Shea Levy 3c14c32975 Really disable the firmware loader user helper fallback 2015-10-30 13:31:51 -04:00
Eelco Dolstra 81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Shea Levy a7157fa2f0 Remove firmware loader fallback.
Systemd dropped support in 207 (would be nice if configure failed with a bad flag),
so all this does is add an annoying delay if firmware can't be found by the kernel
2015-10-30 10:29:56 -04:00
Eelco Dolstra db19779965 nvidia-x11: Update to 352.55 2015-10-30 11:06:36 +01:00
aszlig c82060df9f
linux-testing: 4.3.0-rc5 -> 4.3.0-rc7
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.3-rc7&id2=v4.3-rc5

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-28 13:59:56 +01:00
Eelco Dolstra d2918797bb linux: Fix i686 build 2015-10-28 11:09:59 +01:00
William A. Kennington III 221a970e82 kernel: 4.2.3 -> 4.2.5 2015-10-27 23:07:42 -07:00
William A. Kennington III 658d7b285b kernel: 4.1.11 -> 4.1.12 2015-10-27 23:07:33 -07:00
William A. Kennington III 850fff4448 kernel: 3.14.54 -> 3.14.56 2015-10-27 23:07:17 -07:00
William A. Kennington III 4eaa66c9d2 kernel: 3.10.90 -> 3.10.92 2015-10-27 23:07:09 -07:00
Arseniy Seroka 12277d2a38 Merge pull request #10503 from cleverca22/master
open-iscsi: save the staticly linked binary in its own output for use in the initrd
2015-10-27 00:57:29 +03:00
Eelco Dolstra 52c9e4415b linux: Support x2APIC
Without this, certain servers with lots of CPU cores would show only
one core.
2015-10-26 16:20:02 +01:00
Eelco Dolstra 50ab972b5a linux: Pass through configuration file
This enables "nix-build -A linux.configfile" to get the generated
kernel config.
2015-10-26 16:20:01 +01:00
Tuomas Tynkkynen f08693d042 syslinux: Disable parallel building
Unfortunately I lost the exact failure, but it was something starting
with 'No rule to make target: ...', which suggests missing dependencies
between generated source files.
2015-10-26 09:23:28 +01:00
Vladimír Čunát 7e6288c252 kernel: 4.1.10 -> 4.1.11, /cc #10607
Boots fine for me on 64-bit.
2015-10-26 08:34:44 +01:00
Vladimír Čunát 4e4f560c08 iputils: drop dontGzipMan, as it's not needed anymore 2015-10-25 12:22:32 +01:00
Vladimír Čunát 784f69e6ae busybox: fix minimal build with musl libc
Now we always enable large file support, as it should be cheap enough,
and avoids also problems on some filesystems #10181.

The minimal build disables (almost) all options, so it was building
without large file support. However, in musl the `off_t` is *always*
64-bit, which lead to problems, now detected during build time.
2015-10-25 10:20:08 +01:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
michael bishop 95e3c4f51c open-iscsi: save the staticly linked binary in its own output for use in the initrd 2015-10-21 00:59:21 -03:00
Nikolay Amiantov 1c48e74a33 Merge pull request #8299 from abbradar/steam-native
Steam: use native NixOS libraries instead of Steam Runtime
2015-10-20 17:07:29 +03:00
Nikolay Amiantov 4f3a99d21d pam_pgsql: init at 0.7.3.2 2015-10-19 13:30:28 +03:00
William A. Kennington III d03661b606 linuxFirmware: 2015-09-07 -> 2015-10-18 2015-10-18 17:23:51 -07:00
Nikolay Amiantov e7684e34ec mkinitcpio-nfs-utils: init at 0.3 2015-10-18 18:37:52 +03:00
Charles Strahan b1edc7909a powertop: fix --auto-tune
See https://lists.01.org/pipermail/powertop/2014-December/001727.html
2015-10-15 14:27:09 -04:00
William A. Kennington III 194357ad20 grsecurityUnstable: 4.1.7 -> 4.2.3 2015-10-15 10:41:04 -07:00
William A. Kennington III cfb2651959 kernel: 3.12.48 -> 3.12.49 2015-10-15 10:38:01 -07:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Nikolay Amiantov a0343c3711 android-udev-rules: 20150821 -> 20150920 2015-10-15 17:07:38 +03:00
Eelco Dolstra 013cf1b4f2 syslinux: Strip static libraries
This prevents a retained dependency on gcc.
2015-10-14 14:29:54 +02:00
Michael Raskin 4ab39c9358 eudev: 3.1.2 -> 3.1.5 2015-10-13 19:30:29 +03:00
Florian Paul Schmidt d2a1785133 alsa-tools: remove non-effective parallelBuilding statement 2015-10-13 13:05:44 +02:00
Florian Paul Schmidt 583f16a87f alsa-tools: do not mention phases explicitly 2015-10-13 12:52:37 +02:00
Florian Paul Schmidt 24b375ac06 alsa-tools: update maintainer 2015-10-13 12:48:03 +02:00
Florian Paul Schmidt 3da4f68800 alsa-tools: add initial package building everything except for a few nut cases 2015-10-13 11:33:52 +02:00
aszlig 197547e4ba
linux-testing: 4.3.0-rc4 -> 4.3.0-rc5
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=refs/tags/v4.3-rc5

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 05:31:43 +02:00
Nikolay Amiantov c865eb56ab udev-182: add package (stripped, last version providing libudev.so.0) 2015-10-10 14:26:41 +03:00
Eelco Dolstra 73f0d83858 systemd: Update to 227 2015-10-07 22:01:21 +02:00
Eelco Dolstra 256438659c util-linux: Update to 2.27
This version is required by systemd 227.

CVE-2015-5224
2015-10-07 20:15:00 +02:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
William A. Kennington III c46dd28ffd linux-testing: 4.3.0-rc2 -> 4.3.0-rc4 2015-10-05 11:05:31 -07:00
Ricardo M. Correia ca9e807530 zfs: 0.6.5.1 -> 0.6.5.2 2015-10-05 12:58:19 +02:00
Ricardo M. Correia 42104219f7 spl: 0.6.5 -> 0.6.5.2 2015-10-05 12:58:19 +02:00
Ricardo M. Correia 89cec2d21b gradm, paxctl, pax-utils: unmaintain 2015-10-05 11:19:13 +02:00
William A. Kennington III cac0d87d98 kernel: 4.1.9 -> 4.1.10 2015-10-03 22:25:48 -07:00
William A. Kennington III 62fa68e00c kernel: 3.18.21 -> 3.18.22 2015-10-03 22:25:40 -07:00
William A. Kennington III 23ff27b2c4 kernel: 3.10.89 -> 3.10.90 2015-10-03 22:25:33 -07:00
Shea Levy fc719c2437 Fix kernel config names for BRCMFMAC_* 2015-10-03 15:35:06 -04:00
Shea Levy e7f0b0297d Linux: Enable PCIe and USB support for brcmfmac 2015-10-03 15:22:52 -04:00
Shea Levy edefa43d49 Linux 4.2: Bump 2015-10-03 15:22:03 -04:00
William A. Kennington III 2ef6508c7f Merge branch 'master.upstream' into staging.post-15.06 2015-10-02 12:41:09 -07:00
William A. Kennington III ed71860928 Merge branch 'staging.upstream' into staging.post-15.06 2015-10-02 12:41:04 -07:00
Renzo Carbonara 4902ec1c78 nvidiabl: fix for kernel >= 4 (close #10174) 2015-10-02 12:31:37 +02:00
Thomas Strobel 9e33e2365e miraclecast: init at 0.0-git-20151002 2015-10-02 12:16:37 +02:00
Thomas Strobel 26150153ba systemd: add option to build with "--enable-kdbus" 2015-10-02 12:16:27 +02:00
Eelco Dolstra 277d44f8fb linux: Update to 3.14.54 2015-10-02 12:02:27 +02:00
William A. Kennington III 98172435f7 Merge branch 'master.upstream' into staging.upstream 2015-10-01 10:43:44 -07:00
Thomas Strobel c720f06f7c linux kernel common config: re-enable NFC support
As test, Linux kernels were build successfully with NFC support for 3.18.x and
for 4.1.x.
2015-10-01 17:53:51 +02:00
Eelco Dolstra b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
William A. Kennington III e7bb9e1023 Merge branch 'master.upstream' into staging.upstream 2015-09-30 13:26:04 -07:00
William A. Kennington III 647671bc53 bluez5: 5.33 -> 5.35 2015-09-30 13:23:18 -07:00
William A. Kennington III e45e777c37 kernel: Remove uneeded patch for 4.2 2015-09-29 17:47:18 -07:00
Tobias Geerinckx-Rice 7e3bd2e86d mcelog: build in parallel 2015-09-30 02:29:51 +02:00
Tobias Geerinckx-Rice fc381c5e0c mcelog: 127 -> 128
Fix spurious assertion when parsing sysfs.
2015-09-30 02:29:51 +02:00
William A. Kennington III 05fd70b4be kernel: 4.2.1 -> 4.2.2 2015-09-29 15:57:30 -07:00
William A. Kennington III 40773c7605 kernel: 4.1.8 -> 4.1.9 2015-09-29 15:57:29 -07:00
William A. Kennington III 271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Charles Strahan 597d191844 eventstat: init at 0.02.02 2015-09-29 15:45:09 -04:00
Eelco Dolstra 0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
Tobias Geerinckx-Rice 87989f0e2f mcelog: fix --version output ("unknown" -> "127") 2015-09-29 03:35:55 +02:00
Tobias Geerinckx-Rice d53cb31426 mcelog: 126 -> 127 2015-09-29 03:28:54 +02:00
Eelco Dolstra 506463e06c sysstat: Update to 11.0.7 2015-09-28 15:46:24 +02:00
Lengyel Balázs c67efeb616 wpa_supplicant: 2.4 -> 2.5 2015-09-28 13:29:01 +02:00
Paul Colomiets 84c0098117 Unprivileged overlayfs mounts kernel patch from ubuntu
This allows to create overlayfs mounts by unprivileged containers (i.e.
in user and mount namespace). It's super-useful for containers.

The patch is trivial as I understand from the patch description it's
does not have security implications (on top of what user namespaces
already have). And it's enabled in ubuntu long time ago. Here is a proof:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1357025
2015-09-26 00:42:16 +03:00
William A. Kennington III de514ea334 llvm2: 2.02.128 -> 2.02.132 2015-09-24 16:15:31 -07:00
William A. Kennington III 2dc9cb1120 libcap-ng: 0.7.3 -> 0.7.7
Also support swig + python bindings
2015-09-23 20:49:19 -07:00
William A. Kennington III 40396584eb kernel: 4.2 -> 4.2.1 2015-09-23 12:29:59 -07:00
William A. Kennington III d5c7b265f7 kernel: 4.1.7 -> 4.1.8 2015-09-23 12:29:59 -07:00
William A. Kennington III 97200b7808 kernel: 3.14.52 -> 3.14.53 2015-09-23 12:29:59 -07:00
William A. Kennington III 397f806453 kernel: 3.12.47 -> 3.12.48 2015-09-23 12:29:59 -07:00
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
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 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
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
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 3000e55b06 syslinux: Use gcc 4.8 until a proper fix for 5 is made 2015-09-15 12:14:12 -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
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
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 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
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
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 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
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
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
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