diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 20:14:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 20:14:08 +0200 |
| commit | f2352f7ecfe86249c73416263b397175e8a6f06e (patch) | |
| tree | 027474c621c6407a717c315894096e5f1679abfb /pkgs/development/compilers | |
| parent | 5a98b9f5140578d8cbd4db8bddfe01e24249c2a9 (diff) | |
| parent | bd7f3fbf0f1294e5b32caacbfa66b984aec85c5f (diff) | |
| download | nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.tar nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.gz nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.bz2 nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.lz nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.xz nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.zst nixpkgs-f2352f7ecfe86249c73416263b397175e8a6f06e.zip | |
Merge recent master
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/compcert/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/idris/default.nix | 26 |
2 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index f5e66b8ac10..859c55662dc 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -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"; diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index c32c14cf584..0c3c1c0fba8 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -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 ]; |