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

merge #3330: ocaml: optionalize useX11, update -pcre

Browse Source
This commit is contained in:
Vladimír Čunát 2014-08-12 21:55:12 +02:00
commit 9e31a33a44
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/ocaml/4.01.0.nix
View File

@ -1,7 +1,14 @@
{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto }: let
safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
in
{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
if useX11 && !(safeX11 stdenv)
then throw "x11 not available in ocaml with arm or mips arch"
else # let the indentation flow
let let
useX11 = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips; useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
in in

6
pkgs/development/ocaml-modules/pcre/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, pcre, ocaml, findlib}: {stdenv, fetchurl, pcre, ocaml, findlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-pcre-7.0.4"; name = "ocaml-pcre-7.1.1";
src = fetchurl { src = fetchurl {
url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-7.0.4.tar.gz; url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz;
sha256 = "0h2qlza7jkzgrglw1k0fydpbil0dgpv526kxyyd1apdbyzhb0mpw"; sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib];