Commit graph

4617 commits

Author SHA1 Message Date
Vladimír Čunát
08dd527cc7 Merge branch 'staging'
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
2015-12-29 17:14:35 +01:00
Eelco Dolstra
f6df6d8d46 linux: 3.18.24 -> 3.18.25 2015-12-29 15:56:20 +01:00
Bjørn Forsman
4f3d769d6f conky: add meta.platforms 2015-12-29 13:16:01 +01:00
Tobias Geerinckx-Rice
330b89c68b crda: use PREFIX instead of DESTDIR
Otherwise, `$out/lib/udev/rules.d/85-regulatory.rules` will still refer to a
non-existent `/sbin/crda`.
2015-12-27 21:43:26 +01:00
Tobias Geerinckx-Rice
ee0fae473c crda: init at 3.18 2015-12-27 19:00:42 +01:00
Robin Gloster
501d49ebc4 wpa_supplicant: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Profpatsch
b336e1b24a alsa-utils: fix alsa-info.sh 2015-12-22 19:51:55 +01:00
Nikolay Amiantov
0d7c0efa7d udisks2: fix udev rules file (close #11743)
This properly hides system partitions (like EFI or Windows recovery) from UDisks.
2015-12-22 08:09:34 +01:00
Rok Garbas
38a6b5fb43 Merge pull request #11683 from rvl/fail2ban
Make fail2ban work again
2015-12-22 01:46:18 +01:00
aszlig
a326ab1755
linux-testing: 4.4.0-rc5 -> 4.4.0-rc6
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-21 17:16:49 +01:00
Eelco Dolstra
b60f0fdcd4 systemd: Apply upstream fix: networkd: link - do not drop config for loopback device 2015-12-18 18:02:16 +01:00
Rodney Lorrimar
2eb8c3e491 systemd: python module split out since v223 2015-12-18 09:44:22 +00:00
Tobias Geerinckx-Rice
1e3314718d uksmtools: init at 2015-09-25 2015-12-17 23:51:43 +01:00
Nikolay Amiantov
07eb0ad76c phc-intel: fix installation dir 2015-12-17 16:49:11 +03:00
Igor Pashev
a911acdfb3 LXC: make sure configure script does not guess
Do not try to install init script.
And do not make any assumptions about the distribution.

The latter is important when Nix store in not a part of NixOS.

Closes #11729.
2015-12-17 10:11:39 +03:00
Domen Kožar
a2f8812096 add numad: daemon that manages application locality 2015-12-15 23:41:43 +01:00
Tobias Geerinckx-Rice
b566f73f38 linuxPackages.phc-intel: 0.4.0-rev{18 -> 19}
Fixes #11733.

Minimum Linux kernel version is now 4.3.x.
2015-12-15 19:18:49 +01:00
aszlig
45e335aabd
linux-testing: 4.4.0-rc4 -> 4.4.0-rc5
Upstream changes can be found at:

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-14 20:29:10 +01:00
Daniel Peebles
5caa62dea3 Merge pull request #11689 from sigma/fix/adv_cmds
adv_cmds: fix typo in file name
2015-12-14 09:40:03 -05:00
Arseniy Seroka
fcf88282f9 Merge pull request #11549 from jgillich/syslinux
syslinux: fix missing mtools dependency
2015-12-14 13:21:31 +03:00
Yann Hodique
000fe58769 adv_cmds: fix typo in file name
adv_cmds archive actually contains BSDmakefile, not BSDMakefile. While
that probably doesn't matter in default installations, it does matter
for case-sensitive filesystems.
2015-12-13 12:02:42 -08:00
aszlig
fb37fc631a
systemd: Apply VirtualBox fix for detect-virt.
The update is basically just one additional commit, which was an
upstream cherry-pick pushed at NixOS/systemd#3 and it fixes
systemd-detect-virt with VirtualBox so that services with
ConditionVirtualization set to "oracle" will work properly.

I've tested this with the "virtualbox" NixOS VM test, which was failing
since the update to version 228.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-13 05:36:10 +01:00
Anders Papitto
229f0ac257 sysdig: 0.1.102 -> 0.5.1 2015-12-12 12:31:29 -08:00
Shea Levy
18af0f88d0 Linux 4.3: 4.3 -> 4.3.2 2015-12-12 08:46:34 -05:00
aszlig
fc6d1471ce
linux-testing: Revert build fix for -rc3.
This reverts commit 79bd2b08ee.

The commit was from an upstream commit anyway and has since been applied
to mainline.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-11 11:31:05 +01:00
Eelco Dolstra
54d6f1f683 linux: 3.14.56 -> 3.14.58 2015-12-10 16:26:33 +01:00
Jakob Gillich
985bd0808e syslinux: fix missing mtools dependency
closes #11472
2015-12-09 03:17:08 +01:00
aszlig
c00feace39
linux-testing: 4.4.0-rc3 -> 4.4.0-rc4
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc4

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-08 03:51:34 +01:00
Eelco Dolstra
1da87d4062 systemd: Update to 228 2015-12-07 20:25:53 +01:00
Gabriel Ebner
f4c01fc004 systemd: enable timedated, hostnamed, localed. 2015-12-07 20:25:53 +01:00
Jan Malakhovski
43a1cfccf5 conky: build the docs, fixes #11461 2015-12-05 20:34:57 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
aszlig
79bd2b08ee
linux-testing: Fix build with default config.
Regression introduced by 03a3a905b9.

Our default config includes all modules and since torvalds/linux@47ca6ec
this results in a regression due to in a circular dependency between
libcfs and LNet:

depmod: ERROR: Found 2 modules in dependency cycles!
depmod: ERROR: Cycle detected: lnet -> libcfs -> lnet

The discussion regarding this in the LKML is here:

https://lkml.org/lkml/2015/11/2/388

So this adds a patch which is not yet included in mainline and has been
submitted to the LKML at:

https://lkml.org/lkml/2015/11/6/987

Built successfully via "nix-build -A linux-testing".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-01 11:22:29 +01:00
Franz Pletz
4a2b075154 jool: 3.3.2 -> 3.4.2, fixes #11299 2015-12-01 10:49:44 +01:00
aszlig
03a3a905b9
linux-testing: 4.4.0-rc1 -> 4.4.0-rc3
Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc1&id2=v4.4-rc3

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-01 09:34:39 +01:00
Tobias Geerinckx-Rice
ea8c69039e freefall 4.2 -> 4.3 2015-11-26 23:45:31 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Arseniy Seroka
e568fe9cef udisks: add missing patch 2015-11-26 18:46:08 +03:00
Arseniy Seroka
1af969f8f3 udisks: apply patch to work with new glibc 2015-11-26 18:45:20 +03:00
Pascal Wittmann
6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Jude Taylor
d539d9c935 revert to __impureHostDeps where possible 2015-11-25 10:09:35 -08:00
Tobias Geerinckx-Rice
373da3b815 radeontop 2015-08-06 -> 2015-11-24 2015-11-24 19:28:49 +01:00
Joachim Fasting
b3144ea287 directvnc: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
9d7c387d26 untie: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Jude Taylor
32cb70bb07 propagate nothing for Kernel.framework since it exposes no library 2015-11-21 15:59:43 -08:00
Jude Taylor
4cd86cb068 in cf-private, use correct path to CoreFoundation 2015-11-21 15:55:19 -08:00
Jude Taylor
f5609a4d2a reintroduce impure host deps to all derivations 2015-11-21 15:51:48 -08:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00