Merge staging into closure-size

This commit is contained in:
Vladimír Čunát
2015-05-05 11:49:03 +02:00
869 changed files with 36249 additions and 30352 deletions
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jdk }:
stdenv.mkDerivation rec {
version = "2.0.0-rc8";
version = "2.0.0-rc14";
name = "boot-${version}";
src = fetchurl {
url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j";
sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
};
inherit jdk;
@@ -2,19 +2,19 @@
/* Cargo binary snapshot */
let snapshotDate = "2015-02-26";
let snapshotDate = "2015-04-02";
in
with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
let snapshotHash = if stdenv.system == "i686-linux"
then "2a28b604d09b4a76a54a05d91f7f158692427b3a"
then "ba6c162680d5509d89ba2363d7cae2047f40c034"
else if stdenv.system == "x86_64-linux"
then "7367f4aca86d38e209ef7236b00175df036c03e2"
then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5"
else if stdenv.system == "i686-darwin"
then "e5cabb0a4a2b4e47f7b1ae9b802e2b5d0b14eac5"
then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73"
else if stdenv.system == "x86_64-darwin"
then "3026c60ddd46d2bcf1cb178fc801095dbfba5286"
then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8"
else throw "no snapshot for platform ${stdenv.system}";
snapshotName = "cargo-nightly-${platform}.tar.gz";
in
@@ -35,6 +35,10 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p "$out"
./install.sh "--prefix=$out"
rm "$out/lib/rustlib/components" \
"$out/lib/rustlib/install.log" \
"$out/lib/rustlib/rust-installer-version" \
"$out/lib/rustlib/uninstall.sh"
'' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
@@ -1,11 +1,11 @@
{stdenv, fetchurl, curl, dmd, gcc, unzip}:
{stdenv, fetchurl, curl, dmd, gcc, unzip }:
stdenv.mkDerivation {
name = "dub-0.9.22";
name = "dub-0.9.23";
src = fetchurl {
url = "https://github.com/rejectedsoftware/dub/archive/v0.9.22.tar.gz";
sha256 = "0vhn96ybbsfflldlbyc17rmwb7bz21slbm189k5glyfr9nnp4cir";
url = "https://github.com/D-Programming-Language/dub/archive/v0.9.23.tar.gz";
sha256 = "7ecbce89c0e48b43705d7c48003394f383556f33562c4b5d884a786cd85814d1";
};
buildInputs = [ unzip curl ];