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

opa: 4309 -> 4310

Browse Source
This commit is contained in:
Vincent Laporte 2016-10-23 16:04:56 +02:00
parent 4008300243
commit 0ba77712fc
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,19 @@
{ stdenv, fetchgit, which, perl, jdk { stdenv, fetchFromGitHub, which, perl, jdk
, ocamlPackages, openssl , ocamlPackages, openssl
, coreutils, zlib, ncurses, makeWrapper , coreutils, zlib, ncurses, makeWrapper
, gcc, binutils, gnumake, nodejs} : , gcc, binutils, gnumake, nodejs
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opa"; pname = "opa";
version = "4309"; version = "4310";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchgit { src = fetchFromGitHub {
url = https://github.com/MLstate/opalang.git; owner = "MLstate";
rev = "047f58bfd4be35ee30176156b3718c707a6c0f76"; repo = "opalang";
sha256 = "1laynwf64713q2vhdkxw679dah6hl3bvmrj8cj836a9k9z7jcc1r"; rev = "a13d45af30bc955c40c4b320353fb21e4ecacbc5";
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
}; };
# 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
@ -27,6 +29,12 @@ stdenv.mkDerivation rec {
echo 'let opa_git_sha = "xxxx"' echo 'let opa_git_sha = "xxxx"'
cat ./compiler/buildinfos/buildInfos.ml.post cat ./compiler/buildinfos/buildInfos.ml.post
)> ./compiler/buildinfos/buildInfos.ml )> ./compiler/buildinfos/buildInfos.ml
for p in configure tools/platform_helper.sh
do
substituteInPlace $p --replace 'IS_MAC=1' 'IS_LINUX=1'
done
export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o
export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf
''; '';
prefixKey = "-prefix "; prefixKey = "-prefix ";
@ -36,10 +44,10 @@ stdenv.mkDerivation rec {
buildInputs = [ which perl jdk openssl coreutils zlib ncurses buildInputs = [ which perl jdk openssl coreutils zlib ncurses
makeWrapper gcc binutils gnumake nodejs makeWrapper gcc binutils gnumake nodejs
] ++ (with ocamlPackages; [ ] ++ (with ocamlPackages; [
ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph camlp4
]); ]);
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
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.
@ -62,9 +70,6 @@ stdenv.mkDerivation rec {
homepage = http://opalang.org/; homepage = http://opalang.org/;
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.kkallio ]; maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; unix;
# opa was built with nodejs 0.10 which reached end of LTS
# in October 216, it doesn't built with nodejs 4.x
broken = true;
}; };
} }

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

@ -5114,6 +5114,7 @@ in
opa = callPackage ../development/compilers/opa { opa = callPackage ../development/compilers/opa {
nodejs = nodejs-4_x; nodejs = nodejs-4_x;
ocamlPackages = ocamlPackages_4_02;
}; };
inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0; inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0;