diff options
| author | sternenseemann <git@lukasepple.de> | 2016-11-03 01:09:54 +0100 |
|---|---|---|
| committer | sternenseemann <git@lukasepple.de> | 2016-11-17 21:40:46 +0100 |
| commit | 86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4 (patch) | |
| tree | 8273e252803059762fc16611e2ccff666d4291b0 /pkgs/development/ocaml-modules/nocrypto | |
| parent | cbfc766ad4203bf0b858084377ad91fc6c5219b1 (diff) | |
| download | nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.tar nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.tar.gz nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.tar.bz2 nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.tar.lz nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.tar.xz nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.tar.zst nixpkgs-86c45fc2d3a2cf2d99fa96e6d6e759535c9de0c4.zip | |
ocaml-nocrypto: 0.5.1 -> 0.5.3
Diffstat (limited to 'pkgs/development/ocaml-modules/nocrypto')
| -rw-r--r-- | pkgs/development/ocaml-modules/nocrypto/default.nix | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index fab048a9a9f..d7f7ae0e365 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ocaml_lwt, ounit }: +{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib +, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib +, lwt ? null}: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +with stdenv.lib; +let withLwt = lwt != null; in -stdenv.mkDerivation rec { - name = "ocaml-nocrypto-${version}"; - version = "0.5.1"; +buildOcaml rec { + name = "nocrypto"; + version = "0.5.3"; - src = fetchzip { - url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; - sha256 = "15gffvixk12ghsfra9amfszd473c8h188zfj03ngvblbdm0d80m0"; + minimumSupportedOcamlVersion = "4.02"; + + src = fetchFromGitHub { + owner = "mirleft"; + repo = "ocaml-nocrypto"; + rev = "v${version}"; + sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; }; - buildInputs = [ ocaml findlib type_conv ocaml_lwt ounit ]; - propagatedBuildInputs = [ cstruct zarith ]; + buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt; + + configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; + + configurePhase = "./configure --prefix $out $configureFlags"; - configureFlags = "--enable-tests"; doCheck = true; checkTarget = "test"; createFindlibDestdir = true; @@ -22,7 +32,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; - platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; |