diff options
author | Ruud van Asseldonk <dev@veniogames.com> | 2020-05-24 23:00:17 +0200 |
---|---|---|
committer | Ruud van Asseldonk <dev@veniogames.com> | 2020-05-24 23:00:17 +0200 |
commit | d4d36c37c7ba945597f3ad25a278e304108bab9d (patch) | |
tree | c7581f3d4df4e557409361bf0699aca2019312e3 /pkgs/tools | |
parent | d4c80a478b9b8d3303f39fb788f382dfaa823bdc (diff) | |
download | nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.tar nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.tar.gz nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.tar.bz2 nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.tar.lz nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.tar.xz nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.tar.zst nixlib-d4d36c37c7ba945597f3ad25a278e304108bab9d.zip |
acme-client: 1.0.0 -> 1.0.1
I submitted my patch upstream, it was merged, and version 1.0.1 which includes it has been released. So the patch here is no longer necessary. Also, the maintainer added a Nixpkgs-based build environment to the upstream CI setup, so in the future the upstream version will likely not need any patching.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/acme-client/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/acme-client/limits.h.patch | 41 |
2 files changed, 2 insertions, 45 deletions
diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index e05adae530eb..02af803db724 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "graywolf"; repo = "acme-client-portable"; rev = "v${version}"; - sha256 = "1p6jbxg00ing9v3jnpvq234w5r2gf8b04k9qm06mn336lcd2lgpl"; + sha256 = "0ds7lxn08yiq7hap1xh014smjhd4gf9lv9ypfrf1ahqna3s2w7k8"; }; nativeBuildInputs = [ autoreconfHook bison pkgconfig ]; @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - patches = [ ./limits.h.patch ]; - meta = { homepage = "https://github.com/graywolf/acme-client-portable"; description = "Secure ACME/Let's Encrypt client"; diff --git a/pkgs/tools/networking/acme-client/limits.h.patch b/pkgs/tools/networking/acme-client/limits.h.patch deleted file mode 100644 index 2a2e04fb8fac..000000000000 --- a/pkgs/tools/networking/acme-client/limits.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 05b32236adf0f3f43d74b7824b7b20bc917c6db9 Mon Sep 17 00:00:00 2001 -From: Ruud van Asseldonk <dev@veniogames.com> -Date: Tue, 19 May 2020 22:32:01 +0200 -Subject: [PATCH] Include limits.h in compat.c - -Without this, the compiler says: - - compat.c: In function 'strtonum': - compat.c:235:19: error: 'LLONG_MIN' undeclared (first use in this function) - 235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) - | ^~~~~~~~~ - compat.c:9:1: note: 'LLONG_MIN' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'? - 8 | #include <unistd.h> - +++ |+#include <limits.h> - 9 | - compat.c:235:19: note: each undeclared identifier is reported only once for each function it appears in - 235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) - | ^~~~~~~~~ - compat.c:237:19: error: 'LLONG_MAX' undeclared (first use in this function) - 237 | else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval) - | ^~~~~~~~~ - compat.c:237:19: note: 'LLONG_MAX' is defined in header '<limits.h>'; did you forget to '#include <limits.h>'? ---- - compat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git ./compat.c ./compat.c -index 72a2f96..f990eca 100644 ---- compat.c -+++ compat.c -@@ -1,6 +1,7 @@ - #include "compat.h" - - #include <errno.h> -+#include <limits.h> - #include <stdint.h> - #include <stdio.h> - #include <stdlib.h> --- -2.26.2 - |