ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

ocamlPackages.bitstring: 3.1.1 → 4.0.1

Browse Source 
ocamlPackages.ppx_bitsring: init at 4.0.1
This commit is contained in:
Vincent Laporte 2021-01-03 10:14:22 +01:00 committed by Vincent Laporte
parent 6e57c2b876
commit 331186b9ac
4 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/bap/default.nix
View File

@ -2,6 +2,7 @@
, ocaml, findlib, ocamlbuild, ocaml_oasis, , ocaml, findlib, ocamlbuild, ocaml_oasis,
bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp,
utop, libxml2, utop, libxml2,
ppx_bitstring,
ppx_tools_versioned, ppx_tools_versioned,
which, makeWrapper, writeText which, makeWrapper, writeText
, z3 , z3
@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ]; nativeBuildInputs = [ which makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis
llvm ppx_tools_versioned llvm ppx_bitstring ppx_tools_versioned
z3 z3
utop libxml2 ]; utop libxml2 ];
@ -63,6 +64,10 @@ stdenv.mkDerivation rec {
patches = [ ./dont-add-curses.patch ]; patches = [ ./dont-add-curses.patch ];
preConfigure = ''
substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring
'';
configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ];
BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)";

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

@ -1,20 +1,21 @@
{ stdenv, fetchFromGitHub, buildDunePackage, ppx_tools_versioned, ounit }: { lib, fetchFromGitHub, buildDunePackage, stdlib-shims }:
buildDunePackage rec { buildDunePackage rec {
pname = "bitstring"; pname = "bitstring";
version = "3.1.1"; version = "4.0.1";
useDune2 = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xguerin"; owner = "xguerin";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc"; sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm";
}; };
buildInputs = [ ppx_tools_versioned ounit ]; propagatedBuildInputs = [ stdlib-shims ];
doCheck = true;
meta = with stdenv.lib; { meta = with lib; {
description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
homepage = "https://github.com/xguerin/bitstring"; homepage = "https://github.com/xguerin/bitstring";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;

18
pkgs/development/ocaml-modules/bitstring/ppx.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildDunePackage, ocaml
, bitstring, ppxlib
, ounit
}:
buildDunePackage rec {
pname = "ppx_bitstring";
inherit (bitstring) version useDune2 src;
buildInputs = [ bitstring ppxlib ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ ounit ];
meta = bitstring.meta // {
description = "Bitstrings and bitstring matching for OCaml - PPX extension";
};
}

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

@ -851,6 +851,8 @@ let
posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };
ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { };
ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { };
ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { };