Commit graph

37028 commits

Author SHA1 Message Date
Nikolay Amiantov 8e7c7af3b8 haskellPackages.hoogle: don't override haskell-src-exts 2017-05-19 02:30:13 +03:00
Nikolay Amiantov 6679dbbd60 ffmpeg: fix arm build 2017-05-19 02:29:49 +03:00
Tyson Whitehead 8fdbc828b9
clblas-cuda: requires ocl-icd now for libOpenCL.so.1 #25902 2017-05-18 18:32:09 -04:00
Nikolay Amiantov 63150762ba Merge pull request #24861 from abbradar/qt4-gtk
qt4: enable gtk2 by default
2017-05-18 16:35:33 +03:00
John Ericson afec912d81 Merge pull request #25867 from obsidiansystems/ghc-deps-cross
Fix cross compilation of some GHC deps
2017-05-17 19:09:00 -04:00
Daiderd Jordan a4f772435d Merge pull request #25309 from acowley/rtags-id
rtags: link to libclang.dylib at absolute path on darwin
2017-05-18 00:14:45 +02:00
John Ericson 8ad2c6a830 ncurses: Fix for cross 2017-05-17 17:50:05 -04:00
John Ericson bec5ffee15 Merge pull request #25232 from obsidiansystems/cross-binutils
Cross binutils
2017-05-17 16:34:56 -04:00
John Ericson 76667036ec gmp 6: Fix for cross 2017-05-17 16:15:32 -04:00
Daiderd Jordan fcbb9b3243 Merge pull request #25837 from czyzykowski/v8-on-osx
v8: fixes darwin build
2017-05-17 21:54:43 +02:00
Lukasz Czyzykowski 3de66330cd v8: fixes build on darwin
v8 compilation on macOS was failing because of missing dependency and
wrong linker. The approach to make it work is similar to the nodejs
package.
2017-05-17 21:50:49 +02:00
John Ericson 20fa6fd871 gcc: When cross compiling, always expect prefixed binutils
Previously this was just done on Darwin.
2017-05-17 15:33:05 -04:00
John Ericson 7018dfb9f4 binutils and cctools: Prefix derivation names with target for cross
We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is

 - suffix means build != host, i.e. cross *built* packages. This is
   already done.

 - prefix means build != target, i.e. cross tools. This matches the
   tradition of such binaries themselves being prefixed to disambiguate.]
   Binutils and cctools, as build tools, now use the latter
2017-05-17 15:33:05 -04:00
John Ericson 88ea6463a3 binutils on darwin: Clean up the rats nest
- No more *Cross duplication for binutils on darwin either.
   `cctools_cross` is merged into plain `cctools`, so `buildPackages`
   chains alone are used to disambiguate.

 - Always use a mashup of cctools and actual GNU Binutils as `binutils`.
   Previously, this was only done in the native case as nobody had
   bothered to implement the masher in the cross case. Implemented it
   basically consisted of extending the wrapper to deal with prefixed
   binaries.
2017-05-17 15:33:05 -04:00
Tim Steinbach 9379045664 Merge pull request #25842 from NeQuissimus/ammonite_0_8_5
ammonite: 0.8.4 -> 0.8.5
2017-05-17 08:30:30 -04:00
Frederik Rietdijk fc2caec756 Merge pull request #25850 from jluttine/cram-broken-on-i686
pythonPackages.cram: mark i686 broken
2017-05-17 12:42:16 +02:00
Peter Hoeg d4b3c86a08 editorconfig-core-c: minor cleanups 2017-05-17 16:53:08 +08:00
Jaakko Luttinen e95cb5d58a
pythonPackages.cram: mark i686 broken 2017-05-17 09:38:34 +03:00
Tim Steinbach 8037c5e0cf
ammonite: 0.8.4 -> 0.8.5 2017-05-16 20:39:42 -04:00
Daiderd Jordan ea229a26a3 Merge pull request #25839 from czyzykowski/rdkafka-on-osx
rdkafka: fixes darwin build
2017-05-17 00:13:21 +02:00
Lukasz Czyzykowski 3edc6108c5 Enables rdkafka compilation on macOS
Without --disable-ssl librdkafka ./configure detects that OpenSSL is
installed but when it tries to link it fails because the default
version is incompatible (1.0.2 vs required 1.1.x).

https://github.com/edenhill/librdkafka/issues/49#issuecomment-280219158
2017-05-16 23:41:31 +02:00
Frederik Rietdijk fda2318eab Merge pull request #25814 from sifmelcara/fix/opencvCMakeLibraryPath
opencv: Fix OpenCV build on non NixOS platform
2017-05-16 20:57:19 +02:00
Frederik Rietdijk ea2c573b3b python.pkgs.scipy: move expression and keep only a single version 2017-05-16 13:37:01 +02:00
Frederik Rietdijk c9b4a2f319 python.pkgs.numpy: move and get rid of multiple versions 2017-05-16 13:37:01 +02:00
Frederik Rietdijk 9174bd2538 pythonPackages.pandas: 0.19.2 -> 0.20.1 2017-05-16 13:37:01 +02:00
J M 03d190d54f shibboleth: Add Myself as a Maintainer (#25817) 2017-05-16 10:11:55 +01:00
Masayuki Takeda 1aaeb94855 3to2: init at 1.1.1 (#25202)
* 3to2: init at 1.1.1

* add myself to maintainer list

* add mt-caret as maintainer
2017-05-16 08:40:36 +02:00
Frederik Rietdijk 68adab765c Merge pull request #25810 from mimadrid/update/elixir-1.4.4
elixir: 1.4.2 -> 1.4.4
2017-05-16 08:18:41 +02:00
mingchuan b496ffbe55 opencv: Fix OpenCV build on non NixOS platform
OpenCV's CMakeFile will use libraries in /lib and /lib64 if it can
find libraries from those paths. However, it causes
build failure because nix detects impure paths being used.
2017-05-16 05:02:00 +08:00
Jörg Thalheim d83f1bfed5 Merge pull request #25788 from Mic92/metasploit
metasploit: 3.3.1 -> 4.14.17
2017-05-15 21:50:26 +01:00
mimadrid 4187d31ab7
elixir: 1.4.2 -> 1.4.4 2017-05-15 20:10:45 +02:00
Frederik Rietdijk 37cb24a318 python.pkgs.pytest_xdist: 1.14 -> 1.16.0 2017-05-15 14:36:30 +02:00
Daiderd Jordan e5a4da2ab8 python-pytest-xdist: fix tests 2017-05-15 14:14:51 +02:00
Peter Simons bdf88dd61d hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-1-gc33d81c from Hackage revision
1f35de13eb.
2017-05-15 09:50:55 +02:00
Frederik Rietdijk 8b647e991f Merge pull request #25563 from jluttine/add-piexif
pythonPackages.piexif: init at 1.0.12
2017-05-15 08:48:30 +02:00
Frederik Rietdijk 9468764b15 Merge pull request #25609 from jluttine/add-nbstripout
nbstripout: init at 0.3.0
2017-05-15 08:47:12 +02:00
Jörg Thalheim ae9e73125f
gem-config: add rb-readline 2017-05-14 22:29:51 +01:00
Jörg Thalheim c441ae6feb
gem-config: add pcaprub 2017-05-14 22:29:46 +01:00
Franz Pletz 2ab474b4a7
gitlab-runner_1_11: add patch to fetch shells from system path 2017-05-14 22:48:15 +02:00
Thomas Tuegel fabd48272f
Merge branch 'qt--qpa-plugin-path' 2017-05-14 13:55:42 -05:00
Thomas Tuegel 7c338b7df8
qtbase: search platform plugin paths before other plugin paths 2017-05-14 13:55:03 -05:00
Thomas Tuegel 88a5082edf
Revert "qt58: ignore NIX_PROFILES environment variable"
This reverts commit 6169bd98f5.
2017-05-14 13:55:02 -05:00
Jaakko Luttinen 8a68e4c7f6 pythonPackages.natsort: 5.0.1 -> 5.0.3
* pythonPackages.natsort: refactor config

* pythonPackages.natsort: 5.0.1 -> 5.0.3

* pythonPackages.natsort: fix broken
2017-05-14 20:05:50 +02:00
Joachim Fasting e6c65ecb12
tree-wide: remove uses of features.grsecurity 2017-05-14 15:08:51 +02:00
Daiderd Jordan 22b7b491d5 Merge pull request #25769 from periklis/topic_fix_qt58_qtbase_stl
qt5-qtbase: remove old GNU libstdc++
2017-05-14 14:05:36 +02:00
Peter Simons 5d6c76dd50 git-annex: make sure the test suite runs with git-annex-shell in $PATH 2017-05-14 12:26:08 +02:00
Peter Simons 5052ac8d25 git-annex: fix hash for new version 2017-05-14 11:43:47 +02:00
Peter Simons b5d2c81514 Remove broken haskell-tools overrides.
These overrides no longer evaluate correctly and as a result break Nixpkgs
evaluation.

ping @shlevy
2017-05-14 11:39:08 +02:00
Frederik Rietdijk a9238eae8f Merge pull request #25738 from nand0p/buildbot-0.9.7
buildbot: 0.9.6 -> 0.9.7
2017-05-14 10:00:12 +02:00
Periklis Tsirakidis 096c008036 Fix #25723: Remove old GNU libstdc++ for qtbase 2017-05-14 09:46:38 +02:00