Commit Graph

23472 Commits

Author SHA1 Message Date
Spencer Whitt
4ca6bdfa52 fftw: Fix Darwin build 2015-03-27 21:15:15 -04:00
William A. Kennington III
1f82542fcb librsvg: 2.36.4 -> 2.40.9 2015-03-27 15:36:26 -07:00
William A. Kennington III
c8021333d4 jbigkit: Needs fPIC for library support 2015-03-27 15:36:26 -07:00
William A. Kennington III
0cb847652e openjpeg: Fix pkgconfig file 2015-03-27 15:36:26 -07:00
William A. Kennington III
bf562adad2 liblqr: 0.4.1 -> 0.4.2 2015-03-27 15:36:26 -07:00
William A. Kennington III
29ea62382e jbigkit: Add derivation 2015-03-27 15:36:26 -07:00
William A. Kennington III
8fd9a7cb59 lcms2: 2.6 -> 2.7 2015-03-27 15:36:26 -07:00
William A. Kennington III
3a2df159e6 libfpx: Add derivation 2015-03-27 15:36:26 -07:00
utdemir
c9258a76ba Fix some build failures on GHC 7.10.1 2015-03-27 22:53:11 +02:00
Arseniy Seroka
91eaf5495f Merge pull request #7035 from joachifm/reimplement-kona
Reimplement kona
2015-03-27 23:13:25 +03:00
Peter Simons
f0742a4bfb cryptol is now available from Hackage, 2015-03-27 19:45:54 +01:00
William A. Kennington III
7215167342 nss: 3.17.4 -> 3.18 2015-03-27 11:37:06 -07:00
Joachim Fasting
933e6cc832 kona: bump to 3.21
Use release tarball rather than GIT checkout. Note: disregard the
platform and arch embedded in the release tarball name.
2015-03-27 19:33:59 +01:00
Joachim Fasting
52d77f2360 kona: reimplement using mkDerivation
Also set supported platforms to `all`, per upstream, and specify
license (ISC).
2015-03-27 18:10:32 +01:00
Peter Simons
337c6629e6 Merge pull request #6992 from michelk/rggobi
r-modules: fixing rggobi by adding initial expression for ggobi
2015-03-27 16:31:28 +01:00
Eelco Dolstra
5c0eb64d43 Set more precise meta.position for Haskell packages 2015-03-27 16:17:48 +01:00
Eelco Dolstra
0e2257966f Disable packages that depend on <nixpkgs>
Nothing in Nixpkgs should use <nixpkgs>, because it can cause Nixpkgs
evaluation to depend in part on a different version of Nixpkgs,
leading to unpredictable results (including evaluation errors).
2015-03-27 16:17:48 +01:00
Peter Simons
64a4fab42b ghc: bump version to 7.10.1 release 2015-03-27 15:33:53 +01:00
Peter Simons
5f0d93351d Bump cabal2nix to latest version. 2015-03-27 15:28:00 +01:00
Peter Simons
fa8c514407 hackage-packages.nix: re-generate from Hackage 2015-03-26T14:11:09+0100 2015-03-27 15:28:00 +01:00
Michael Raskin
9fc71d3bf6 Add mkcl; patch by Tomas Hlavaty <tom@logand.com> 2015-03-27 08:24:35 +03:00
William A. Kennington III
a8d795bfda Merge pull request #7001 from spwhitt/sdl
Darwin: Build SDL and SDL_image
2015-03-26 21:08:55 -07:00
William A. Kennington III
1eeee6c87c libseccomp: 2.1.1 -> 2.2.0 2015-03-26 17:54:08 -07:00
William A. Kennington III
5e790f0e17 libical: 1.0.0 -> 1.0.1 2015-03-26 17:29:57 -07:00
William A. Kennington III
0a8efb537b librsync: 0.9.7 -> 1.0.0 2015-03-26 16:52:41 -07:00
William A. Kennington III
c8a05f484f usbredir: 0.6 -> 0.7 2015-03-26 14:57:59 -07:00
William A. Kennington III
66adf64bae Merge pull request #7016 from spwhitt/libdc1394
libdc1394: Build on Darwin
2015-03-26 14:29:06 -07:00
William A. Kennington III
9d4230fb75 Merge pull request #7015 from spwhitt/libass
libass: build on Darwin
2015-03-26 14:24:33 -07:00
William A. Kennington III
78d8e55245 libinput: 0.11.0 -> 0.13.0 2015-03-26 14:03:52 -07:00
William A. Kennington III
ed40a9fe42 libva-intel-driver: 1.5.0 -> 1.5.1 2015-03-26 13:59:12 -07:00
William A. Kennington III
721c425962 libvdpau: 0.9 -> 1.1 2015-03-26 13:59:01 -07:00
William A. Kennington III
8c3dcb25b9 libva: 1.5.0 -> 1.5.1 2015-03-26 13:58:48 -07:00
Spencer Whitt
f74adfdb45 libdc1394: Build on Darwin 2015-03-26 16:58:02 -04:00
Spencer Whitt
0fb50ed754 libass: build on Darwin 2015-03-26 16:56:41 -04:00
Edward Tjörnhammar
ba555339f4 Merge pull request #7008 from bendlas/jetbrains
idea.ruby-mine: 7.0 -> 7.0.4
idea.clion: eap update
openjdk8: add home location as passthrough
2015-03-26 20:50:24 +01:00
William A. Kennington III
cb4c9cf633 harfbuzz: 0.9.38 -> 0.9.40 2015-03-26 12:47:47 -07:00
William A. Kennington III
e41037ae04 libmbim: 1.6.0 -> 1.12.2 2015-03-26 12:44:17 -07:00
William A. Kennington III
a12a63fc08 libqmi: 1.8.0 -> 1.12.6 2015-03-26 12:39:05 -07:00
William A. Kennington III
8071107881 libwebp: 0.4.2 -> 0.4.3 2015-03-26 12:36:04 -07:00
William A. Kennington III
b17cf394bd libdrm: 2.4.59 -> 2.4.60 2015-03-26 12:34:05 -07:00
Arseniy Seroka
fe91ef5132 Merge pull request #7004 from spwhitt/libsvm
libsvm: New package
2015-03-26 21:22:12 +03:00
Herwig Hochleitner
24ddfc7c38 passthru.home in openjdk8, similar to other jdks 2015-03-26 19:06:36 +01:00
Arseniy Seroka
a062b64cdf Merge pull request #6995 from oxij/add-toluapp
tolua++ (toluapp): add version 1.0.92
2015-03-26 20:13:31 +03:00
Spencer Whitt
c37f53ed56 libsvm: New package 2015-03-26 11:41:57 -04:00
Spencer Whitt
b5099669ac SDL_image: Enable building on Darwin 2015-03-26 11:15:02 -04:00
Spencer Whitt
1cef6dc89a SDL: Build on Darwin 2015-03-26 11:14:45 -04:00
Jan Malakhovski
46aa9361d6 tolua++ (toluapp): add version 1.0.92 2015-03-26 13:03:17 +00:00
Michel Kuhlmann
c96bc1e507 r-modules: fixing rggobi by adding initial expression for ggobi 2015-03-26 12:20:07 +01:00
goodwillcoding
62d4564de4 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1

(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-26 11:42:02 +01:00
Peter Simons
1841a05b9d haskell-stm-queue-extras: real fix for the broken Cabal file 2015-03-26 11:29:06 +01:00
Peter Simons
a8d249cbbb haskell-bytestring-arbitrary: use compiler-specific LLVM version 2015-03-26 11:29:06 +01:00
Peter Simons
753284c2d0 hackage-packages.nix: add compiler-specific LLVM support
This change will resolve 'llvm' and related symbols from the compiler-specific
'llvmPackages' set rather than the global 'pkgs'. This allows us to use
different versions of llvm depending on the copmiler we're building with.
2015-03-26 11:29:06 +01:00
Peter Simons
2e811ff754 hackage-packages: re-generate from Hackage 2015-03-25T19:49:53+0100 2015-03-26 11:29:05 +01:00
Peter Simons
39ec62fa96 haskell-configuration-common: don't import LLVM into the package set
Instead, we'll make sure that packages find it in self.llvmPackages.
2015-03-26 11:29:05 +01:00
Nikolay Amiantov
49f3c375b5 ghcWithPackages: add withLLVM 2015-03-26 11:29:05 +01:00
Peter Simons
1368206eb8 haskell-configuration-common: remember ticket URL 2015-03-26 11:29:05 +01:00
Peter Simons
73f35dcc0c haskell-CLI fails its test suite because of missing modules. 2015-03-26 11:29:05 +01:00
Peter Simons
eb4f75a868 ghc: remove obsolete "i686-darwin" from meta.platforms 2015-03-26 11:29:05 +01:00
Peter Simons
6bd48cbfef Enable Darwin builds of Haskell packages again.
Hopefully, issues like https://github.com/NixOS/nixpkgs/issues/2689 are
all remedied by now.
2015-03-26 11:29:05 +01:00
Peter Simons
93bd02a6aa ghc: versions prior to 7.4.x currently don't work on Darwin
db4cb021c0 (commitcomment-10320216)
2015-03-26 11:29:05 +01:00
Peter Simons
a6f3b54fd0 haskell-ng: disable failing builds on Hydra 2015-03-26 11:29:05 +01:00
Rob Vermaas
46eedd9de5 Dohh 2015-03-26 09:48:27 +00:00
Rob Vermaas
ac35d15bcc bazel: Upstream pushed patch, removing patch. 2015-03-26 09:46:31 +00:00
Rob Vermaas
7721ff4ccb bazel: add patch suggested by upstream 2015-03-26 06:30:21 +00:00
William A. Kennington III
c32a0d9eb1 Merge pull request #6970 from joachifm/libev
Libev updates
2015-03-25 22:13:13 -07:00
William A. Kennington III
bb70b19394 Merge pull request #6988 from spwhitt/schroedinger
Fix schroedinger on Darwin
2015-03-25 21:45:30 -07:00
William A. Kennington III
e73b4f42a3 Merge pull request #6989 from spwhitt/libmatroska
libmatroska: Fix Darwin build
2015-03-25 21:43:56 -07:00
William A. Kennington III
938403bc09 Merge pull request #6990 from spwhitt/libmpeg2
libmpeg2: Fix Darwin build
2015-03-25 21:43:20 -07:00
Spencer Whitt
54bf845153 libmpeg2: Fix Darwin build 2015-03-25 23:12:14 -04:00
Spencer Whitt
af2d875865 libmatroska: Fix Darwin build 2015-03-25 22:58:28 -04:00
Spencer Whitt
0b853b767a libebml: 1.3.0 -> 1.3.1 2015-03-25 22:51:44 -04:00
Spencer Whitt
c7a0e68e58 schroedinger: 1.0.0 -> 1.0.11 2015-03-25 22:22:20 -04:00
Spencer Whitt
5284c5684f orc: Enable building on Darwin 2015-03-25 22:13:48 -04:00
Tobias Geerinckx-Rice
9060ae8f89 include-what-you-use: pin clang to version 3.5
Fixes Hydra failure with clang 3.6 <http://hydra.nixos.org/build/20560181>.
Also shorten excessive longDescription a bit.
2015-03-26 00:29:42 +01:00
William A. Kennington III
151c42aa98 libvorbis: 1.3.4 -> 1.3.5 2015-03-25 16:02:42 -07:00
William A. Kennington III
838acbe701 Merge pull request #6983 from spwhitt/libtheora
Libtheora
2015-03-25 15:36:56 -07:00
William A. Kennington III
fe6055dc2a Merge pull request #6984 from spwhitt/x264
X264 updates
2015-03-25 15:35:59 -07:00
Spencer Whitt
84a15d6d08 x264: Update metadata 2015-03-25 18:13:47 -04:00
Spencer Whitt
3630a37dd5 x264: Add option to encode videos as bit depth 10
At compile time libx264 must be configured to encode videos in either 8
bit depth or 10 bit depth. It is not possible to compile libx264 to
support both bit depths simultaneously. This exposes the bit depth
compile option.
2015-03-25 18:10:08 -04:00
Spencer Whitt
98bf3f9d39 x264: snapshot-20130424-2245-stable -> snapshot-20141218-2245-stable
Update fixes configure error on Darwin
2015-03-25 18:04:07 -04:00
Spencer Whitt
7adbb34315 libtheora: Add metadata 2015-03-25 17:57:40 -04:00
Spencer Whitt
04f724873a libtheora: Fix build on Darwin 2015-03-25 17:52:19 -04:00
Peter Simons
bdd4304870 Merge pull request #6980 from Fuuzetsu/remove-ansi-patch
ansi-wl-pprint: don't patch anymore
2015-03-25 20:36:05 +01:00
Peter Simons
706b2274cb haskell-esqueleto fails its test suite. 2015-03-25 20:33:26 +01:00
Mateusz Kowalczyk
5faa4e5aef ansi-wl-pprint: don't patch anymore
The package version we have now already has this patch courtesy to @hvr
making a release with it.
2015-03-25 19:16:26 +00:00
Peter Simons
f7c2699fde hunspell-dictionaries: cosmetic 2015-03-25 19:34:46 +01:00
Peter Simons
279429b700 hunspell-dictionaries: update french dictonary to fix the build
The old version has disappeared from the server.
2015-03-25 19:34:46 +01:00
Rob Vermaas
f5eed7e14e Add initial version for bazel.io build manager. 2015-03-25 15:12:02 +00:00
Peter Simons
6792f76706 haskell-stm-queue-extras: manually remove the update to revision 1
That revision doesn't exist. What happened is that upstream uploaded a Cabal
file that says "x-revision: 1". Of course, the incorrect setting will come back
in as soon as we update hackage-packages.nix. Nonetheless, I'm opting for the
short-term solution here, hoping that upstream will remove the x-revision
header from Hackage soon'ish.

https://github.com/haskell/hackage-server/issues/337
2015-03-25 14:37:15 +01:00
Peter Simons
1fcac34d46 hackage-packages.nix: re-generate from Hackage 2015-03-24T20:22:17+0100 2015-03-25 14:37:15 +01:00
Peter Simons
9170b4bd65 haskell-lambdabot: upstream has fixed the build 2015-03-25 14:37:15 +01:00
Peter Simons
013b12a54c haskell-ng: expose Hackage's revision number in hackage-packages.nix and use it to generate stable download URLs for edited Cabal files
Fixes https://github.com/NixOS/nixpkgs/issues/6914.
2015-03-25 14:37:15 +01:00
Peter Simons
e77ad8855a haskell-feldspar-signal exports no modules. 2015-03-25 14:37:14 +01:00
Peter Simons
eaf95037cd haskell-Hipmunk: mark broken because it doesn't support recent versions of StateVar 2015-03-25 14:37:14 +01:00
Peter Simons
a4ffd5800e haskell-directory: version 1.2.2.0 tries to access the network when running the test suite 2015-03-25 14:37:14 +01:00
Peter Simons
c8c355941c haskell-ng: update bytestring to latest version 2015-03-25 14:37:14 +01:00
Peter Simons
0533fdb09d haskell-ng: update haskeline to latest version 2015-03-25 14:37:14 +01:00
Peter Simons
adff1a2b35 haskell-HStringTemplate: update to latest version 2015-03-25 14:37:14 +01:00
Peter Simons
258bc13966 haskell-ng: update Cabal and deepseq to latest versions 2015-03-25 14:37:14 +01:00
Peter Simons
3f0097fc4b hackage-packages.nix: re-generate from Hackage 2015-03-24T13:42:07+0100 2015-03-25 14:37:14 +01:00
Eric Seidel
0bfce5bb4a pixman: patch for clang36 2015-03-24 20:54:05 -07:00
Eric Seidel
69d02b71a0 clang: add isClang passthru attribute to mirror isGNU 2015-03-24 20:37:01 -07:00
William A. Kennington III
6f025832b5 Merge pull request #6971 from joachifm/remove-redundant-clppcre
Delete redundant clppcre expression
2015-03-24 19:19:50 -07:00
Shea Levy
6e3c9d5ce4 Fix fallout of recent cc-wrapper changes
Fixes tarball except for 56e21d05e8
2015-03-24 22:13:43 -04:00
Mateusz Kowalczyk
25eee1c865 gtkspell3: update from 3.0.6 to 3.0.7 2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
0a6eb7f8d5 gloox: update from 1.0.12 to 1.0.13 2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
66b72cf5d6 glm: update from 0.9.6.0 to 0.9.6.1 2015-03-25 00:46:58 +00:00
Joachim Fasting
b71865b1bb libev: bump to 4.19 2015-03-25 00:07:22 +01:00
Joachim Fasting
2284a1ab8e libev: set license and description
Use upstream's description
2015-03-24 23:47:17 +01:00
Vladimír Čunát
9a75c1d7c8 lensfun: fix build by using older make 2015-03-24 21:15:46 +01:00
Luis G. Torres
f7e4be5011 flann: make it build on Darwin (close #6946) 2015-03-24 20:48:10 +01:00
Joachim Fasting
a64d43b96d Delete redundant clppcre expression
The top-level name clppcre has no reverse dependencies, is out-of-date, and
appears to have been superceded by lispPackages.cl-ppcre.
2015-03-24 20:39:25 +01:00
Joachim Fasting
be7ef555f2 libev: port to mkDerivation 2015-03-24 19:44:26 +01:00
Michael Raskin
7c8410b196 Merge pull request #6965 from joachifm/reimplement-j
j: re-implement using mkDerivation
2015-03-24 17:02:48 +03:00
Joachim Fasting
62a6499243 j: re-implement using mkDerivation 2015-03-24 14:05:25 +01:00
Shea Levy
f80e342e83 ccache-links is wrapped, so it needs a gcc attribute 2015-03-24 08:59:34 -04:00
Peter Simons
85704cd9d3 cabal2nix: update to latest Git version 2015-03-24 13:58:08 +01:00
Arseniy Seroka
3a08b70be5 Merge pull request #6959 from pmahoney/libdevil
libdevil: patch to build on darwin
2015-03-24 10:36:29 +03:00
Michael Raskin
03912fb435 Update libfixposix link 2015-03-24 09:45:08 +03:00
Patrick Mahoney
7f728ae2e1 libdevil: patch to build on darwin
On a OSX 10.10 system:

    libtool: compile:  clang++ -DHAVE_CONFIG_H -I. -I../include/IL -I ./../src-IL/include -I ./../include -fgnu89-inline -msse -msse2 -msse3 -D_THREAD_SAFE -I/nix/store/7n9c36hz9sl2dqvfry8d554l935hq4ma-openexr-2.2.0/include/OpenEXR -I/nix/store/3jxslxa37wmfdnyfj1hckpxl0skscgj0-ilmbase-2.2.0/include/OpenEXR -O3 -c ./../src-IL/src/il_exr.cpp  -fno-common -DPIC -o .libs/libIL_la-il_exr.o
    In file included from ./../src-IL/src/il_exr.cpp:22:
    In file included from ./../src-IL/include/il_exr.h:18:
    In file included from /nix/store/7n9c36hz9sl2dqvfry8d554l935hq4ma-openexr-2.2.0/include/OpenEXR/ImfIO.h:49:
    In file included from /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/string:434:
    /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/__config:32:22: error: expected value in expression
    #if __LITTLE_ENDIAN__
                         ^
    /nix/store/3qsrpjbsmn7w4d18i8zc6a44myiaa516-libc++-3.5.0/include/c++/v1/__config:110:11: fatal error: 'endian.h' file not found
    # include <endian.h>
              ^
    2 errors generated.
    make[1]: *** [libIL_la-il_exr.lo] Error 1
    make[1]: Leaving directory `/private/var/folders/1g/yfm550_10sb76p0z469bq9mr5zsthm/T/nix-build-libdevil-1.7.8.drv-1/devil-1.7.8/lib'
    make: *** [all-recursive] Error 1

See http://sourceforge.net/p/resil/tickets/8/
2015-03-23 15:53:45 -05:00
Pascal Wittmann
5e3a99e7d6 groovy: update from 2.4.1 to 2.4.2 2015-03-23 15:29:36 +01:00
Eelco Dolstra
433d30b877 libguestfs: Don't build on Hydra
It produces a package over 4 GB large, and takes several hours to
build (probably because of the overhead of copying that 4 GB image).
2015-03-23 13:25:20 +01:00
vbgl
bc5692f3ec Merge pull request #6939 from henrytill/opam
opam: update to 1.2.1
2015-03-23 11:45:05 +01:00
Arseniy Seroka
268a90a397 Merge pull request #6938 from j-keck/sbt
sbt: bump to 0.13.8
2015-03-23 13:12:57 +03:00
lethalman
3af17021d4 Merge pull request #6867 from risicle/master
New packages for luabind, stxxl and osrm-backend
2015-03-23 10:03:12 +01:00
Aistis Raulinaitis
3c7a919431 ansi-wl-pprint hash correction 2015-03-22 15:00:07 -07:00
Henry Till
a5fb20d65a opam: update to 1.2.1 2015-03-22 16:33:15 -04:00
j-keck
de9e7bc5f1 sbt: bump to 0.13.8 2015-03-22 19:58:01 +01:00
Thomas Tuegel
0777420850 kf57: don't set obsolete KDE_DEFAULT_HOME 2015-03-22 13:10:24 -05:00
Luis G. Torres
d1cf37eeb7 Cleaned up swt derivation 2015-03-22 13:28:34 -04:00
Luis G. Torres
e8d85753cf Added Darwin case for java.swt. This still can't be built on Darwin, but at least this derivation won't cause nix-env -qas to crash on Darwin. 2015-03-22 13:28:34 -04:00
Tobias Geerinckx-Rice
627e2bf90c nx-libs 3.5.0.30 -> 3.5.0.31 2015-03-22 14:20:59 +01:00
William A. Kennington III
935938f262 Merge pull request #6924 from joachifm/picolisp-update
picolisp: bump to 3.1.9
2015-03-21 20:46:41 -07:00
Joachim Fasting
262a3ac3c4 picolisp: bump to 3.1.9 2015-03-21 23:49:57 +01:00
Peter Simons
5238bfb73f r-modules: fix evaluation errors 2015-03-21 23:33:50 +01:00
Peter Simons
701251e435 r-modules: update from CRAN state at 2015-03-21T20:01:16+0100) 2015-03-21 23:33:50 +01:00
Russell O'Connor
e2e4c1182e Update OpenSSL dependency of bitcoin to be the latest OpenSSL.
Purge OpenSSL version 1.0.1j.
2015-03-21 17:49:42 -04:00
Peter Simons
d242b5220a haskell-bytestring-arbitrary: fix build by passing an older LLVM version 2015-03-21 19:47:53 +01:00
Peter Simons
fddc2fa8bc haskell-hydrogen-syntax does not compile. 2015-03-21 19:44:12 +01:00
Peter Simons
16b9fd71f9 haskell-ansi-wl-pprint: fix the build with ghc-7.10.x 2015-03-21 19:44:12 +01:00
Peter Simons
61b1ef496f haskell-bindings-GLFW has been fixed upstream. 2015-03-21 19:44:12 +01:00
Peter Simons
446f301078 hackage-packages: re-generate from Hackage 2015-03-20T11:29:46+0100 2015-03-21 19:44:12 +01:00
Peter Simons
5c268bca2e haskell-locators test suite is broken. 2015-03-21 19:44:12 +01:00
Michael Raskin
c64b5270fe update luarocks 2015-03-21 21:29:39 +03:00
Michael Raskin
0d2a00fdee update lush 2015-03-21 21:29:38 +03:00
Thomas Tuegel
0451646382 Merge branch 'cmake32'
Packages that use CMake and depend on OpenSSL should use CMake 3.2 or later.
2015-03-21 12:34:48 -05:00
Thomas Tuegel
a17535822a kf57: use cmake-3.2
Build was broken by openssl update because older cmake could not parse
openssl's version correctly.
2015-03-21 12:33:31 -05:00
Thomas Tuegel
7e21c519ba add cmake-3.2.1
Earlier versions of CMake have a bug in their OpenSSL version detection code.
2015-03-21 12:32:38 -05:00
Thomas Tuegel
19a4fc2b46 add jsoncpp-1.6.0
dependency of cmake-3.2
2015-03-21 12:32:12 -05:00
Jaka Hudoklin
f953d77be2 Revert "Reverts a bunch of commits as a try to fix GC errors."
This reverts commit 1e4ba025c2.

Conflicts:
	pkgs/development/web/nodejs/build-node-package.nix
2015-03-21 17:49:37 +01:00
Arseniy Seroka
37c95d6a48 Merge pull request #6909 from johbo/libatopic_ops
libatomic_ops: Allow on all unix platforms
2015-03-21 13:48:19 +03:00
Vincent Laporte
0f2509a52d ocaml-batteries: update from 2.2.0 to 2.3.1 2015-03-21 10:04:15 +01:00
Vincent Laporte
4c8681fea1 Adds ocaml-qtest-2.0.1
Inline test extraction utility for OCaml, originally developed
internally for Batteries

Homepage: https://github.com/vincent-hugot/iTeML
2015-03-21 10:04:14 +01:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Shea Levy
19cd9f16a0 Merge branch 'staging' 2015-03-20 09:53:34 -04:00
Johannes Bornhold
c30b11c776 libatomic_ops: Allow on all unix platforms 2015-03-20 14:31:54 +01:00
aszlig
3bb0e6df8a
haxe: Add package for the hxcpp runtime library.
I'm not adding this to pkgs/development/libraries because it somewhat is
strongly tied to Haxe itself, because otherwise you can't compile to C++
and in the event that someone is going to create something like
"haxePackages" someday it is easier to notice when it's residing in the
Haxe folder.

In theory it would also work by using imperative haxelib, but you'll get
precompiled libraries which need to be patched on NixOS systems. That's
the main reason I was packaging this, among from the fact that even when
patching the libraries, it still leads to occasional library hell and
instabilities.

The package has two outputs: One with the library itself, needed for
compile time ($out) and another one ($lib) which is needed at runtime,
so after compiling, the $out path can be safely garbage collected.

Right now, I've set meta.platforms to Linux only, because that's where
I've tested it. In order to get it running on other platforms the
targetArch attribute has to be set accordingly.

We also build everything completely from scratch, even though there are
binaries within the source ZIP file. The main reason is to make smaller
library dependencies by avoiding bundled libraries and using the ones we
already ship with nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-20 08:47:11 +01:00
aszlig
d68e9b855c
haxe: Add setup-hook and patch to add haxlib path.
Introduces a new environment variable called HAXELIB_PATH and the patch
for haxelib is trying to search that environment variable for other
libraries. If the haxelib path for a particular library isn't found, it
reverts to the normal behaviour of searching the user's home directory
for a file called .haxelib, which in turn points to a repsitory path and
that in turn has .current/.dev files to point it to the right version
number.

This avoids workarounds like this when using Nix to build Haxe projects:

configurePhase = ''
  export HOME="$(pwd)"
  echo "$(pwd)" > .haxelib

  mkdir dependency1
  echo dev > dependency1/.current
  echo "${dependency1}" > dependency1/.dev

  mkdir dependency2
  echo dev > dependency2/.current
  echo "${dependency2}" > dependency2/.dev
'';

Now every haxelib is expected to be in $out/lib/haxe/$name and whenever
it is listed in buildInputs of another Haxe derivation, HAXELIB_PATH
gets automatically set in the build environment.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-20 08:39:21 +01:00
Austin Seipp
9b41cf0281 nixpkgs: arcanist 20150118 -> 20150318
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-19 17:46:24 -05:00
Vladimír Čunát
cd97c58110 openssl_1_0_1j: fix after updating the main version 2015-03-19 20:28:35 +01:00
Vincent Laporte
20b150b26c Adds ocaml-dolog-1.0
dolog is a minimalistic lazy logger in OCaml

Homepage: https://github.com/UnixJunkie/dolog
2015-03-19 19:14:18 +01:00
Vincent Laporte
d52b6f1d3e ocaml-re: update from 1.3.0 to 1.3.1 2015-03-19 19:14:15 +01:00
Peter Simons
afb0874e06 hackage-packages.nix: re-generate from Hackage 2015-03-19T13:39:37+0100 2015-03-19 17:55:19 +01:00
Eelco Dolstra
2fe351c7e3 openssl: Update to 1.0.1m
Fixes various "Moderate" / "Low" CVEs:
http://openssl.org/news/secadv_20150319.txt
2015-03-19 15:57:17 +01:00
Joachim Fasting
0e52c562b5 RAppArmor: use AppArmor 2.9 2015-03-19 14:14:28 +01:00
Peter Simons
5a2fd23b8a Merge pull request #6896 from NixOS/revert-6886-fix/vlc
Revert "VLC wants a newer version of libdvdnav".
2015-03-19 13:34:35 +01:00
Mateusz Kowalczyk
d56831a9af ghc: update link and version of 7.10 RC3 2015-03-19 12:33:11 +00:00
Peter Simons
f30743b86b Revert "VLC wants a newer version of libdvdnav" 2015-03-19 13:19:17 +01:00
Robin Bate Boerop
91004a3485 Merge branch 'Sqitch' into sqitch-pg 2015-03-19 08:11:31 -03:00
lethalman
515bd937f9 Merge pull request #6868 from lancelotsix/add_checkbashisms
Add checkbashisms package
2015-03-19 10:42:00 +01:00
Peter Jones
05d6d77c8e VLC wants a newer version of libdvdnav
* Updated libdvdnav/libdvdread to latest versions

  * Removed libdvdnav patches since they have been incorporated into the
    latest release

  * Added `--enable-dvdnav` configure flag to VLC to ensure that if this
    happens again VLC will fail to build
2015-03-18 14:37:12 -06:00
Lancelot SIX
7bf0458cb6 Add checkbashisms package 2015-03-18 21:03:30 +01:00
Vladimír Čunát
105f933f64 ffmpeg: add new branch 2.6.1 (no switching yet)
/cc maintainers @codyopel, @fuuzetsu.

Release notes don't indicate any new options or dependencies.
http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.6
APIchanges looks like we should be able to replace 2.5 by 2.6
without anything breaking (belongs to staging and needs some testing).
2015-03-18 18:10:26 +01:00
Robin Bate Boerop
a3a98d7242 Improved builder for Sqitch 2015-03-18 10:32:46 -03:00
Jaka Hudoklin
b5298683aa Add chef-dk 2015-03-18 14:17:25 +01:00
Jaka Hudoklin
17b9405685 bundlerEnv: add support for additional build inputs 2015-03-18 14:15:50 +01:00
Peter Simons
3f45fe100a haskell-bindings-GLFW is broken (and has been for quite a while). 2015-03-18 13:31:33 +01:00
Peter Simons
5cdd855938 haskell-lens: update to 4.8 2015-03-18 13:31:33 +01:00
Peter Simons
25f4f78c92 haskell-mysql: fix build 2015-03-18 12:13:43 +01:00
Peter Simons
fe8d65c9a6 Add required overrrides for haskell-hosc and haskell-tidal-midi.
Fixes https://github.com/NixOS/nixpkgs/issues/6864.
2015-03-18 12:13:43 +01:00
Peter Simons
53fa11398c hackage-packages.nix: re-generate from Hackage 2015-03-17T11:52:35+0100 2015-03-18 12:13:43 +01:00
Domen Kožar
e61f23d89f Fix a bad revert at 1e4ba025c2 2015-03-18 11:50:19 +01:00
Austin Seipp
1ef6f44e5d nixpkgs: hhvm 3.3.0 -> 3.6.0
- We need {perl,git,krb5,libvpx,etc} as a dependency
  - Drop upstream patches.
  - Simplify build (uses cmake configuration)
  - Simplify install (uses cmake generated installer)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-18 05:11:31 -05:00
lethalman
59e3226d27 Merge pull request #6866 from benley/iojs
iojs: Fix update script, update iojs
2015-03-18 10:42:40 +01:00
Austin Seipp
5bbbb2c96b nixpkgs: concurrencykit 0.4.4 -> 0.4.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Austin Seipp
c8d46c7374 nixpkgs: re2c 0.13.7.5 -> 0.14.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Austin Seipp
70528e9f8e nixpkgs: ninja 1.5.1 -> 1.5.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Austin Seipp
075c1886a3 nixpkgs: libressl 2.1.4 -> 2.1.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Benjamin Staffin
e3eb1aa719 Update iojs using the fixed-up script 2015-03-17 15:22:35 -07:00
Robert Scott
5a45003800 luajit: declare lua in propagatedBuildInputs, remove from osrm-backend's buildInputs 2015-03-17 22:05:13 +00:00
Benjamin Staffin
1b1f26636e iojs: Fix update-iojs script
The nix-instantiate invocations only work correctly if this script is
run from the root directory of nixpkgs, or in a directory without a
default.nix file and NIX_PATH set appropriately.
2015-03-17 15:00:16 -07:00
Longrin Wischnewski
30beb0ad7d flightgear: bump version to 3.4 (close #6385)
- openscenegraph: bump version to 3.2.1: http://www.openscenegraph.org/index.php/download-section/stable-releases
- remove obsolete patch
- simgear: bump version to 3.4.0
- flightgear: add qt5 as build input
2015-03-17 22:58:39 +01:00
Vladimír Čunát
2ed90cd27f gdal: fix build by adding openssl
I'm not sure why it started needing it, but I suspect mysql (mariadb).
2015-03-17 13:58:09 +01:00
Robin Bate Boerop
566cd9ba19 Remove unnecessary propagatedBuildInputs line 2015-03-17 09:46:52 -03:00
Vladimír Čunát
e924f05cc3 Merge branch 'master' into staging 2015-03-17 13:35:05 +01:00
Peter Simons
658bb1e68d Merge pull request #6839 from joelmo/master
graph-tool: enable drawing and openmp for algorithms
2015-03-17 12:53:12 +01:00
Joel Moberg
14106ba4f7 graph-tool: enable drawing and openmp for algorithms 2015-03-17 12:25:35 +01:00
Peter Simons
04611ab692 ghc: update 7.10.1 to rc3 2015-03-17 11:40:51 +01:00
Peter Simons
eb7b6e2137 haskell-exceptions: upstream has fixed the test suite 2015-03-17 11:40:51 +01:00
Peter Simons
cf9994a53b Merge pull request #6841 from KoviRobi/gnu-apl
Added GNU APL, a free APL interpreter.
2015-03-17 11:09:09 +01:00