1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

4397 commits

Author SHA1 Message Date
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
William A. Kennington III d4661c7366 kernel: 4.1.12 -> 4.1.13 2015-11-10 16:17:09 -08:00
William A. Kennington III 3950ab9eb9 kernel: 4.2.5 -> 4.2.6 2015-11-10 16:17:06 -08:00
Eelco Dolstra 789504dadf perf: Fix libbfd dependency
This fixes C++ symbol demangling.
2015-11-10 22:12:38 +01:00
Nikolay Amiantov d4c27381dc Merge pull request #10460 from abbradar/remote-askpass
Support network in initrd and entering LUKS passphrase via SSH
2015-11-10 16:41:34 +03:00
Arseniy Seroka f60d710f88 Merge pull request #10894 from dezgeg/pr-trinity-update
trinity: 1.5 -> 1.6
2015-11-09 22:47:01 +03:00
William A. Kennington III 2441e002e2 kernel: Remove unsupported 3.10, 3.12, 3.14
Our base kernel headers were bumped to 3.18 so we can no longer reliably
support kernels older than 3.18
2015-11-09 11:10:42 -08:00
Tobias Geerinckx-Rice 0c55a42dfb fatrace 0.10 -> 0.11 2015-11-09 18:07:05 +01:00
Tobias Geerinckx-Rice 10df3db175 kexec-tools 2.0.10 -> 2.0.11 2015-11-09 18:03:11 +01:00
Tobias Geerinckx-Rice ba527075af kexec-tools: add mirror://kernel URI
From http://horms.net/projects/kexec/kexec-tools:

  "The canonical site for kexec-tools release is
   http://kernel.org/pub/linux/utils/kernel/kexec/. It should also be
   available on the extensive network of kernel.org mirror sites and
   it is mirrored at http://horms.net/projects/kexec/kexec-tools/
   just for good measure."
2015-11-09 18:03:10 +01:00
Nikolay Amiantov 265718c985 x86_enegry_perf_policy: init at kernel versions 2015-11-09 17:29:48 +03:00
Tuomas Tynkkynen 291f187334 trinity: 1.5 -> 1.6
Need to fix a /usr/include reference in the new release.
2015-11-08 20:09:17 +02:00
William A. Kennington III 5149c03adc Merge branch 'master.upstream' into staging.upstream 2015-11-07 18:53:26 -08:00
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