From 2f79308872482402d3a32174dbefbf3d6d40f727 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Oct 2021 20:38:42 +0200 Subject: gnu: Fix ‘this packages’ and some other niggles. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crates-io.scm (rust-home-0.5)[description]: Fix ‘this packages’ typo. * gnu/packages/emacs-xyz.scm (emacs-ahg, emacs-cwl-mode)[description]: Likewise. * gnu/packages/python-check.scm (python-pytest-csv)[description]: Likewise. * gnu/packages/ocaml.scm (ocaml-syntax-shims)[description]: Likewise, and note which language. * gnu/packages/python-xyz.scm (python-recommonmark)[description]: Likewise, and work around ‘enabling you’. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0fd9e865cbb..7d7a3c43172 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -807,7 +807,7 @@ programming language."))) ;; The nginx source code is part of the module’s source. (format #t "decompressing nginx source code~%") (invoke "tar" "xvf" (assoc-ref inputs "nginx-sources") - ;; This packages's LICENSE file would be + ;; This package's LICENSE file would be ;; overwritten with the one from nginx when ;; unpacking the nginx source, so rename the nginx ;; one when unpacking. -- cgit v1.2.3 From 6b0b6bb4a21afab9720df9f04d531af9ab804673 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Oct 2021 23:19:42 +0200 Subject: gnu: goaccess: Update to 1.5.2. * gnu/packages/web.scm (goaccess): Update to 1.5.2. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7d7a3c43172..dc5a9d61a8d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5823,20 +5823,19 @@ config files---you only have to specify the www root.") (define-public goaccess (package (name "goaccess") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "http://tar.goaccess.io/goaccess-" version ".tar.gz")) (sha256 (base32 - "03wp75n1krv8g643q00gcv1ikmzwwh8jjqmph0wxww1bwrw7whc8")) + "12hwmd9cn7yy7vj92110skjaslpxkn05msb9wj228qmjjf9jzkm0")) (modules '((guix build utils))) (snippet '(begin (substitute* "src/error.h" (("__DATE__") "\"1970-01-01\"") - (("__TIME__") "\"00:00:00\"")) - #t)))) + (("__TIME__") "\"00:00:00\"")))))) (build-system gnu-build-system) (inputs ;; TODO: Add dependency on geoip-tools. -- cgit v1.2.3 From e598e46913c661bc92df813d537eeb6be5a86471 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 Oct 2021 02:01:41 +0200 Subject: gnu: darkhttpd: Update to 1.13. * gnu/packages/web.scm (darkhttpd): Update to 1.13. [source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/web.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dc5a9d61a8d..2bd3c4ea13d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5791,28 +5791,28 @@ and similar services.") (define-public darkhttpd (package (name "darkhttpd") - (version "1.12") + (version "1.13") (source (origin - (method url-fetch) - (uri (string-append "https://unix4lyfe.org/darkhttpd/darkhttpd-" - version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/emikulic/darkhttpd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155")))) + (base32 "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk")))) (build-system gnu-build-system) (arguments `(#:make-flags '("CC=gcc") #:tests? #f ; No test suite #:phases (modify-phases %standard-phases - (delete 'configure) + (delete 'configure) ; no configure script (replace 'install (lambda* (#:key outputs #:allow-other-keys) (install-file "darkhttpd" (string-append (assoc-ref outputs "out") - "/bin")) - #t))))) + "/bin"))))))) (synopsis "Simple static web server") (description "darkhttpd is a simple static web server. It is standalone and does not need inetd or ucspi-tcp. It does not need any -- cgit v1.2.3 From d579df680e38bde3ab94373ae1b293caa28015b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 Oct 2021 02:01:53 +0200 Subject: gnu: darkhttpd: Cross-compile. * gnu/packages/web.scm (darkhttpd)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/web.scm') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2bd3c4ea13d..d7df3079b3e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5803,7 +5803,8 @@ and similar services.") (base32 "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=gcc") + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target))) #:tests? #f ; No test suite #:phases (modify-phases %standard-phases -- cgit v1.2.3