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

Merge recent master

Browse Source
This commit is contained in:
Vladimír Čunát
2014-06-10 20:14:08 +02:00
parent 5a98b9f514 bd7f3fbf0f
commit f2352f7ecf
199 changed files with 5598 additions and 2940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/compcert/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, coq, ocaml, gcc }:
{ stdenv, fetchurl, coq, ocaml, ocamlPackages, gcc }:
stdenv.mkDerivation rec {
name = "compcert-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8";
};
buildInputs = [ coq ocaml ];
buildInputs = [ coq ocaml ocamlPackages.menhir ];
enableParallelBuilding = true;
configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux";

26
pkgs/development/compilers/idris/default.nix
View File

@@ -1,23 +1,25 @@
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
, boehmgc, Cabal, cheapskate, deepseq, filepath, gmp, happy
, haskeline, languageJava, lens, libffi, llvmGeneral
, llvmGeneralPure, mtl, network, parsers, split, text, time
, transformers, trifecta, unorderedContainers, utf8String, vector
, vectorBinaryInstances, xml, zlib
, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
, filepath, gmp, happy, haskeline, languageJava, lens, libffi
, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative
, parsers, split, text, time, transformers, trifecta
, unorderedContainers, utf8String, vector, vectorBinaryInstances
, xml, zlib
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.12";
sha256 = "151h9qkx7yw24q0b60r78hki1y8m6sxmfars7wywnbzk3kalqb6x";
version = "0.9.13";
sha256 = "0bpp8b19s1przycndvl542ar9dc285ccnwm7cic33ym1lcqil86n";
isLibrary = true;
isExecutable = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal cheapskate
deepseq filepath haskeline languageJava lens libffi llvmGeneral
llvmGeneralPure mtl network parsers split text time transformers
trifecta unorderedContainers utf8String vector
vectorBinaryInstances xml zlib
annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml
blazeMarkup Cabal cheapskate deepseq filepath haskeline
languageJava lens libffi llvmGeneral llvmGeneralPure mtl network
optparseApplicative parsers split text time transformers trifecta
unorderedContainers utf8String vector vectorBinaryInstances xml
zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];