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

Update OpaLang; it still doesn't build for a mysterious reason: apparently the missing fields are actually defined…

Browse Source
This commit is contained in:
Michael Raskin 2014-08-12 16:22:19 +04:00
parent 6129a7aea6
commit 4ab466cc56
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/compilers/opa/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, which, ocaml, perl, jdk { stdenv, fetchurl, which, ocaml, perl, jdk
, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex , findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex
, ocamlgraph, coreutils, zlib, ncurses, makeWrapper , ocamlgraph, coreutils, zlib, ncurses, makeWrapper
, gcc, binutils, gnumake } : , gcc, binutils, gnumake, nodejs, git } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opa"; pname = "opa";
version = "962"; version = "4308";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/MLstate/opalang/tarball/v${version}"; url = "https://github.com/MLstate/opalang/tarball/v${version}";
name = "opa-${version}.tar.gz"; name = "opa-${version}.tar.gz";
sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l"; sha256 = "1farii9474i14ack6bpqm1jihs6i8pvwky3a7q8v8pbnl4i6lb5g";
}; };
# Paths so the opa compiler code generation will use the same programs as were # Paths so the opa compiler code generation will use the same programs as were
@ -23,18 +23,27 @@ stdenv.mkDerivation rec {
find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \; find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \;
''; '';
patches = [ ./locate.patch ./libdir.patch ]; patches = [];
preConfigure = '' preConfigure = ''
configureFlags="$configureFlags -prefix $out" configureFlags="$configureFlags -prefix $out"
(
cat ./compiler/buildinfos/buildInfos.ml.pre
./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt
echo let opa_git_version = ${version}
echo 'let opa_git_sha = "xxxx"'
cat ./compiler/buildinfos/buildInfos.ml.post
)> ./compiler/buildinfos/buildInfos.ml
''; '';
dontAddPrefix = true; dontAddPrefix = true;
configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib"; configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind ";
buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex
ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ]; ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake
nodejs git
];
postInstall = '' postInstall = ''
# Have compiler use same tools for code generation as used to build it. # Have compiler use same tools for code generation as used to build it.
@ -58,5 +67,14 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.kkallio ]; maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
# File "compiler/libqmlcompil/dbGen/schema_io.ml", line 199, characters 3-53:
# Error: Signature mismatch:
# ...
# The field `remove_edge_e' is required but not provided
# The field `remove_edge' is required but not provided
# The field `remove_vertex' is required but not provided
# Command exited with code 2.
# make: *** [node] Error 10
broken = true;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -3289,7 +3289,7 @@ let
ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { }; opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { };
ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };