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

ocamlPackages.asn1-combinators: 0.1.3 -> 0.2.0 (#33566)

Browse Source 
* ocamlPackages.asn1-combinators: 0.1.3 -> 0.2.0

* ocamlPackages.x509: 0.5.3 -> 0.6.0

* ocamlPackages.x509: 0.6.0 -> 0.6.1

* ocamlPackages.tls: 0.7.1 -> 0.9.0

* jackline: fix build with ocaml-tls ≥ 0.9.0
This commit is contained in:
Vincent Laporte
2018-01-15 05:01:50 +01:00
committed by GitHub
parent 9bbaa2a1de
commit 550136f516
5 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/asn1-combinators/default.nix
+18 -6
View File
@@ -1,8 +1,22 @@
{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg }:
{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
, cstruct, zarith, ounit, result, topkg, ptime
}:
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "0.2.0";
sha256 = "0yfq4hnyzx6hy05m60007cfpq88wxwa8wqzib19lnk2qrgy772mx";
propagatedBuildInputs = [ ptime ];
} else {
version = "0.1.3";
sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
propagatedBuildInputs = [ ];
};
in
buildOcaml rec {
name = "asn1-combinators";
version = "0.1.3";
inherit (param) version;
minimumSupportedOcamlVersion = "4.01";
@@ -10,13 +24,11 @@ buildOcaml rec {
owner = "mirleft";
repo = "ocaml-asn1-combinators";
rev = "v${version}";
sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ounit topkg ];
propagatedBuildInputs = [ result cstruct zarith ];
createFindlibDestdir = true;
propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
buildPhase = "${topkg.run} build --tests true";