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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-18 09:48:49 +01:00
parent 85628148de c23b0856fd
commit 620c147cce
284 changed files with 11434 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghc/8.0.1.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
, hscolour
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
./dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752
];
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
buildInputs = [ ghc perl hscolour ];
enableParallelBuilding = true;

6
pkgs/development/compilers/llvm/3.5/llvm.nix
View File

@@ -13,6 +13,7 @@
, zlib
, compiler-rt_src
, debugVersion ? false
, enableSharedLibraries ? !stdenv.isDarwin
}:
let
@@ -43,10 +44,11 @@ in stdenv.mkDerivation rec {
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_REQUIRES_RTTI=1"
] ++ stdenv.lib.optionals (!isDarwin) [
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
] ++ stdenv.lib.optionals ( isDarwin) [
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"
];

6
pkgs/development/compilers/llvm/3.6/llvm.nix
View File

@@ -13,6 +13,7 @@
, zlib
, compiler-rt_src
, debugVersion ? false
, enableSharedLibraries ? !stdenv.isDarwin
}:
let
@@ -43,10 +44,11 @@ in stdenv.mkDerivation rec {
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
] ++ stdenv.lib.optionals (!isDarwin) [
] ++ stdenv.lib.optional enableSharedLibraries
"-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional (!isDarwin)
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
] ++ stdenv.lib.optionals ( isDarwin) [
++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"
];

42
pkgs/development/compilers/terra/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{ stdenv, lua, fetchFromGitHub, fetchurl, which, llvm, clang, ncurses }:
let luajitArchive = "LuaJIT-2.0.4.tar.gz";
luajitSrc = fetchurl {
url = "http://luajit.org/download/${luajitArchive}";
sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
};
in stdenv.mkDerivation rec {
name = "terra-git-${version}";
version = "2016-01-06";
src = fetchFromGitHub {
owner = "zdevito";
repo = "terra";
rev = "914cb98b8adcd50b2ec8205ef5d6914d3547e281";
sha256 = "1q0dm9gkx2lh2d2sfgly6j5nw32qigmlj3phdvjp26bz99cvxq46";
};
patchPhase = ''
substituteInPlace Makefile --replace \
'-lcurses' '-lncurses'
'';
configurePhase = ''
mkdir -p build
cp ${luajitSrc} build/${luajitArchive}
'';
installPhase = ''
mkdir -p $out
cp -r "release/"* $out
'';
buildInputs = [ which lua llvm clang ncurses ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "A low-level counterpart to Lua";
maintainers = with maintainers; [ jb55 ];
license = licenses.mit;
};
}