3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4597 commits

Author SHA1 Message Date
Arseniy Seroka fcf88282f9 Merge pull request #11549 from jgillich/syslinux
syslinux: fix missing mtools dependency
2015-12-14 13:21:31 +03: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
Jude Taylor 914e9baefe start on sandbox stuff 2015-11-19 11:31:06 -08:00
Eelco Dolstra 16acdb45bd Revert "kernel: Remove unsupported 3.10, 3.12, 3.14"
This reverts commit 2441e002e2. The
motivation for removing them was not very convincing. Also, we need
3.14 on some Hydra build machines.
2015-11-19 14:25:16 +01:00
Domen Kožar 648265e020 Merge pull request #11111 from davidrusu/master
update net-tools home page
2015-11-18 08:31:02 +01:00
David Rusu c46ffb05ff update net-tools home page
Previous domain had expired
2015-11-18 00:35:28 -05:00
William A. Kennington III 8d01a4a4e4 nvidia: 352.55 -> 352.63 2015-11-17 21:13:41 -08:00
William A. Kennington III 893179e9c1 linux-testing: Bump to 4.4-rc1 2015-11-17 17:21:25 -08:00
Pascal Wittmann 7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
aszlig 880eba6481
conky: Fix building with CMake 3.4.0.
Regression introduced by 050bebb8c4.

It's essentially an upgrade to CMake 3.4.0, which breaks the build
because it seems that in CMake 3.3.x, the check_include_files() command
was implicitly included (haven't found out about why exactly).

So we're now just adding an import for CheckIncludeFiles in addition to
CheckIncludeFile, so that we have both commands (the plural and the
singular variant) available.

My original goal was to use brndnmtthws/conky@3a574ba, but this breaks
the build as well, because check_include_files doesn't accept additional
compile flags.

However, this is needed if building with wireless support, because
including iwlib.h needs -D_GNU_SOURCE set and check_include_files
doesn't do that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 05:51:27 +01:00
William A. Kennington III 453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08:00
William A. Kennington III 6e18a33183 syslinux: 6.03 -> 2015-11-09 2015-11-14 12:38:56 -08:00
William A. Kennington III 4ead61ca39 Merge remote-tracking branch 'upstream/master' into master.upstream 2015-11-14 12:33:53 -08:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Luca Bruno fb864b8898 pommed: mark as broken, src hash changed
cc @shlevy
2015-11-14 18:57:51 +01:00
Domen Kožar fc8562c785 udisks: add missing libgudev 2015-11-14 16:50:23 +01:00
William A. Kennington III 8f45d18a71 Merge branch 'master.upstream' into staging.upstream 2015-11-13 15:54:10 -08:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Brian McKenna 6668058a62 linux: add config options needed for a Bay Trail Chromebook
Close #10416.
Got /dev/mmcblk0 on a live CD with these options:

    X86_INTEL_LPSS y
    PINCTRL_BAYTRAIL y
2015-11-11 15:33:42 +01:00
Thomas Strobel 2ee7aaf46b miraclecast: init at 0.0-git-20151002
(cherry picked from commit 9e33e2365e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-11-11 12:54:14 +01:00
Domen Kožar 505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Desmond O. Chang a058329a28 android-udev-rules: 20150920 -> 20151108 2015-11-11 16:45:16 +08:00