diff options
| author | Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com> | 2023-06-01 15:32:35 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-06-06 09:55:35 +0300 |
| commit | f351f2aaf2d02439eefd9baac8f5f3a1518584d8 (patch) | |
| tree | 4eddb3beb58c015747c7a1605ee12718d7e1d76d | |
| parent | cdbd87b6f3110082a51a5e221adc0c86a3913787 (diff) | |
| download | guix-f351f2aaf2d02439eefd9baac8f5f3a1518584d8.tar.gz guix-f351f2aaf2d02439eefd9baac8f5f3a1518584d8.zip | |
gnu: jimtcl: Update to 0.82.
* gnu/packages/embedded (jimtcl): Update to 0.82.
[arguments]: Use G-Expressions and update failing test, TTY test doesn't
fail anymore.
[inputs]: Add openssl as an input as now by default jimtcl enables the
SSL configuration option.
* gnu/packages/embedded (openocd): Support jimtcl 0.82.
[arguments]: Link against libssl and libcrypto.
[inputs]: Add openssl.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| -rw-r--r-- | gnu/packages/embedded.scm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 2a90ca22d0..6efecf9700 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) + #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) @@ -535,7 +536,7 @@ SEGGER J-Link and compatible devices.") (define-public jimtcl (package (name "jimtcl") - (version "0.80") + (version "0.82") (source (origin (method git-fetch) (uri (git-reference @@ -544,23 +545,22 @@ SEGGER J-Link and compatible devices.") (file-name (git-file-name name version)) (sha256 (base32 - "06rn60cx9sapc175vxvan87b8j5rkhh5gvvz7343xznzwlr0wcgk")))) + "01nxqzn41797ypph1vpwjfh3zqgks0l8ihh6932b4kb83apy6f08")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - ;; This package doesn't use autoconf. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "--prefix=" out))))) - (add-before 'check 'delete-failing-tests - (lambda _ - ;; XXX All but 1 TTY tests fail (Inappropriate ioctl for device). - (delete-file "tests/tty.test") - #t)) - ))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'configure + ;; This package doesn't use autoconf. + (lambda _ + (invoke "./configure" + (string-append "--prefix=" #$output)))) + (add-before 'check 'delete-failing-tests + (lambda _ + ;; XXX All but 1 SSL tests fail (tries connecting to Google + ;; servers). + (delete-file "tests/ssl.test")))))) + (inputs (list openssl)) (native-inputs ;; For tests. (list inetutils)) ; for hostname @@ -592,10 +592,10 @@ language.") pkg-config texinfo)) (inputs - (list hidapi jimtcl libftdi libjaylink libusb-compat)) + (list hidapi jimtcl libftdi libjaylink libusb-compat openssl)) (arguments '(#:configure-flags - (append (list "LIBS=-lutil" + (append (list "LIBS=-lutil -lcrypto -lssl" "--disable-werror" "--enable-sysfsgpio" "--disable-internal-jimtcl" |