Commit graph

414 commits

Author SHA1 Message Date
Mikhail Volkhov
bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Danny Wilson
1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Ricardo M. Correia
2b694c237b cargo, cargoSnapshot: add rustc runtime dependency
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
2015-11-18 02:41:45 +01:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
Desmond O. Chang
b9c11de2a8 gradle: 2.6 -> 2.8 2015-11-11 16:45:19 +08:00
Edward Tjörnhammar
38ca909811 maven: 3.2.5 -> 3.3.3 2015-11-10 08:46:14 +01:00
Aristid Breitkreuz
c35e349409 rename make->gnustep-make to avoid people installing it accidentally 2015-11-07 16:08:17 +01:00
Pascal Wittmann
fcb4627695 Merge pull request #9980 from wavewave/gradle25
add gradle 2.5.
2015-11-06 17:17:28 +01:00
Ian-Woo Kim
3d5f95d61b gradle: reinit at 2.5.
For some projects (especially using android ndk), we still need to keep 2.5.
2015-11-06 07:31:58 -08:00
Ricardo M. Correia
84afac6b89 cargo: 0.5.0 -> 0.6.0 2015-11-03 20:32:12 +01:00
Pascal Wittmann
36a529e566 icmake: 7.22.01 -> 7.23.02 2015-10-28 17:43:41 +01:00
Cillian de Róiste
e42e4cfbd9 Meson: tidy up, untabify 2015-10-24 12:50:15 +02:00
Brandon Edens
6774b09af7 Add meson build system package. 2015-10-21 09:08:48 -07:00
Edward Tjörnhammar
c10caef1a2 Merge pull request #10062 from gebner/sbt-loader-package
sbt: use sbt-launcher-package.
2015-10-12 23:02:58 +02:00
Gabriel Ebner
98be4ed5e8 sbt: use sbt-launcher-package. 2015-09-25 16:54:35 +02:00
William A. Kennington III
d5395b0506 Merge pull request #10024 from mayflower/update-rust
Update rust and dependants
2015-09-23 22:43:25 -07:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Robin Gloster
feda2925f7 cargo: 0.3.0 -> 0.5.0 2015-09-23 21:16:16 +00:00
Tobias Geerinckx-Rice
ee7df6a566 dub: 0.9.23 -> 0.9.24
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
2015-09-21 19:22:14 +02:00
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
goibhniu
529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms
Update argyllcms
2015-09-14 10:01:36 +02:00
Tim Cuthbertson
9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Samuel Rivas
4ef2d19981 jam: add yacc as build input
I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
2015-09-07 11:37:18 +02:00
Peter Simons
fcb0bdbaa0 Merge pull request #9639 from k0ral/scons
scons: 2.3.5 -> 2.3.6
2015-09-03 21:08:32 +02:00
koral
bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Eelco Dolstra
6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice
687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub
Also add myself as a maintainer.

CC@ pSub
2015-09-01 05:28:53 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Desmond O. Chang
ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
Moritz Ulrich
2ffc2099be leiningen: 2.5.1 -> 2.5.2. 2015-08-19 12:25:50 +02:00
William A. Kennington III
6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Rickard Nilsson
cef8f0180d Merge pull request #9213 from j-keck/sbt0.13.9
sbt: 0.13.8 -> 0.13.9
2015-08-12 11:02:42 +02:00
j-keck
5e7d2e2003 sbt: 0.13.8 -> 0.13.9 2015-08-12 07:45:25 +02:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Profpatsch
062cdfb3a1 sbt: add JAVA_HOME to sbt script 2015-08-08 20:08:00 +02:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
William A. Kennington III
793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
lethalman
dad54b36fb Merge pull request #9008 from philandstuff/fix-bazel
Fix bazel package
2015-08-06 11:47:54 +02:00
Ragnar Dahlén
25bad2be17 boot: 2.0.0 -> 2.2.0 2015-08-05 11:54:40 +01:00
Nikolay Amiantov
4dde32b4f2 gradle: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:49 +03:00
Nikolay Amiantov
52fb36e7e0 maven: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:45 +03:00
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
Ricardo M. Correia
205a6b894d cargo: workaround frequent hash mismatches due to #8567
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.

Fixes #8566 and closes #8862.
2015-07-21 21:26:02 +02:00
Austin Seipp
f07d5a244f nixpkgs: ninja 1.5.3 -> 1.6.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Vladimír Čunát
9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Stewart Mackenzie
f46bbbce49 boot: correct sha256 2015-07-19 02:33:43 +08:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Jude Taylor
43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00