Commit graph

12 commits

Author SHA1 Message Date
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Ricardo M. Correia
2ee7809ac9 cargoSnapshot: Update from 2014-12-30 -> 2015-01-24 2015-01-27 04:36:37 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Ericson
8d96df76b9 cargo: common.nix now only contains version-agnostic bits 2015-01-08 08:38:20 +00:00
Ricardo M. Correia
9ad3f0ed7e cargoSnapshot: Update from 2014-12-21 -> 2014-12-30 2015-01-07 05:50:17 +01:00
Tobias Geerinckx-Rice
c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Ricardo M. Correia
66ca0b6163 cargoSnapshot: Update from 2014-11-22 -> 2014-12-21 2014-12-22 23:40:30 +01:00
Ricardo M. Correia
ca6d86b7fb cargoSnapshot: Update from 2014-09-19 -> 2014-11-22 2014-11-25 01:07:10 +01:00
Ricardo M. Correia
a1f76142b4 cargoSnapshot: Fix evaluation error when building tarball 2014-09-26 02:22:04 +02:00
Ricardo M. Correia
a7a67e99b6 cargoSnapshot: Fix meta attributes 2014-09-25 23:30:27 +02:00
Ricardo M. Correia
614a99bd8e cargoSnapshot: Add package
Cargo downloads your Rust project's dependencies and builds your
project.

The cargoSnapshot derivation simply uses a binary build, because
it's not easy to build cargo from source yet.

In the future, it's expected that we'll also add a derivation for
building cargo from source.
2014-09-24 18:18:15 +02:00