diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-08 08:52:02 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-08 08:52:02 +0200 |
commit | eb2be6d97e30559dda2ae4855a5431db42d4e2fa (patch) | |
tree | 1a94aaa0da1d9a26c10619e9467c8d36c7ffd8e5 /pkgs/applications/science | |
parent | 4523f0251f888f1ad0d272da9c9ee9bb681d7193 (diff) | |
download | nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.tar nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.tar.gz nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.tar.bz2 nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.tar.lz nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.tar.xz nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.tar.zst nixlib-eb2be6d97e30559dda2ae4855a5431db42d4e2fa.zip |
acgtk: 1.1 -> 1.3.1
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/acgtk/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index fa890c03b6f7..9c8ecd016394 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -1,42 +1,42 @@ -{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4, +{ stdenv, fetchurl, ocamlPackages, buildBytecode ? true, buildNative ? true, installExamples ? true, installEmacsMode ? true }: -let inherit (stdenv.lib) getVersion versionAtLeast +let inherit (stdenv.lib) versionAtLeast optionals optionalString; in -assert versionAtLeast (getVersion ocaml) "3.07"; -assert versionAtLeast (getVersion dypgen) "20080925"; -assert versionAtLeast (getVersion bolt) "1.4"; +let inherit (ocamlPackages) ocaml camlp4; in assert buildBytecode || buildNative; stdenv.mkDerivation { - name = "acgtk-1.1"; + name = "acgtk-1.3.1"; src = fetchurl { - url = "http://www.loria.fr/equipes/calligramme/acg/software/acg-1.1-20140905.tar.gz"; - sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6"; + url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz; + 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 ./use-nix-ocaml-byteflags.patch ]; postPatch = stdenv.lib.optionalString (camlp4 != null) '' 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 # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to # -rpath) to make sure that ocamlrun is able to link the library at # 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" + " " |