1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

72248 commits

Author SHA1 Message Date
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
John Wiegley 17044e0e71 openvpn: Allow building on non-Linux systems 2015-11-16 20:34:56 -08:00
Domen Kožar 0ff2240da3 Merge pull request #11078 from svend/nim-darwin
nim: Add darwin platform
2015-11-17 01:06:02 +01:00
Svend Sorensen d4994d85e4 nim: Add darwin platform 2015-11-16 14:50:40 -08:00
Michael Raskin 05129a3ee6 Add sct — a minimal utility to set display colour temperature 2015-11-17 01:50:09 +03:00
lethalman ca186286d7 Merge pull request #10986 from teh/master
update flow + new go binary (codesearch)
2015-11-16 20:45:10 +01:00
Pascal Wittmann fece57da45 Merge pull request #11007 from makefu/mhddfs_init_master
mhddfs: init at 0.1.39
2015-11-16 20:21:39 +01:00
Pascal Wittmann 743151e9f3 Merge pull request #11054 from makefu/acng_init
apt-cacher-ng: init at 0.8.6
2015-11-16 20:00:01 +01:00
Pascal Wittmann 59bb76e894 snapraid: append the version to the name 2015-11-16 19:56:14 +01:00
Benno Fünfstück 2fc679b6f7 pyacoustid: use requests2
This fixes an issue with beets which already needs requests2
due to the fetchart plugins' dependencies, so it would depend
on two different versions of requests if this package didn't
use requests2.
2015-11-16 19:45:06 +01:00
Benno Fünfstück c0cb70bf7c python-discogs-client: use requests2
This fixes an issue in beets which would depend on two versions of
requests if this used requests and not requests2.
2015-11-16 19:45:06 +01:00
Sander van der Burg a06dd213b6 nodejs-5_0: add package 2015-11-16 17:58:11 +00:00
Florent Becker e61ad1288c emacs-packages.rust-mode: init at 20151026 (close #10674) 2015-11-16 16:46:04 +01:00
taku0 b3a40786c0 firefox-bin: 41.0.2 -> 42.0 (close #10821) 2015-11-16 16:39:26 +01:00
Stefan Junker 63edfb1871 go14: 1.4.2 -> 1.4.3 (close #10702) 2015-11-16 16:39:08 +01:00
Arseniy Seroka 855cba7da7 Merge pull request #11029 from ryantrinkle/mariadb-darwin
Add CoreServices framework dependency to mariadb on darwin
2015-11-16 18:28:23 +03:00
Arseniy Seroka aca3377672 Merge pull request #11028 from ryantrinkle/hmatrix-darwin
Add Accelerate framework dependency to hmatrix on darwin
2015-11-16 18:19:25 +03:00
Matthijs Steen 0ceda119d7 google-chrome: init at 45.0.2454.101-1 (close #10892)
As suggested the Google Chrome .deb file that is used for Chromium's plugins is reused.
vcunat removed lots of newlines, as the style was diverging from the
majority far too much (IHHO).
2015-11-16 15:15:51 +01:00
makefu 8db9408ac6 apt-cacher-ng: init at 0.8.6 2015-11-16 14:45:21 +01:00
William A. Kennington III 61402311cc ceph: Deduplicate the default 2015-11-16 05:15:19 -08:00
Domen Kožar 91fcff45a3 atom: 1.1.0 -> 1.2.0 2015-11-16 14:04:18 +01:00
Domen Kožar 0567714b99 Merge pull request #10610 from joachifm/scsi-link-pm
nixos: set scsi link power policy using udev
2015-11-16 13:21:36 +01:00
Domen Kožar b76519069d Merge pull request #9733 from basvandijk/wordpress-fix-extraConfig
wordpress: execute the extraConfig before loading wp-settings.php
2015-11-16 13:16:10 +01:00
Asko Soukka 5b745f469f scikit-image: init at 0.11.3 (close #10881) 2015-11-16 13:12:43 +01:00
Asko Soukka a69511e298 darwin: llvmlite: add impure dep to fix build 2015-11-16 13:12:43 +01:00
Domen Kožar 0b4776b6b7 Merge pull request #9182 from greedy/erlang-setup-hook
erlang: add setupHook to set ERL_LIBS
2015-11-16 13:09:26 +01:00
Domen Kožar 88f5cfc126 Merge pull request #8637 from FRidh/statsmodels
python-packages statsmodels: init at 0.6.1
2015-11-16 12:58:17 +01:00
viric 2a7b5e9f30 Merge pull request #11047 from dezgeg/pr-raspi-kheaders-defconfig
platforms.nix: Use bcm2835_defconfig for RPi kernelHeadersBaseConfig
2015-11-16 12:57:10 +01:00
Frederik Rietdijk ce41204fa0 python-packages statsmodels: init at 0.6.1 2015-11-16 12:56:33 +01:00
Domen Kožar 5ca01c71d1 Merge pull request #10814 from NarrativeScience/no_large_file_test
numpy: patch to remove large file test
2015-11-16 12:55:13 +01:00
Domen Kožar 5900949ef2 Merge pull request #9520 from FRidh/bokeh
python-packages bokeh: init at 0.9.3
2015-11-16 12:53:29 +01:00
Frederik Rietdijk ccb3eb13d9 python bokeh: init at 0.10.0 2015-11-16 12:38:21 +01:00
Domen Kožar 76e93b6362 Merge pull request #8868 from lancelotsix/update_pytestflakes
pythonPackages.pytestflakes: 0.2 -> 1.0.0
2015-11-16 12:22:41 +01:00
Domen Kožar c651e6cbe5 pythonPackages.requests: disable on 3.4 2015-11-16 12:19:02 +01:00
Peter Simons 5a6028c996 Merge pull request #11045 from zimbatm/fix/nix-prefetch-git
nix-prefetch-git: add missing coreutils dependency
2015-11-16 12:02:01 +01:00
zimbatm 76bf9c54ea nix-prefetch-git: add missing coreutils dependency
At runtime, `readlink` is a dependency
2015-11-16 11:54:43 +01:00
Rickard Nilsson 3e18ddae49 Merge pull request #11005 from robbinch/fix-nix-serve
Change argument --port to --listen in nix-serve.nix
2015-11-16 11:43:31 +01:00
Peter Simons e71a080488 Merge pull request #9252 from FRidh/audacity
audacity: 2.0.5 -> 2.1.1
2015-11-16 11:38:46 +01:00
Domen Kožar ae15f96fd1 Merge pull request #11036 from FRidh/pycparser
python pycparser: 2.10 -> 2.14
2015-11-16 11:32:00 +01:00
Domen Kožar 4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Peter Simons 2cb80f7fbc Merge pull request #10865 from NixOS/gnucash26
gnucash 2.6 package, partially broken (no HTML reports)
2015-11-16 11:14:08 +01:00
Peter Simons 731965eb24 Merge pull request #10967 from sjourdois/cracklib
cracklib: 2.9.4 -> 2.9.6
2015-11-16 11:09:04 +01:00
Peter Simons 2025ed52a0 Merge pull request #10987 from mcmtroffaes/feature/libssh2-mingw
libssh2: fix shared library build under mingw
2015-11-16 11:05:45 +01:00
Peter Simons 7255b9c0b6 Merge pull request #11017 from oxij/update-youtube-dl
youtube-dl: 2015.11.10 -> 2015.11.13
2015-11-16 11:05:02 +01:00
Peter Simons cc679b8383 Merge pull request #11040 from cleverca22/master
future proof the wireshark source path
2015-11-16 11:03:51 +01:00
Vladimír Čunát bd33a41493 README: drop 14.12 references
We probably no longer want to advertise it.
2015-11-16 08:33:45 +01:00
Matthew O'Gorman 7df0fefcbc xscreensaver: security update 5.33 -> 5.34 (close #10845)
Fixes a crash when hot-swapping monitors while locked.
2015-11-16 08:20:12 +01:00
Edward Tjörnhammar 656c21e55a idea.idea-{community,ultimate}: 15.0 -> 15.0.1 2015-11-16 07:48:00 +01:00
Tuomas Tynkkynen 6102398d46 platforms.nix: Use bcm2835_defconfig for RPi kernelHeadersBaseConfig
kirkwood_defconfig was removed in the 3.17 kernel release, so
kernelHeadersBaseConfig needs to be changed in order to build
any Raspberry Pi stuff against linuxHeaders_3_18 (which has been the
default since the systemd 227 merge).
2015-11-16 02:37:13 +02:00
Pascal Wittmann ee5f7d4c16 Merge pull request #11016 from rnhmjoj/imv
imv: add version in the package name
2015-11-15 23:39:19 +01:00