diff options
author | Luke Granger-Brown <git@lukegb.com> | 2021-07-25 10:20:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-25 10:20:50 +0100 |
commit | c53dafb2dc62b529309495531d08aa7a4e35152e (patch) | |
tree | 09deff752b5858a0c6bf2645c0ee1e40b0b429d0 /pkgs/development/ocaml-modules | |
parent | 6737ba2d50f7fc7230ceebf1ad5146c56164c414 (diff) | |
parent | 48ef7e38ce6e6d8ceb1dd7e4ab3d0985855250a0 (diff) | |
download | nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.tar nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.tar.gz nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.tar.bz2 nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.tar.lz nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.tar.xz nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.tar.zst nixlib-c53dafb2dc62b529309495531d08aa7a4e35152e.zip |
Merge pull request #131333 from sternenseemann/letsencrypt-0.3.0
ocamlPackages.letsencrypt: 0.2.5 -> 0.3.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/letsencrypt/app.nix | 45 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/letsencrypt/default.nix | 25 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/letsencrypt/dns.nix | 35 |
3 files changed, 82 insertions, 23 deletions
diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix new file mode 100644 index 000000000000..dc9006d6d16b --- /dev/null +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -0,0 +1,45 @@ +{ lib +, buildDunePackage +, letsencrypt +, letsencrypt-dns +, cmdliner +, cohttp-lwt-unix +, logs +, fmt +, lwt +, mirage-crypto-rng +, ptime +, bos +, fpath +, randomconv +}: + +buildDunePackage { + pname = "letsencrypt-app"; + + inherit (letsencrypt) + src + version + useDune2 + minimumOCamlVersion + ; + + buildInputs = [ + letsencrypt + letsencrypt-dns + cmdliner + cohttp-lwt-unix + logs + fmt + lwt + mirage-crypto-rng + ptime + bos + fpath + randomconv + ]; + + meta = letsencrypt.meta // { + description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 0a70bf302428..623fba942f2f 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -6,11 +6,6 @@ , uri , rresult , base64 -, cmdliner -, cohttp -, cohttp-lwt -, cohttp-lwt-unix -, zarith , logs , fmt , lwt @@ -20,38 +15,25 @@ , x509 , yojson , ounit -, dns -, dns-tsig , ptime -, bos -, fpath -, randomconv , domain-name }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.2.5"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607"; + sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; }; minimumOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ - cmdliner - cohttp - cohttp-lwt-unix - zarith fmt - mirage-crypto-rng ptime - bos - fpath - randomconv domain-name ]; @@ -65,11 +47,8 @@ buildDunePackage rec { asn1-combinators x509 uri - dns - dns-tsig rresult astring - cohttp-lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix new file mode 100644 index 000000000000..99058f48d069 --- /dev/null +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -0,0 +1,35 @@ +{ lib +, buildDunePackage +, letsencrypt +, logs +, fmt +, lwt +, dns +, dns-tsig +, domain-name +}: + +buildDunePackage { + pname = "letsencrypt-dns"; + + inherit (letsencrypt) + version + src + useDune2 + minimumOCamlVersion + ; + + propagatedBuildInputs = [ + letsencrypt + dns + dns-tsig + domain-name + logs + lwt + fmt + ]; + + meta = letsencrypt.meta // { + description = "A DNS solver for the ACME implementation in OCaml"; + }; +} |