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

acgtk: 1.1 -> 1.3.1

This commit is contained in:
Vincent Laporte 2017-07-08 08:52:02 +02:00
parent 4523f0251f
commit eb2be6d97e
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -1,42 +1,42 @@
{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4, { stdenv, fetchurl, ocamlPackages,
buildBytecode ? true, buildBytecode ? true,
buildNative ? true, buildNative ? true,
installExamples ? true, installExamples ? true,
installEmacsMode ? true }: installEmacsMode ? true }:
let inherit (stdenv.lib) getVersion versionAtLeast let inherit (stdenv.lib) versionAtLeast
optionals optionalString; in optionals optionalString; in
assert versionAtLeast (getVersion ocaml) "3.07"; let inherit (ocamlPackages) ocaml camlp4; in
assert versionAtLeast (getVersion dypgen) "20080925";
assert versionAtLeast (getVersion bolt) "1.4";
assert buildBytecode || buildNative; assert buildBytecode || buildNative;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "acgtk-1.1"; name = "acgtk-1.3.1";
src = fetchurl { src = fetchurl {
url = "http://www.loria.fr/equipes/calligramme/acg/software/acg-1.1-20140905.tar.gz"; url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz;
sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6"; sha256 = "1hhrf6bx2x2wbv5ldn4fnxhpr9lyrj3zh1vcnx8wf8f06ih4rzfq";
}; };
buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ]; buildInputs = with ocamlPackages; [
ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson
];
patches = [ ./install-emacs-to-site-lisp.patch patches = [ ./install-emacs-to-site-lisp.patch
./use-nix-ocaml-byteflags.patch ]; ./use-nix-ocaml-byteflags.patch ];
postPatch = stdenv.lib.optionalString (camlp4 != null) '' postPatch = stdenv.lib.optionalString (camlp4 != null) ''
substituteInPlace src/Makefile.master.in \ substituteInPlace src/Makefile.master.in \
--replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/" --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
''; '';
# The bytecode executable is dependent on the dynamic library provided by # The bytecode executable is dependent on the dynamic library provided by
# ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to
# -rpath) to make sure that ocamlrun is able to link the library at # -rpath) to make sure that ocamlrun is able to link the library at
# runtime and that Nix detects a runtime dependency. # runtime and that Nix detects a runtime dependency.
NIX_OCAML_BYTEFLAGS = "-dllpath ${ansiterminal}/lib/ocaml/${getVersion ocaml}/site-lib/ANSITerminal"; NIX_OCAML_BYTEFLAGS = "-dllpath ${ocamlPackages.ansiterminal}/lib/ocaml/${ocaml.version}/site-lib/ANSITerminal";
buildFlags = optionalString buildBytecode "byte" buildFlags = optionalString buildBytecode "byte"
+ " " + " "

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

@ -17927,6 +17927,10 @@ with pkgs;
abella = callPackage ../applications/science/logic/abella {}; abella = callPackage ../applications/science/logic/abella {};
acgtk = callPackage ../applications/science/logic/acgtk {
ocamlPackages = ocamlPackages_4_03;
};
alt-ergo = callPackage ../applications/science/logic/alt-ergo { alt-ergo = callPackage ../applications/science/logic/alt-ergo {
ocamlPackages = ocamlPackages_4_02; ocamlPackages = ocamlPackages_4_02;
}; };

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

@ -15,8 +15,6 @@ let
buildOcaml = callPackage ../build-support/ocaml { }; buildOcaml = callPackage ../build-support/ocaml { };
acgtk = callPackage ../applications/science/logic/acgtk { };
alcotest = callPackage ../development/ocaml-modules/alcotest {}; alcotest = callPackage ../development/ocaml-modules/alcotest {};
angstrom = callPackage ../development/ocaml-modules/angstrom { }; angstrom = callPackage ../development/ocaml-modules/angstrom { };