Revert "ocamlPackages.letsencrypt: 0.2.5 -> 0.3.0"

This commit is contained in:
sterni 2021-07-25 15:45:06 +02:00 committed by Vincent Laporte
parent beb353c776
commit 4cf4f3c454
4 changed files with 23 additions and 86 deletions

View file

@ -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";
};
}

View file

@ -6,6 +6,11 @@
, uri , uri
, rresult , rresult
, base64 , base64
, cmdliner
, cohttp
, cohttp-lwt
, cohttp-lwt-unix
, zarith
, logs , logs
, fmt , fmt
, lwt , lwt
@ -15,25 +20,38 @@
, x509 , x509
, yojson , yojson
, ounit , ounit
, dns
, dns-tsig
, ptime , ptime
, bos
, fpath
, randomconv
, domain-name , domain-name
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "letsencrypt"; pname = "letsencrypt";
version = "0.3.0"; version = "0.2.5";
src = fetchurl { src = fetchurl {
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607";
}; };
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";
useDune2 = true; useDune2 = true;
buildInputs = [ buildInputs = [
cmdliner
cohttp
cohttp-lwt-unix
zarith
fmt fmt
mirage-crypto-rng
ptime ptime
bos
fpath
randomconv
domain-name domain-name
]; ];
@ -47,8 +65,11 @@ buildDunePackage rec {
asn1-combinators asn1-combinators
x509 x509
uri uri
dns
dns-tsig
rresult rresult
astring astring
cohttp-lwt
]; ];
doCheck = true; doCheck = true;

View file

@ -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";
};
}

View file

@ -607,10 +607,6 @@ let
letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { };
letsencrypt-app = callPackage ../development/ocaml-modules/letsencrypt/app.nix { };
letsencrypt-dns = callPackage ../development/ocaml-modules/letsencrypt/dns.nix { };
linenoise = callPackage ../development/ocaml-modules/linenoise { }; linenoise = callPackage ../development/ocaml-modules/linenoise { };
llvm = callPackage ../development/ocaml-modules/llvm { llvm = callPackage ../development/ocaml-modules/llvm {