Commit Graph

342 Commits

Author SHA1 Message Date
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency
Also, don't install static libraries in jsoncpp.
2015-05-13 18:17:26 +02:00
Ricardo M. Correia
981ea747b5 cargo: 2015-05-11 -> 2015-05-13 2015-05-13 17:23:18 +02:00
Ricardo M. Correia
755df64ee3 Merge pull request #7501 from wizeman/u/upd-rust
Add support for Rust / Cargo packaging
2015-05-12 17:30:11 +02:00
Ricardo M. Correia
cbdedca255 cargo: 2015-04-14 -> 2015-05-11 2015-05-12 17:28:50 +02:00
William A. Kennington III
64c68c5413 cmake: 3.2.1 -> 3.2.2 2015-05-01 22:27:14 -07:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
6b4aec742d Merge pull request #7628 from ragnard/bump-boot
boot: bump from rc8 to rc14
2015-04-29 10:55:16 +02:00
Ragnar Dahlén
543ec3cf46 boot: bump from rc8 to rc14 2015-04-29 08:50:48 +01:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Ricardo M. Correia
d6093505cc buildRustPackage: Get rid of /proc/self/cwd hack
This makes buildRustPackage portable to non-Linux platforms.

Additionally, now we also save the `Cargo.lock` file into the fetch output, so
that we don't have to run $cargoUpdateHook again just before building.
2015-04-23 20:22:19 +02:00
Ricardo M. Correia
0cde1dc524 cargo: Remove setupHook
Instead, move that code into buildRustPackage.

The setup hook was only doing part of the work anyway, and having it in
a separate place was obscuring what was really going on.
2015-04-23 15:26:23 +02:00
Ricardo M. Correia
e42c17ee97 buildRustPackage: Fix Cargo.lock being ignored
It turns out that `cargo`, with respect to registry dependencies, was
ignoring the package versions locked in `Cargo.lock` because we changed
the registry index URL.

Therefore, every time `rustRegistry` would be updated, we'd always try
to use the latest version available for every dependency and as a result
the deps' SHA256 hashes would almost always have to be changed.

To fix this, now we do a string substitution in `Cargo.lock` of the
`crates.io` registry URL with our URL. This should be safe because our
registry is just a copy of the `crates.io` registry at a certain point
in time.

Since now we don't always use the latest version of every dependency,
the build of `cargo` actually started to fail because two of the
dependencies specified in its `Cargo.lock` file have build failures.

To fix the latter problem, I've added a `cargoUpdateHook` variable that
gets ran both when fetching dependencies and just before building the
program. The purpose of `cargoUpdateHook` is to do any ad-hoc updating
of dependencies necessary to get the package to build. The use of the
'--precise' flag is needed so that cargo doesn't try to fetch an even
newer version whenever `rustRegistry` is updated (and therefore have to
change depsSha256 as a consequence).
2015-04-23 02:58:07 +02:00
Ricardo M. Correia
d648be6724 buildRustPackage: Add check phase and enable it by default
Also disable check phase in cargo as there are lots of failures (some
probably due to trying to access the network).
2015-04-21 20:45:05 +02:00
Ricardo M. Correia
5e8a447739 cargo: Build optimized binary 2015-04-21 20:44:41 +02:00
Georges Dubus
7d67efa3f2 Add support for building cargo'ed Rust programs 2015-04-21 19:46:29 +02:00
Arseniy Seroka
d56e9b4f05 Merge pull request #7330 from RumataEstor/rust-beta
Provide rustc-1.0.0-beta as the default rust package
2015-04-16 13:05:40 +03:00
Charles Cooper
ba206b550a dub update to v0.9.23 2015-04-14 10:46:16 -07:00
Dmitry Belyaev
871d11c176 Update cargoSnapshot to rustc-1.0.0-beta release 2015-04-13 15:55:39 +10:00
Eric Seidel
c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
John Wiegley
d628247bdf Merge pull request #7095 from giogadi/cmake-full-install-name-staging
Make cmake install shared libraries with full install names by default
2015-03-30 21:47:27 -05:00
Luis G. Torres
ff35c4a5e2 Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821. 2015-03-30 21:25:44 -04:00
William A. Kennington III
22018c40d1 cmake: Remove obsolete openssl patch 2015-03-27 11:30:39 -07:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07: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 30dd174520)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-03-26 11:42:02 +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
Rob Vermaas
f5eed7e14e Add initial version for bazel.io build manager. 2015-03-25 15:12:02 +00:00
Thomas Tuegel
8fd5dd89ac Merge branch 'master' into staging 2015-03-24 17:49:30 -05:00
Thomas Tuegel
f47af9b2c8 remove cmake-3.0 2015-03-22 17:03:57 -05:00
Thomas Tuegel
3628370127 remove cmake-2.6.4 2015-03-22 17:02:32 -05:00
Thomas Tuegel
67199bda4e remove cmake-2.8 2015-03-22 17:01:45 -05:00
Thomas Tuegel
a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -05:00
j-keck
de9e7bc5f1 sbt: bump to 0.13.8 2015-03-22 19:58:01 +01: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
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
Ricardo M. Correia
e6561c5fb1 cargo: Install man page
... as well as other artifacts.
2015-03-04 18:08:52 +01:00
Jordan Woehr
5821e91bd1 Restructure rustc derivations for ease of updating.
Update racerRust to use new rustcMaster and upgrade cargoSnapshot so racer builds.
2015-03-02 12:40:55 -07:00
Bjørn Forsman
fc966aead0 gradle: don't hardcode gradle-launcher-VERSION.jar
Instead, figure out VERSION at build-time. This simplifies using
overrideDerivation (no need to copy and modify installPhase).

Also add a check that the file exists (catch potential failure early).
2015-02-27 12:08:03 +01:00
Moritz Ulrich
1bbf15eca1 Leiningen: Fix GnuPG Support. 2015-02-07 18:45:35 +01:00
Eric Seidel
dbf3d31727 make llvm-3.5 the default and remove references to gccApple
make perl be less dumb

revert change to release.nix
2015-02-03 14:31:04 -08:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Ragnar Dahlén
aaa6d79300 Clojure: boot: Add new derivation for boot build tooling 2015-01-30 09:33:55 +00:00
Pascal Wittmann
3c7e1ef698 Merge pull request #5866 from nckx/maven
maven 3.2.3 -> 3.2.5
2015-01-30 10:17:35 +01:00
Ricardo M. Correia
2ee7809ac9 cargoSnapshot: Update from 2014-12-30 -> 2015-01-24 2015-01-27 04:36:37 +01:00
Tobias Geerinckx-Rice
fe6944e5bc maven: 3.2.3 -> 3.2.5 2015-01-21 22:01:15 +01:00
Pascal Wittmann
c6845151f1 icmake: update from 7.21.01 to 7.22.00 2015-01-21 13:21:59 +01:00
Johannes Bornhold
51b4ce18f4 dub: Add dub to interact with the D package registry 2015-01-18 18:32:46 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Benjamin Saunders
0351b7a710 Add tup
Closes #5720
2015-01-14 01:37:44 -05:00