Commit graph

26168 commits

Author SHA1 Message Date
Peter Simons 6be6397aa1 ghcjs: import gtk2hs-buildtools from the regular Haskell package set
The tool is required for ghcjs builds, but ghcjs cannot compile it itself,
obviously, because it's written in C.
2015-09-14 16:43:31 +02:00
Peter Simons 346d777d31 hackage-packages.nix: update to 7fb00804dc with hackage2nix v20150903-37-ge57a1f9 2015-09-14 12:27:34 +02:00
Bjørn Forsman d7a0becf37 opencv3: add enableContrib flag
If true, enable the repository of extra modules for OpenCV.
Build tested.

Based on patch from Bas van Dijk <v.dijk.bas@gmail.com>.
2015-09-14 11:10:13 +02:00
Bjørn Forsman affcf2e030 opencv3: add enableIpp flag
Intel Integrated Performance Primitives (IPP) speeds up parts of OpenCV
on Intel processors (and compatible). It increases the store path from
220 MiB to 300 MiB, so it defaults to off.

Original patch from Bas van Dijk <v.dijk.bas@gmail.com>.

I tried applying the same change to opencv(2.x). OpenCV 2.x didn't
automatically detect IPP, so I reverted the change.
2015-09-14 11:10:13 +02:00
goibhniu 529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms
Update argyllcms
2015-09-14 10:01:36 +02:00
William A. Kennington III 285db2986a Revert "libtasn1: 4.5 -> 4.6"
This reverts commit ea818b155e.

This broke building gnutls.
2015-09-13 19:51:52 -07:00
William A. Kennington III 0310a61e66 gnutls: 3.4.4 -> 3.4.5 2015-09-13 19:51:52 -07:00
William A. Kennington III 0ba0368a89 gnutls33: 3.3.17 -> 3.3.18 2015-09-13 19:51:52 -07:00
William A. Kennington III ea818b155e libtasn1: 4.5 -> 4.6 2015-09-13 15:55:49 -07:00
Pascal Wittmann f2e03fb4dc bundler: 1.10.5 -> 1.10.6 2015-09-13 21:25:58 +02:00
AndersonTorres 5a5c05f6e3 Intercal: init at 0.30 2015-09-13 09:42:23 -03:00
Andrew Kelley 18f1842fe0 libsoundio: init at 1.0.1 2015-09-12 17:38:42 -07:00
Arseniy Seroka 5286878998 Merge pull request #9795 from lancelotsix/add_netcdfcxx_lib
netcdf-cxx4: init at 4.2.1
2015-09-13 01:56:22 +03:00
Lancelot SIX 49b7f613a7 netcdf-cxx4: init at 4.2.1 2015-09-12 21:52:36 +00:00
Peter Simons ea72d27a21 configuration-hackage2nix.yaml: enable builds for maintained packages goatee and goatee-gtk 2015-09-12 22:28:12 +02:00
Peter Simons 3378b8430e hackage-packages.nix: update to 489f207e95 with hackage2nix v20150903-35-gfaf50c2 2015-09-12 22:20:53 +02:00
Peter Simons 4c089421d7 Merge pull request #9828 from drvink/fix-ginsu-deps
haskellPackages: ginsu: add missing deps
2015-09-12 21:17:08 +02:00
Arseniy Seroka 55415f2cf2 Merge pull request #9823 from taku0/fix_amr_urls
amrnb, amrwb: fixed URLs
2015-09-12 20:59:47 +03:00
Mark Laws b6636db0a1 ginsu: add missing deps 2015-09-12 07:57:22 -07:00
taku0 bbe32710f0 amrnb, amrwb: fixed URLs 2015-09-12 21:00:53 +09:00
Pascal Wittmann b7dd128a7a intel-gpu-tools: 1.11 -> 1.12 2015-09-12 11:58:57 +02:00
Pascal Wittmann 6fbeecbd00 tidyp: init at 1.04 2015-09-12 11:58:56 +02:00
Pascal Wittmann d8e90049d4 Merge pull request #9811 from khumba/maintain-goatee
goatee, goatee-gtk: add myself as maintainer
2015-09-12 11:05:10 +02:00
Tobias Geerinckx-Rice 170fd9efce vaapiIntel: 1.6.0 -> 1.6.1 2015-09-12 08:45:51 +02:00
Tobias Geerinckx-Rice a747216abd libva: 1.6.0 -> 1.6.1 2015-09-12 08:45:51 +02:00
Bryan Gardiner 7d74847471
goatee, goatee-gtk: add myself as maintainer 2015-09-11 20:37:53 -07:00
Tobias Geerinckx-Rice 24e10b0f9a libkeyfinder: remove now unused version 0.11 2015-09-12 02:35:11 +02:00
William A. Kennington III 520958d891 Merge pull request #9794 from taku0/libao_for_darwin
libao: enable libcap only on Linux
2015-09-11 12:21:05 -07:00
taku0 2cc27bcfd8 libao: enable libcap only on Linux 2015-09-11 21:50:41 +09:00
Pascal Wittmann e62b38bee8 pure-octave: 0.6 -> 0.7
compilation issue with octave 4 was fixed in this release
2015-09-11 10:39:05 +02:00
Peter Simons 9395a4c645 hackage-packages.nix: update to 99bc43a909 with hackage2nix v20150903-33-g4e6aefa 2015-09-11 10:30:28 +02:00
Peter Simons 6b682a9e37 haskell-language-nix: pull this library in from Hackage 2015-09-11 10:28:30 +02:00
Peter Simons f6fd6defa5 haskell-nix-paths: pull the library in from Hackage now that it's been published 2015-09-11 10:28:30 +02:00
Peter Simons eb5657e5a2 hackage-packages.nix: update to c5e3b29678 with hackage2nix v20150903-29-gdd74ac4 2015-09-11 10:28:30 +02:00
Tobias Geerinckx-Rice 8b29707592 {,pythonPackages.}libvirt: 1.2.18 -> 1.2.19
The previous bump erroneously said 1.2.19. Make it so.
2015-09-11 00:41:06 +02:00
Tobias Geerinckx-Rice 41386bfdc6 libnetfilter_conntrack: 1.0.4 -> 1.0.5 2015-09-10 23:01:59 +02:00
William A. Kennington III 91da606101 gnutls: Fix parallel build issue introduced in 3.4.x 2015-09-10 13:42:44 -07:00
Peter Simons a3540d9bb7 haskell-generic-builder: drop "haskell-" prefix from interactive environment's names 2015-09-10 19:51:47 +02:00
vbgl 83fe2a4bfa Merge pull request #9423 from vbgl/gdal
gdal: fix standalone python programs (fixes #9386)
2015-09-10 19:37:48 +02:00
aszlig 2cc8680b88
neko: Add patch fixing arg handling on 32bit.
The error was reported at HaxeFoundation/haxelib#152 and was fixed by
HaxeFoundation/neko#41 in HaxeFoundation/neko@ccc78c2, the latter being
fetchpatch'ed by us now.

This has caused the hxcpp build to fail on i686-linux with an "Invalid
array access" error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-10 18:38:22 +02:00
Peter Simons 10d196c7f1 sqldeveloper: update to version 4.1.1.19.59
I also switched the build to depend on openjdk instead of Oracle's proprietary
one. I'm open to suggestions on how to determine the proper value of $JAVA_HOME
in a jdk-agnostic fashion. Right now, I just hard-coded the proper choice for
openjdk.

* pkgs/development/tools/database/sqldeveloper/default.nix:
2015-09-10 16:47:43 +02:00
Eelco Dolstra af3ec14b24 Merge pull request #9769 from bjornfor/cudatoolkit-include-fixup
cudatoolkit: don't move $out/include to $out/usr_include
2015-09-10 13:06:32 +02:00
Peter Simons 873bd03458 hackage-packages.nix: update to 9f8783f6a6 with hackage2nix v20150903-29-gdd74ac4 2015-09-10 10:40:58 +02:00
William Casarin 3cfe7b138d hackage: add jb55 maintainer to skeletons project 2015-09-10 10:39:28 +02:00
Bjørn Forsman 22321f2e58 cudatoolkit: don't move $out/include to $out/usr_include
This effectively reverts 86c283824f
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.

As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.

In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.

[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
2015-09-10 10:35:40 +02:00
Allen Nelson d2457ea991 add shellHook argument so that users can pass in their own 2015-09-09 12:58:28 -05:00
Austin Seipp 3cff7030c0 nixpkgs: clean up, adopt urweb package
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-09-09 07:40:35 -05:00
Benjamin Staffin ae9bd823ed mathics: Fix unit tests
Disabled two tests that require a preinstalled build of Mathics to
work, which is incompatible with the way nix runs them.

[Bjørn: remove unrelated disabling on Python 3]
2015-09-09 12:16:21 +02:00
Peter Simons 1e5e17eeac haskell-nix-paths: initial version 1 2015-09-09 11:31:14 +02:00
Peter Simons c0b25fe164 configuration-ghcjs.nix: remove obsolete overrides for dependent-map
Fixes https://github.com/NixOS/nixpkgs/issues/9734.
2015-09-09 10:22:29 +02:00