diff options
| author | sterni <sternenseemann@systemli.org> | 2021-07-25 15:45:06 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-07-25 16:45:09 +0200 |
| commit | 4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d (patch) | |
| tree | ca766ef15c7bcb5d93bbe7320107842d595c8423 /pkgs/development/ocaml-modules | |
| parent | beb353c7765ad6ea632acccb26f0d63c8c12d06b (diff) | |
| download | nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.tar nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.tar.gz nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.tar.bz2 nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.tar.lz nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.tar.xz nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.tar.zst nixlib-4cf4f3c454ed5f6c54afdfdf0cad23f8badabd0d.zip | |
Revert "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, 23 insertions, 82 deletions
diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix deleted file mode 100644 index dc9006d6d16b..000000000000 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ 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 623fba942f2f..0a70bf302428 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -6,6 +6,11 @@ , uri , rresult , base64 +, cmdliner +, cohttp +, cohttp-lwt +, cohttp-lwt-unix +, zarith , logs , fmt , lwt @@ -15,25 +20,38 @@ , x509 , yojson , ounit +, dns +, dns-tsig , ptime +, bos +, fpath +, randomconv , domain-name }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.3.0"; + version = "0.2.5"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; + sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607"; }; minimumOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ + cmdliner + cohttp + cohttp-lwt-unix + zarith fmt + mirage-crypto-rng ptime + bos + fpath + randomconv domain-name ]; @@ -47,8 +65,11 @@ 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 deleted file mode 100644 index 99058f48d069..000000000000 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ 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"; - }; -} |