diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-04-19 22:53:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-19 22:53:50 -0400 |
commit | e4db75f46dc54e55a86d5c09f752e9dc334ac076 (patch) | |
tree | 1772951b17e48deaa642fa21d911c07fdf7daff4 /pkgs/applications/science/logic | |
parent | 4c910ed4d6824ac83c5a51a23ddff7a581f1c118 (diff) | |
parent | ad7b7367b6191ccaca00928e0cc9633b98b27490 (diff) | |
download | nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.tar nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.tar.gz nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.tar.bz2 nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.tar.lz nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.tar.xz nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.tar.zst nixlib-e4db75f46dc54e55a86d5c09f752e9dc334ac076.zip |
Merge pull request #84535 from bcdarwin/update-beluga
beluga: 20180403 -> unstable-2020-03-11
Diffstat (limited to 'pkgs/applications/science/logic')
-rw-r--r-- | pkgs/applications/science/logic/beluga/default.nix | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 55cee9b7e17c..44478a032b38 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -1,34 +1,40 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, omake }: +{ lib, fetchFromGitHub, ocamlPackages, rsync }: -stdenv.mkDerivation { - name = "beluga-20180403"; +ocamlPackages.buildDunePackage { + pname = "beluga"; + version = "unstable-2020-03-11"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; - rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; - sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + rev = "6133b2f572219333f304bb4f77c177592324c55b"; + sha256 = "0sy6mi50z3mvs5z7dx38piydapk89all81rh038x3559b5fsk68q"; }; - nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; - buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + useDune2 = true; - installPhase = '' - mkdir -p $out - cp -r bin $out/ + buildInputs = with ocamlPackages; [ + gen sedlex_2 ocaml_extlib dune-build-info linenoise + ]; - mkdir -p $out/share/beluga - cp -r tools/ examples/ $out/share/beluga + postPatch = '' + patchShebangs ./TEST ./run_harpoon_test.sh + ''; + + checkPhase = "./TEST"; + checkInputs = [ rsync ]; + doCheck = true; + postInstall = '' mkdir -p $out/share/emacs/site-lisp/beluga/ cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga ''; - meta = { + meta = with lib; { description = "A functional language for reasoning about formal systems"; homepage = "http://complogic.cs.mcgill.ca/beluga/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bcdarwin ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bcdarwin ]; + platforms = platforms.unix; }; } |