public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
This commit is contained in:
Vladimír Čunát
2014-01-12 12:27:06 +01:00
parent 51713fbbfc a0070a9157
commit a2c316288c
281 changed files with 3039 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/development/compilers/dmd/default.nix Normal file
View File

@@ -0,0 +1,52 @@
{ stdenv, fetchurl, gcc, unzip, curl }:
stdenv.mkDerivation {
name = "dmd-2.064.2";
src = fetchurl {
url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip;
sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm";
};
buildInputs = [ gcc unzip curl ];
configurePhase = "";
patchPhase = ''
cp src/VERSION src/dmd/
cp license.txt src/phobos/LICENSE_1_0.txt
'';
buildPhase = ''
cd src/dmd
make -f posix.mak INSTALL_DIR=$out
export DMD=$PWD/dmd
cd ../druntime
make -f posix.mak INSTALL_DIR=$out DMD=$DMD
cd ../phobos
make -f posix.mak INSTALL_DIR=$out DMD=$DMD
cd ../..
'';
installPhase = ''
cd src/dmd
tee dmd.conf.default << EOF
[Environment]
DFLAGS=-I$out/import -L-L$out/lib
EOF
make -f posix.mak INSTALL_DIR=$out install
export DMD=$PWD/dmd
cd ../druntime
make -f posix.mak INSTALL_DIR=$out install
cd ../phobos
make -f posix.mak INSTALL_DIR=$out install
cd ../..
'';
meta = {
description = "D language compiler";
homepage = http://dlang.org/;
license = "open source, see included files";
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

4
pkgs/development/compilers/elm/elm-server.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "elm-server";
version = "0.9.0.2";
sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
version = "0.10.1";
sha256 = "0rh01jm9h9zbslnzy6xg7bin76gdmypannh3ly40azplw9xmf2dn";
isLibrary = false;
isExecutable = true;
buildDepends = [

29
pkgs/development/compilers/rdmd/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchurl, writeText, lib, dmd }:
stdenv.mkDerivation {
name = "rdmd-2.064";
src = fetchurl {
url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d;
sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1";
name = "rdmd-src";
};
buildInputs = [ dmd ];
builder = writeText "drmd-builder.sh" ''
source $stdenv/setup
cp $src rdmd.d
dmd rdmd.d
mkdir -p $out/bin
cp rdmd $out/bin/
'';
meta = {
description = "rdmd wrapper for D language compiler";
homepage = http://dlang.org/rdmd.html;
license = lib.licenses.boost;
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

24
pkgs/development/compilers/vala/15.2.nix
View File

@@ -1,24 +0,0 @@
{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
stdenv.mkDerivation rec {
version = "0.15.2";
name = "vala-${version}";
src = fetchurl {
url = "mirror://gnome/sources/vala/0.15/${name}.tar.xz";
sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w";
};
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];
meta = {
description = "Compiler for the GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
};
}

24
pkgs/development/compilers/vala/16.1.nix
View File

@@ -1,24 +0,0 @@
{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
stdenv.mkDerivation rec {
version = "0.16.1";
name = "vala-${version}";
src = fetchurl {
url = "mirror://gnome/sources/vala/0.16/${name}.tar.xz";
sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb";
};
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];
meta = {
description = "Compiler for the GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
};
}

48
pkgs/development/compilers/vala/default.nix
View File

@@ -1,31 +1,31 @@
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools
, libiconvOrEmpty, libintlOrEmpty }:
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconvOrEmpty, libintlOrEmpty
}:
let
major = "0.23";
minor = "1";
sha256 = "1m8f2d01r4jqp266mk29qsl68lzh7c258cqd5zzbpbryxszlzdfj";
in
stdenv.mkDerivation rec {
p_name = "vala";
ver_maj = "0.19";
ver_min = "0";
src = fetchurl {
url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz";
sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp";
};
name = "${p_name}-${ver_maj}.${ver_min}";
postPatch = "patchShebangs .";
nativeBuildInputs = [ yacc flex pkgconfig ];
buildInputs = [ glib ] ++ libiconvOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
doCheck = false; # problems when launching dbus tests
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for the GObject type system";
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono iyzsong ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib ]
++ libiconvOrEmpty
++ libintlOrEmpty;
}