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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-19 12:26:52 +00:00
committed by GitHub
parent dac047cef4 24d3016208
commit c804f22a81
30 changed files with 231 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "bitstring";
version = "4.0.1";
version = "4.1.0";
useDune2 = true;
@@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "xguerin";
repo = pname;
rev = "v${version}";
sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm";
sha256 = "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b";
};
propagatedBuildInputs = [ stdlib-shims ];

4
pkgs/development/ocaml-modules/bitstring/ppx.nix
View File

@@ -3,6 +3,10 @@
, ounit
}:
if !lib.versionAtLeast ppxlib.version "0.18.0"
then throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
else
buildDunePackage rec {
pname = "ppx_bitstring";
inherit (bitstring) version useDune2 src;

17
pkgs/development/ocaml-modules/ppx_import/default.nix
View File

@@ -1,27 +1,28 @@
{ lib, fetchurl, buildDunePackage, ocaml
, ounit, ppx_deriving, ppx_tools_versioned
, ppxlib, ocaml-migrate-parsetree
{ lib, fetchurl, buildDunePackage
, ppx_tools_versioned
, ocaml-migrate-parsetree
, ounit, ppx_deriving, ppxlib
}:
buildDunePackage rec {
pname = "ppx_import";
version = "1.7.1";
version = "1.8.0";
useDune2 = true;
minimumOCamlVersion = "4.04";
src = fetchurl {
url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz";
sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v";
url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz";
sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv";
};
propagatedBuildInputs = [
ppxlib ppx_tools_versioned ocaml-migrate-parsetree
ppx_tools_versioned ocaml-migrate-parsetree
];
doCheck = true;
checkInputs = [ ounit ppx_deriving ];
checkInputs = [ ounit ppx_deriving ppxlib ];
meta = {
description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";