alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #4976 from BlackEdder/pr-dmd

Browse source 
dmd: update to 2.066.1
This commit is contained in:
Arseniy Seroka 2014-11-14 00:32:55 +03:00
parent 113961c681 959f706ace
commit c8c7cc1f09
2 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pkgs/development/compilers/dmd/default.nix
View file

@ -1,20 +1,15 @@
{ stdenv, fetchurl, gcc, unzip, curl }: { stdenv, fetchurl, gcc, unzip, curl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "dmd-2.064.2"; name = "dmd-2.066.1";
src = fetchurl { src = fetchurl {
url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip; url = http://downloads.dlang.org/releases/2014/dmd.2.066.1.zip;
sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm"; sha256 = "1qifwgrl6h232zsnvcx3kmb5d0fsy7j9zv17r3b4vln7x5rvzc66";
}; };
buildInputs = [ gcc unzip curl ]; buildInputs = [ gcc unzip curl ];
configurePhase = "";
patchPhase = ''
cp src/VERSION src/dmd/
cp license.txt src/phobos/LICENSE_1_0.txt
'';
buildPhase = '' buildPhase = ''
cd src/dmd cd src/dmd
make -f posix.mak INSTALL_DIR=$out make -f posix.mak INSTALL_DIR=$out
@ -28,25 +23,33 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
cd src/dmd cd src/dmd
tee dmd.conf.default << EOF mkdir $out
[Environment] mkdir $out/bin
DFLAGS=-I$out/import -L-L$out/lib cp dmd $out/bin
EOF
make -f posix.mak INSTALL_DIR=$out install
export DMD=$PWD/dmd
cd ../druntime cd ../druntime
make -f posix.mak INSTALL_DIR=$out install mkdir $out/include
mkdir $out/include/d2
cp -r import/* $out/include/d2
cd ../phobos cd ../phobos
make -f posix.mak INSTALL_DIR=$out install mkdir $out/lib
cd ../.. cp generated/linux/release/64/libphobos2.a $out/lib # for 64-bit version
cp -r std $out/include/d2
cp -r etc $out/include/d2
cd $out/bin
tee dmd.conf << EOF
[Environment]
DFLAGS=-I$out/include/d2 -L-L$out/lib -L--no-warn-search-mismatch -L--export-dynamic
EOF
''; '';
meta = { meta = {
description = "D language compiler"; description = "D language compiler";
homepage = http://dlang.org/; homepage = http://dlang.org/;
license = "open source, see included files"; license = "open source, see included files";
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }

24
pkgs/development/compilers/rdmd/default.nix
View file

@ -1,20 +1,21 @@
{ stdenv, fetchurl, writeText, lib, dmd }: {stdenv, lib, fetchgit, dmd}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rdmd-2.064"; name = "rdmd-20141113";
src = fetchurl {
url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d;
sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1";
name = "rdmd-src";
};
buildInputs = [ dmd ]; buildInputs = [ dmd ];
builder = writeText "drmd-builder.sh" '' src = fetchgit {
source $stdenv/setup url = git://github.com/D-Programming-Language/tools.git;
cp $src rdmd.d rev = "f496c68ee4e776597bd7382aa47f05da698a69e";
sha256 = "0vbhmz8nbh8ayml4vad0239kfg982vqfyqqrjv6wrlnjah97n5ms";
};
buildPhase = ''
dmd rdmd.d dmd rdmd.d
'';
installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp rdmd $out/bin/ cp rdmd $out/bin/
''; '';
@ -23,7 +24,6 @@ stdenv.mkDerivation {
description = "Wrapper for D language compiler"; description = "Wrapper for D language compiler";
homepage = http://dlang.org/rdmd.html; homepage = http://dlang.org/rdmd.html;
license = lib.licenses.boost; license = lib.licenses.boost;
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }