Commit Graph

25522 Commits

Author SHA1 Message Date
Philip Potter
76dd430cd8 bazel: fix build, make compatible with openjdk
Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
2015-07-28 20:38:44 +01:00
Allen Nelson
3c6c6c19f2 freetds: fix broken url (close #9031) 2015-07-28 20:37:41 +02:00
Luca Bruno
9e0dcf3bd9 libarchive: fix .la file 2015-07-28 15:22:56 +02:00
Nikolay Amiantov
c60e4016e7 libtirpc: fix missing symbols 2015-07-28 15:23:38 +03:00
Eelco Dolstra
cca7cdb631 php: Update to 5.4.43, 5.5.27, 5.6.11
CVE-2015-3152
2015-07-28 13:10:53 +02:00
Arseniy Seroka
40724d6843 Merge pull request #9019 from deepfire/nokinds-bump
ghcNokinds:  update 20150703 -> 20150718
2015-07-28 13:58:35 +03:00
Nikolay Amiantov
5fc747f23b qpdf: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
83e6095f9f libiberty: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
4b9d22db08 folly: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
ce5a813acb double-conversion: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
81d1367b79 cppzmq: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
b639dcf9e0 libtirpc: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
3ed3503bf7 libchardet: update upstream URL 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
41281e46a5 libbluray: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
5656c8cb8e libaacs: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
f2692a96a2 fix homepages 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
f5b41dbf42 haskellPackages.gnuplot: remove reduntant patch 2015-07-28 12:33:29 +03:00
Nikolay Amiantov
e3461ce259 rPackages.stringi: add ICU data tables 2015-07-28 12:33:29 +03:00
James Cook
fba4a95068 expat: patch for CVE-2015-1283 from Mozilla 2015-07-27 22:36:15 -07:00
Tobias Geerinckx-Rice
208bd8242d apktool: set sourceRoot
Otherwise installation fails with the message that unpacking produced
no directories (which is true).
2015-07-28 02:55:55 +02:00
Kosyrev Serge
103613f766 ghcNokinds: 20150703 -> 20150718 2015-07-28 02:02:33 +03:00
William A. Kennington III
e4956ba0ca Merge pull request #9011 from eduarrrd/master
Add current alpha of protobuf 3
2015-07-27 18:05:10 -04:00
Eduard Bachmakov
67c186a7ea Add current alpha of protobuf 3 2015-07-27 18:00:47 -04:00
Arseniy Seroka
fe0809fb66 Merge pull request #9015 from AndersonTorres/lightning
Lightning: 2.0.5 -> 2.1.0
2015-07-28 00:45:19 +03:00
William A. Kennington III
6e2103068d exempi: Use default boost 2015-07-27 13:12:24 -07:00
William A. Kennington III
56ed2e9b11 Merge pull request #9010 from rycee/fix/ecj
ecj: require jdk7 instead of jdk (fix build)
2015-07-27 15:50:11 -04:00
AndersonTorres
6f1b2e7de2 Lightning: 2.0.5 -> 2.1.0 2015-07-27 13:28:34 -03:00
Robert Helgesson
923dda992b ecj: require jdk7 instead of jdk
The ecj build fails in Java 8 due to backwards incompatible changes in
the `javax.lang.model` namespace so with this change we specifically ask
for a JDK for Java 7.
2015-07-27 17:37:37 +02:00
vbgl
93ec36702e Merge pull request #9013 from lessrest/update-flow
flow: 0.1.0 -> 0.13.1
2015-07-27 13:38:18 +02:00
Daniel Brockman
322358db03 flow: 0.1.0 -> 0.13.1 2015-07-27 12:00:54 +02:00
Eelco Dolstra
f98c7f2976 More docs in separate outputs 2015-07-26 22:46:45 +02:00
Eelco Dolstra
a2ddbc422f xapian: Move docs to separate output
This reduces xapian's "out" from 9.1 to 3.3 MB.
2015-07-26 22:46:44 +02:00
Eelco Dolstra
b07de4bf8b libsoup: Don't install docs 2015-07-26 22:46:23 +02:00
Eelco Dolstra
fc1077c9fb libsoup: Don't enable GNOME support by default
This bloats packages (like GStreamer) that depend on libsoup.
2015-07-26 22:46:23 +02:00
Eelco Dolstra
ecae014ddb gnutls: Don't depend on trousers by default
Let's keep the base system free of "trusted" computing crap...
2015-07-26 22:46:23 +02:00
Ricardo M. Correia
61f1594378 libraw: fix version number (0.16.1 -> 0.16.0)
The last commit that touched this library updated the version number but
not the hash. I opted into fixing the version number rather than the
hash because actually updating libraw into version 0.16.1 or later
causes a build failure in libkdcraw and therefore breaks gwenview (which
is one of the main KDE apps).
2015-07-26 16:11:08 +02:00
Eelco Dolstra
1a4bb0ef9b libbluray: Don't depend on the JDK by default
Depending on the JDK increases the closure size by a few hundred MB.

Issue #8990.
2015-07-26 12:00:54 +02:00
Eelco Dolstra
d7e97e07a3 librsvg: Disable GTK+ 3 dependency
GTK+ 2 is still our default, so packages should generally not depend
on GTK+ 3. For instance, this causes Emacs to depend on both GTK+ 2
and 3, which is obviously a bad thing.

Issue #8990.
2015-07-26 12:00:43 +02:00
Vladimír Čunát
4de0d7def5 libdmtx: remove imagemagick dependency, /cc #8990
I found no reason for the dependency at all, and it was even propagated.
Neither Debian nor Arch have any kind of it.
2015-07-26 09:36:13 +02:00
Peter Simons
54d86f86fd haskell-base: update override for new version 2015-07-25 20:54:42 +02:00
Peter Simons
867eda32ca haskell-Southpaw cannot be built on Unix. 2015-07-25 20:54:42 +02:00
Peter Simons
b49b2d9bba haskell-shelly: test suite has been fixed upstream 2015-07-25 20:54:42 +02:00
Peter Simons
4139c6c809 hackage-packages.nix: update to 0a07c4217d with hackage2nix revision e5e4464893b2b964424077e4fe7ef1a76e6d1173 2015-07-25 20:54:42 +02:00
Vladimír Čunát
389c90aa86 llvmPackages*: refactor to use callPackage, etc.
Also use recurseIntoAttrs only on the default version (instead of only on 3.4).

The "self" variants (stil) don't build and they're inconsistent
versions. /cc @shlevy (fea2266290).
2015-07-25 09:13:52 +02:00
Peter Simons
3d6bd6a1fa gfortran: disable parallel building to avoid weird build failures
More details are at 784025c747 (commitcomment-12328357).
2015-07-24 16:56:46 +02:00
Vladimír Čunát
a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
Vincent Laporte
8897299e8f mezzo: fix build with OCaml-4.02 2015-07-23 21:45:14 +02:00
Sergey Mironov
9944d92dff omniorb: add the expression 2015-07-23 20:42:35 +02:00
Peter Simons
74bc5a2240 haskell-shelly: disable test suite to fix the build 2015-07-23 19:50:56 +02:00
Peter Simons
44513ae025 haskell-inilist: test suite cannot be built because it depends on broken testpack 2015-07-23 19:50:56 +02:00