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

Merge pull request #84535 from bcdarwin/update-beluga

Browse Source 
beluga: 20180403 -> unstable-2020-03-11
This commit is contained in:
Benjamin Hipple 2020-04-19 22:53:50 -04:00 committed by GitHub
commit e4db75f46d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/applications/science/logic/beluga/default.nix
View File

@ -1,34 +1,40 @@
{ stdenv, fetchFromGitHub, ocamlPackages, omake }: { lib, fetchFromGitHub, ocamlPackages, rsync }:
stdenv.mkDerivation { ocamlPackages.buildDunePackage {
name = "beluga-20180403"; pname = "beluga";
version = "unstable-2020-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Beluga-lang"; owner = "Beluga-lang";
repo = "Beluga"; repo = "Beluga";
rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; rev = "6133b2f572219333f304bb4f77c177592324c55b";
sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; sha256 = "0sy6mi50z3mvs5z7dx38piydapk89all81rh038x3559b5fsk68q";
}; };
nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; useDune2 = true;
buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ];
installPhase = '' buildInputs = with ocamlPackages; [
mkdir -p $out gen sedlex_2 ocaml_extlib dune-build-info linenoise
cp -r bin $out/ ];
mkdir -p $out/share/beluga postPatch = ''
cp -r tools/ examples/ $out/share/beluga patchShebangs ./TEST ./run_harpoon_test.sh
'';
checkPhase = "./TEST";
checkInputs = [ rsync ];
doCheck = true;
postInstall = ''
mkdir -p $out/share/emacs/site-lisp/beluga/ mkdir -p $out/share/emacs/site-lisp/beluga/
cp -r tools/beluga-mode.el $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"; description = "A functional language for reasoning about formal systems";
homepage = "http://complogic.cs.mcgill.ca/beluga/"; homepage = "http://complogic.cs.mcgill.ca/beluga/";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.bcdarwin ]; maintainers = [ maintainers.bcdarwin ];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }

17
pkgs/development/ocaml-modules/dune-build-info/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, buildDunePackage, dune_2 }:
buildDunePackage rec {
pname = "dune-build-info";
inherit (dune_2) src version;
useDune2 = true;
dontAddPrefix = true;
meta = with lib; {
inherit (dune_2.meta) homepage;
description = "Embed build information inside executables";
maintainers = [ maintainers.bcdarwin ];
license = licenses.mit;
};
}

4
pkgs/development/ocaml-modules/linenoise/default.nix
View File

@ -2,7 +2,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "linenoise"; pname = "linenoise";
version = "1.1.0"; version = "1.3.0";
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";
@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "fxfactorial"; owner = "fxfactorial";
repo = "ocaml-${pname}"; repo = "ocaml-${pname}";
rev = "v${version}"; rev = "v${version}";
sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q"; sha256 = "0m9mm1arsawi5w5aqm57z41sy1wfxvhfgbdiw7hzy631i391144g";
}; };
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];

6
pkgs/development/ocaml-modules/sedlex/2.nix
View File

@ -38,9 +38,9 @@ buildDunePackage rec {
sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
}; };
buildInputs = [ ppx_tools_versioned ocaml-migrate-parsetree ]; propagatedBuildInputs = [
gen uchar ocaml-migrate-parsetree ppx_tools_versioned
propagatedBuildInputs = [ gen uchar ]; ];
preBuild = '' preBuild = ''
ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt

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

@ -234,6 +234,8 @@ let
dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };
dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { };
dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { };
dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { };