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

buildDunePackage: new support function; use it to refactor some OCaml derivations

Browse Source
This commit is contained in:
Théo Zimmermann
2018-11-07 10:08:03 +01:00
parent 5fc73fd52e
commit 794158fcd5
64 changed files with 506 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/cstruct/default.nix
+4 -10
View File
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, ocaml, dune, findlib, sexplib, ocplib-endian }:
{ stdenv, fetchurl, buildDunePackage, sexplib, ocplib-endian }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-${version}";
buildDunePackage rec {
pname = "cstruct";
version = "3.1.1";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";
sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2";
@@ -10,19 +11,12 @@ stdenv.mkDerivation rec {
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml dune findlib ];
propagatedBuildInputs = [ sexplib ocplib-endian ];
buildPhase = "dune build -p cstruct";
inherit (dune) installPhase;
meta = {
description = "Access C-like structures directly from OCaml";
license = stdenv.lib.licenses.isc;
homepage = "https://github.com/mirage/ocaml-cstruct";
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}
pkgs/development/ocaml-modules/cstruct/lwt.nix
+5 -7
View File
@@ -1,12 +1,10 @@
{ stdenv, ocaml, cstruct, lwt }:
{ buildDunePackage, cstruct, lwt }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
buildDunePackage {
pname = "cstruct-lwt";
inherit (cstruct) version src unpackCmd meta;
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-lwt-${version}";
inherit (cstruct) version src unpackCmd buildInputs installPhase meta;
minimumOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct lwt ];
buildPhase = "${cstruct.buildPhase}-lwt";
}
pkgs/development/ocaml-modules/cstruct/ppx.nix
+6 -8
View File
@@ -1,13 +1,11 @@
{ stdenv, ocaml, cstruct, ppx_tools_versioned }:
{ buildDunePackage, cstruct, ppx_tools_versioned }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
buildDunePackage {
pname = "ppx_cstruct";
inherit (cstruct) version src unpackCmd meta;
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ppx_cstruct-${version}";
inherit (cstruct) version src unpackCmd installPhase meta;
minimumOCamlVersion = "4.02";
buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ];
buildInputs = [ ppx_tools_versioned ];
propagatedBuildInputs = [ cstruct ];
buildPhase = "dune build -p ppx_cstruct";
}
pkgs/development/ocaml-modules/cstruct/unix.nix
+5 -7
View File
@@ -1,12 +1,10 @@
{ stdenv, ocaml, cstruct }:
{ buildDunePackage, cstruct }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
buildDunePackage {
pname = "cstruct-unix";
inherit (cstruct) version src unpackCmd meta;
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-unix-${version}";
inherit (cstruct) version src unpackCmd buildInputs installPhase meta;
minimumOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct ];
buildPhase = "${cstruct.buildPhase}-unix";
}