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

ocamlPackages.cstruct: 3.1.1 -> 4.0.0

Browse Source 
ocamlPackages.cstruct-sexp: init at 4.0.0

ocamlPackages.x509: 0.6.1 -> 0.7.1

ocamlPackages.tls: 0.9.0 -> 0.10.4

jackline: 2018-05-11 -> 2019-08-08
This commit is contained in:
Vincent Laporte 2019-08-24 07:02:26 +00:00 committed by Vincent Laporte
parent 10ffd51a96
commit 81760f3235
10 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/jackline/default.nix
View File

@ -3,14 +3,14 @@
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2018-05-11"; version = "2019-08-08";
name = "jackline-${version}"; name = "jackline-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hannesm"; owner = "hannesm";
repo = "jackline"; repo = "jackline";
rev = "bc36b1c8b80fee6baba4f91011cd01b82a06e8eb"; rev = "b934594010a563ded9c0f436e3fab8f1cae29856";
sha256 = "1xx2yx8a95m84sa1bkxi3rlx7pd39zkqwk3znj0zzz3cni6apfrz"; sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc";
}; };
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [

14
pkgs/development/ocaml-modules/cstruct/default.nix
View File

@ -1,20 +1,18 @@
{ stdenv, fetchurl, buildDunePackage, sexplib, ocplib-endian }: { lib, fetchurl, buildDunePackage }:
buildDunePackage rec { buildDunePackage rec {
pname = "cstruct"; pname = "cstruct";
version = "3.1.1"; version = "4.0.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a";
}; };
propagatedBuildInputs = [ sexplib ocplib-endian ];
meta = { meta = {
description = "Access C-like structures directly from OCaml"; description = "Access C-like structures directly from OCaml";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
homepage = "https://github.com/mirage/ocaml-cstruct"; homepage = "https://github.com/mirage/ocaml-cstruct";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

6
pkgs/development/ocaml-modules/cstruct/ppx.nix
View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, cstruct, ppx_tools_versioned }: { lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }:
if !lib.versionAtLeast (cstruct.version or "1") "3" if !lib.versionAtLeast (cstruct.version or "1") "3"
then cstruct then cstruct
@ -8,8 +8,8 @@ buildDunePackage {
pname = "ppx_cstruct"; pname = "ppx_cstruct";
inherit (cstruct) version src meta; inherit (cstruct) version src meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.03";
buildInputs = [ ppx_tools_versioned ]; buildInputs = [ sexplib ppx_tools_versioned ];
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
} }

16
pkgs/development/ocaml-modules/cstruct/sexp.nix Normal file
View File

@ -0,0 +1,16 @@
{ lib, buildDunePackage, alcotest, cstruct, sexplib }:
if !lib.versionAtLeast (cstruct.version or "1") "3"
then cstruct
else
buildDunePackage {
pname = "cstruct-sexp";
inherit (cstruct) version src meta;
doCheck = true;
buildInputs = [ alcotest ];
propagatedBuildInputs = [ cstruct sexplib ];
}

2
pkgs/development/ocaml-modules/cstruct/unix.nix
View File

@ -8,7 +8,7 @@ buildDunePackage {
pname = "cstruct-unix"; pname = "cstruct-unix";
inherit (cstruct) version src meta; inherit (cstruct) version src meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.06";
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
} }

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, buildDunePackage { stdenv, fetchFromGitHub, buildDunePackage
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, ocplib-endian, uri
, alcotest, mtime, nocrypto , alcotest, mtime, nocrypto
}: }:
@ -15,7 +15,7 @@ buildDunePackage rec {
}; };
buildInputs = [ alcotest mtime nocrypto ]; buildInputs = [ alcotest mtime nocrypto ];
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph ocplib-endian uri ];
doCheck = true; doCheck = true;
meta = { meta = {

12
pkgs/development/ocaml-modules/nocrypto/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
, cpuid, ocb-stubblr , cpuid, ocb-stubblr, sexplib
, cstruct, zarith, ppx_sexp_conv , cstruct, zarith, ppx_sexp_conv
, cstruct-lwt ? null , cstruct-lwt ? null
}: }:
@ -33,10 +33,18 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch";
sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9";
}) })
(fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch";
sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9";
})
(fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch";
sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z";
})
]; ];
buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ]; buildInputs = [ ocaml findlib ocamlbuild topkg cpuid ocb-stubblr ];
propagatedBuildInputs = [ cstruct ppx_sexp_conv zarith ] ++ optional withLwt cstruct-lwt; propagatedBuildInputs = [ cstruct ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt;
buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
inherit (topkg) installPhase; inherit (topkg) installPhase;

15
pkgs/development/ocaml-modules/tls/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit
, lwt ? null}: , lwt ? null}:
with stdenv.lib; with stdenv.lib;
@ -11,23 +11,24 @@ then throw "tls is not available for OCaml ${ocaml.version}"
else else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.0"; version = "0.10.4";
name = "ocaml${ocaml.version}-tls-${version}"; name = "ocaml${ocaml.version}-tls-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirleft"; owner = "mirleft";
repo = "ocaml-tls"; repo = "ocaml-tls";
rev = "${version}"; rev = "${version}";
sha256 = "0qgw8lq8pk9hss7b5i6fr08pi711i0zqx7yyjgcil47ipjig6c31"; sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g";
}; };
buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ounit ppx_cstruct cstruct-unix ]; buildInputs = [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_cstruct ]
propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++ ++ optionals doCheck [ ounit cstruct-unix ];
propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++
optional withLwt lwt; optional withLwt lwt;
buildPhase = "${topkg.run} build --tests true --with-mirage false --with-lwt ${if withLwt then "true" else "false"}"; buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}";
doCheck = true; doCheck = versionAtLeast ocaml.version "4.06";
checkPhase = "${topkg.run} test"; checkPhase = "${topkg.run} test";
inherit (topkg) installPhase; inherit (topkg) installPhase;

29
pkgs/development/ocaml-modules/x509/default.nix
View File

@ -1,28 +1,23 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg { lib, fetchurl, buildDunePackage, ocaml
, asn1-combinators, astring, nocrypto, ppx_sexp_conv , alcotest, cstruct-unix
, ounit, cstruct-unix , asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult
}: }:
stdenv.mkDerivation rec { buildDunePackage rec {
name = "ocaml${ocaml.version}-x509-${version}"; pname = "x509";
version = "0.6.1"; version = "0.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirleft/ocaml-x509/releases/download/${version}/x509-${version}.tbz"; url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
sha256 = "1c62mw9rnzq0rs3ihbhfs18nv4mdzwag7893hlqgji3wmaai70pk"; sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ];
propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ];
buildPhase = "${topkg.run} build --tests true"; doCheck = lib.versionAtLeast ocaml.version "4.06";
doCheck = true; meta = with lib; {
checkPhase = "${topkg.run} test";
inherit (topkg) installPhase;
meta = with stdenv.lib; {
homepage = https://github.com/mirleft/ocaml-x509; homepage = https://github.com/mirleft/ocaml-x509;
description = "X509 (RFC5280) handling in OCaml"; description = "X509 (RFC5280) handling in OCaml";
license = licenses.bsd2; license = licenses.bsd2;

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

@ -188,6 +188,8 @@ let
lwt = ocaml_lwt; lwt = ocaml_lwt;
}; };
cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {};
cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {}; cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {};
csv = csv =