aboutsummaryrefslogtreecommitdiff
path: root/tests/bournish.scm
blob: 3b40ce26434c4d6744d3e22a035789c27dc1efea (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

(define-module (test-bournish)
  #:use-module (guix build bournish)
  #:use-module (system base compile)
  #:use-module (system base language)
  #:use-module (srfi srfi-64))


(test-begin "bournish")

(test-equal "single statement"
  '(chdir "/foo")
  (read-and-compile (open-input-string "cd /foo")
                    #:from %bournish-language #:to 'scheme))

(test-equal "multiple statements"
  '(begin
     (chdir "/foo")
     (getcwd)
     ((@@ (guix build bournish) ls-command-implementation)))
  (read-and-compile (open-input-string "cd /foo\npwd\nls")
                    #:from %bournish-language #:to 'scheme))

(test-equal "rm"
  '(for-each delete-file (list "foo" "bar"))
  (read-and-compile (open-input-string "rm foo bar\n")
                    #:from %bournish-language #:to 'scheme))

(test-equal "rm -r"
  '(for-each (@ (guix build utils) delete-file-recursively)
             (list "/foo" "/bar"))
  (read-and-compile (open-input-string "rm -r /foo /bar\n")
                    #:from %bournish-language #:to 'scheme))

(test-end "bournish")

st they seem to -fail if it's I run them without connecting my computer to the web. - -I'm looking at this as part of packaging linkchecker for GNU Guix, -where the package is build and the tests are run in a isolated -environment, intentionally without network access, to avoid issues -with non-reproducible package builds. ---- - tests/checker/test_http.py | 2 ++ - tests/checker/test_http_misc.py | 2 ++ - tests/checker/test_http_redirect.py | 2 ++ - tests/checker/test_httpbin.py | 5 +++++ - tests/checker/test_misc.py | 4 ++++ - tests/checker/test_whitespace.py | 3 +++ - 6 files changed, 18 insertions(+) - -diff --git a/tests/checker/test_http.py b/tests/checker/test_http.py -index e4c1e097..8a8af567 100644 ---- a/tests/checker/test_http.py -+++ b/tests/checker/test_http.py -@@ -20,6 +20,7 @@ - - import pytest - -+from tests import need_network - from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler - - class TestHttp (HttpServerTest): -@@ -29,6 +30,7 @@ def __init__(self, methodName='runTest'): - super(TestHttp, self).__init__(methodName=methodName) - self.handler = CookieRedirectHttpRequestHandler - -+ @need_network - def test_html (self): - confargs = dict(recursionlevel=1) - self.file_test("http.html", confargs=confargs) -diff --git a/tests/checker/test_http_misc.py b/tests/checker/test_http_misc.py -index 9922d85f..c6b6afdb 100644 ---- a/tests/checker/test_http_misc.py -+++ b/tests/checker/test_http_misc.py -@@ -20,11 +20,13 @@ - import os - import sys - from .httpserver import HttpServerTest -+from tests import need_network - from linkcheck.network import iputil - - class TestHttpMisc (HttpServerTest): - """Test http:// misc link checking.""" - -+ @need_network - def test_html (self): - self.swf_test() - self.obfuscate_test() -diff --git a/tests/checker/test_http_redirect.py b/tests/checker/test_http_redirect.py -index f212d98e..2253a70d 100644 ---- a/tests/checker/test_http_redirect.py -+++ b/tests/checker/test_http_redirect.py -@@ -17,6 +17,7 @@ - """ - Test http checking. - """ -+from tests import need_network - from .httpserver import HttpServerTest, CookieRedirectHttpRequestHandler - - class TestHttpRedirect (HttpServerTest): -@@ -26,6 +27,7 @@ def __init__(self, methodName='runTest'): - super(TestHttpRedirect, self).__init__(methodName=methodName) - self.handler = CookieRedirectHttpRequestHandler - -+ @need_network - def test_redirect (self): - self.redirect1() - self.redirect2() -diff --git a/tests/checker/test_httpbin.py b/tests/checker/test_httpbin.py -index 0319c2f6..4c8fa846 100644 ---- a/tests/checker/test_httpbin.py -+++ b/tests/checker/test_httpbin.py -@@ -18,6 +18,7 @@ - Test http stuff with httpbin.org. - """ - import re -+from tests import need_network - from . import LinkCheckTest - - -@@ -30,6 +31,7 @@ def get_httpbin_url(path): - class TestHttpbin(LinkCheckTest): - """Test http:// link redirection checking.""" - -+ @need_network - def test_http_link(self): - linkurl = u"http://www.example.com" - nlinkurl = self.norm(linkurl) -@@ -48,6 +50,7 @@ def test_http_link(self): - ] - self.direct(url, resultlines, recursionlevel=1) - -+ @need_network - def test_basic_auth(self): - user = u"testuser" - password = u"testpassword" -@@ -67,6 +70,7 @@ def test_basic_auth(self): - ] - self.direct(url, resultlines, confargs=confargs) - -+ @need_network - def test_http_refresh_header(self): - linkurl = u"http://www.example.com" - nlinkurl = self.norm(linkurl) -@@ -85,6 +89,7 @@ def test_http_refresh_header(self): - ] - self.direct(url, resultlines, recursionlevel=1) - -+ @need_network - def test_http_content_location_header(self): - linkurl = u"http://www.example.com" - nlinkurl = self.norm(linkurl) -diff --git a/tests/checker/test_misc.py b/tests/checker/test_misc.py -index 2e4cfd07..f9591f9d 100644 ---- a/tests/checker/test_misc.py -+++ b/tests/checker/test_misc.py -@@ -17,6 +17,7 @@ - """ - Test miscellaneous html tag parsing and URL types - """ -+from tests import need_network - from . import LinkCheckTest - - -@@ -25,15 +26,18 @@ class TestMisc (LinkCheckTest): - Test misc link types. - """ - -+ @need_network - def test_misc (self): - self.file_test("misc.html") - - def test_html5 (self): - self.file_test("html5.html") - -+ @need_network - def test_archive (self): - self.file_test("archive.html") - -+ @need_network - def test_itms_services(self): - url = u"itms-services:?action=download-manifest&url=http://www.example.com/" - resultlines = [ -diff --git a/tests/checker/test_whitespace.py b/tests/checker/test_whitespace.py -index 609c108a..fc2727d6 100644 ---- a/tests/checker/test_whitespace.py -+++ b/tests/checker/test_whitespace.py -@@ -17,6 +17,7 @@ - """ - Test whitespace handling. - """ -+from tests import need_network - from . import LinkCheckTest - - -@@ -25,6 +26,7 @@ class TestWhitespace (LinkCheckTest): - Test whitespace in URLs. - """ - -+ @need_network - def test_leading_whitespace (self): - # Leading whitespace - url = u" http://www.example.org/" -@@ -50,6 +52,7 @@ def test_leading_whitespace (self): - ] - self.direct(url, resultlines) - -+ @need_network - def test_trailing_whitespace (self): - # Trailing whitespace - url = u"http://www.example.org/ " diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d1f1d0f755..412308b417 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2021 Arun Isaac ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 Bake Timmons ;;; Copyright © 2017 Thomas Danckaert @@ -6578,51 +6578,37 @@ Instagram and YouTube.") (define-public linkchecker (package (name "linkchecker") - (version "9.4.0") + (version "10.0.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/linkchecker/linkchecker") (commit (string-append "v" version)))) - (patches - (search-patches "linkchecker-tests-require-network.patch")) (file-name (git-file-name name version)) (sha256 (base32 - "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187")))) + "1j97dc9a4yhpscwadhv5dxp7036pnrxiaky18l8ddr3pvxdjvkxs")))) (build-system python-build-system) (inputs - `(("python2-dnspython" ,python2-dnspython-1.16) - ("python2-pyxdg" ,python2-pyxdg) - ("python2-requests" ,python2-requests))) + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-dnspython" ,python-dnspython) + ("python-pyxdg" ,python-pyxdg) + ("python-requests" ,python-requests))) (native-inputs `(("gettext" ,gettext-minimal) - ("python2-pytest" ,python2-pytest) - ("python2-miniboa" ,python2-miniboa) - ("python2-parameterized" ,python2-parameterized))) + ("python-pytest" ,python-pytest) + ("python-miniboa" ,python-miniboa) + ("python-parameterized" ,python-parameterized))) (arguments - `(#:python ,python-2 - #:phases + `(#:phases (modify-phases %standard-phases - ;; Move the 'check phase to after 'install, so that the installed - ;; library can be used - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Set PYTHONPATH so that the installed linkchecker is used - (setenv "PYTHONPATH" - (string-append out "/lib/python2.7/site-packages" - ":" - (getenv "PYTHONPATH"))) - ;; Remove this directory to avoid it being used when running - ;; the tests - (delete-file-recursively "linkcheck") - - (invoke "py.test" "tests")) - #t))))) - (home-page "https://linkcheck.github.io/linkchecker") + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "py.test" "tests"))))))) + (home-page "https://linkchecker.github.io/linkchecker/") (synopsis "Check websites for broken links") (description "LinkChecker is a website validator. It checks for broken links in websites. It is recursive and multithreaded providing output in -- cgit v1.2.3 From 9fd9364492b95baf48baf054a326145fde5bc21b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 13 Jun 2021 09:37:31 +0200 Subject: gnu: Add duc. * gnu/packages/disk.scm (duc): New variable. --- gnu/packages/disk.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ccda71b268..2a4dbee748 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 Michael Rohleder ;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -1303,3 +1305,53 @@ like raw system image files, can be copied or flashed a lot faster and more reliably with @code{bmaptool} than with traditional tools, like @code{dd} or @code{cp}.") (license license:gpl2))) + +(define-public duc + (package + (name "duc") + (version "1.4.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevv/duc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* "src/duc/cmd-ui.c" + (("ncursesw/ncurses.h") "ncurses.h")) + (substitute* "examples/index.cgi" + (("/usr/local/bin/duc") + (string-append out "/bin/duc")))))) + (add-after 'install 'install-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (copy-recursively "examples" (string-append doc "/examples")))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("pango" ,pango) + ("tokyocabinet" ,tokyocabinet) + ("ncurses" ,ncurses))) + (home-page "http://duc.zevv.nl") + (synopsis "Library and suite of tools for inspecting disk usage") + (description "Duc maintains a database of accumulated sizes of +directories of the file system, and allows you to query this database with +some tools, or create fancy graphs showing you where your bytes are. + +Duc comes with console utilities, ncurses and X11 user interfaces and a CGI +wrapper for disk usage querying and visualisation.") + (license license:lgpl3+))) -- cgit v1.2.3 From 9171079e515289120405c70c143445df2a35db1c Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sat, 19 Jun 2021 03:07:39 -0700 Subject: import: launchpad: Use repository to retrieve releases. * guix/import/launchpad.scm (latest-released-version): Use repository instead of package name. (latest-release): Pass repository to latest-released-version. Signed-off-by: Brice Waegeneire --- guix/import/launchpad.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index a52b39a085..ecd6f88738 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Arun Isaac +;;; Copyright © 2021 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,8 +101,8 @@ URL of the form (match (string-split (uri-path (string->uri url)) #\/) ((_ repo . rest) repo))) -(define (latest-released-version package-name) - "Return a string of the newest released version name given the PACKAGE-NAME, +(define (latest-released-version repository) + "Return a string of the newest released version name given the REPOSITORY, for example, 'linuxdcpp'. Return #f if there is no releases." (define (pre-release? x) ;; Versions containing anything other than digit characters and "." (for @@ -112,7 +113,7 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (match (json-fetch (string-append "https://api.launchpad.net/1.0/" - package-name "/releases")) + repository "/releases")) (#f #f) ;404 or similar (json (assoc-ref @@ -129,7 +130,8 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (let* ((source-uri (origin-github-uri (package-source pkg))) (name (package-name pkg)) - (newest-version (latest-released-version name))) + (repository (launchpad-repository source-uri)) + (newest-version (latest-released-version repository))) (if newest-version (upstream-source (package name) -- cgit v1.2.3 From 3aabe51e8c09b9a2a87c03c40e3cc0f90d531bfd Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 19 Jun 2021 22:21:47 +0200 Subject: import: launchpad: Fix typo. * guix/import/launchpad.scm (latest-release): Rename 'origin-github-uri' to 'origin-launchpad-uri'. --- guix/import/launchpad.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index ecd6f88738..aeb447b0a5 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,13 +123,13 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (define (latest-release pkg) "Return an for the latest release of PKG." - (define (origin-github-uri origin) + (define (origin-launchpad-uri origin) (match (origin-uri origin) ((? string? url) url) ; surely a Launchpad URL ((urls ...) (find (cut string-contains <> "launchpad.net") urls)))) - (let* ((source-uri (origin-github-uri (package-source pkg))) + (let* ((source-uri (origin-launchpad-uri (package-source pkg))) (name (package-name pkg)) (repository (launchpad-repository source-uri)) (newest-version (latest-released-version repository))) -- cgit v1.2.3 From cae5f6e54bea5a43762985f3b37818079aee326b Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sat, 19 Jun 2021 01:45:00 +0000 Subject: gnu: esbuild: Update to 0.12.9. * gnu/packages/web.scm (esbuild): Update to 0.12.9. Signed-off-by: Brice Waegeneire --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 412308b417..896125aab2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1596,7 +1596,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.11.14") + (version "0.12.9") (source (origin (method git-fetch) @@ -1605,7 +1605,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qxylzc7lzpsp5hm3dl5jvy9aca8azn8dmbjz9z5n5rkdmm8vd9p")) + (base32 "10bz1xq2frdja7mbx04m009svg8b5rj7vfq3sc2gc88n31v21b1j")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From eb939109b9c06a09e1534a403745bd362b653d95 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 12 Jun 2021 15:02:12 +0200 Subject: gnu: opendoas: Fix restricted path "safepath". * gnu/packages/admin.scm (opendoas)[phases]: Rename 'fix-install' phase to 'pre-configure', run it before 'configure' and add a substitution for safepath. --- gnu/packages/admin.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f97be3c735..ea5cd91e38 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2021 Hyunseok Kim ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 WinterHound +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1700,18 +1701,27 @@ commands and their arguments.") (arguments `(#:phases (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "GNUmakefile" + (("^\tchown.*$") "")) + ;; OpenDoas look for binaries in safepath when a rule specify a + ;; relative command, such as “permit keepenv :wheel cmd guix”. + (substitute* "doas.c" + (("safepath =" match) + (string-append match " \"" + "/run/setuid-programs:" + "/run/current-system/profile/bin:" + "/run/current-system/profile/sbin:" + "\" "))) + #t)) (replace 'configure ;; The configure script doesn't accept most of the default flags. (lambda* (#:key configure-flags #:allow-other-keys) ;; The configure script can be told which compiler to use only ;; through environment variables. (setenv "CC" ,(cc-for-target)) - (apply invoke "./configure" configure-flags))) - (add-before 'install 'fix-makefile - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "GNUmakefile" - (("^\tchown.*$") "")) - #t))) + (apply invoke "./configure" configure-flags)))) #:configure-flags (list (string-append "--prefix=" (assoc-ref %outputs "out")) "--with-timestamp") -- cgit v1.2.3 From 4bed8486d4c0a4ff142903b8bc1584ce84767355 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 12 Jun 2021 16:46:00 +0200 Subject: services: pcscd: Cleanup socket when started. Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL), it won't start again because of it's socket already existing. * gnu/services/security-token.scm (pcscd-shepherd-service)[start]: Remove existing socket file. --- gnu/services/security-token.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index ec26006538..0cbb591e10 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,9 @@ (requirement '(syslogd)) (modules '((gnu build shepherd))) (start #~(lambda _ + (let ((socket "/run/pcscd/pcscd.comm")) + (when (file-exists? socket) + (delete-file socket))) (invoke #$(file-append pcsc-lite "/sbin/pcscd")) (call-with-input-file "/run/pcscd/pcscd.pid" read))) (stop #~(make-kill-destructor))))))) -- cgit v1.2.3 From ffe50737b2c178eba3e810ba1c8dbf90064c9503 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 19 Jun 2021 23:51:25 +0200 Subject: doc: Fix a typo. * doc/guix.texi (Substitute Server Authorization): Fix typo. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 094d1acd2c..efeb176e3d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3736,7 +3736,7 @@ other substitute server. @cindex access control list (ACL), for substitutes @cindex ACL (access control list), for substitutes To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER-1}}, @code{@value{SUBSTITUTE-SERVER-2}} or a mirror, you -must add the releavnt public key to the access control list (ACL) of archive +must add the relevant public key to the access control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix archive}). Doing so implies that you trust the substitute server to not be compromised and to serve genuine substitutes. -- cgit v1.2.3 From acb34cda237b462c6872cb698f5fc4123550d77c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 20 Jun 2021 00:05:32 +0200 Subject: gnu: emacs-emms: Update to 7.5. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 7.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ca87a2ed46..2a319ef2aa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2052,14 +2052,14 @@ incrementally confined in Isearch manner.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "7.4") + (version "7.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "153j76jfnh01b4pkkpyxfh83rl975rx0mh7mx4nnf83qd4dzkkd4")))) + (base32 "0d7nsx2idzbp6d5im5rrsnwppbr2cimvxgx31bhwsm2aq3ya5v2j")))) (build-system gnu-build-system) (arguments `(#:make-flags '("emms-print-metadata") -- cgit v1.2.3 From 376b16e9a180ddef1aca795a3acf2512561976ef Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 19 Jun 2021 17:50:32 +0200 Subject: gnu: Add ocaml-pcre. * gnu/packages/ocaml.scm (ocaml-pcre): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4510affe0f..a6637c83ff 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3086,6 +3086,38 @@ every compliant installation of OCaml and organize these libraries into a hierarchy of modules.") (license license:lgpl2.1+))) +(define-public ocaml-pcre + (package + (name "ocaml-pcre") + (version "7.4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mmottl/pcre-ocaml") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym")))) + (build-system dune-build-system) + (arguments + ;; No tests. + '(#:tests? #f)) + (propagated-inputs + `(("dune-configurator" ,dune-configurator) + ("pcre" ,pcre))) + (native-inputs + `(("pcre:bin" ,pcre "bin"))) + (home-page "https://mmottl.github.io/pcre-ocaml") + (synopsis + "Bindings to the Perl Compatibility Regular Expressions library") + (description "Pcre-ocaml offers library functions for string +pattern matching and substitution, similar to the functionality +offered by the Perl language.") + ;; With static linking exception + (license license:lgpl2.1+))) + (define-public ocaml4.07-pcre (package (name "ocaml4.07-pcre") -- cgit v1.2.3 From 97d3a9f781ac4e436cad4a7c1a59de8f48baec0c Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 19 Jun 2021 17:50:35 +0200 Subject: gnu: ocaml4.07-expect: Switch to default OCaml compiler. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml4.07-expect): Rename to ‘ocaml-expect’. [arguments]: Use default OCaml compiler. [native-inputs]: Use ‘ocaml-*’ packages instead of ‘ocaml4.07-*’. [propagated-inputs]: Likewise. [description]: Make it a full sentence. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a6637c83ff..549009eb09 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3148,9 +3148,9 @@ matching and substitution, similar to the functionality offered by the Perl language.") (license license:lgpl2.1+))); with the OCaml link exception -(define-public ocaml4.07-expect +(define-public ocaml-expect (package - (name "ocaml4.07-expect") + (name "ocaml-expect") (version "0.0.6") (source (origin (method url-fetch) @@ -3159,21 +3159,20 @@ language.") (base32 "098qvg9d4yrqzr5ax291y3whrpax0m3sx4gi6is0mblc96r9yqk0")))) (arguments - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + `(#:tests? #f)) (build-system ocaml-build-system) (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)) - ("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) - ("ocaml-pcre" ,ocaml4.07-pcre) - ("ounit" ,(package-with-ocaml4.07 ocaml-ounit)))) + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-num" ,ocaml-num) + ("ocaml-pcre" ,ocaml-pcre) + ("ounit" ,ocaml-ounit))) (propagated-inputs - `(("batteries" ,(package-with-ocaml4.07 ocaml-batteries)))) + `(("batteries" ,ocaml-batteries))) (home-page "https://forge.ocamlcore.org/projects/ocaml-expect/") (synopsis "Simple implementation of expect") - (description "Help building unitary testing of interactive program. You -can match the question using a regular expression or a timeout.") + (description "This package provides utilities for building unitary testing +of interactive program. You can match the question using a regular expression +or a timeout.") (license license:lgpl2.1+))) ; with the OCaml static compilation exception (define-public ocaml-stdlib-shims -- cgit v1.2.3 From 96dce8c7fe0d86a7997a771e60b735789f97bc19 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 19 Jun 2021 17:50:37 +0200 Subject: gnu: ocaml4.07-pcre: Remove package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml4.07-pcre): Remove package. It has been superseded by ‘ocaml-pcre’. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 549009eb09..22767ee2a2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3118,36 +3118,6 @@ offered by the Perl language.") ;; With static linking exception (license license:lgpl2.1+))) -(define-public ocaml4.07-pcre - (package - (name "ocaml4.07-pcre") - (version "7.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mmottl/pcre-ocaml") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf")))) - (build-system dune-build-system) - (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (native-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("pcre:bin" ,pcre "bin"))) - (propagated-inputs `(("pcre" ,pcre))) - (home-page "https://mmottl.github.io/pcre-ocaml") - (synopsis "Bindings to the Perl Compatibility Regular Expressions library") - (description "Pcre-ocaml offers library functions for string pattern -matching and substitution, similar to the functionality offered by the Perl -language.") - (license license:lgpl2.1+))); with the OCaml link exception - (define-public ocaml-expect (package (name "ocaml-expect") -- cgit v1.2.3 From fe6fd923a8b5a8307ae47c1f218dc9b9b41a722d Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 19 Jun 2021 17:50:38 +0200 Subject: gnu: Add ocaml-mparser. * gnu/packages/ocaml.scm (ocaml-mparser): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 22767ee2a2..0117f6dca2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6799,6 +6799,34 @@ in the documentation always stays up-to-date. compatibility.") (license license:isc))) +(define-public ocaml-mparser + (package + (name "ocaml-mparser") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/murmour/mparser") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx")))) + (build-system dune-build-system) + (arguments + ;; No tests. + '(#:package "mparser" + #:tests? #f)) + (home-page "https://github.com/murmour/mparser") + (synopsis "Simple monadic parser combinator library") + (description + "This library implements a rather complete and efficient monadic parser +combinator library similar to the Parsec library for Haskell by Daan Leijen and +the FParsec library for FSharp by Stephan Tolksdorf.") + ;; With static linking exception. + (license license:lgpl2.1+))) + (define-public lablgtk3 (package (name "lablgtk") -- cgit v1.2.3 From 620b4e8ad3b8a6c3a770a5a3ab69b546d7570df7 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 19 Jun 2021 17:50:40 +0200 Subject: gnu: Add ocaml-mparser-re. * gnu/packages/ocaml.scm (ocaml-mparser-re): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0117f6dca2..f795f8d918 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6827,6 +6827,21 @@ the FParsec library for FSharp by Stephan Tolksdorf.") ;; With static linking exception. (license license:lgpl2.1+))) +(define-public ocaml-mparser-re + (package + (inherit ocaml-mparser) + (name "ocaml-mparser-re") + (arguments + ;; No tests. + '(#:package "mparser-re" + #:tests? #f)) + (propagated-inputs + `(("ocaml-mparser" ,ocaml-mparser) + ("ocaml-re" ,ocaml-re))) + (synopsis "MParser plugin for RE-based regular expressions") + (description "This package provides RE-based regular expressions +support for Mparser."))) + (define-public lablgtk3 (package (name "lablgtk") -- cgit v1.2.3 From dcd94ee855fa03596a8e84b7cffe1344bb6206ef Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 19 Jun 2021 17:50:41 +0200 Subject: gnu: Add ocaml-mparser-pcre. * gnu/packages/ocaml.scm (ocaml-mparser-pcre): New variable. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f795f8d918..4e0c6458b6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6842,6 +6842,21 @@ the FParsec library for FSharp by Stephan Tolksdorf.") (description "This package provides RE-based regular expressions support for Mparser."))) +(define-public ocaml-mparser-pcre + (package + (inherit ocaml-mparser) + (name "ocaml-mparser-pcre") + (arguments + ;; No tests. + '(#:package "mparser-pcre" + #:tests? #f)) + (propagated-inputs + `(("ocaml-mparser" ,ocaml-mparser) + ("ocaml-pcre" ,ocaml-pcre))) + (synopsis "MParser plugin for PCRE-based regular expressions") + (description "This package provides PCRE-based regular expressions +support for Mparser."))) + (define-public lablgtk3 (package (name "lablgtk") -- cgit v1.2.3 From 019c862a67b677ceeb0d91c9440f5ed8d9c149a4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 20 Jun 2021 08:22:37 +0200 Subject: gnu: tectonic: Update to 0.7.0. * gnu/packages/rust-apps.scm (tectonic): Update to 0.7.0. --- gnu/packages/rust-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 82afb01998..5108ade3c9 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -587,14 +587,14 @@ gitignore rules.") (define-public tectonic (package (name "tectonic") - (version "0.6.4") + (version "0.7.0") (source (origin (method url-fetch) (uri (crate-uri "tectonic" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1h6m0mxqd8580c82dknja7qqhkg1pbvwmw4rlzfr1ndfjrcbk3al")))) + (base32 "1x6i97dl28y6wxpq2r4dcsa853sa4yw5vhl79qdb44q5wsd6ba1f")))) (build-system cargo-build-system) (arguments `(#:rust ,rust-1.52 -- cgit v1.2.3 From 7ab6907448002d7049f01f320300a9daa2388e69 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Sat, 19 Jun 2021 19:04:08 +0200 Subject: gnu: openvpn: Update to 2.5.3. * gnu/packages/vpn.scm (openvpn): Update to 2.5.3. Signed-off-by: Brice Waegeneire --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 5b10d92f0f..8272a3a26e 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -513,7 +513,7 @@ this process. It is compatible with Fortinet VPNs.") (define-public openvpn (package (name "openvpn") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) (uri (string-append @@ -521,7 +521,7 @@ this process. It is compatible with Fortinet VPNs.") version ".tar.xz")) (sha256 (base32 - "1j0xkiya20hhvalfjg5l3v1226vyjs9j9aw2mzpnbwq1d61l69xi")))) + "0zlski66mw10klmwvg445z051mld7xjng4iyl4f9b883qr1rjspv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) -- cgit v1.2.3 From 0bfafa49fa387c6a58f79178fc6344b2ce0bf02d Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 20 Jun 2021 12:41:52 +0200 Subject: gnu: ocaml-menhir: Update to 20210419. * gnu/packages/ocaml.scm (ocaml-menhir): Update to 20210419. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4e0c6458b6..a49ee8370b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1030,7 +1030,7 @@ Emacs.") (define-public ocaml-menhir (package (name "ocaml-menhir") - (version "20200211") + (version "20210419") (source (origin (method git-fetch) @@ -1039,7 +1039,7 @@ Emacs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "019izf51kdc7pzkw68zg8a2alc8lxw1gwdp7in970mr90n16b5zj")))) + (base32 "0jcbr7s3iwfr7xxfybs3h407g76yfp5yq5r9i0wg2ahvvbqh03ky")))) (build-system dune-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 6e6769dde0a3e613784834aeded53b3aaa2e4cec Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 20 Jun 2021 12:59:56 +0200 Subject: gnu: why3: Update to 1.3.3. * gnu/packages/maths.scm (why3): Update to 1.3.3. [arguments]: Adjust for newer ocaml-num. --- gnu/packages/maths.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a79d546abd..84540d5ffe 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6289,14 +6289,14 @@ numeric differences and differences in numeric formats.") (define-public why3 (package (name "why3") - (version "1.3.1") + (version "1.3.3") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php/file" - "/38291/why3-" version ".tar.gz")) + "/38367/why3-" version ".tar.gz")) (sha256 (base32 - "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv")))) + "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw")))) (build-system ocaml-build-system) (native-inputs `(("coq" ,coq) @@ -6320,8 +6320,8 @@ numeric differences and differences in numeric formats.") (setenv "CONFIG_SHELL" (which "sh")) (substitute* "configure" ;; find ocaml-num in the correct directory - (("\\$DIR/nums.cma") "$DIR/../nums.cma") - (("\\$DIR/num.cmi") "$DIR/../num.cmi")) + (("\\$DIR/nums.cma") "$DIR/num.cma") + (("\\$DIR/num.cmi") "$DIR/core/num.cmi")) #t)) (add-after 'configure 'fix-makefile (lambda _ -- cgit v1.2.3 From a211078f992bc5a26eaf787c6b01caa41de67597 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 20 Jun 2021 12:42:43 +0200 Subject: gnu: ocaml-ppxlib: Update to 0.22.1. * gnu/packages/ocaml.scm (ocaml-ppxlib): Update to 0.22.1. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a49ee8370b..047d504a0a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5025,7 +5025,7 @@ as part of the same ocaml-migrate-parsetree driver.") (define-public ocaml-ppxlib (package (name "ocaml-ppxlib") - (version "0.22.0") + (version "0.22.1") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin @@ -5036,7 +5036,7 @@ as part of the same ocaml-migrate-parsetree driver.") (file-name (git-file-name name version)) (sha256 (base32 - "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q")))) + "0cpfg634if1py1b2rljk3cagq9gj68dl2gk1kdg76f9rapvl2i4g")))) (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,ocaml-base) -- cgit v1.2.3 From ef3f38ea0027f48feb6a29df131ac58bfbb46b7d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 20 Jun 2021 15:15:55 +0200 Subject: services: openssh: Replace 'without-password' by 'prohibit-password'. For some time, OpenSSH's option 'PermitRootLogin' has deprecated the ambiguous argument 'without-password' with 'prohibit-password'. * doc/guix.texi (Network Services): Replace 'without-password by 'prohibit-password. * gnu/machine/digital-ocean.scm (guix-infect): Change system configuration to use 'prohibit-password. * gnu/services/ssh.scm (openssh-configuration): Change comment to use 'prohibit-password. (openssh-config-file): Add support for 'prohibit-password to 'permit-root-login'. Warn about deprecated 'without-password usage. * gnu/tests/ganeti.scm (%ganeti-os): Replace 'without-password by 'prohibit-password. Signed-off-by: Tobias Geerinckx-Rice --- doc/guix.texi | 6 +++--- gnu/machine/digital-ocean.scm | 3 ++- gnu/services/ssh.scm | 11 +++++++++-- gnu/tests/ganeti.scm | 3 ++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index efeb176e3d..66c6adc4f5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17070,7 +17070,7 @@ shell daemon, @command{sshd}. Its value must be an (service openssh-service-type (openssh-configuration (x11-forwarding? #t) - (permit-root-login 'without-password) + (permit-root-login 'prohibit-password) (authorized-keys `(("alice" ,(local-file "alice.pub")) ("bob" ,(local-file "bob.pub")))))) @@ -17104,7 +17104,7 @@ TCP port on which @command{sshd} listens for incoming connections. @item @code{permit-root-login} (default: @code{#f}) This field determines whether and when to allow logins as root. If @code{#f}, root logins are disallowed; if @code{#t}, they are allowed. -If it's the symbol @code{'without-password}, then root logins are +If it's the symbol @code{'prohibit-password}, then root logins are permitted but not with password-based authentication. @item @code{allow-empty-passwords?} (default: @code{#f}) @@ -29333,7 +29333,7 @@ cluster node that supports multiple storage backends, and installs the ;; Ganeti uses SSH to communicate between nodes. (service openssh-service-type (openssh-configuration - (permit-root-login 'without-password))) + (permit-root-login 'prohibit-password))) (service ganeti-service-type (ganeti-configuration diff --git a/gnu/machine/digital-ocean.scm b/gnu/machine/digital-ocean.scm index 82383a8c7c..d97c300d18 100644 --- a/gnu/machine/digital-ocean.scm +++ b/gnu/machine/digital-ocean.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -256,7 +257,7 @@ cat > /etc/bootstrap-config.scm << EOF (service openssh-service-type (openssh-configuration (log-level 'debug) - (permit-root-login 'without-password)))) + (permit-root-login 'prohibit-password)))) %base-services))) EOF # guix pull diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 1891db0487..a018052eeb 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -6,6 +6,8 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 pinoaffe ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +32,7 @@ #:use-module (gnu services web) #:use-module (gnu system pam) #:use-module (gnu system shadow) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) @@ -288,7 +291,7 @@ The other options should be self-descriptive." ;; integer (port-number openssh-configuration-port-number (default 22)) - ;; Boolean | 'without-password + ;; Boolean | 'prohibit-password (permit-root-login openssh-configuration-permit-root-login (default #f)) ;; Boolean @@ -441,7 +444,11 @@ of user-name/file-like tuples." #$(match (openssh-configuration-permit-root-login config) (#t "yes") (#f "no") - ('without-password "without-password"))) + ('without-password (warn-about-deprecation + 'without-password #f + #:replacement 'prohibit-password) + "prohibit-password") + ('prohibit-password "prohibit-password"))) (format port "PermitEmptyPasswords ~a\n" #$(if (openssh-configuration-allow-empty-passwords? config) "yes" "no")) diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm index ff853a7149..19c26b86dd 100644 --- a/gnu/tests/ganeti.scm +++ b/gnu/tests/ganeti.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Marius Bakke . +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,7 +66,7 @@ (service openssh-service-type (openssh-configuration - (permit-root-login 'without-password))) + (permit-root-login 'prohibit-password))) (service ganeti-service-type (ganeti-configuration -- cgit v1.2.3 From 6b8552fd5af1a794a355cf0f3279a82b8267a202 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Jun 2021 16:38:54 +0200 Subject: gnu: knot: Update to 3.0.7. * gnu/packages/dns.scm (knot): Update to 3.0.7. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 199b876369..dc6b101e3c 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -817,7 +817,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.0.6") + (version "3.0.7") (source (origin (method git-fetch) @@ -826,7 +826,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mjgjx43yb3w688jw16g5m1724wb0wnv4y7di2rslrp0s11wl2a9")) + (base32 "0ihd0lfh0r1nzz2di2rqkrx5j1017xv7m54irlhccx21inwv6g3y")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From df68e5c65ae015639566baf5cce1faf96a2d0ed4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Jun 2021 16:39:29 +0200 Subject: gnu: rsnapshot: Update to 1.4.4. * gnu/packages/backup.scm (rsnapshot): Update to 1.4.4. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5e0009472e..d425243848 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -451,7 +451,7 @@ rdiff-backup is easy to use and settings have sensible defaults.") (define-public rsnapshot (package (name "rsnapshot") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) @@ -459,7 +459,7 @@ rdiff-backup is easy to use and settings have sensible defaults.") "https://github.com/rsnapshot/rsnapshot/releases/download/" version "/rsnapshot-" version ".tar.gz")) (sha256 - (base32 "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b")))) + (base32 "0yc5k2fhm54ypxgm1fsaf8vrg5b7qbvbsqk371n6baf592vprjy1")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From eca228eb09fd54021af98347aeeb92e5c3dd629e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Jun 2021 16:39:36 +0200 Subject: gnu: tcpdump: Update to 4.99.1. * gnu/packages/admin.scm (tcpdump): Update to 4.99.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ea5cd91e38..16fcdfcb8c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1319,14 +1319,14 @@ network statistics collection, security monitoring, network debugging, etc.") (define-public tcpdump (package (name "tcpdump") - (version "4.99.0") + (version "4.99.1") (source (origin (method url-fetch) (uri (string-append "https://www.tcpdump.org/release/tcpdump-" version ".tar.gz")) (sha256 (base32 - "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc")))) + "1ghfs5gifzrk3813zf9zalfbjs70wg6llz6q31k180r7zf2nkcvr")))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap) ("openssl" ,openssl))) -- cgit v1.2.3 From d027858e70c4a37aca90b1d4ecb2f0421a95d987 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Jun 2021 16:43:50 +0200 Subject: gnu: corsix-th: Update to 0.65. * gnu/packages/games.scm (corsix-th): Update to 0.65. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6b3a6f0e1f..fca25294db 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -946,7 +946,7 @@ allows users to brew while offline.") (define-public corsix-th (package (name "corsix-th") - (version "0.64") + (version "0.65") (source (origin (method git-fetch) @@ -955,7 +955,7 @@ allows users to brew while offline.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0chh9cv2kdc39sr0x8hclcyzd8dz2y6grgagqzkvr7j570wa5cqh")))) + (base32 "0hp7da7b73dpn1h22rw3h8w6aaj9azn18qnp3ap3lrlqhj4fzcb3")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5ae0d2c24737572ba3e0619a0176a07758078e1d Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 20 Jun 2021 16:52:14 +0200 Subject: gnu: ocaml-dot-merlin-reader: Update to 4.2-411. * gnu/packages/ocaml.scm (ocaml-dot-merlin-reader): Update to 4.2-411. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 047d504a0a..58b34d4293 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4540,7 +4540,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (define-public ocaml-dot-merlin-reader (package (name "ocaml-dot-merlin-reader") - (version "3.4.2") + (version "4.2-411") (source (origin (method git-fetch) @@ -4550,7 +4550,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (file-name (git-file-name name version)) (sha256 (base32 - "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) + "1vl6p8m2pag5j283h5g2gzxxfm599k6qhyrjkdf3kyc476fc9lw8")))) (build-system dune-build-system) (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests -- cgit v1.2.3 From 980c33bd3f16e44a123ef21408a56e59ebb76373 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 20 Jun 2021 16:52:16 +0200 Subject: gnu: ocaml-merlin: Inherit from ‘ocaml-dot-merlin-reader’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-merlin): Inherit from ‘ocaml-dot-merlin-reader’, thus also updating it to 4.2-411. [version, source, build-system, home-page]: Remove. [arguments]<#:phases>: Use custom test phase. Signed-off-by: Julien Lepiller --- gnu/packages/ocaml.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 58b34d4293..21d16a46a1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4566,21 +4566,16 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (define-public ocaml-merlin (package + (inherit ocaml-dot-merlin-reader) (name "ocaml-merlin") - (version "3.4.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml/merlin") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) - (build-system dune-build-system) - (arguments '(#:package "merlin" - #:test-target "tests")) + (arguments + '(#:package "merlin" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) (inputs `(("ocaml-yojson" ,ocaml-yojson) ("ocaml-csexp" ,ocaml-csexp) @@ -4589,7 +4584,6 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for tests ("ocaml-mdx" ,ocaml-mdx) ("jq" ,jq))) - (home-page "https://ocaml.github.io/merlin/") (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. -- cgit v1.2.3 From 4ebc965edea519c884b4a643f970b235cd0ff37f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Jun 2021 23:40:36 +0200 Subject: gnu: whois: Update to 5.5.10. * gnu/packages/networking.scm (whois): Update to 5.5.10. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index da4ede06f2..5bdbe3bc9d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1399,7 +1399,7 @@ and up to 1 Mbit/s downstream.") (define-public whois (package (name "whois") - (version "5.5.9") + (version "5.5.10") (source (origin (method git-fetch) @@ -1408,7 +1408,7 @@ and up to 1 Mbit/s downstream.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0l9dhyciylh14lqw8j5mrk0y2hl95cnj8pyvvabbgwxpsdn0yvbb")))) + (base32 "179hgmh9yqk8jq26ybik4cr3lgryd5p6kdwccc3r7mfssk3yp8lz")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From 2955fec1c9a97f6468a3a36580f70256103d708c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Jun 2021 01:13:38 +0200 Subject: gnu: asio: Update to 1.18.2. * gnu/packages/networking.scm (asio): Update to 1.18.2. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5bdbe3bc9d..34369e892e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3033,14 +3033,14 @@ asynchronous model using a modern C++ approach.") (define-public asio (package (inherit asio-1.12) - (version "1.18.1") + (version "1.18.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asio/asio/" version " (Stable)/asio-" version ".tar.bz2")) (sha256 - (base32 "04wi69d72l1p5c7d63z1dz06zn8pdqsbgx1if98dszs9ymfqgyaa")))))) + (base32 "1wpr4ymv63a192fmymwyxd7v0bv575v022gz53y0mcflhr2mvh1s")))))) (define-public shadowsocks ;; There are some security fixes after the last release. -- cgit v1.2.3 From 8b9b707674bf0ad11e0d773ec6939685900f9683 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Jun 2021 01:13:51 +0200 Subject: gnu: kirc: Update to 0.2.7. * gnu/packages/irc.scm (kirc): Update to 0.2.7. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 3d1753bff4..7f5394c03c 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -378,7 +378,7 @@ for the IRCv3 protocol.") (define-public kirc (package (name "kirc") - (version "0.2.6") + (version "0.2.7") (source (origin (method git-fetch) (uri (git-reference @@ -386,7 +386,7 @@ for the IRCv3 protocol.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11pwbil44q7sm3mp1khgw8wmwln2n03f1qawlgmg168jzyxqrs16")))) + (base32 "0phx00lr7ya8rx1hskv1wdwbq2vlihiqhnplqdvk1r3m23is7al9")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 3a67aafc557f37c7c224149168d7db77acfc1a37 Mon Sep 17 00:00:00 2001 From: "Boris A. Dekshteyn" Date: Tue, 15 Jun 2021 01:31:13 +1200 Subject: gnu: font-terminus: Build Open Type Bitmap. * gnu/packages/fonts.scm (font-terminus)[outputs]: Add otb. [arguments]: Add 'build-otb, 'install-otb phases. Signed-off-by: Efraim Flashner --- gnu/packages/fonts.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4d57bbd514..9297256f8e 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -426,7 +426,7 @@ The unified Libertinus family consists of: (sha256 (base32 "0yggffiplk22lgqklfmd2c0rw8gwchynjh5kz4bz8yv2h6vw2qfr")))) (build-system gnu-build-system) - (outputs (list "out" "pcf-8bit")) + (outputs (list "out" "pcf-8bit" "otb")) (arguments `(#:tests? #f ; no test target in tarball #:phases @@ -441,6 +441,15 @@ The unified Libertinus family consists of: (let ((pcf-8bit (assoc-ref outputs "pcf-8bit"))) (apply invoke "make" "install-pcf-8bit" (string-append "prefix=" pcf-8bit) + make-flags)))) + (add-after 'build-more-bits 'build-otb + ;; Build Open Type Bitmap + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "otb" make-flags))) + (add-after 'install 'install-otb + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let ((otb (assoc-ref outputs "otb"))) + (apply invoke "make" "install-otb" (string-append "prefix=" otb) make-flags))))))) (native-inputs `(("bdftopcf" ,bdftopcf) -- cgit v1.2.3 From 5bf6b88ef39e192d1a433d5fb61824626a2954e3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 21 Jun 2021 08:07:09 +0200 Subject: gnu: emacs-corfu: Update to 0.9. * gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 0.9. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a319ef2aa..6a93fe41bc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2817,7 +2817,7 @@ of bibliographic references.") (define-public emacs-corfu (package (name "emacs-corfu") - (version "0.8") + (version "0.9") (source (origin (method git-fetch) (uri (git-reference @@ -2826,7 +2826,7 @@ of bibliographic references.") (file-name (git-file-name name version)) (sha256 (base32 - "007r1l3ian2bfj4h2xkd2qwh1d1m7kda1p6pj51dikbzaphglh1r")))) + "0265kld5vg870n1zaks42qdawl03zi6rjhffrkkngwgs9i9ap30i")))) (build-system emacs-build-system) (home-page "https://github.com/minad/corfu") (synopsis "Completion overlay region function") -- cgit v1.2.3 From 0f1e95746b89878f7e8debc3d9f435c13948568d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 21 Jun 2021 08:08:41 +0200 Subject: gnu: emacs-vertico: Update to 0.12. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 0.12. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6a93fe41bc..046a861f6c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28501,7 +28501,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "0.11") + (version "0.12") (source (origin (method git-fetch) @@ -28510,7 +28510,7 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0vx23csk1nsrcazifwjxchqdmp3qbg2mwbvkqxn134g89qi8pqkw")))) + (base32 "1qb5qmspc7042r366d73j26hrzmrsdwscv8ly9glsa4gbdxcjkln")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From a7495b04b5c606c900ceb76202fdeb5785dea0f7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 21 Jun 2021 08:10:05 +0200 Subject: gnu: emacs-marginalia: Update to 0.7. * gnu/packages/emacs-xyz.scm (emacs-marginalia): Update to 0.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 046a861f6c..e73ebfa2e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8031,7 +8031,7 @@ list of candidates.") (define-public emacs-marginalia (package (name "emacs-marginalia") - (version "0.6") + (version "0.7") (source (origin (method git-fetch) @@ -8040,7 +8040,7 @@ list of candidates.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lisns2vghmqlg8wiv6jy15cfgnc8j83khz0vfnmrjwgcmjw3bbz")))) + (base32 "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc")))) (build-system emacs-build-system) (home-page "https://github.com/minad/marginalia") (synopsis "Marginalia in the minibuffer completions") -- cgit v1.2.3 From 30a04c00beb3b0bc3799f27caf05bedb5094c0c5 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 18 Jun 2021 18:15:46 +0200 Subject: gnu: Add tlf. * gnu/packages/patches/tlf-support-hamlib-4.2+.patch: New file. * gnu/local.mk: Add it. * gnu/packages/radio.scm (tlf): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/local.mk | 1 + gnu/packages/patches/tlf-support-hamlib-4.2+.patch | 66 ++++++++++++++++++++++ gnu/packages/radio.scm | 62 ++++++++++++++++++++ 3 files changed, 129 insertions(+) create mode 100644 gnu/packages/patches/tlf-support-hamlib-4.2+.patch diff --git a/gnu/local.mk b/gnu/local.mk index 375883de03..f7ff9af997 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1753,6 +1753,7 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-qt5.patch \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/tla2tools-build-xml.patch \ + %D%/packages/patches/tlf-support-hamlib-4.2+.patch \ %D%/packages/patches/tor-fix-build-with-gcc-7.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transmission-honor-localedir.patch \ diff --git a/gnu/packages/patches/tlf-support-hamlib-4.2+.patch b/gnu/packages/patches/tlf-support-hamlib-4.2+.patch new file mode 100644 index 0000000000..3c5db10010 --- /dev/null +++ b/gnu/packages/patches/tlf-support-hamlib-4.2+.patch @@ -0,0 +1,66 @@ +From 295fa956f899af37acb6bda9c76ad77748eb9a4a Mon Sep 17 00:00:00 2001 +From: Ervin Hegedus +Date: Sat, 5 Jun 2021 09:23:06 +0200 +Subject: [PATCH] Quick fix for changing of Hamlib's FILPATHLEN macro + +This patch was prepared for Guix by Jack Hill by +squashing together the changes from upstream #268 +. + +It allows the released version of Tlf to build against the version 4.2 of +hamlib in Guix. + +--- + src/sendqrg.c | 6 +++--- + src/sendqrg.h | 10 ++++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/sendqrg.c b/src/sendqrg.c +index ceeb356..5d4420e 100644 +--- a/src/sendqrg.c ++++ b/src/sendqrg.c +@@ -87,7 +87,7 @@ int init_tlf_rig(void) { + + rigportname[strlen(rigportname) - 1] = '\0'; // remove '\n' + strncpy(my_rig->state.rigport.pathname, rigportname, +- FILPATHLEN - 1); ++ TLFFILPATHLEN - 1); + + caps = my_rig->caps; + +@@ -104,9 +104,9 @@ int init_tlf_rig(void) { + if (dcd_type != RIG_DCD_NONE) + my_rig->state.dcdport.type.dcd = dcd_type; + if (ptt_file) +- strncpy(my_rig->state.pttport.pathname, ptt_file, FILPATHLEN); ++ strncpy(my_rig->state.pttport.pathname, ptt_file, TLFFILPATHLEN); + if (dcd_file) +- strncpy(my_rig->state.dcdport.pathname, dcd_file, FILPATHLEN); ++ strncpy(my_rig->state.dcdport.pathname, dcd_file, TLFFILPATHLEN); + + my_rig->state.rigport.parm.serial.rate = serial_rate; + +diff --git a/src/sendqrg.h b/src/sendqrg.h +index 8c53f2e..1ef85a6 100644 +--- a/src/sendqrg.h ++++ b/src/sendqrg.h +@@ -23,6 +23,16 @@ + + #include + ++#ifdef HAMLIB_FILPATHLEN ++ #define TLFFILPATHLEN HAMLIB_FILPATHLEN ++#else ++ #ifdef FILPATHLEN ++ #define TLFFILPATHLEN FILPATHLEN ++ #else ++ #error "(HAMLIB_)FILPATHLEN macro not found" ++ #endif ++#endif ++ + int init_tlf_rig(void); + void close_tlf_rig(RIG *my_rig); + +-- +2.32.0 + diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 618b2cfeaa..991d2e3a2e 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Charlie Ritter ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 João Pedro Simas +;;; Copyright © 2021 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages astronomy) @@ -68,6 +70,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -1065,6 +1068,65 @@ users.") "--with-tcl-binding" "--with-xml-support"))))) +(define-public tlf + (package + (name "tlf") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tlf/tlf") + (commit (string-append "tlf-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj")) + (patches + (search-patches "tlf-support-hamlib-4.2+.patch")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list "--enable-fldigi-xmlrpc"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("cmocka" ,cmocka) + ("glib" ,glib) + ("hamlib" ,hamlib) + ("libusb" ,libusb) ;`Requires.private: libusb-1.0` in hamlib pkg-config + ("ncurses" ,ncurses) + ("xmlrpc-c" ,xmlrpc-c))) + (home-page "https://tlf.github.io/") + (synopsis "Amateur radio contest logging for the terminal") + (description "TLF is a @acronym{Text User Interface, TUI} amateur radio +contest logging program. It integrates with radios supported by hamlib and +other ham radio programs like fldigi. Many contests are supported including: + +@itemize +@item CQWW (SO, M/S and M/M) +@item WPX (SO, M/S and M/M) +@item ARRL Sweepstakes (SO, M/S ) +@item EU SPRINT +@item EUHFC +@item ARRL-DX (both sides) +@item ARRL-FD +@item ARRL 10m +@item ARRL 160m +@item Region1 field day +@item SP DX contest +@item PACC (both sides) +@item NRAU - scandinavian +@item Wysiwyg mults mode (per band or per contest) +@item WAEDX +@end itemize + +It also supports connecting to DX clusters, log synchronization with other TLF +instances over the network, and general QSO and DXpedition logging.") + (license license:gpl2+))) + (define-public wsjtx (package (name "wsjtx") -- cgit v1.2.3 From 659cc959b3d028edb1e1f1d931ccc10983285f1d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 09:00:59 +0200 Subject: gnu: Add forgotten ecl-stmx and cl-stmx definitions. * gnu/packages/lisp-xyz.scm (cl-ecl-stmx, ecl-ecl-stmx): New variables. --- gnu/packages/lisp-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1bd35d5812..2e95d5c694 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17471,3 +17471,9 @@ Memory transactions give freedom from deadlocks, are immune to thread-safety bugs and race conditions, provide automatic roll-back on failure, and aim at resolving the tension between granularity and concurrency.") (license license:llgpl)))) + +(define-public ecl-stmx + (sbcl-package->ecl-package sbcl-stmx)) + +(define-public cl-stmx + (sbcl-package->cl-source-package sbcl-stmx)) -- cgit v1.2.3 From 9d48a179d19ffa32c3255bbc5c573afad0b2cc3a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 09:14:04 +0200 Subject: gnu: Add binding-arrows. * gnu/packages/lisp-xyz.scm (cl-binding-arrows, ecl-binding-arrows, sbcl-binding-arrows): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2e95d5c694..f0073b80b9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17477,3 +17477,40 @@ resolving the tension between granularity and concurrency.") (define-public cl-stmx (sbcl-package->cl-source-package sbcl-stmx)) + +(define-public sbcl-binding-arrows + ;; Fork of sbcl-arrows that does not have a new tag. + (let ((commit "d19364ec8850880ed6e42078ccaa2ed9114dc83a") + (revision "1")) + (package + (name "sbcl-binding-arrows") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/phoe/binding-arrows") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hqikgzic7kjq2n1d924yldfm30qz67cmsk6gghi9cbmxkwdlwp8")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("hu.dwim.stefil" ,sbcl-hu.dwim.stefil))) + (home-page "https://github.com/phoe/binding-arrows") + (synopsis "Threading macros based on binding anonymous variables") + (description + "This system implements binding threading macros -- a kind of threading +macros with different semantics than classical, Clojure core threading macros +or their extension, swiss-arrows. Two Common Lisp implementations of those are +@code{arrows} and @code{arrow-macros}. + +This system is a fork of @code{arrows} with changes in semantics that make it +impossible to merge back upstream.") + (license license:expat)))) + +(define-public ecl-binding-arrows + (sbcl-package->ecl-package sbcl-binding-arrows)) + +(define-public cl-binding-arrows + (sbcl-package->cl-source-package sbcl-binding-arrows)) -- cgit v1.2.3 From 9903342ac822c7e569e6b0425945cfacfb40c4e6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 09:41:10 +0200 Subject: gnu: Add atomics. * gnu/packages/lisp-xyz.scm (cl-atomics, ecl-atomics, sbcl-atomics): New variables. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f0073b80b9..f5a4f2f1de 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17514,3 +17514,38 @@ impossible to merge back upstream.") (define-public cl-binding-arrows (sbcl-package->cl-source-package sbcl-binding-arrows)) + +(define-public sbcl-atomics + ;; No release in years. + (let ((commit "9ee0bdebcd2bb9b242671a75460db13fbf45454c") + (revision "1")) + (package + (name "sbcl-atomics") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/atomics") + (commit commit))) + (file-name (git-file-name "atomics" version)) + (sha256 + (base32 "0mp5jdqq0aamdhgnvw149cqqi3zg7dkkibp25qi4rafw1fnpd40z")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("documentation-utils" ,sbcl-documentation-utils))) + (native-inputs + `(("parachute" ,sbcl-parachute))) + (home-page "https://shinmera.github.io/atomics/") + (synopsis "Common Lisp portability layer for atomic operations") + (description + "This is a library for access to atomic operation primitives such as +compare-and-swap. It aims to be a rather thin layer over what the +implementations offer.") + (license license:zlib)))) + +(define-public ecl-atomics + (sbcl-package->ecl-package sbcl-atomics)) + +(define-public cl-atomics + (sbcl-package->cl-source-package sbcl-atomics)) -- cgit v1.2.3 From 3b45aa167dba93196bf0908e32f744b6b10734e5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 10:02:17 +0200 Subject: gnu: Add cl-mock. * gnu/packages/lisp-xyz.scm (cl-mock, ecl-cl-mock, sbcl-cl-mock): New variables. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f5a4f2f1de..83ca4c17ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17549,3 +17549,38 @@ implementations offer.") (define-public cl-atomics (sbcl-package->cl-source-package sbcl-atomics)) + +(define-public sbcl-cl-mock + ;; .asd version only got updated recently, despired the old GitHug "1.0.1" release. + (let ((commit "7988dca2093358911b67597a2cd1570c785dfe76")) + (package + (name "sbcl-cl-mock") + (version (git-version "1.0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ferada/cl-mock/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f40wikcf783jx26ip0nnhwjjfjvjiw7njqsqrb6kaphc8bgw0i1")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("closer-mop" ,sbcl-closer-mop) + ("trivia" ,sbcl-trivia))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/Ferada/cl-mock") + (synopsis "Mocking functions for Common Lisp testing") + (description + "This small library provides a way to replace the actual implementation +of either regular or generic functions with mocks.") + (license license:agpl3)))) + +(define-public ecl-cl-mock + (sbcl-package->ecl-package sbcl-cl-mock)) + +(define-public cl-mock + (sbcl-package->cl-source-package sbcl-cl-mock)) -- cgit v1.2.3 From 40098148bdc0a6abe8d99dbcc6c9113661fd38e7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 11:11:36 +0200 Subject: gnu: Add cl-murmurhash. * gnu/packages/lisp-xyz.scm (cl-murmurhash, ecl-cl-murmurhash, sbcl-cl-murmurhash): New variables. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 83ca4c17ab..e16ea33d0a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17584,3 +17584,39 @@ of either regular or generic functions with mocks.") (define-public cl-mock (sbcl-package->cl-source-package sbcl-cl-mock)) + +(define-public sbcl-cl-murmurhash + ;; No release. + (let ((commit "5433f5e95f1cce63a81259a471150834c6a59364") + (revision "1")) + (package + (name "sbcl-cl-murmurhash") + (version (git-version "0.0.0" revision commit)) + (home-page "https://github.com/ruricolist/cl-murmurhash/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0251r0mpjm0y3qsm4lm7ncvrkxvgwc53spdm1p2mpayhvkkqqsws")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("babel" ,sbcl-babel))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (synopsis "32-bit version of Murmurhash3 for Common Lisp") + (description + "This Common Lisp package offers an implementation of the 32-bit +variant of MurmurHash3 (@url{https://github.com/aappleby/smhasher}), a fast +non-crytographic hashing algorithm.") + (license license:expat)))) + +(define-public ecl-cl-murmurhash + (sbcl-package->ecl-package sbcl-cl-murmurhash)) + +(define-public cl-murmurhash + (sbcl-package->cl-source-package sbcl-cl-murmurhash)) -- cgit v1.2.3 From 008da15880c80a905e2b9e34e0f0abadb7eefda1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 11:14:10 +0200 Subject: gnu: Add cl-hamt. * gnu/packages/lisp-xyz.scm (cl-hamt, ecl-cl-hamt, sbcl-cl-hamt): New variables. --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e16ea33d0a..81bb1dad2e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17620,3 +17620,36 @@ non-crytographic hashing algorithm.") (define-public cl-murmurhash (sbcl-package->cl-source-package sbcl-cl-murmurhash)) + +(define-public sbcl-cl-hamt + ;; No release + (let ((commit "7a99eaaca1f952029def9ad5a2b80a612a712208")) + (package + (name "sbcl-cl-hamt") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/danshapero/cl-hamt/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ycbd73ykfj5j9sdhlzamyv18qbjj6xqf7fhm4fa0nsyr6sr3rf5")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-murmurhash" ,sbcl-cl-murmurhash))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/danshapero/cl-hamt") + (synopsis "Dictionary & set data structure using hash array-mapped tries") + (description + "This library provides purely functional dictionaries and sets in +Common Lisp based on the hash array-mapped trie data structure.") + (license license:bsd-3)))) + +(define-public ecl-cl-hamt + (sbcl-package->ecl-package sbcl-cl-hamt)) + +(define-public cl-hamt + (sbcl-package->cl-source-package sbcl-cl-hamt)) -- cgit v1.2.3 From 71c3f954194770956b39d311fab44ee6ddb4f666 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jun 2021 11:17:37 +0200 Subject: gnu: Add cl-gserver. * gnu/packages/lisp-xyz.scm (cl-gserver, ecl-cl-gserver, sbcl-cl-gserver): New variables. --- gnu/packages/lisp-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 81bb1dad2e..f2fe9c93d1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17653,3 +17653,45 @@ Common Lisp based on the hash array-mapped trie data structure.") (define-public cl-hamt (sbcl-package->cl-source-package sbcl-cl-hamt)) + +(define-public sbcl-cl-gserver + (package + (name "sbcl-cl-gserver") + (version "1.7.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mdbergmann/cl-gserver") + (commit version))) + (file-name (git-file-name "cl-gserver" version)) + (sha256 + (base32 "1vkxs6ybi1pkpji2crmhq8c71zg0dn2ji0lcwhs0rivphz5jxk24")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("lparallel" ,sbcl-lparallel) + ("cl-speedy-queue" ,sbcl-cl-speedy-queue) + ("log4cl" ,sbcl-log4cl) + ("str" ,sbcl-cl-str) + ("blackbird" ,sbcl-blackbird) + ("cl-hamt" ,sbcl-cl-hamt) + ("binding-arrows" ,sbcl-binding-arrows) + ("atomics" ,sbcl-atomics))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("mock" ,sbcl-cl-mock))) + (home-page "https://mdbergmann.github.io/cl-gserver/index.html") + (synopsis "Actor framework for easy access to state and async operations") + (description + "@code{cl-gserver} is a 'message passing' library / framework with actors +similar to Erlang or Akka. It supports creating reactive systems for parallel +computing and event based message handling.") + (license license:agpl3))) + +(define-public ecl-cl-gserver + (sbcl-package->ecl-package sbcl-cl-gserver)) + +(define-public cl-gserver + (sbcl-package->cl-source-package sbcl-cl-gserver)) -- cgit v1.2.3 From bf0f9dd051919f1f66d7f48b1724a1e4a0e37795 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 21 Jun 2021 12:15:52 +0200 Subject: gnu: apache-arrow: Update to 4.0.1. * gnu/packages/databases.scm (apache-arrow): Update to 4.0.1. [arguments]: Remove trailing boolean; ensure that xsimd is not downloaded and built anew. [inputs]: Add xsimd. --- gnu/packages/databases.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f90b6e1bd8..e963789695 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) @@ -3655,7 +3656,7 @@ the SQL language using a syntax that reflects the resulting query.") (define-public apache-arrow (package (name "apache-arrow") - (version "3.0.0") + (version "4.0.1") (source (origin (method git-fetch) @@ -3665,21 +3666,22 @@ the SQL language using a syntax that reflects the resulting query.") (file-name (git-file-name name version)) (sha256 (base32 - "03ngddh3r1g6f9aja2jlfksgvgyzmxmfy4bxvzjrcv5fvl5x8ii0")))) + "1lcd9gdpwlrr92rm812a5p4l6zx0arwd0zj72a4ga699s1psz8yv")))) (build-system cmake-build-system) (arguments `(#:tests? #f #:phases (modify-phases %standard-phases (add-before 'configure 'enter-source-directory - (lambda _ (chdir "cpp") #t)) + (lambda _ (chdir "cpp"))) (add-after 'unpack 'set-env (lambda _ + (substitute* "cpp/cmake_modules/ThirdpartyToolchain.cmake" + (("set\\(xsimd_SOURCE.*") "")) (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost")) (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli")) (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers")) - (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")) - #t))) + (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson"))))) #:build-type "Release" #:configure-flags (list "-DARROW_PYTHON=ON" @@ -3701,6 +3703,7 @@ the SQL language using a syntax that reflects the resulting query.") ;; function, or using pkg-config for packages th