From 23e2ff223c0511317edf236504fb474e3b5ac301 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 2 Aug 2023 20:23:01 +0300 Subject: gnu: apr: Fix building on powerpc-linux. * gnu/packages/apr.scm (apr): When building for powerpc-linux add a phase to apply a patch. [native-inputs]: When building for powerpc-linux add a patch. * gnu/packages/patches/apr-fix-atomics.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/packages/apr.scm | 21 +++++++++++-- gnu/packages/patches/apr-fix-atomics.patch | 49 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/apr-fix-atomics.patch (limited to 'gnu/packages') diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index aedddd86446..aac3822eaea 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2018 Mark H Weaver +;;; Copyright © 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,8 @@ #:use-module ((guix licenses) #:prefix l:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages perl) @@ -46,9 +49,23 @@ ;; Sometimes we end up with two processes concurrently trying to make ;; 'libmod_test.la': . ;; Thus, build sequentially. - '(#:parallel-build? #f - #:parallel-tests? #f)) + `(#:parallel-build? #f + #:parallel-tests? #f + ,@(if (target-ppc32?) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (invoke "patch" "-p1" "--force" "--input" + (assoc-ref (or native-inputs inputs) + "atomics-patch")))))) + '()))) (inputs (list perl libltdl)) + (native-inputs + `(,@(if (target-ppc32?) + `(("atomics-patch" + ,(local-file (search-patch "apr-fix-atomics.patch")))) + '()))) (home-page "https://apr.apache.org/") (synopsis "The Apache Portable Runtime Library") (description diff --git a/gnu/packages/patches/apr-fix-atomics.patch b/gnu/packages/patches/apr-fix-atomics.patch new file mode 100644 index 00000000000..94cce9b5f10 --- /dev/null +++ b/gnu/packages/patches/apr-fix-atomics.patch @@ -0,0 +1,49 @@ +This patch is taken from Debian, using Debian version 1.7.0-8. +A new patch will be needed when apr is updated. + +# quick and dirty fix for FTBFS on mipsel +# There should be a proper configure check, see +# https://bz.apache.org/bugzilla/show_bug.cgi?id=63566 +Index: apr-1.7.0/include/arch/unix/apr_arch_atomic.h +=================================================================== +--- apr-1.7.0.orig/include/arch/unix/apr_arch_atomic.h ++++ apr-1.7.0/include/arch/unix/apr_arch_atomic.h +@@ -26,6 +26,9 @@ + /* noop */ + #elif HAVE_ATOMIC_BUILTINS + # define USE_ATOMICS_BUILTINS ++# if (__INTPTR_WIDTH__ == 32) && ( defined(__MIPSEL__) || defined(__powerpc__) ) || defined(__m68k__) || defined(__sh__) ++# define NEED_ATOMICS_GENERIC64 ++# endif + #elif defined(SOLARIS2) && SOLARIS2 >= 10 + # define USE_ATOMICS_SOLARIS + # define NEED_ATOMICS_GENERIC64 +Index: apr-1.7.0/atomic/unix/builtins64.c +=================================================================== +--- apr-1.7.0.orig/atomic/unix/builtins64.c ++++ apr-1.7.0/atomic/unix/builtins64.c +@@ -16,7 +16,7 @@ + + #include "apr_arch_atomic.h" + +-#ifdef USE_ATOMICS_BUILTINS ++#if defined(USE_ATOMICS_BUILTINS) && ! defined(NEED_ATOMICS_GENERIC64) + + APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem) + { +Index: apr-1.7.0/atomic/unix/builtins.c +=================================================================== +--- apr-1.7.0.orig/atomic/unix/builtins.c ++++ apr-1.7.0/atomic/unix/builtins.c +@@ -20,7 +20,11 @@ + + APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p) + { ++#if defined (NEED_ATOMICS_GENERIC64) ++ return apr__atomic_generic64_init(p); ++#else + return APR_SUCCESS; ++#endif + } + + APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem) -- cgit v1.3 From 55593beaba8328c16e3b1fa81197f4173fc17691 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Fri, 28 Jul 2023 21:51:57 +0900 Subject: gnu: ibus: Wrap ibus-daemon with GUIX_PYTHONPATH and GI_TYPELIB_PATH. * gnu/packages/ibus.scm (ibus)[arguments]: Wrap 'ibus-daemon' in the same way as 'ibus-setup'. --- gnu/packages/ibus.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index b156e2ab587..1182b6ba695 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -243,13 +243,20 @@ may also simplify input method development.") #~(modify-phases #$phases (replace 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'ibus-setup' runs with the correct - ;; GUIX_PYTHONPATH and GI_TYPELIB_PATH. - (wrap-program (search-input-file outputs "bin/ibus-setup") - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH") - ,(string-append #$output "/lib/girepository-1.0")))))))))) + ;; Make sure 'ibus-setup' and 'ibus-daemon' runs with the + ;; correct GUIX_PYTHONPATH and GI_TYPELIB_PATH. Wrap + ;; 'ibus-daemon' is needed because engines spawned by + ;; the daemon need access to those libraries. + (for-each + (lambda (prog) + (wrap-program prog + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH") + ,(string-append #$output "/lib/girepository-1.0"))))) + (list (search-input-file outputs "bin/ibus-setup") + (search-input-file outputs "bin/ibus-daemon"))))))))) (inputs (modify-inputs (package-inputs ibus-minimal) (prepend gtk pango -- cgit v1.3 From 4eeb35595b05d7a3c83de1f901b3edffcafe9df5 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Fri, 28 Jul 2023 21:51:58 +0900 Subject: gnu: Add ibus-table. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/ibus-table-paths.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/ibus.scm (ibus-table): New variable. Co-authored-by: 宋文武 --- gnu/local.mk | 1 + gnu/packages/ibus.scm | 44 +++++++++++++++++++++++++++++ gnu/packages/patches/ibus-table-paths.patch | 38 +++++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 gnu/packages/patches/ibus-table-paths.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index c603c15d6c5..77707127a7c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -899,6 +899,7 @@ dist_patch_DATA = \ %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/ibus-anthy-fix-tests.patch \ + %D%/packages/patches/ibus-table-paths.patch \ %D%/packages/patches/anki-mpv-args.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 1182b6ba695..4d99ef39f6b 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -906,6 +906,50 @@ hanja dictionary and small hangul character classification.") "ibus-hangul is a Korean input method engine for IBus.") (license gpl2+))) +(define-public ibus-table + (package + (name "ibus-table") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/mike-fabian/ibus-table/releases/download/" + version "/ibus-table-" version ".tar.gz")) + (sha256 + (base32 "063ba4fwk04lh0naj8z9r9x15ikckp94pd3f8xn40z3lnwsjx2sj")) + (patches (search-patches "ibus-table-paths.patch")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "engine/tabcreatedb.py" + (("/usr/share/ibus-table") + (string-append #$output "/share/ibus-table"))) + (substitute* "engine/ibus_table_location.py" + (("/usr/share/ibus-table") + (string-append #$output "/share/ibus-table")) + (("/usr/libexec") + (string-append #$output "/libexec"))))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd))))))) ; tests write to $HOME + (native-inputs (list (list glib "bin") pkg-config)) + (inputs (list glib gtk+ ibus python python-pygobject)) + (native-search-paths + (list (search-path-specification + (variable "IBUS_TABLE_LOCATION") + (files '("share/ibus-table")) + (separator #f)))) + (home-page "https://mike-fabian.github.io/ibus-table") + (synopsis "Table based input framework for IBus") + (description + "@code{ibus-table} is a framework for table based input methods using +IBus.") + (license lgpl2.1+))) + (define-public ibus-speech-to-text (package (name "ibus-speech-to-text") diff --git a/gnu/packages/patches/ibus-table-paths.patch b/gnu/packages/patches/ibus-table-paths.patch new file mode 100644 index 00000000000..bc0c5e78e1c --- /dev/null +++ b/gnu/packages/patches/ibus-table-paths.patch @@ -0,0 +1,38 @@ +diff --git a/engine/ibus-engine-table.in b/engine/ibus-engine-table.in +index e79d62a6cad4..675007204abd 100644 +--- a/engine/ibus-engine-table.in ++++ b/engine/ibus-engine-table.in +@@ -24,8 +24,6 @@ prefix=@prefix@ + exec_prefix=@prefix@ + datarootdir=@datarootdir@ + datadir=@datadir@ +-export IBUS_TABLE_LOCATION=@datarootdir@/ibus-table +-export IBUS_TABLE_LIB_LOCATION=@libexecdir@ + + # Set this variable to something > 0 to get more debug output. + # (Debug output may show up in the log file and/or in the lookup table): +diff --git a/engine/ibus-table-createdb.in b/engine/ibus-table-createdb.in +index 91eb28b7cbe5..187dddf2c952 100644 +--- a/engine/ibus-table-createdb.in ++++ b/engine/ibus-table-createdb.in +@@ -24,6 +24,4 @@ exec_prefix=@exec_prefix@ + bindir=@bindir@ + datarootdir=@datarootdir@ + datadir=@datadir@ +-export IBUS_TABLE_DATA_DIR=@datarootdir@ +-export IBUS_TABLE_BIN_PATH=@bindir@ + exec @PYTHON@ @datarootdir@/ibus-table/engine/tabcreatedb.py $@ +diff --git a/setup/ibus-setup-table.in b/setup/ibus-setup-table.in +index 7f7405c37296..ae6f96921c56 100644 +--- a/setup/ibus-setup-table.in ++++ b/setup/ibus-setup-table.in +@@ -22,9 +22,6 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ +-export IBUS_PREFIX=@prefix@ +-export IBUS_DATAROOTDIR=@datarootdir@ +-export IBUS_LOCALEDIR=@localedir@ + cd @prefix@/share/ibus-table/setup/ + exec @PYTHON@ main.py $@ + -- cgit v1.3 From 782cf09b84bc72514e89d783460ea98bc353bf6a Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Fri, 28 Jul 2023 21:51:59 +0900 Subject: gnu: Add ibus-table-others. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ibus.scm (ibus-table-others): New variable. Signed-off-by: 宋文武 --- gnu/packages/ibus.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 4d99ef39f6b..c3310ec2a37 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -950,6 +950,55 @@ hanja dictionary and small hangul character classification.") IBus.") (license lgpl2.1+))) +(define-public ibus-table-others + (package + (name "ibus-table-others") + (version "1.3.16") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/moebiuscurve/ibus-table-others/releases/" + "download/" version "/ibus-table-others-" version ".tar.gz")) + (sha256 + (base32 "0vllwrjlgcvdjhs7nrg45hfvnivnfhrc05r6rhw8m0c41layl9jg")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda _ + (setenv "HOME" (getcwd))))))) ; db written in $HOME + (native-inputs (list pkg-config python)) + (inputs (list ibus ibus-table)) + (home-page "https://github.com/moebiuscurve/ibus-table-others") + (synopsis "Various table-based input methods for IBus") + (description + "@code{ibus-table-others} provides the following input methods on +IBus-Table on IBus framework: + +@itemize +@item CNS11643 +@item Compose +@item Emoji +@item IPA-X-SAMPA +@item LaTex +@item Mathwriter +@item Mongol bichig +@item RussianTraditional +@item Telex +@item Thai +@item Translit +@item Ua-Translit +@item Viqr +@item VNI +@item Yawerty +@end itemize") + ;; GPL-3.0-or-later: vni, ipa-x-sampa, telex + ;; WTFPL: mongol_bichig + ;; LGPL-2.1-or-later: others + (license (list lgpl2.1+ gpl3+ wtfpl2)))) + (define-public ibus-speech-to-text (package (name "ibus-speech-to-text") -- cgit v1.3 From 6afe1246b9e87a0802ab5d06a6033c58efa48e8e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: ant@1.10: Update to 1.10.13. * gnu/packages/java.scm (ant/java8): Update to 1.10.13. --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index dd6c549a251..16dcbe18a6d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1589,14 +1589,14 @@ OpenJDK.") (define-public ant/java8 (package (name "ant") - (version "1.10.10") + (version "1.10.13") (source (origin (method url-fetch) (uri (string-append "mirror://apache/ant/source/apache-ant-" version "-src.tar.gz")) (sha256 (base32 - "1dhkk9ajc378cln6sj9q0ya8bl9dpyji5xcrl1zq41zx1k6j54g5")) + "01l4g9b1xnnq450ljvhrlvcf8wzzmr45wmhkybrx0hcdi166y06s")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 5fa4a99eb0bae4a20743e1d126dde74c713acf45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: debian-archive-keyring: Update to 2023.4. * gnu/packages/debian.scm (debian-archive-keyring): Update to 2023.4. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/debian.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index c5cfda9f809..ef3c5f1f2cb 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -47,7 +47,7 @@ (define-public debian-archive-keyring (package (name "debian-archive-keyring") - (version "2023.3") + (version "2023.4") (source (origin (method git-fetch) @@ -56,8 +56,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1x0hsgfq08c53ws5llkhr1jqwr6yr0sccy5w9pz3p1dzbgfv2wd5")))) + (base32 "0gn24dgzpg9zwq2hywkac4ljr5lrh7smyqxm21k2bivl0bhc4ca6")))) (build-system gnu-build-system) (arguments '(#:test-target "verify-results" @@ -74,8 +73,7 @@ (install-file "keyrings/debian-archive-removed-keys.gpg" key) (for-each (lambda (file) (install-file file apt)) - (find-files "trusted.gpg" "\\.gpg$"))) - #t))))) + (find-files "trusted.gpg" "\\.gpg$")))))))) (native-inputs (list gnupg jetring)) (home-page "https://packages.qa.debian.org/d/debian-archive-keyring.html") -- cgit v1.3 From 15fea85d1c15c314ac444d12ad739a3bba6f0eaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: cxxtest: Use Web Archived home page. * gnu/packages/check.scm (cxxtest)[home-page]: Use a copy archived by the Wayback Machine. --- gnu/packages/check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 71dc9eb54ba..1d70ea9fe0d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -785,7 +785,7 @@ favourite continuous integration framework. Among Cukinia features are: #t)))))) (propagated-inputs (list python-ply)) - (home-page "https://cxxtest.com/") + (home-page "https://web.archive.org/web/20230604070022/http://cxxtest.com/") (synopsis "Unit testing framework for C++") (description "CxxTest is a unit testing framework for C++ that is similar in spirit to JUnit, CppUnit, and xUnit. CxxTest does not require precompiling -- cgit v1.3 From 8ece3fbe5649b0c77c2b11bafcc4bdcc7b85ffdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: cutter: Update home page. * gnu/packages/engineering.scm (cutter)[home-page]: Update. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 88f541d2e91..f5bc99942b4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2436,7 +2436,7 @@ simulation.") ;; Depends on radare2 4.5.1 officially, builds and works fine with ;; radare2 5.0.0 but fails to build with radare2 5.1.1. radare2-for-cutter)) - (home-page "https://github.com/radareorg/cutter") + (home-page "https://cutter.re") (synopsis "GUI for radare2 reverse engineering framework") (description "Cutter is a GUI for radare2 reverse engineering framework. Its goal is making an advanced andcustomizable reverse-engineering platform -- cgit v1.3 From f2d250506630a3169b4bc7d9b573694ef01f920c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: cutter: Update source URL. * gnu/packages/engineering.scm (cutter)[source]: Update. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f5bc99942b4..b5b4ad1b103 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2406,7 +2406,7 @@ simulation.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/radareorg/cutter") + (url "https://github.com/rizinorg/cutter") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 -- cgit v1.3 From 19503defc09d8b8b6746fe5041bfdcc51f286891 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: delta: Use Web Archived home page. * gnu/packages/debug.scm (delta)[home-page]: Use a copy archived by the Wayback Machine. --- gnu/packages/debug.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 0c97f61ccbe..4a9319d0a90 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -114,7 +114,8 @@ `("delta" "multidelta" "topformflat")))) #t)) (delete 'configure)))) ; no configure script - (home-page "http://delta.tigris.org/") + (home-page + "https://web.archive.org/web/20200701152100/http://delta.tigris.org/") (synopsis "Heuristical file minimizer") (description "Delta assists you in minimizing \"interesting\" files subject to a test -- cgit v1.3 From 7bb1bea4d7345cbe2ab9f6ea6d9194b23fedef63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: delta: Remove broken source URL. This does indeed serve infinite redirects, even from the Wayback Machine, so there is no value in keeping it here. * gnu/packages/debug.scm (delta)[source]: Drop tigris.org URL --- gnu/packages/debug.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4a9319d0a90..e2a29a3ae90 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -86,10 +86,7 @@ (method url-fetch) (uri (list (string-append "mirror://debian/pool/main/d/delta/" - "delta_" version ".orig.tar.gz") - ;; This uri seems to send guix download into an infinite loop - (string-append "http://delta.tigris.org/files/documents/3103/" - "33566/delta-" version ".tar.gz"))) + "delta_" version ".orig.tar.gz"))) (sha256 (base32 "184wh35pf2ddx97319s6sgkzpz48xxkbwzcjpycv009bm53lh61q")))) -- cgit v1.3 From 79e8072a18cb74861a9a7a14a1cd469eb23b0eba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: dconf: Update home page. * gnu/packages/gnome.scm (dconf)[home-page]: Update. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 18f07832084..c887da70039 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4689,7 +4689,7 @@ and RDP protocols.") (propagated-inputs ;; In Requires of dconf.pc. (list glib)) - (home-page "https://developer.gnome.org/dconf/") + (home-page "https://wiki.gnome.org/action/show/Projects/dconf") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that don't already have -- cgit v1.3 From 3c5050b6133acda1dd105c84772b6654863854d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: sg3-utils: Update to 1.48. * gnu/packages/scsi.scm (sg3-utils): Update to 1.48. --- gnu/packages/scsi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index f63b391dc12..a2dd263a7c1 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -30,14 +30,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.47") + (version "1.48") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "1ckj2kjcs23lbjfyl5mz2rb0aylnyq13yghg0bdv1n7dbywcmc6x")))) + "1ynv6kijzjj8xab3z87nks26qcrpvg46mhlr3s6yah6mj0ba9ffn")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.3 From 753ca72fc14c5bec7328604ad35cc342872503c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: sg3-utils: Download over HTTPS. * gnu/packages/scsi.scm (sg3-utils)[source]: Use HTTPS. --- gnu/packages/scsi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index a2dd263a7c1..6e52e3aaa5d 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -33,7 +33,7 @@ (version "1.48") (source (origin (method url-fetch) - (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" + (uri (string-append "https://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 -- cgit v1.3 From e09275f300efcb9f2f4d805833c2f86ebc599ddd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: catgirl: Don't use snapshot tarball. * gnu/packages/irc.scm (catgirl)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/irc.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index cbe80f5e457..8ffe3882db4 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -410,13 +410,15 @@ for the IRCv3 protocol.") (package (name "catgirl") (version "2.1") - (source (origin - (method url-fetch) - (uri (string-append "https://git.causal.agency/catgirl/snapshot/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "13pfphcfkdzqfb4x7w21xp6rnmg3ix9f39mpqmxxzg15ys1gp2x6")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.causal.agency/catgirl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gxxblv3bwv1rl2ajjy791333r6qwgzb6qmk3iviw71mzi6ckxba")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.3 From 8e3ac218b6b80bdc6d1ca5be57c88291a256b9f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: catgirl: Update to 2.2. * gnu/packages/irc.scm (catgirl): Update to 2.2. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 8ffe3882db4..a3a5c69e21e 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -409,7 +409,7 @@ for the IRCv3 protocol.") (define-public catgirl (package (name "catgirl") - (version "2.1") + (version "2.2") (source (origin (method git-fetch) @@ -418,7 +418,7 @@ for the IRCv3 protocol.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gxxblv3bwv1rl2ajjy791333r6qwgzb6qmk3iviw71mzi6ckxba")))) + (base32 "0r1h10qdhhgy3359ndbjh269daivm126qc0c23db7bffv0xs4bff")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.3 From 4ded034a57ffacdd6c7afa73bb58893afd614644 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: catgirl: Use G-expressions. * gnu/packages/irc.scm (catgirl)[arguments]: Rewrite as G-expressions. --- gnu/packages/irc.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index a3a5c69e21e..f9667240229 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -421,9 +421,11 @@ for the IRCv3 protocol.") (base32 "0r1h10qdhhgy3359ndbjh269daivm126qc0c23db7bffv0xs4bff")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests - #:make-flags (list (string-append "PREFIX=" %output) - ,(string-append "CC=" (cc-for-target))))) + (list + #:tests? #f ; no tests + #:make-flags + #~(list (string-append "prefix=" #$output) + (string-append "CC=" #$(cc-for-target))))) (native-inputs (list universal-ctags pkg-config)) (inputs -- cgit v1.3 From 492d56b9e07159493b44dcbbad845cfa16ad70cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: libstrophe: Update to 0.12.3. * gnu/packages/messaging.scm (libstrophe): Update to 0.12.3. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/messaging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 02b0d10c6e2..00d8d29017b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2089,7 +2089,7 @@ is also scriptable and extensible via Guile.") (define-public libstrophe (package (name "libstrophe") - (version "0.12.2") + (version "0.12.3") (source (origin (method git-fetch) @@ -2098,7 +2098,7 @@ is also scriptable and extensible via Guile.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ispq6sf7pq02irrqfga4i1xhrg1pg0f86qvvnix15clm8i1agld")))) + (base32 "17wxaqdcwhm34bl31g9fmsgmnsd7znyxcb9dhw9lmaghkql1sf0h")))) (build-system gnu-build-system) (arguments (list #:configure-flags '(list "--disable-static") @@ -2107,8 +2107,7 @@ is also scriptable and extensible via Guile.") (add-after 'unpack 'patch-make (lambda _ (substitute* "Makefile.am" - (("'\\^xmpp_'") "'.'")) - #t)) + (("'\\^xmpp_'") "'.'")))) (add-after 'install-licence-files 'install-extra-licence-files (lambda _ (let ((license-directory (string-append #$output -- cgit v1.3 From e9abc417d3a284776bb2440c5d67a3bd4acb6a29 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: entr: Update to 5.4. * gnu/packages/entr.scm (entr): Update to 5.4. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/entr.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm index b74a00fec30..c8198d4706c 100644 --- a/gnu/packages/entr.scm +++ b/gnu/packages/entr.scm @@ -35,14 +35,14 @@ (define-public entr (package (name "entr") - (version "5.2") + (version "5.4") (source (origin (method url-fetch) (uri (string-append "https://eradman.com/entrproject/code/entr-" version ".tar.gz")) (sha256 (base32 - "1063b33bqggyqd0h7cvcvznpgiy9s2zqkdsc1q622xdh8sfk0zi3")))) + "17hz4aca6dsh6z58625jg8fbk5m9ng3s95pl4s6ws79zrk9dw7a9")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -64,8 +64,7 @@ (("/bin/cat" command) (search-input-file inputs command)) (("/usr(/bin/clear)" _ command) - (search-input-file inputs command))) - #t))))) + (search-input-file inputs command)))))))) (inputs (list bash coreutils ncurses)) (home-page "https://eradman.com/entrproject/") -- cgit v1.3 From f4d418a13ebdd72af62c187b4ace556a1fad85a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: entr: Rewrite description. * gnu/packages/entr.scm (entr)[description]: Rewrite. --- gnu/packages/entr.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm index c8198d4706c..5827da1d07c 100644 --- a/gnu/packages/entr.scm +++ b/gnu/packages/entr.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2019 Ricardo Wurmus -;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020, 2023 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2022 jgart @@ -70,11 +70,13 @@ (home-page "https://eradman.com/entrproject/") (synopsis "Run arbitrary commands when files change") (description - "entr is a zero-configuration tool with no external build or run-time -dependencies. The interface to entr is not only minimal, it aims to be simple -enough to create a new category of ad hoc automation. These micro-tests -reduce keystrokes, but more importantly they emphasize the utility of -automated checks.") + "@acronym{entr, event notify test runner} reads a list of file names from +standard input and executes a given command (including arguments) whenever any +of them change. It aims to facilitate rapid feedback and automated testing. + +For example, you can use @command{entr} to automatically invoke @command{make} +each time you modify a source code file. It supports interactive utilities and +doesn't waste resources by polling for changes.") ;; Per 'LICENSE', portability code under missing/ is under BSD-2. (license isc))) -- cgit v1.3 From 17fadbb5ea3b35f962ab1bcd5b8cf4e1d699eb7e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 4 Aug 2023 16:17:31 +0200 Subject: gnu: r-liana: Update to 0.1.11-1.10d8177. * gnu/packages/bioinformatics.scm (r-liana): Update to 0.1.11-1.10d8177. --- gnu/packages/bioinformatics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d1448e390f7..b847c9a5d72 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15057,11 +15057,11 @@ activity prediction from transcriptomics data, and its R implementation (license license:expat)))) (define-public r-liana - (let ((commit "efb1249af46f576d1d620956053cfa93b2cee961") + (let ((commit "10d81773e0874de676eb106ce56e3cf9d4fe01d3") (revision "1")) (package (name "r-liana") - (version (git-version "0.1.5" revision commit)) + (version (git-version "0.1.11" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15070,13 +15070,13 @@ activity prediction from transcriptomics data, and its R implementation (file-name (git-file-name name version)) (sha256 (base32 - "0z645k26kqrfj5f1s412vwclw1q47h1zfxxrh9ijr30pxhpv6cv0")))) + "0b0m8i9kava36s3cn6vnn5vmiwvqwxmcq8jacy6ccshsji3kgp09")))) (properties `((upstream-name . "liana"))) (build-system r-build-system) (arguments (list #:phases - `(modify-phases %standard-phases + '(modify-phases %standard-phases ;; This is needed to find ~/.config/OmnipathR/omnipathr.yml (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" "/tmp")))))) -- cgit v1.3 From 85736a545d142fbab6a5c15634d1e22adf57df58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: diffoscope: Update to 247. * gnu/packages/diffoscope.scm (diffoscope): Update to 247. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 52717f6bdb5..5275f34a736 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -74,7 +74,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "246") + (version "247") (source (origin (method git-fetch) @@ -83,7 +83,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1y54r0kayn7nvv0ng9dx6bwxvrwdkd0xaklmfq53z7p00wgx0ly8")))) + (base32 "0c81pvdq0bz47sk3gcgpm2l3g5hxdi2s1jz05krv1cr2bd0sfq4j")))) (build-system python-build-system) (arguments (list -- cgit v1.3 From 2c7f12a6cb3f8a6646098ef8985c0f6061ccd3fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: Add libtracefs. * gnu/packages/linux.scm (libtracefs): New public variable. --- gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3aec03a3ec9..595866699e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9975,6 +9975,46 @@ formats.") (license (list license:gpl2 license:lgpl2.1)))) +(define-public libtracefs + (package + (name "libtracefs") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v896n3q0df0nxx5drbwyaqhrqiyxl06rvrdw3gp2r37awa9g1zb")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* (list "Makefile" "scripts/utils.mk") + (("/bin/(pwd)" _ command) command)))))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no test suite + #:make-flags + #~(list + (string-append "CC=" #$(cc-for-target)) + (string-append "pkgconfig_dir=" #$output "/lib/pkgconfig") + (string-append "prefix=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (native-inputs (list pkg-config)) + (inputs (list libtraceevent)) + (home-page "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/") + (synopsis "Linux kernel trace file system library") + (description + "This library provides APIs to access the Linux kernel's trace file +system.") + (license (list license:gpl2 + license:lgpl2.1)))) + (define-public libtree (package (name "libtree") -- cgit v1.3 From 5ecf70535d56b68fc03e4ee26063d872e57cae78 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: libtraceevent: Tweak description. * gnu/packages/linux.scm (libtraceevent)[description]: Do grammar. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 595866699e3..e5f39d7ff19 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9970,8 +9970,8 @@ older system-wide @file{/sys} interface.") (delete 'configure)))) ; no configure script (home-page "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/") (synopsis "Linux kernel trace event library") - (description "This package provides library to parse raw trace event -formats.") + (description + "This library parses raw Linux kernel trace event formats.") (license (list license:gpl2 license:lgpl2.1)))) -- cgit v1.3 From 8b8944a4d2e208321ed8ded653d786885950800a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: ndctl: Update to 78. * gnu/packages/disk.scm (ndctl): Update to 78. [inputs]: Add libtraceevent & libtracefs. --- gnu/packages/disk.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index bb68b171f96..fab35850f5c 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -968,7 +968,7 @@ passphrases.") (define-public ndctl (package (name "ndctl") - (version "75") + (version "78") (source (origin (method git-fetch) (uri (git-reference @@ -977,7 +977,7 @@ passphrases.") (file-name (git-file-name name version)) (sha256 (base32 - "0i3fmda285qnwnmkxzwji5ffz123yrq9dpcwzg922qpysir7zq40")))) + "0rhmxjajxxslsikixlf9cdg5vcn42h7zzqkqj5p5pshxch368kn0")))) (build-system meson-build-system) (arguments ;; The test suite runs but SKIPs all tests: do not consider this tested! @@ -1020,6 +1020,8 @@ passphrases.") json-c keyutils kmod + libtraceevent + libtracefs `(,util-linux "lib"))) (home-page "https://github.com/pmem/ndctl") (synopsis "Manage the non-volatile memory device sub-system in the Linux kernel") -- cgit v1.3 From 54a5d07aa5127bf0abd8524a698b4252f078e165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: sudo: Update to 1.9.14p3. * gnu/packages/admin.scm (sudo): Update to 1.9.14p3. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fa697b79fb4..8ec3034a401 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1960,7 +1960,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.14p1") + (version "1.9.14p3") (source (origin (method url-fetch) (uri @@ -1970,7 +1970,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "1bwg2bn1sbc6l2gx2r9vfqyf8dyvgp7nad0wj3p5gn095vpza6z9")) + "0qibg30d30gy85g83fj6gsg59g1sj3i9mkfl0k0851dwqjqii0x0")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From e222d9192aa0b7d169cf9db6b82191a6a3ece817 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: reprotest: Update to 0.7.26. * gnu/packages/diffoscope.scm (reprotest): Update to 0.7.26. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 5275f34a736..86f0c779ef8 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -243,7 +243,7 @@ install.") (define-public reprotest (package (name "reprotest") - (version "0.7.23") + (version "0.7.26") (source (origin (method git-fetch) @@ -252,7 +252,7 @@ install.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hkzh4i3c5hrbvdkhbmwm5vmb4msnlm5rvhjin6h2ni40kix69g0")))) + (base32 "1992wlkil07fmj64lw3i7l16dgkkzphz0f932hbkkj9rlcamdwxd")))) (inputs (list python-debian python-distro python-libarchive-c python-rstr)) (native-inputs -- cgit v1.3 From 42ae42cf41e8f5e88422e30d801251a3427d7f3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: tlpui: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (tlpui)[arguments]: Search for …/bin/lspci, not …/sbin/lspci. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e5f39d7ff19..9c49cc0b3a1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7762,7 +7762,7 @@ every time the power supply source is changed.") (lambda* (#:key inputs #:allow-other-keys) (let ((defaults.conf (search-input-file inputs "/share/tlp/defaults.conf")) - (lspci (search-input-file inputs "/sbin/lspci")) + (lspci (search-input-file inputs "/bin/lspci")) (lsusb (search-input-file inputs "/bin/lsusb")) (tlp-stat (search-input-file inputs "/bin/tlp-stat"))) (with-directory-excursion "tlpui" -- cgit v1.3 From 0e11ca71be43c44150d123f19630c28900ccaef1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:01:17 +0200 Subject: gnu: Add java-commons-rdf-api. * gnu/packages/java-rdf.scm: New file. (java-commons-rdf-api): New variable. --- gnu/packages/java-rdf.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 gnu/packages/java-rdf.scm (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm new file mode 100644 index 00000000000..3a10ca4d0a3 --- /dev/null +++ b/gnu/packages/java-rdf.scm @@ -0,0 +1,57 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Liliana Marie Prikler +;;; +;;; 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 . + +(define-module (gnu packages java-rdf) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system ant) + #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages java)) + +(define-public java-commons-rdf-api + (package + (name "java-commons-rdf-api") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://apache/commons/rdf/source/" + "apache-commons-rdf-" version + "-source-release.zip")) + (sha256 + (base32 + "14ihqgpbci6z5a5xlksbhjjxaw1kb80gx1k8l20v8w41in53rzqz")))) + (build-system ant-build-system) + (arguments + (list #:jar-name "commons-rdf-api.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "commons-rdf-api"))) + (replace 'install + (install-from-pom "pom.xml"))))) + (native-inputs (list java-junit java-slf4j-simple unzip)) + (home-page "https://commons.apache.org/proper/commons-rdf/") + (synopsis "Java interfaces for RDF 1.1 concepts") + (description "This package provides Java interfaces for RDF 1.1 concepts.") + (license license:asl2.0))) -- cgit v1.3 From fd044f86a0329a2cdbc744f75f81cfa7cf4b245b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:02:42 +0200 Subject: gnu: Add java-commons-rdf-api-tests. * gnu/packages/java-rdf.scm (java-commons-rdf-api-tests): New variable. --- gnu/packages/java-rdf.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 3a10ca4d0a3..1f4b6797916 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -55,3 +55,18 @@ (synopsis "Java interfaces for RDF 1.1 concepts") (description "This package provides Java interfaces for RDF 1.1 concepts.") (license license:asl2.0))) + +(define-public java-commons-rdf-api-tests + (package + (inherit java-commons-rdf-api) + (name "java-commons-rdf-api-tests") + (arguments + (list #:tests? #f + #:jar-name "commons-rdf-api-tests.jar" + #:source-dir "commons-rdf-api/src/test/java")) + (propagated-inputs (list java-commons-rdf-api + java-junit + java-slf4j-simple)) + (native-inputs (list unzip)) + (description "This package provides common test classes for packages +implementing java-commons-rdf-api."))) -- cgit v1.3 From 5c1212919f9f76678fae7226f8f81b6ca01ba3a2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:03:46 +0200 Subject: gnu: Add java-commons-rdf-simple. * gnu/packages/java-rdf.scm (java-commons-rdf-simple): New variable. --- gnu/packages/java-rdf.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 1f4b6797916..066b383c5ae 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -70,3 +70,32 @@ (native-inputs (list unzip)) (description "This package provides common test classes for packages implementing java-commons-rdf-api."))) + +(define-public java-commons-rdf-simple + (package + (inherit java-commons-rdf-api) + (name "java-commons-rdf-simple") + (arguments + (list #:jar-name "commons-rdf-api.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "commons-rdf-simple"))) + (add-after 'chdir 'delete-failing-tests + (lambda _ + (with-directory-excursion "src/test/java/org/apache/commons/" + (delete-file "rdf/simple/SimpleServiceLoaderTest.java")))) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("\\$\\{project\\.parent\\.groupId\\}") + "org.apache.commons")))) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs (list java-commons-rdf-api)) + (native-inputs (list java-commons-rdf-api-tests unzip)) + (synopsis "Simple implementation of RDF 1.1 concepts") + (description "This package provides a simple implementation of RDF 1.1 +concepts in Java."))) -- cgit v1.3 From 44a768b8901cf3fb1c7a39c1f6e2d90062f62c97 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:10:06 +0200 Subject: gnu: Add java-eclipse-rdf4j-model-api. Since RDF4J is a large framework with many parts, this patch also prepares some boilerplate code for the other packages. * gnu/packages/java-rdf.scm (%rdf4j-version, %rdf4j-sha256, %rdf4j-source) (rdf4j-common-arguments): New variables. (java-eclipse-rdf4j-model-api): New variable. --- gnu/packages/java-rdf.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 066b383c5ae..bf83c9ab5ea 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -99,3 +99,47 @@ implementing java-commons-rdf-api."))) (synopsis "Simple implementation of RDF 1.1 concepts") (description "This package provides a simple implementation of RDF 1.1 concepts in Java."))) + +(define %rdf4j-version "3.7.7") +(define %rdf4j-sha256 + (base32 "1lala4wjl5lbg45jdgd94rfkvdg6r4vq23k3q54bkk9q3w9v2bdx")) +(define %rdf4j-source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse/rdf4j") + (commit %rdf4j-version))) + (file-name (git-file-name "rdf4j" %rdf4j-version)) + (sha256 %rdf4j-sha256) + (modules '((guix build utils))) + (snippet #~(begin (delete-file-recursively "site"))))) + +(define (rdf4j-common-arguments jar-name directory) + (list #:source-dir "src/main/java" + #:test-dir "src/test/java" + #:tests? #f ; tests require junit 5 + #:jar-name jar-name + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir (lambda _ (chdir #$directory))) + (add-after 'chdir 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("\\$\\{project\\.groupId\\}") "org.eclipse.rdf4j")))) + (replace 'install + (install-from-pom "pom.xml"))))) + +(define-public java-eclipse-rdf4j-model-api + (package + (name "java-eclipse-rdf4j-model-api") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-model-api.jar" + "core/model-api")) + (home-page "https://rdf4j.org/") + (synopsis "RDF4J model interfaces") + (description "This package provides interfaces for the RDF data model used +in the RDF4J framework.") + (license license:epl1.0))) -- cgit v1.3 From 3e332c380f3dc45f228b4b9aec60718b76dafc4e Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:12:23 +0200 Subject: gnu: Add java-eclipse-rdf4j-model-vocabulary. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-model-vocabulary): New variable. --- gnu/packages/java-rdf.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index bf83c9ab5ea..34a7b4637f4 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -143,3 +143,19 @@ concepts in Java."))) (description "This package provides interfaces for the RDF data model used in the RDF4J framework.") (license license:epl1.0))) + +(define-public java-eclipse-rdf4j-model-vocabulary + (package + (name "java-eclipse-rdf4j-model-vocabulary") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-model-vocabulary.jar" + "core/model-vocabulary")) + (propagated-inputs (list java-eclipse-rdf4j-model-api)) + (home-page "https://rdf4j.org/") + (synopsis "Well known RDF vocabularies") + (description "This package provides Java classes for well known +RDF vocabularies.") + (license license:epl1.0))) -- cgit v1.3 From 7944619cb07b401ece34f5d75deb813e864b2333 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:12:37 +0200 Subject: gnu: Add java-eclipse-rdf4j-util. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-util): New variable. --- gnu/packages/java-rdf.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 34a7b4637f4..d3b0973c17a 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -159,3 +159,20 @@ in the RDF4J framework.") (description "This package provides Java classes for well known RDF vocabularies.") (license license:epl1.0))) + +(define-public java-eclipse-rdf4j-util + (package + (name "java-eclipse-rdf4j-util") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-util.jar" + "core/util")) + (inputs (list java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-model-api)) + (home-page "https://rdf4j.org/") + (synopsis "RDF4J model interfaces") + (description "This package provides utility classes used throughout the +RDF4J framework.") + (license license:epl1.0))) -- cgit v1.3 From f0af938f16b8d82c4652af9a083440dffc529a2c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:14:12 +0200 Subject: gnu: Add java-eclipse-rdf4j-model. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-model): New variable. --- gnu/packages/java-rdf.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index d3b0973c17a..42f9d01127e 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -129,6 +129,25 @@ concepts in Java."))) (replace 'install (install-from-pom "pom.xml"))))) +(define-public java-eclipse-rdf4j-model + (package + (name "java-eclipse-rdf4j-model") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-model.jar" + "core/model")) + (inputs (list java-slf4j-api java-guava)) + (propagated-inputs (list java-eclipse-rdf4j-util + java-eclipse-rdf4j-model-api + java-eclipse-rdf4j-model-vocabulary)) + (home-page "https://rdf4j.org/") + (synopsis "Implementation of RDF data model") + (description "This package provides the RDF model implementation used by +Eclipse RDF4J.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-model-api (package (name "java-eclipse-rdf4j-model-api") -- cgit v1.3 From 8b90feffbef98de2de1340fc8b59c1b48834ba68 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:20:11 +0200 Subject: gnu: Add java-easymock version 3.2. * gnu/packages/java.scm (java-easymock-3.2): New variable. --- gnu/packages/java.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 16dcbe18a6d..22ca2faf135 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5019,6 +5019,47 @@ constructor on object instantiation.") mock objects in unit testing.") (license license:asl2.0))) +(define-public java-easymock-3.2 + (package + (inherit java-easymock) + (name "java-easymock") + (version "3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/easymock/easymock/") + (commit (string-append "easymock-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cn6qqa261mhk9mwxrsz39lkkknfv2h7iprr5zw7wpz9p96dwgv4")))) + (arguments + (list #:jar-name "easymock.jar" + #:source-dir "easymock/src/main" + #:test-dir "easymock/src/test" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-android-support + (lambda _ + (with-directory-excursion "easymock/src/main/java/org/easymock/internal" + (substitute* "MocksControl.java" + (("AndroidSupport.isAndroid\\(\\)") "false") + (("return classProxyFactory = new AndroidClassProxyFactory\\(\\);") "")) + (delete-file "AndroidClassProxyFactory.java")))) + (add-after 'unpack 'delete-broken-tests + (lambda _ + (with-directory-excursion "easymock/src/test/java/org/easymock" + ;; This test depends on dexmaker. + (delete-file "tests2/ClassExtensionHelperTest.java") + ;; This is not a test. + (delete-file "tests/BaseEasyMockRunnerTest.java") + ;; ...but deleting it means that we also have to delete these + ;; dependent files. + (delete-file "tests2/EasyMockRunnerTest.java") + ;; This test fails because the file "easymock.properties" does + ;; not exist. + (delete-file "tests2/EasyMockPropertiesTest.java"))))))))) + (define-public java-jmock-1 (package (name "java-jmock") -- cgit v1.3 From 50281136d41c8e7953b8ea3d4b25b441d904d5df Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:27:47 +0200 Subject: gnu: Add java-easymock-class-extension. * gnu/packages/java.scm (java-easymock-class-extension): New variable. --- gnu/packages/java.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 22ca2faf135..f3cc4822b27 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -5060,6 +5060,27 @@ mock objects in unit testing.") ;; not exist. (delete-file "tests2/EasyMockPropertiesTest.java"))))))))) +(define-public java-easymock-class-extension + (package + (inherit java-easymock-3.2) + (name "java-easymock-class-extension") + (build-system ant-build-system) + (arguments + (list #:jar-name "easymock-class-extensions.jar" + #:source-dir "easymock-classextension/src/main/java" + #:test-dir "easymock-classextension/src/test")) + (inputs (list java-asm + java-easymock-3.2 + java-cglib + java-objenesis)) + (native-inputs + (list java-junit java-hamcrest-core)) + (home-page "https://easymock.org/") + (synopsis "Easymock extension to mock classes") + (description "This package provides an extension to earlier versions of +easymock that allows mocking classes.") + (license license:asl2.0))) + (define-public java-jmock-1 (package (name "java-jmock") -- cgit v1.3 From 6facf26f0eea08533323b5cebd441d520840df01 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:32:46 +0200 Subject: gnu: Add java-httpcomponents-httpclient-cache. * gnu/packages/java.scm (java-httpcomponents-httpclient-cache): New variable. --- gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f3cc4822b27..2106dfd074c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6278,6 +6278,34 @@ feature-rich package implementing the client side of the most recent HTTP standards and recommendations.") (license license:asl2.0))) +(define-public java-httpcomponents-httpclient-cache + (package (inherit java-httpcomponents-httpclient) + (name "java-httpcomponents-httpclient-cache") + (arguments + `(#:jar-name "httpcomponents-httpclient-cache.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-unused-impls + (lambda _ + (for-each + delete-file-recursively + '("src/main/java/org/apache/http/impl/client/cache/ehcache/" + "src/main/java/org/apache/http/impl/client/cache/memcached/" + "src/test/java/org/apache/http/impl/client/cache/ehcache/" + "src/test/java/org/apache/http/impl/client/cache/memcached/")))) + (add-after 'unpack 'chdir + (lambda _ (chdir "httpclient-cache")))))) + (inputs + (modify-inputs (package-inputs java-httpcomponents-httpclient) + (prepend java-httpcomponents-httpclient + java-httpcomponents-httpmime + java-hamcrest-core))) + (native-inputs (list java-easymock-3.2 java-easymock-class-extension)) + (description "This package provides an API for caching accessed HTTP +resources."))) + (define-public java-httpcomponents-httpmime (package (inherit java-httpcomponents-httpclient) (name "java-httpcomponents-httpmime") -- cgit v1.3 From 9a110021b363c2cc7198b19d22934cbee92c651d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:50:40 +0200 Subject: gnu: Add java-httpcomponents-httpcore-osgi. * gnu/packages/java.scm (java-httpcomponents-httpcore-osgi): New variable. --- gnu/packages/java.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2106dfd074c..fb8472f4073 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6242,6 +6242,32 @@ NIO."))) (description "This package provides the HttpCore benchmarking tool. It is an Apache AB clone based on HttpCore."))) +(define-public java-httpcomponents-httpcore-osgi + (package (inherit java-httpcomponents-httpcore) + (name "java-httpcomponents-httpcore-osgi") + (arguments + `(#:jar-name "httpcomponents-httpcore-osgi.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpcore-osgi")))))) + (inputs + (modify-inputs (package-inputs java-httpcomponents-httpcore) + (prepend java-httpcomponents-httpcore + java-httpcomponents-httpcore-nio + java-hamcrest-core))) + (native-inputs (list java-ops4j-pax-exam-core + java-ops4j-pax-exam-core-junit + java-ops4j-pax-exam-core-spi + java-junit)) + (description "HttpCore is a set of low level HTTP transport components +that can be used to build custom client and server side HTTP services with a +minimal footprint. HttpCore supports two I/O models: blocking I/O model based +on the classic Java I/O and non-blocking, event driven I/O model based on Java +NIO. + +This package provides... some tests."))) + (define-public java-httpcomponents-httpclient (package (name "java-httpcomponents-httpclient") -- cgit v1.3 From fb64a1bd58481ba7e282b59fae2d0d75371cf34b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:54:21 +0200 Subject: gnu: Add java-httpcomponents-httpclient-osgi. * gnu/packages/java.scm (java-httpcomponents-httpclient-osgi): New variable. --- gnu/packages/java.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fb8472f4073..4e0146f7a7c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6332,6 +6332,23 @@ standards and recommendations.") (description "This package provides an API for caching accessed HTTP resources."))) +(define-public java-httpcomponents-httpclient-osgi + (package (inherit java-httpcomponents-httpclient) + (name "java-httpcomponents-httpclient-osgi") + (arguments + `(#:jar-name "httpcomponents-httpclient-osgi.jar" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "httpclient-osgi") #t))))) + (inputs + (modify-inputs (package-inputs java-httpcomponents-httpclient) + (prepend java-httpcomponents-httpclient + java-httpcomponents-httpclient-cache + java-osgi-framework + java-osgi-service-cm + java-hamcrest-core))))) + (define-public java-httpcomponents-httpmime (package (inherit java-httpcomponents-httpclient) (name "java-httpcomponents-httpmime") -- cgit v1.3 From 56202bf1d4e20c6a84fb1ea68a00bc8a6ba8d5d0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:56:04 +0200 Subject: gnu: Add java-jsonld-java. * gnu/packages/java-rdf.scm (java-jsonld-java): New variable. --- gnu/packages/java-rdf.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 42f9d01127e..dc662c192f7 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -27,6 +27,47 @@ #:use-module (gnu packages compression) #:use-module (gnu packages java)) +(define-public java-jsonld-java + (package + (name "java-jsonld-java") + (version "0.13.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jsonld-java/jsonld-java") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d113szja4p16k2n2way8mmdj1kxzanjcnnsdan65iw27qag7dr0")))) + (build-system ant-build-system) + (arguments + (list #:tests? #f ; no tests included + #:jar-name "jsonld-java.jar" + #:source-dir "core/src/main/java" + #:test-dir "core/src/test" + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "com.github.jsonld-java" + "jsonld-java" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml"))))) + (inputs (list java-slf4j-api java-guava + java-commons-io + java-httpcomponents-httpcore + java-httpcomponents-httpcore-osgi + java-httpcomponents-httpclient + java-httpcomponents-httpclient-cache + java-httpcomponents-httpclient-osgi + java-fasterxml-jackson-core + java-fasterxml-jackson-databind)) + (home-page "https://github.com/jsonld-java/jsonld-java") + (synopsis "Java implementation of JSON-LD") + (description "This package provides a Java implementation of JSON-LD 1.0.") + (license license:bsd-3))) + (define-public java-commons-rdf-api (package (name "java-commons-rdf-api") -- cgit v1.3 From c3978ba23ac9833ff7348d3acfd77cd7b00f2d91 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:56:11 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-api. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-api): New variable. --- gnu/packages/java-rdf.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index dc662c192f7..81967f5322c 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -23,6 +23,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system ant) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages java)) @@ -220,6 +221,33 @@ in the RDF4J framework.") RDF vocabularies.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-api + (package + (name "java-eclipse-rdf4j-rio-api") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (substitute-keyword-arguments + (rdf4j-common-arguments "rdf4j-rio-api.jar" + "core/rio/api") + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "org.eclipse.rdf4j" + "rdf4j-rio-api" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml")))))) + (inputs (list java-commons-codec java-commons-io java-slf4j-api + java-jsonld-java)) + (propagated-inputs (list java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF Input/Output API") + (description "This package provides an API for parsers and writers of +various RDF formats.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From 18321fe7c72442564e814cbe2636d4d18e87251a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:57:02 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-datatypes. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-datatypes): New variable. --- gnu/packages/java-rdf.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 81967f5322c..9014d3f9bfd 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -248,6 +248,22 @@ RDF vocabularies.") various RDF formats.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-datatypes + (package + (name "java-eclipse-rdf4j-rio-datatypes") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-datatypes.jar" + "core/rio/datatypes")) + (propagated-inputs (list java-eclipse-rdf4j-model + java-eclipse-rdf4j-rio-api)) + (home-page "https://rdf4j.org/") + (synopsis "RDF datatype handlers") + (description "This package provides datatype handlers used in RDF4J.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From 445190950b76af4e0141925ddcdf6381fa4f9f37 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:57:39 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-languages. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-languages): New variable. --- gnu/packages/java-rdf.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 9014d3f9bfd..07bd26bfc2c 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -264,6 +264,22 @@ various RDF formats.") (description "This package provides datatype handlers used in RDF4J.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-languages + (package + (name "java-eclipse-rdf4j-rio-languages") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-languages.jar" + "core/rio/languages")) + (propagated-inputs (list java-eclipse-rdf4j-model + java-eclipse-rdf4j-rio-api)) + (home-page "https://rdf4j.org/") + (synopsis "RDF language handlers") + (description "This package provides language handlers used in RDF4J.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From cb7a29826bcaff97d14cc35a165a7c0e723e1b93 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:58:31 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-turtle. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-turtle): New variable. --- gnu/packages/java-rdf.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 07bd26bfc2c..bbe15dcfd57 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -280,6 +280,26 @@ various RDF formats.") (description "This package provides language handlers used in RDF4J.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-turtle + (package + (name "java-eclipse-rdf4j-rio-turtle") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-turtle.jar" + "core/rio/turtle")) + (inputs (list java-commons-io java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-rio-datatypes + java-eclipse-rdf4j-rio-languages + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF Turtle serialization") + (description "This package provides an implementation of the RDF4J Rio API, +which reads and writes Turtle.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From f89facf051a1fb7b458b552d67c4147a53bde94b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:58:39 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-ntriples. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-ntriples): New variable. --- gnu/packages/java-rdf.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index bbe15dcfd57..9cbd3ca681f 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -280,6 +280,26 @@ various RDF formats.") (description "This package provides language handlers used in RDF4J.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-ntriples + (package + (name "java-eclipse-rdf4j-rio-ntriples") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-ntriples.jar" + "core/rio/ntriples")) + (inputs (list java-commons-io java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-rio-datatypes + java-eclipse-rdf4j-rio-languages + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF NTriples serialization") + (description "This package provides an implementation of the RDF4J Rio API, +which reads and writes NTriples.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-turtle (package (name "java-eclipse-rdf4j-rio-turtle") -- cgit v1.3 From 790dcd2a22257d4820829bcafb361c205e8c2bfa Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:58:52 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-nquads. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-nquads): New variable. --- gnu/packages/java-rdf.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 9cbd3ca681f..7329efb5d38 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -300,6 +300,27 @@ various RDF formats.") which reads and writes NTriples.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-nquads + (package + (name "java-eclipse-rdf4j-rio-nquads") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-nquads.jar" + "core/rio/nquads")) + (inputs (list java-commons-io java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-rio-datatypes + java-eclipse-rdf4j-rio-languages + java-eclipse-rdf4j-rio-ntriples + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF NQuads serialization") + (description "This package provides an implementation of the RDF4J Rio API, +which reads and writes NQuads.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-turtle (package (name "java-eclipse-rdf4j-rio-turtle") -- cgit v1.3 From b0c49196d3ac4b52cf6c033a9a7c617dc95306d5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:59:18 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-jsonld. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-jsonld): New variable. --- gnu/packages/java-rdf.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 7329efb5d38..52c4b4c69b6 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -264,6 +264,39 @@ various RDF formats.") (description "This package provides datatype handlers used in RDF4J.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-jsonld + (package + (name "java-eclipse-rdf4j-rio-jsonld") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (substitute-keyword-arguments + (rdf4j-common-arguments "rdf4j-rio-jsonld.jar" + "core/rio/jsonld") + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "org.eclipse.rdf4j" + "rdf4j-rio-jsonld" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml")))))) + (inputs (list java-commons-io + java-slf4j-api + java-fasterxml-jackson-core + java-fasterxml-jackson-databind + java-jsonld-java)) + (propagated-inputs (list java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-rio-datatypes + java-eclipse-rdf4j-rio-languages + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF JSON-LD serialization") + (description "This package provides an implementation of the RDF4J Rio API, +which reads and writes JSON-LD.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-languages (package (name "java-eclipse-rdf4j-rio-languages") -- cgit v1.3 From 6053f0a2c708d275d63c93100f6eebd5d429117d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 16:59:41 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-rdfxml. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-rdfxml): New variable. --- gnu/packages/java-rdf.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 52c4b4c69b6..15aeb0016be 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -354,6 +354,26 @@ which reads and writes NTriples.") which reads and writes NQuads.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-rdfxml + (package + (name "java-eclipse-rdf4j-rio-rdfxml") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-rdfxml.jar" + "core/rio/rdfxml")) + (inputs (list java-commons-io java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-rio-datatypes + java-eclipse-rdf4j-rio-languages + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF XML serialization") + (description "This package provides an implementation of the RDF4J Rio API, +which reads and writes XML.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-turtle (package (name "java-eclipse-rdf4j-rio-turtle") -- cgit v1.3 From 0a02ff4c64c38ada2a95778032f8f6010fcab177 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:00:04 +0200 Subject: gnu: Add java-eclipse-rdf4j-rio-trig. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-rio-trig): New variable. --- gnu/packages/java-rdf.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 15aeb0016be..28d31a2ecc7 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -394,6 +394,27 @@ which reads and writes XML.") which reads and writes Turtle.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-rio-trig + (package + (name "java-eclipse-rdf4j-rio-trig") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-rio-trig.jar" + "core/rio/trig")) + (inputs (list java-commons-io java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-rio-datatypes + java-eclipse-rdf4j-rio-languages + java-eclipse-rdf4j-rio-turtle + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "RDF TriG serialization") + (description "This package provides an implementation of the RDF4J Rio API, +which reads and writes TriG.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From 06b3c21f843aa18c47536fc8ad9ca362d345c2a3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:03:46 +0200 Subject: gnu: Add java-eclipse-rdf4j-query. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-query): New variable. --- gnu/packages/java-rdf.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 28d31a2ecc7..5615cd2d9be 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -221,6 +221,37 @@ in the RDF4J framework.") RDF vocabularies.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-query + (package + (name "java-eclipse-rdf4j-query") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (substitute-keyword-arguments + (rdf4j-common-arguments "rdf4j-query.jar" + "core/query") + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "org.eclipse.rdf4j" + "rdf4j-query" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml")))))) + (inputs (list java-commons-text + java-slf4j-api + java-fasterxml-jackson-annotations + java-fasterxml-jackson-core + java-fasterxml-jackson-databind)) + (propagated-inputs (list java-eclipse-rdf4j-model + java-eclipse-rdf4j-rio-api)) + (home-page "https://rdf4j.org/") + (synopsis "Querying RDF") + (description "This package provides an interface and implementation for +querying RDF.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-api (package (name "java-eclipse-rdf4j-rio-api") -- cgit v1.3 From 3a58b3672f3f6a765b11f448d6da68be16a22108 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:04:22 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryalgebra-model. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryalgebra-model): New variable. --- gnu/packages/java-rdf.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 5615cd2d9be..fc026616895 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -252,6 +252,24 @@ RDF vocabularies.") querying RDF.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryalgebra-model + (package + (name "java-eclipse-rdf4j-queryalgebra-model") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryalgebra-model.jar" + "core/queryalgebra/model")) + (inputs (list java-fasterxml-jackson-annotations + java-guava)) + (propagated-inputs (list java-eclipse-rdf4j-model + java-eclipse-rdf4j-query)) + (home-page "https://rdf4j.org/") + (synopsis "RDF query algebra") + (description "This package provides an algebra model for RDF queries.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-api (package (name "java-eclipse-rdf4j-rio-api") -- cgit v1.3 From b66a7746cf755ac4bc749e2f03a0b122809a0e38 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:05:15 +0200 Subject: gnu: Add java-eclipse-rdf4j-repository-api. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-repository-api): New variable. --- gnu/packages/java-rdf.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index fc026616895..8f1a4a9d385 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -270,6 +270,25 @@ querying RDF.") (description "This package provides an algebra model for RDF queries.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-repository-api + (package + (name "java-eclipse-rdf4j-repository-api") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-repository-api.jar" + "core/repository/api")) + (inputs (list java-slf4j-api java-commons-lang3)) + (propagated-inputs (list java-eclipse-rdf4j-model + java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-query)) + (home-page "https://rdf4j.org/") + (synopsis "Interact with RDF repositories") + (description "This package provides an API for interacting with repositories +of RDF data.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-api (package (name "java-eclipse-rdf4j-rio-api") -- cgit v1.3 From b7a3bc9f483634cb3b4b1e7123ae62370375129b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:05:19 +0200 Subject: gnu: Add java-eclipse-rdf4j-sail-api. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-sail-api): New variable. --- gnu/packages/java-rdf.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 8f1a4a9d385..d17f76a168f 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -483,6 +483,26 @@ which reads and writes Turtle.") which reads and writes TriG.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-sail-api + (package + (name "java-eclipse-rdf4j-sail-api") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-sail-api.jar" + "core/sail/api")) + (inputs (list java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-query + java-eclipse-rdf4j-queryalgebra-model + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "Interfaces for low-level access to RDF data") + (description "The @acronym{SAIL, Storage And Interface Layer} API +decouples database implementations and the functional modules of the RDF4J +framework.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From c30cc9318a9e680ba4ddd7ae47e3c9e39cdcff88 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:28:49 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryparser-api. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryparser-api): New variable. --- gnu/packages/java-rdf.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index d17f76a168f..42d8966ebb7 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -270,6 +270,23 @@ querying RDF.") (description "This package provides an algebra model for RDF queries.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryparser-api + (package + (name "java-eclipse-rdf4j-queryparser-api") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryparser-api.jar" + "core/queryparser/api")) + (propagated-inputs (list java-eclipse-rdf4j-query + java-eclipse-rdf4j-queryalgebra-model)) + (home-page "https://rdf4j.org/") + (synopsis "Generic query parser API") + (description "This package provides a common API for query parsers in +RDF4J.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-repository-api (package (name "java-eclipse-rdf4j-repository-api") -- cgit v1.3 From cf4ba19dd114105a549cb61340394af762ba9410 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:28:57 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryparser-sparql. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryparser-sparql): New variable. --- gnu/packages/java-rdf.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 42d8966ebb7..d35df018e35 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -287,6 +287,23 @@ querying RDF.") RDF4J.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryparser-sparql + (package + (name "java-eclipse-rdf4j-queryparser-sparql") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryparser-sparql.jar" + "core/queryparser/sparql")) + (propagated-inputs (list java-eclipse-rdf4j-queryparser-api + java-eclipse-rdf4j-model + java-eclipse-rdf4j-rio-trig)) + (home-page "https://rdf4j.org/") + (synopsis "SPARQL query parser") + (description "This package provides a parser for SPARQL queries.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-repository-api (package (name "java-eclipse-rdf4j-repository-api") -- cgit v1.3 From f748b305d553455c6167efb42c2977f6b80f3287 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:32:35 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryresultio-api. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryresultio-api): New variable. --- gnu/packages/java-rdf.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index d35df018e35..4380052ac95 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -304,6 +304,24 @@ RDF4J.") (description "This package provides a parser for SPARQL queries.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryresultio-api + (package + (name "java-eclipse-rdf4j-queryresultio-api") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryresultio-api.jar" + "core/queryresultio/api")) + (propagated-inputs (list java-eclipse-rdf4j-query + java-eclipse-rdf4j-rio-api + java-eclipse-rdf4j-sail-api)) + (home-page "https://rdf4j.org/") + (synopsis "Handling RDF query results") + (description "This package provides an API for handling input and output +on RDF query results.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-repository-api (package (name "java-eclipse-rdf4j-repository-api") -- cgit v1.3 From 8f252b6eef3af52346174a48f27057341afae468 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:32:42 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryresultio-binary. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryresultio-binary): New variable. --- gnu/packages/java-rdf.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 4380052ac95..68851791be3 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -322,6 +322,23 @@ RDF4J.") on RDF query results.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryresultio-binary + (package + (name "java-eclipse-rdf4j-queryresultio-binary") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryresultio-binary.jar" + "core/queryresultio/binary")) + (inputs (list java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-queryresultio-api)) + (home-page "https://rdf4j.org/") + (synopsis "Handling RDF query results") + (description "This package provides binary input and output for RDF +queries.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-repository-api (package (name "java-eclipse-rdf4j-repository-api") -- cgit v1.3 From 07ad57b5756e6fd145285dbe7ab355edd40b6005 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:32:49 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryresultio-sparqlxml. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryresultio-sparqlxml): New variable. --- gnu/packages/java-rdf.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 68851791be3..523d0c51acb 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -339,6 +339,23 @@ on RDF query results.") queries.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryresultio-sparqlxml + (package + (name "java-eclipse-rdf4j-queryresultio-sparqlxml") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryresultio-sparqlxml.jar" + "core/queryresultio/sparqlxml")) + (inputs (list java-slf4j-api java-commons-lang3)) + (propagated-inputs (list java-eclipse-rdf4j-queryresultio-api)) + (home-page "https://rdf4j.org/") + (synopsis "Handling RDF query results") + (description "This package provides classes for handling SPARQL/XML-based +RDF queries.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-repository-api (package (name "java-eclipse-rdf4j-repository-api") -- cgit v1.3 From 635387763534ee66ccb51c40d86509ec76263637 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:32:54 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryresultio-sparqljson. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryresultio-sparqljson): New variable. --- gnu/packages/java-rdf.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 523d0c51acb..3402f79bd5e 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -356,6 +356,34 @@ queries.") RDF queries.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryresultio-sparqljson + (package + (name "java-eclipse-rdf4j-queryresultio-sparqljson") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (substitute-keyword-arguments + (rdf4j-common-arguments "rdf4j-queryresultio-sparqljson.jar" + "core/queryresultio/sparqljson") + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "org.eclipse.rdf4j" + "rdf4j-queryresultio-sparqljson" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml")))))) + (inputs (list java-slf4j-api + java-commons-lang3 + java-fasterxml-jackson-core)) + (propagated-inputs (list java-eclipse-rdf4j-queryresultio-api)) + (home-page "https://rdf4j.org/") + (synopsis "Handling RDF query results") + (description "This package provides classes for handling SPARQL/JSON-based +RDF queries.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-repository-api (package (name "java-eclipse-rdf4j-repository-api") -- cgit v1.3 From 0c5de09b39a8a4e24343b827c1aff33d74ca70fd Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:34:31 +0200 Subject: gnu: Add java-eclipse-rdf4j-http-protocol. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-http-protocol): New variable. --- gnu/packages/java-rdf.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 3402f79bd5e..e098766fc48 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -171,6 +171,33 @@ concepts in Java."))) (replace 'install (install-from-pom "pom.xml"))))) +(define-public java-eclipse-rdf4j-http-protocol + (package + (name "java-eclipse-rdf4j-http-protocol") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (substitute-keyword-arguments + (rdf4j-common-arguments "rdf4j-http-protocol.jar" + "core/http/protocol") + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "org.eclipse.rdf4j" + "rdf4j-http-protocol" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml")))))) + (propagated-inputs (list java-eclipse-rdf4j-rio-ntriples + java-eclipse-rdf4j-repository-api + java-eclipse-rdf4j-model)) + (home-page "https://rdf4j.org/") + (synopsis "HTTP protocol for RDF4J") + (description "This package provides a protocol for communicating RDF +resourcess over HTTP.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-model (package (name "java-eclipse-rdf4j-model") -- cgit v1.3 From 208be0e1af641120e9cb6b06c800d545dde9c035 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:34:36 +0200 Subject: gnu: Add java-eclipse-rdf4j-http-client. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-http-client): New variable. --- gnu/packages/java-rdf.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index e098766fc48..c5b31eeb4e1 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -171,6 +171,41 @@ concepts in Java."))) (replace 'install (install-from-pom "pom.xml"))))) +(define-public java-eclipse-rdf4j-http-client + (package + (name "java-eclipse-rdf4j-http-client") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (substitute-keyword-arguments + (rdf4j-common-arguments "rdf4j-http-client.jar" + "core/http/client") + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'install 'generate-pom.xml + (generate-pom.xml "guix-pom.xml" + "org.eclipse.rdf4j" + "rdf4j-http-client" #$version)) + (replace 'install + (install-from-pom "guix-pom.xml")))))) + (inputs (list java-commons-io + java-httpcomponents-httpcore + java-httpcomponents-httpclient + java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-http-protocol + java-eclipse-rdf4j-repository-api + java-eclipse-rdf4j-queryparser-sparql + java-eclipse-rdf4j-queryresultio-api + java-eclipse-rdf4j-queryresultio-binary + java-eclipse-rdf4j-queryresultio-sparqlxml + java-eclipse-rdf4j-queryresultio-sparqljson)) + (home-page "https://rdf4j.org/") + (synopsis "HTTP client for RDF4J") + (description "This package provides a client for communicating with RDF4J +servers.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-http-protocol (package (name "java-eclipse-rdf4j-http-protocol") -- cgit v1.3 From 9b762bd550118239d038035d6cd1687aa8d07412 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:35:37 +0200 Subject: gnu: Add java-eclipse-rdf4j-repository-sparql. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-repository-sparql): New variable. --- gnu/packages/java-rdf.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index c5b31eeb4e1..500c9acd3df 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -465,6 +465,25 @@ RDF queries.") of RDF data.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-repository-sparql + (package + (name "java-eclipse-rdf4j-repository-sparql") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-repository-sparql.jar" + "core/repository/sparql")) + (inputs (list java-httpcomponents-httpclient + java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-http-client + java-eclipse-rdf4j-queryparser-sparql + java-eclipse-rdf4j-repository-api)) + (home-page "https://rdf4j.org/") + (synopsis "Repository based on SPARQL") + (description "This package provides a repository implementation that SPARQL.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-api (package (name "java-eclipse-rdf4j-rio-api") -- cgit v1.3 From d165dd15ef900128d05f0c992b85882793248667 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:40:02 +0200 Subject: gnu: Add java-mapdb. * gnu/packages/java.scm (java-mapdb): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 4e0146f7a7c..614d5859160 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11280,6 +11280,38 @@ protocol-independent framework to build mail and messaging applications.") (license (list license:cddl1.1 license:gpl2)))); with classpath exception +(define-public java-mapdb + (package + (name "java-mapdb") + (version "1.0.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jankotek/mapdb") + (commit (string-append "mapdb-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1slb4h282jqvk16896lcvgm65pj3v6crcp2wvjdvad7nx7d2f1kv")))) + (build-system ant-build-system) + (arguments + (list #:jar-name "mapdb.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:test-exclude (list "**/ClosedThrowsExceptionTest.java" + "**/ConcurrentMapInterfaceTest.java" + "**/EngineTest.java" + "**/Issue664Test.java" + "**/MapInterfaceTest.java") + #:phases #~(modify-phases %standard-phases + (replace 'install (install-from-pom "pom.xml"))))) + (native-inputs (list java-junit)) + (home-page "https://mapdb.org/") + (synopsis "Concurrent data structures") + (description "MapDB provides concurrent maps, sets and queues backed by +disk storage or off-heap memory.") + (license license:bsd-3))) + (define-public java-jeromq (package (name "java-jeromq") -- cgit v1.3 From b4f9e2c8c8ccb816a97f560887fb84e3244691ff Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:36:06 +0200 Subject: gnu: Add java-eclipse-rdf4j-queryalgebra-evaluation. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-queryalgebra-evaluation): New variable. --- gnu/packages/java-rdf.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 500c9acd3df..a252c56598b 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -332,6 +332,29 @@ querying RDF.") (description "This package provides an algebra model for RDF queries.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-queryalgebra-evaluation + (package + (name "java-eclipse-rdf4j-queryalgebra-evaluation") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-queryalgebra-evaluation.jar" + "core/queryalgebra/evaluation")) + (inputs (list java-guava + java-slf4j-api + java-commons-math3 + java-mapdb)) + (propagated-inputs (list java-eclipse-rdf4j-model + java-eclipse-rdf4j-repository-sparql + java-eclipse-rdf4j-queryalgebra-model + java-eclipse-rdf4j-queryparser-sparql)) + (home-page "https://rdf4j.org/") + (synopsis "RDF query algebra") + (description "This package provides evaluation strategies and an +implementation for RDF4J's query algebra.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-queryparser-api (package (name "java-eclipse-rdf4j-queryparser-api") -- cgit v1.3 From 5a4e19bc1e8007eecb23b9fbd6cee5311143e7b0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:36:38 +0200 Subject: gnu: Add java-eclipse-rdf4j-repository-sail. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-repository-sail): New variable. --- gnu/packages/java-rdf.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index a252c56598b..30d1e4e6737 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -507,6 +507,27 @@ of RDF data.") (description "This package provides a repository implementation that SPARQL.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-repository-sail + (package + (name "java-eclipse-rdf4j-repository-sail") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-repository-sail.jar" + "core/repository/sail")) + (inputs (list java-httpcomponents-httpclient + java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-queryparser-sparql + java-eclipse-rdf4j-queryalgebra-evaluation + java-eclipse-rdf4j-repository-api + java-eclipse-rdf4j-sail-api)) + (home-page "https://rdf4j.org/") + (synopsis "Repository based on SAIL") + (description "This package provides a repository implementation that uses +an RDF4J SAIL stack.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-rio-api (package (name "java-eclipse-rdf4j-rio-api") -- cgit v1.3 From 87c1cfec65c2ec3b7500859e5abda6b55852498f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:37:13 +0200 Subject: gnu: Add java-eclipse-rdf4j-sail-base. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-sail-base): New variable. --- gnu/packages/java-rdf.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 30d1e4e6737..f480c88b117 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -742,6 +742,27 @@ decouples database implementations and the functional modules of the RDF4J framework.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-sail-base + (package + (name "java-eclipse-rdf4j-sail-base") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-sail-base.jar" + "core/sail/base")) + (inputs (list java-slf4j-api)) + (propagated-inputs (list java-eclipse-rdf4j-sail-api + java-eclipse-rdf4j-queryalgebra-evaluation + java-eclipse-rdf4j-queryalgebra-model + java-eclipse-rdf4j-query + java-eclipse-rdf4j-repository-sail)) + (home-page "https://rdf4j.org/") + (synopsis "Base implementations of RD4J's storage API") + (description "This package provides basic implementation of RDF4J's +@acronym{SAIL, Storage And Interface Layer} API.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From cd2abde781366b2d2321dab8cc105b173e700524 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:37:20 +0200 Subject: gnu: Add java-eclipse-rdf4j-sail-memory. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-sail-memory): New variable. --- gnu/packages/java-rdf.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index f480c88b117..68f590ca8c5 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -763,6 +763,31 @@ framework.") @acronym{SAIL, Storage And Interface Layer} API.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-sail-memory + (package + (name "java-eclipse-rdf4j-sail-memory") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-sail-memory.jar" + "core/sail/memory")) + (inputs (list java-slf4j-api + java-commons-lang3 + java-guava)) + (propagated-inputs (list java-eclipse-rdf4j-sail-api + java-eclipse-rdf4j-sail-base + java-eclipse-rdf4j-model + java-eclipse-rdf4j-rio-turtle + java-eclipse-rdf4j-query + java-eclipse-rdf4j-queryalgebra-model + java-eclipse-rdf4j-queryalgebra-evaluation)) + (home-page "https://rdf4j.org/") + (synopsis "Memory-based implementations of RD4J's storage API") + (description "This package provides an implementation of RDF4J's +@acronym{SAIL, Storage And Interface Layer} API, which stores data in RAM.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From 5e18b94a78f6acf1e94d591a357eeecd057d103f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:37:24 +0200 Subject: gnu: Add java-eclipse-rdf4j-sail-nativerdf. * gnu/packages/java-rdf.scm (java-eclipse-rdf4j-sail-nativerdf): New variable. --- gnu/packages/java-rdf.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 68f590ca8c5..97606b1b10f 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -788,6 +788,27 @@ framework.") @acronym{SAIL, Storage And Interface Layer} API, which stores data in RAM.") (license license:epl1.0))) +(define-public java-eclipse-rdf4j-sail-nativerdf + (package + (name "java-eclipse-rdf4j-sail-nativerdf") + (version %rdf4j-version) + (source %rdf4j-source) + (build-system ant-build-system) + (arguments + (rdf4j-common-arguments "rdf4j-sail-nativerdf.jar" + "core/sail/nativerdf")) + (inputs (list java-slf4j-api + java-commons-io + java-guava)) + (propagated-inputs (list java-eclipse-rdf4j-sail-api + java-eclipse-rdf4j-sail-base)) + (home-page "https://rdf4j.org/") + (synopsis "File-based implementations of RD4J's storage API") + (description "This package provides an implementation of RDF4J's +@acronym{SAIL, Storage And Interface Layer} API, which stores data on disk +in various formats.") + (license license:epl1.0))) + (define-public java-eclipse-rdf4j-util (package (name "java-eclipse-rdf4j-util") -- cgit v1.3 From ea17bc5b20ca781bca6231506e2ffd329f53a266 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 29 Jul 2023 17:58:17 +0200 Subject: gnu: Add java-commons-rdf-rdf4j. * gnu/packages/java-rdf.scm (java-commons-rdf-rdf4j): New variable. --- gnu/packages/java-rdf.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm index 97606b1b10f..7c400643bc1 100644 --- a/gnu/packages/java-rdf.scm +++ b/gnu/packages/java-rdf.scm @@ -113,6 +113,51 @@ (description "This package provides common test classes for packages implementing java-commons-rdf-api."))) +(define-public java-commons-rdf-rdf4j + (package + (inherit java-commons-rdf-api) + (name "java-commons-rdf-rdf4j") + (version "0.5.0") + (arguments + (list #:jar-name "commons-rdf-rdf4j.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:test-exclude (list "**/RDF4JServiceLoaderTest.java") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "commons-rdf-rdf4j"))) + (add-before 'install 'fix-pom + (lambda _ + (substitute* "pom.xml" + (("\\$\\{project\\.parent\\.groupId\\}") + "org.apache.commons")))) + (replace 'install + (install-from-pom "pom.xml"))))) + (inputs (list java-guava + java-commons-io + java-commons-lang3 + java-commons-text + java-fasterxml-jackson-annotations + java-fasterxml-jackson-core + java-fasterxml-jackson-databind + java-mapdb)) + (propagated-inputs (list java-commons-rdf-api + java-commons-rdf-simple + java-eclipse-rdf4j-model + java-eclipse-rdf4j-repository-api + java-eclipse-rdf4j-repository-sail + java-eclipse-rdf4j-rio-turtle + java-eclipse-rdf4j-rio-nquads + java-eclipse-rdf4j-rio-jsonld + java-eclipse-rdf4j-rio-rdfxml + java-eclipse-rdf4j-sail-memory + java-eclipse-rdf4j-sail-nativerdf)) + (native-inputs (list java-commons-rdf-api-tests unzip)) + (synopsis "Implementation RDF 1.1 concepts backed by RDF4J") + (description "This package provides an RDF4J-based implementation of RDF 1.1 +concepts."))) + (define-public java-commons-rdf-simple (package (inherit java-commons-rdf-api) -- cgit v1.3 From 4739e6844cfbf815357019faf708d3c266137acc Mon Sep 17 00:00:00 2001 From: TakeV Date: Thu, 27 Jul 2023 21:26:37 -0700 Subject: gnu: godot: Use system brotli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/game-development.scm (godot)[source]: Do not preserve brotli. [arguments]<#:scons-flags>: Add “builtin_brotli=no”. [inputs]: Add brotli. Signed-off-by: Liliana Marie Prikler --- gnu/packages/game-development.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f4b1a1e1e3d..5771b7530f4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2017,10 +2017,6 @@ scripted in a Python-like language.") "assimp" "astcenc" "basis_universal" - ;; TODO: Can unbundle once - ;; - ;; is merged - "brotli" ;; Godot needs ca-certificates.crt, but that is ;; not available in build environment "certs" @@ -2067,6 +2063,7 @@ scripted in a Python-like language.") "use_volk=no" ;; Avoid using many of the bundled libs. ;; Note: These options can be found in the SConstruct file. + "builtin_brotli=no" "builtin_embree=no" "builtin_enet=no" "builtin_freetype=no" @@ -2193,6 +2190,7 @@ scripted in a Python-like language.") (list pkg-config)) (inputs (list alsa-lib + brotli dbus embree enet -- cgit v1.3 From cf97ea92d17d5aae3684a6e4ff85b5f643cd6a4c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 6 May 2023 18:04:20 -0300 Subject: gnu: gsequencer: Update to 5.5.0. * gnu/packages/music.scm (gsequencer): Update to 5.5.0. [inputs]: Add json-glib. --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8656716fd39..23baa291604 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5122,7 +5122,7 @@ studio.") (define-public gsequencer (package (name "gsequencer") - (version "4.5.0") + (version "5.5.0") (source (origin (method git-fetch) @@ -5131,7 +5131,7 @@ studio.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0j66b8y1pyka2im5hbwz6yh3hip0wsw7fa3kwl2212wq1y2a4ys1")))) + (base32 "0dl3gsmpc7b4hi97qri5d5rc3ikx639r3l1dy204p6dx8pwpv2ry")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -5159,6 +5159,7 @@ studio.") gstreamer gtk jack-1 + json-glib ladspa libinstpatch libsamplerate -- cgit v1.3 From ebfb795232803c4776ad24bb84447d64804084c0 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 2 Aug 2023 16:29:51 -0300 Subject: gnu: freecad: Update to 0.21.0. * gnu/packages/engineering.scm (freecad): Update to 0.21.0. [inputs]: Add fmt. --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b5b4ad1b103..79ba1e45360 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2687,7 +2687,7 @@ comments."))) (define-public freecad (package (name "freecad") - (version "0.20.2") + (version "0.21.0") (source (origin (method git-fetch) @@ -2696,7 +2696,7 @@ comments."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0wsfz2jqfhmqshyr1n4qxcc3c6a96gyll4h34vn2zzvvcnncn9rb")))) + (base32 "1i1wv3swnnimmn3kwphb2fcmsc64z96rcg7fhfsgqxcbyrygw6w7")))) (build-system qt-build-system) (native-inputs (list doxygen @@ -2710,6 +2710,7 @@ comments."))) coin3D double-conversion eigen + fmt fontconfig freetype gl2ps -- cgit v1.3 From 645aeaf52dfae66506e382f632042bc7fa4643a2 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 5 Aug 2023 18:26:12 -0300 Subject: gnu: python-pytensor: Update to 2.14.2. * gnu/packages/python-science.scm (python-pytensor): Update to 2.14.2. [native-inputs]: Add python-pytest-mock. --- gnu/packages/python-science.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 86ba4209fd4..4a010b4127f 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -785,7 +785,7 @@ functions and around einops with an API and features adapted to xarray.") (define-public python-pytensor (package (name "python-pytensor") - (version "2.12.3") + (version "2.14.2") (source (origin (method git-fetch) (uri (git-reference @@ -794,7 +794,7 @@ functions and around einops with an API and features adapted to xarray.") (file-name (git-file-name name version)) (sha256 (base32 - "1445fwbmzkdbndkq9hxiagdkfclgrnmpfzad40zqn6m5ry8192x8")))) + "1428l1v7yrnls8875xjx1svn48cmz0q83sv7sg0xdqghkfnyi7xx")))) (build-system pyproject-build-system) (arguments (list @@ -840,7 +840,10 @@ parentdir_prefix = pytensor- "--ignore" "tests/tensor/" "--ignore" "tests/sandbox/" "--ignore" "tests/sparse/sandbox/"))))))) - (native-inputs (list python-cython python-pytest python-versioneer)) + (native-inputs (list python-cython + python-pytest + python-pytest-mock + python-versioneer)) (propagated-inputs (list python-cons python-etuples python-filelock -- cgit v1.3 From c4b9f726e3a1889b92a4b14a2af1c25f10798469 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 5 Aug 2023 18:26:39 -0300 Subject: gnu: python-pymc: Update to 5.7.1. * gnu/packages/statistics.scm (python-pymc): Update to 5.7.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dc620b13a1d..5abc62d7605 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2177,7 +2177,7 @@ comparison and diagnostics.") (define-public python-pymc (package (name "python-pymc") - (version "5.6.1") + (version "5.7.1") (source (origin (method git-fetch) ; no tests in PyPI (uri (git-reference @@ -2186,7 +2186,7 @@ comparison and diagnostics.") (file-name (git-file-name name version)) (sha256 (base32 - "0in5lw55camvgd6b4hiw4gr11bdy96jc74z1gvsd0xj7cfxvc043")))) + "0ddb467qzwzzz3zhqbpks8n7mqqr7isskbirnxlfdmcwyyf4cq3q")))) (build-system pyproject-build-system) (arguments (list #:tests? #f ; tests are too computationally intensive -- cgit v1.3 From f770a130a5b3f3faca7fe1b567cf5d0304a03677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: acpica: Update to 20230628. * gnu/packages/admin.scm (acpica): Update to 20230628. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8ec3034a401..01c7d2dbe87 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2419,15 +2419,15 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20220331") + (version "20230628") (source (origin (method url-fetch) (uri (string-append - "https://acpica.org/sites/acpica/files/acpica-unix2-" + "https://downloadmirror.intel.com/783536/acpica-unix2-" version ".tar.gz")) (sha256 (base32 - "0yjcl00nnnlw01sz6a1i5d3v75gr17mkbxkxfx2v344al33abk8w")))) + "1fmkng72zb0yqp4hfl8a6pqmylixqbpjd43xmi6k3p74x5qiq0h6")))) (build-system gnu-build-system) (native-inputs (list flex bison)) (arguments -- cgit v1.3 From 49239397adb32e64342f7adbb8ef3fe68b6fe1bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: xonotic-data: Update to 0.8.6. * gnu/packages/games.scm (xonotic-data): Update to 0.8.6. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1573d7de00c..bf5c6800420 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7978,7 +7978,7 @@ original.") (define xonotic-data (package (name "xonotic-data") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) @@ -7986,7 +7986,7 @@ original.") version ".zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 "1r9pdrrki7mkdw99zh9m7911fqldsfdnl0nrp5cv1bk2hcism4hg")))) + (base32 "0kcnps65k81sm56s5dclahvllilnir3ix9kf5xr9jx0fh26hz1ah")))) (build-system trivial-build-system) (native-inputs (list unzip)) (arguments -- cgit v1.3 From 9dcd6d48ba6f7fc9101ef05b97a62677b09b8a4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: asymptote: Update to 2.86. * gnu/packages/plotutils.scm (asymptote): Update to 2.86. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index fde3e5bd5c7..114cde6f1f1 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -276,14 +276,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.85") + (version "2.86") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "11zcfnc80sbh10w53j4rwnmz0g5xj78b8i7hzfslgya15jv5j1ac")) + (base32 "07y9yg7kdkgmz024qzny8xhjw3c367kxfpwzv19cxcy7qcgsvsy4")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. -- cgit v1.3 From 611b5e5bd0ee812377d752d92c19090cbef2556a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: lynis: Update to 3.0.9. * gnu/packages/admin.scm (lynis): Update to 3.0.9. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 01c7d2dbe87..53d07976f7d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4652,7 +4652,7 @@ Logitech Unifying Receiver.") (package (name "lynis") ;; Also update the ‘lynis-sdk’ input to the commit matching this release. - (version "3.0.8") + (version "3.0.9") (source (origin (method git-fetch) @@ -4661,7 +4661,7 @@ Logitech Unifying Receiver.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "19kz1ffbbd431cdfw7fjcl5hjkks3gfkwk3w2zkwsxgyiky1gx3w")) + (base32 "1rgiifbzlk9lfjhbgxy6pqza5kxpr5rsr8vj9fcqvqihzdb5izj1")) (modules '((guix build utils))) (snippet '(begin @@ -4677,7 +4677,7 @@ Logitech Unifying Receiver.") (method git-fetch) (uri (git-reference (url "https://github.com/CISOfy/lynis-sdk") - (commit "dffe5d352e4d6029ea95a84d50604ccd97cb8999"))) + (commit "92522b3ec39ad4cdef4756dc303d99741ec7fe20"))) (file-name (git-file-name "lynis-sdk" version)) (sha256 (base32 "05qq4395x8f0kyl1ppm74npsf8sb3hhgz0ck4fya91sy6a26b4ja")))))) -- cgit v1.3 From b896184a55258a8dfb0b8f69a38eba1081505020 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Jul 2023 02:00:00 +0200 Subject: gnu: lynis: Use G-expressions. * gnu/packages/admin.scm (lynis)[arguments]: Rewrite as G-expressions. --- gnu/packages/admin.scm | 81 ++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 39 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 53d07976f7d..32cb7007bce 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4682,45 +4682,48 @@ Logitech Unifying Receiver.") (sha256 (base32 "05qq4395x8f0kyl1ppm74npsf8sb3hhgz0ck4fya91sy6a26b4ja")))))) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'unpack - ;; XXX Remove after fixing . - (lambda* (#:key source #:allow-other-keys) - (mkdir "source") - (chdir "source") - (copy-recursively source "." - #:keep-mtime? #t))) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "lynis" - (("/usr/share/lynis") - (string-append (assoc-ref outputs "out") "/share/lynis"))) - (substitute* "include/functions" - (("/usr/local/etc/lynis") - (string-append (assoc-ref outputs "out") "/etc/lynis"))))) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "lynis" (string-append out "/bin/")) - (install-file "default.prf" (string-append out "/etc/lynis")) - (for-each - (lambda (dir) - (copy-recursively dir (string-append out "/share/lynis/" dir))) - (list "db" "include" "plugins")) - (install-file "lynis.8" (string-append out "/share/man/man8"))))) - (replace 'check - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "lynis-sdk") "../lynis-sdk") - (setenv "LANG" "en_US.UTF-8") - (let ((lynis-dir (getcwd))) - (with-directory-excursion "../lynis-sdk" - (substitute* "config" - (("\\.\\./lynis") lynis-dir)) - (substitute* "unit-tests/tests-language-translations.sh" - (("\\.\\./lynis") lynis-dir)) - (invoke "sh" "lynis-devkit" "run" "unit-tests")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'unpack + ;; XXX Remove after fixing . + (lambda* (#:key source #:allow-other-keys) + (mkdir "source") + (chdir "source") + (copy-recursively source "." + #:keep-mtime? #t))) + (replace 'configure + (lambda _ + (substitute* "lynis" + (("/usr/share/lynis") + (string-append #$output "/share/lynis"))) + (substitute* "include/functions" + (("/usr/local/etc/lynis") + (string-append #$output "/etc/lynis"))))) + (delete 'build) + (replace 'install + (lambda _ + (install-file "lynis" (string-append #$output "/bin/")) + (install-file "default.prf" (string-append #$output "/etc/lynis")) + (for-each + (lambda (dir) + (copy-recursively + dir (string-append #$output "/share/lynis/" dir))) + (list "db" "include" "plugins")) + (install-file "lynis.8" + (string-append #$output "/share/man/man8")))) + (replace 'check + (lambda _ + (copy-recursively #$(this-package-native-input "lynis-sdk") + "../lynis-sdk") + (setenv "LANG" "en_US.UTF-8") + (let ((lynis-dir (getcwd))) + (with-directory-excursion "../lynis-sdk" + (substitute* "config" + (("\\.\\./lynis") lynis-dir)) + (substitute* "unit-tests/tests-language-translations.sh" + (("\\.\\./lynis") lynis-dir)) + (invoke "sh" "lynis-devkit" "run" "unit-tests")))))))) (home-page "https://cisofy.com/lynis/") (synopsis "Security auditing tool") (description "Lynis is a security auditing tool. It performs an in-depth -- cgit v1.3 From bbdf1488cd91d1588bcf5fbf6b40fa6bf0b9e46d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: cairomm: Update to 1.16.2. * gnu/packages/gtk.scm (cairomm): Update to 1.16.2. [source]: Hard-code NAME. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 848ed91d96b..0d6df1f5838 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1594,14 +1594,14 @@ guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview.") (define-public cairomm (package (name "cairomm") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (string-append "https://www.cairographics.org/releases/" - name "-" version ".tar.xz")) + "cairomm-" version ".tar.xz")) (sha256 (base32 - "1im2yjzvjfx8s7cal9kwq23z936kppfmyag2zsnbim4dx7c60q3g")))) + "0gy1gn79gwqzrf1d7f7rf25yy2dr7xginkg3al7jpnkxm6cbyqva")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.3 From ac8875cdfaab4e5ad04dd0c5b97951485dee8357 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: homebank: Update to 5.6.6. * gnu/packages/finance.scm (homebank): Update to 5.6.6. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e0d6bd6e2ce..c4420a5838e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -288,14 +288,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.6.5") + (version "5.6.6") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/sources/" "homebank-" version ".tar.gz")) (sha256 (base32 - "1a1cdldvs0xc30xkxkap72gafss90hmglakad5r8aykxz3y4sjdm")))) + "03nwcpxmsw82gnhy1dialky1d9mfb2jqdzlgc79bxwhlhpqwsvv5")))) (build-system glib-or-gtk-build-system) (native-inputs (list pkg-config intltool)) -- cgit v1.3 From f885f0b73a9e9e3fefc3aab843fb7cb3c41d6260 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: ncmpc: Update to 0.49. * gnu/packages/mpd.scm (ncmpc): Update to 0.49. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 111150ce6b0..0112c91fdf4 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -261,7 +261,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.48") + (version "0.49") (source (origin (method url-fetch) (uri @@ -270,7 +270,7 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "035rd64a70qiv334bgs9z2hqnvzldkwdvxay2hmdx5l0a5zd5cml")))) + "0afgcbqk4gqhc26wlw6vsnyv5gl5ciq0qyv4miicyswyvq7frfv5")))) (build-system meson-build-system) (inputs (list boost pcre libmpdclient ncurses)) (native-inputs -- cgit v1.3 From cd2b717c3d428a4f36e3ae406449cef50a968a24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: lvm2: Update to 2.03.22. * gnu/packages/linux.scm (lvm2): Update to 2.03.22. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9c49cc0b3a1..0be849f39d9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4469,7 +4469,7 @@ one to send arbitrary keycodes when a given key is tapped or held.") (define-public lvm2 (package (name "lvm2") - (version "2.03.21") + (version "2.03.22") (source (origin (method url-fetch) (uri (list (string-append "https://sourceware.org/ftp/lvm2/LVM2." @@ -4478,7 +4478,7 @@ one to send arbitrary keycodes when a given key is tapped or held.") version ".tgz"))) (sha256 (base32 - "0zksqsz8y47kh6vq0ykkgxf19il4wxfn234n6zf8m691sqhij9hy")) + "0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From a21eb92b855f91e12d3161dc8fc5c8a4e17ee951 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Jul 2023 02:00:00 +0200 Subject: gnu: guile-ncurses: Update to 3.1. * gnu/packages/guile-xyz.scm (guile-ncurses): Update to 3.1. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/guile-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9c0b642b97f..53f5e08e6f1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2505,14 +2505,14 @@ many readers as needed).") (define-public guile-ncurses (package (name "guile-ncurses") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile-ncurses/guile-ncurses-" version ".tar.gz")) (sha256 (base32 - "038xbffalhymg26lvmzgf7ljilxz2f2zmqg5r5nfzbipfbprwjhf")))) + "0cypz1ikw66n8bc2klsnnaj1plpl22dwq6pwyc7dvffamz7fi2gf")))) (build-system gnu-build-system) (inputs (list ncurses guile-3.0)) (native-inputs (list pkg-config)) @@ -2539,8 +2539,7 @@ many readers as needed).") (substitute* files (("\"libguile-ncurses\"") (format #f "\"~a/lib/guile/~a/libguile-ncurses\"" - out (target-guile-effective-version)))) - #t)))))) + out (target-guile-effective-version)))))))))) (home-page "https://www.gnu.org/software/guile-ncurses/") (synopsis "Guile bindings to ncurses") (description -- cgit v1.3 From 985638aea14720e16ed5fd94a0e1382a57dec7ac Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 21 Jul 2023 19:17:51 -0700 Subject: gnu: lcrq: Update to 0.1.0. * gnu/packages/networking.scm (lcrq): Update to 0.1.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 488d0151070..542e93891cd 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -256,7 +256,7 @@ protocols.") (define-public lcrq (package (name "lcrq") - (version "0.0.1") + (version "0.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -265,7 +265,7 @@ protocols.") (file-name (git-file-name name version)) (sha256 (base32 - "0jf7x3zcdbz5b99qz7liw4i90hn9s457zr82n0r8g9qsi81a1d8c")))) + "13mfg866scvy557zrvjxjhkzam39h8d07s2w3fqbwhw6br6axkxk")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f -- cgit v1.3 From 56667ee55cd7f3368cbff169352fe440f4f93da5 Mon Sep 17 00:00:00 2001 From: "Ricardo G. Herdt" Date: Wed, 21 Jun 2023 19:27:32 +0000 Subject: gnu: guile-scheme-json-rpc: Update to 0.4.0. * gnu/packages/guile-xyz.scm (guile-scheme-json-rpc): Update to 0.4.0. [inputs]: Add guile-srfi-145, guile-srfi-180, remove guile-json-3. Co-authored-by: Andrew Tropin Signed-off-by: Andrew Tropin --- gnu/packages/guile-xyz.scm | 53 ++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 53f5e08e6f1..a350b6700e8 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1054,36 +1054,33 @@ It has a nice, simple s-expression based syntax.") (inputs (list guile-2.2)))) (define-public guile-scheme-json-rpc - (let ((commit "45ae6890f6619286f5679f88c094c88127b54c4a") - (revision "0") - (version "0.2.11")) - (package - (name "guile-scheme-json-rpc") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://codeberg.org/rgherdt/scheme-json-rpc.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0w4m8xx8yyj0rv0q57mjr8ja87l7yikscj33i3ck26wg7230ppa5")))) - (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'change-to-guile-dir - (lambda _ - (chdir "guile")))))) - (inputs (list guile-3.0 guile-json-3)) - (native-inputs (list pkg-config)) - (synopsis "Library providing JSON-RPC capability in Scheme") - (description - "This library implements parts of the + (package + (name "guile-scheme-json-rpc") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/rgherdt/scheme-json-rpc.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jsampz2ahs18z6yh9b5l3lkj8ycnavs0vg9sjngdj3w3zvrdcvm")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'change-to-guile-dir + (lambda _ + (chdir "guile")))))) + (inputs (list guile-3.0 guile-srfi-145 guile-srfi-180)) + (native-inputs (list pkg-config)) + (synopsis "Library providing JSON-RPC capability for Guile Scheme") + (description + "This library implements parts of the @uref{https://www.jsonrpc.org/specification,JSON-RPC specification}, allowing for calling methods on remote servers by exchanging JSON objects.") - (home-page "https://codeberg.org/rgherdt/scheme-json-rpc/") - (license license:expat)))) + (home-page "https://codeberg.org/rgherdt/scheme-json-rpc/") + (license license:expat))) (define-public guile-squee (let ((commit "9f2609563fc53466e46d37c8d8d2fbcfce67b2ba") -- cgit v1.3 From 9c4d3c6f2baf4bf99d4304abd7b7f6844f90944e Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 5 Jul 2023 13:45:58 +0100 Subject: gnu: autoconf-archive: Update to 2023.02.20. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/autotools.scm (autoconf-archive): Update to 2023.02.20. Signed-off-by: Ludovic Courtès --- gnu/packages/autotools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 5ffefec4a1f..79d25b59a5b 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -275,7 +275,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (define-public autoconf-archive (package (name "autoconf-archive") - (version "2022.09.03") + (version "2023.02.20") (source (origin (method url-fetch) @@ -283,7 +283,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\" version ".tar.xz")) (sha256 (base32 - "08zl68xdd907fb1r8kb88ycq09w9g53hfbflpq3pkblc1pq58x70")))) + "0cqsqdnmjdyybzw8wqhwkgs1vh7r5pbw66a6g7sz2a5fg6209m3i")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/autoconf-archive/") (synopsis "Collection of freely reusable Autoconf macros") -- cgit v1.3 From 2bb0f9bac6cc37955251d9b3dc33cfa148de6ebe Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 24 Jun 2023 14:20:41 +0200 Subject: gnu: signify: Complete update to 31. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (signify)[source]: Add snippet to delete bundled libbsd. [license]: Drop bsd-4 as it was replaced with bsd-3. Signed-off-by: Ludovic Courtès --- gnu/packages/crypto.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 07e718feaf9..7d9410a6465 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -224,7 +224,9 @@ communication, encryption, decryption, signatures, etc.") "/download/v" version "/signify-" version ".tar.xz")) (sha256 (base32 - "0x1bipfphnyvf2kl7n9q4gawaglma79368vb8whama6lxsggsm8i")))) + "0x1bipfphnyvf2kl7n9q4gawaglma79368vb8whama6lxsggsm8i")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "libbsd")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). @@ -246,7 +248,7 @@ signatures using the elliptic curve Ed25519. This is a Linux port of the OpenBSD tool of the same name.") ;; This package includes third-party code that was originally released under ;; various non-copyleft licenses. See the source files for clarification. - (license (list license:bsd-3 license:bsd-4 license:expat license:isc + (license (list license:bsd-3 license:expat license:isc license:public-domain (license:non-copyleft "file://base64.c" "See base64.c in the distribution for -- cgit v1.3 From 1551f28ca72232ebe0ab5221906b67602296866c Mon Sep 17 00:00:00 2001 From: Christopher Howard Date: Wed, 19 Jul 2023 13:35:39 -0800 Subject: gnu: Add kineto. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (kineto): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e5fd081d276..7cc563586b8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -62,6 +62,7 @@ ;;; Copyright © 2023 Paul A. Patience ;;; Copyright © 2022 Bruno Victal ;;; Copyright © 2023 David Thompson +;;; Copyright © 2023 Christopher Howard ;;; ;;; This file is part of GNU Guix. ;;; @@ -8564,6 +8565,34 @@ detection. It delegates TLS support to an external daemon, for example @command{stunnel} on @command{inetd}.") (license license:bsd-2))) +(define-public kineto + (package + (name "kineto") + (version "0.0.0-20211105093215-857f8c97ebc5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~sircmpwn/kineto") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r17c904i76yy5ilvhjczmhnq5g7r4nkjwmsjcfxcqzly0ia7m2k")))) + (build-system go-build-system) + (arguments + '(#:import-path "git.sr.ht/~sircmpwn/kineto/")) + (propagated-inputs + (list go-git-sr-ht-sircmpwn-getopt go-git-sr-ht-adnano-go-gemini)) + (home-page "https://git.sr.ht/~sircmpwn/kineto/") + (synopsis "HTTP proxy for Gemini") + (description + "This is an @acronym{HTTP} to +@url{https://gemini.circumlunar.space/,Gemini} proxy designed to provide +service for a single domain, i.e. to make your Gemini site available over +HTTP. It can proxy to any domain in order to facilitate linking to the rest +of Geminispace, but it defaults to a specific domain.") + (license license:gpl3+))) + (define-public libzim (package (name "libzim") -- cgit v1.3 From 5b738d10e2d401fc29e1dea5a71907d72c696c8b Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Fri, 9 Jun 2023 20:39:17 +0800 Subject: gnu: Add tgs2png. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/telegram.scm (tgs2png): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/telegram.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692d..aa5c303603e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Lu Hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -792,3 +793,30 @@ formerly a part of telegram-cli, but now being maintained separately.") (synopsis "Telegram Terminal Application") (description "TgCli is a telegram client to automate repetitive tasks.") (license license:asl2.0))) + +(define-public tgs2png + (let ((commit "25c15b7c2ca3b1a580a383d9d3cb13bf8531d04a") + (revision "0")) + (package + (name "tgs2png") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zevlg/tgs2png") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0camvzapkfvr9v0nkk96n26rdmw0g8wbpv41i5l03j6bzdgm4myl")))) + (build-system cmake-build-system) + (native-inputs (list pkg-config)) + (inputs (list libpng rlottie)) + (arguments + `(#:tests? #f)) ;no tests + (home-page "https://github.com/zevlg/tgs2png") + (synopsis "Convert Telegram's TGS format into PNG images") + (description + "This program converts Telegram's animated stickers in TGS format into +a series of PNG images.") + (license license:gpl3+)))) -- cgit v1.3 From 94e2e07942a4e4ee5ba74eb39157f2f0f930500e Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:14 -0500 Subject: gnu: praat: Update to 6.1.49. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 6.1.30 of praat can't be built with GCC. Version 6.1.49 patches this. See https://github.com/praat/praat/pull/1622 for more information. -- >8 -- * gnu/packages/language.scm (praat): Update to 6.1.49. [inputs]: Replace gtk+-2 with gtk+. Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 27a6ebf329f..87ab60eba13 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -854,7 +854,7 @@ noun phrases, verb phrases, etc.).") (define-public praat (package (name "praat") - (version "6.1.30") + (version "6.1.49") (source (origin (method git-fetch) (uri (git-reference @@ -863,7 +863,7 @@ noun phrases, verb phrases, etc.).") (file-name (git-file-name name version)) (sha256 (base32 - "1pjfifyv3wjn68l3i2dr83xm75nf2kxvfxrk9qqbmwz58p183jw4")))) + "17ymrnvwvb08x61ygqlnfzzvggz937miix7rnk8vscrznywhh4jc")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test target @@ -882,7 +882,7 @@ noun phrases, verb phrases, etc.).") #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("gtk" ,gtk+-2) + ("gtk" ,gtk+) ("jack" ,jack-1) ("publesaudio" ,pulseaudio))) (native-inputs -- cgit v1.3 From 730fea3f284dd78c1e05e6c8ab8ebf150a6393c3 Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:15 -0500 Subject: gnu: praat: Update to 6.3.10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm (praat): Update to 6.3.10. [make-flags]: Use (cc-for-target). Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 87ab60eba13..fc33e6f42e9 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -854,7 +854,7 @@ noun phrases, verb phrases, etc.).") (define-public praat (package (name "praat") - (version "6.1.49") + (version "6.3.10") (source (origin (method git-fetch) (uri (git-reference @@ -863,10 +863,11 @@ noun phrases, verb phrases, etc.).") (file-name (git-file-name name version)) (sha256 (base32 - "17ymrnvwvb08x61ygqlnfzzvggz937miix7rnk8vscrznywhh4jc")))) + "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test target + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) + #:tests? #f ; no test target #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.3 From a9070e8ece5e4c9951047e304ee864f2b3016346 Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:16 -0500 Subject: gnu: praat: Add tests to praat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm (praat): Run non-graphical tests. Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index fc33e6f42e9..11fc17b427a 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -867,13 +867,21 @@ noun phrases, verb phrases, etc.).") (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) - #:tests? #f ; no test target #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-failing-tests + (lambda _ + (delete-file "test/sys/graphicsText.praat") + #t)) (replace 'configure (lambda _ (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs") #t)) + (replace 'check + (lambda _ + (invoke "./praat" "--run" + "test/runAllTests_batch.praat") + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.3 From 67d480d4a08ddbcebc4d785e0d6f2eddd3f35106 Mon Sep 17 00:00:00 2001 From: "Preston M. Firestone" Date: Mon, 26 Jun 2023 12:42:17 -0500 Subject: gnu: praat: Update style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm (praat): [arguments]: Use g-exps. [#:phases]: Drop trailing #t. [inputs]: Use new format. Signed-off-by: Ludovic Courtès --- gnu/packages/language.scm | 60 +++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 11fc17b427a..758fb4f336d 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -858,47 +858,41 @@ noun phrases, verb phrases, etc.).") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/praat/praat") - (commit (string-append "v" version)))) + (url "https://github.com/praat/praat") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-failing-tests - (lambda _ - (delete-file "test/sys/graphicsText.praat") - #t)) - (replace 'configure - (lambda _ - (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs") - #t)) - (replace 'check - (lambda _ - (invoke "./praat" "--run" - "test/runAllTests_batch.praat") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (copy-file "praat" (string-append bin "/praat"))) - #t))))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("gtk" ,gtk+) - ("jack" ,jack-1) - ("publesaudio" ,pulseaudio))) - (native-inputs - (list pkg-config)) + (list #:make-flags #~(list (string-append "CC=" + #$(cc-for-target))) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'delete-failing-tests + (lambda _ + (delete-file "test/sys/graphicsText.praat"))) + (replace 'configure + (lambda _ + (copy-file "makefiles/makefile.defs.linux.pulse" + "makefile.defs"))) + (replace 'check + (lambda _ + (invoke "./praat" "--run" + "test/runAllTests_batch.praat"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (copy-file "praat" + (string-append bin "/praat")))))))) + (inputs (list alsa-lib gtk+ jack-1 pulseaudio)) + (native-inputs (list pkg-config)) (home-page "https://www.fon.hum.uva.nl/praat/") (synopsis "Doing phonetics by computer") - (description "Praat is a tool to perform phonetics tasks. It can do speech + (description + "Praat is a tool to perform phonetics tasks. It can do speech analysis (pitch, formant, intensity, ...), speech synthesis, labelling, segmenting and manipulation.") (license license:gpl2+))) -- cgit v1.3 From f1badc9406aca4e59ab1eb823c40bd333612833e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 Aug 2023 16:11:01 +0200 Subject: gnu: praat: Honor #:tests?. * gnu/packages/language.scm (praat)[arguments]: Check #:tests? in 'check phase. --- gnu/packages/language.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 758fb4f336d..175cdc8d5eb 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -877,9 +877,10 @@ noun phrases, verb phrases, etc.).") (copy-file "makefiles/makefile.defs.linux.pulse" "makefile.defs"))) (replace 'check - (lambda _ - (invoke "./praat" "--run" - "test/runAllTests_batch.praat"))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./praat" "--run" + "test/runAllTests_batch.praat")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.3 From c47f5587a23d6780ad6cae31b56d2d05d446c5c0 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 7 Aug 2023 17:25:27 +0200 Subject: gnu: maths: Remove a duplicate module import. Reported-by: Andy Tai * gnu/packages/maths.scm: Remove duplicate line. --- gnu/packages/maths.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0d74a2a55c1..6fceddb4ad2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -82,7 +82,6 @@ #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) -- cgit v1.3 From a4e3b7ce4804681a2086058be50cca556034570b Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 7 Aug 2023 18:15:59 +0200 Subject: gnu: Add older version of jbr. * gnu/packages/java.scm (jbr11): New variable. --- gnu/packages/java.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 614d5859160..1dbec6bd12c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1550,6 +1550,43 @@ blacklisted.certs.pem" (define-public openjdk openjdk19) +;; This version of JBR is here in order to be able to build custom +;; IntelliJ plugins. Those usually need both jbr11 and jbr17 for +;; tests. +(define-public jbr11 + (package + (inherit openjdk11) + (name "jbr") + (version "11_0_16-b2248") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JetBrains/JetBrainsRuntime.git") + (commit (string-append "jb" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1fnrdx0wb21ghm6jczjzk7b9fz9hbdzd62512xhwpzvca57v2z09")))) + (arguments + (substitute-keyword-arguments (package-arguments openjdk11) + ((#:configure-flags configure-flags) + #~(append #$configure-flags + (list "--with-jvm-features=shenandoahgc" + "--enable-cds=yes" + "--with-vendor-name=JetBrains s.r.o" + "--with-vendor-url=https://www.jetbrains.com/" + "--with-vendor-bug-url=https://youtrack.jetbrains.com/issues/JBR"))))) + (synopsis "JetBrains Java Runtime") + (description "This package provides a Java runtime environment for +and Java development kit. It supports enhanced class redefinition (DCEVM), +features optional JCEF, a framework for embedding Chromium-based browsers, +includes a number of improvements in font rendering, keyboards support, +windowing/focus subsystems, HiDPI, accessibility, and performance, +provides better desktop integration and bugfixes not yet present in +OpenJDK.") + (home-page "https://www.jetbrains.com/") + (license license:gpl2+))) + (define-public jbr17 (package (inherit openjdk17) -- cgit v1.3 From 2d91ef7a93b9eefc808df63d02f707a3a87254d6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:27 +0100 Subject: gnu: sextractor: Update to 2.28.0 and add input. * gnu/packages/astronomy.scm (sextractor): Update to 2.28.0, fix build. [arguments]: Add configure flags for CFitsio detection. [inputs]: Add cfitsio. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5b9434fb33e..4637265b95e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -917,7 +917,7 @@ from Stark Labs.") (define-public sextractor (package (name "sextractor") - (version "2.25.0") + (version "2.28.0") (source (origin (method git-fetch) @@ -926,7 +926,7 @@ from Stark Labs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0q69n3nyal57h3ik2xirwzrxzljrwy9ivwraxzv9566vi3n4z5mw")))) + (base32 "15v7brjiraj2rdyxiidcgb58b3dqzdd363j31cjrfqhd1wc8ii5j")))) (build-system gnu-build-system) ;; NOTE: (Sharlatan-20210124T103117+0000): Building with `atlas' is failing ;; due to missing shared library which required on configure phase. Switch @@ -936,6 +936,10 @@ from Stark Labs.") `(#:configure-flags (list "--enable-openblas" + (string-append + "--with-cfitsio-libdir=" (assoc-ref %build-inputs "cfitsio") "/lib") + (string-append + "--with-cfitsio-incdir=" (assoc-ref %build-inputs "cfitsio") "/include") (string-append "--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib") (string-append @@ -947,7 +951,8 @@ from Stark Labs.") (native-inputs (list autoconf automake libtool)) (inputs - `(("openblas" ,openblas) + `(("cfitsio" ,cfitsio) + ("openblas" ,openblas) ("fftw" ,fftwf))) (home-page "https://www.astromatic.net/software/sextractor") (synopsis "Extract catalogs of sources from astronomical images") -- cgit v1.3 From c84dce05c5135b466548973025befef175b9b0fd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:28 +0100 Subject: gnu: sextractor: Use G-expressions. * gnu/packages/astronomy.scm (sextractor): Use G-expressions. [inputs]: Remove labels. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4637265b95e..b957e173502 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -933,27 +933,26 @@ from Stark Labs.") ;; build to use `openblas' instead. It requires FFTW with single precision ;; `fftwf'. (arguments - `(#:configure-flags - (list - "--enable-openblas" - (string-append - "--with-cfitsio-libdir=" (assoc-ref %build-inputs "cfitsio") "/lib") - (string-append - "--with-cfitsio-incdir=" (assoc-ref %build-inputs "cfitsio") "/include") - (string-append - "--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib") - (string-append - "--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include") - (string-append - "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") - (string-append - "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) + (list + #:configure-flags + #~(list + "--enable-openblas" + (string-append "--with-cfitsio-incdir=" + #$(this-package-input "cfitsio") "/include") + (string-append "--with-cfitsio-libdir=" + #$(this-package-input "cfitsio") "/lib") + (string-append "--with-fftw-incdir=" + #$(this-package-input "fftwf") "/include") + (string-append "--with-fftw-libdir=" + #$(this-package-input "fftwf") "/lib") + (string-append "--with-openblas-incdir=" + #$(this-package-input "openblas") "/include") + (string-append "--with-openblas-libdir=" + #$(this-package-input "openblas") "/lib")))) (native-inputs (list autoconf automake libtool)) (inputs - `(("cfitsio" ,cfitsio) - ("openblas" ,openblas) - ("fftw" ,fftwf))) + (list cfitsio fftwf openblas)) (home-page "https://www.astromatic.net/software/sextractor") (synopsis "Extract catalogs of sources from astronomical images") (description -- cgit v1.3 From 8a88a7c0d9eb18920152671ef0f50d8d1d5171e3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:29 +0100 Subject: gnu: python-photutils: Update package style. * gnu/packages/astronomy.scm (python-photutils): Update package style. [build-system]: Swap to python-build-system. [arguments]: Use G-expressions. Rename the phase before check 'writable-compiler to 'build-extensions to reflect its purpose, add new step in phase building extensions for testing. [native-inputs]: Remove python-pytest-runner. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b957e173502..791a7395957 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1918,23 +1918,29 @@ the easy construction of interactive matplotlib widget based animations.") (uri (pypi-uri "photutils" version)) (sha256 (base32 "1bq4ma402lpa5d6l85awlc23kasxf40nq8hgi3iyrilnfikan0jz")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:test-target "pytest" - #:phases - (modify-phases %standard-phases - ;; This file is opened in both install and check phases. - (add-before 'install 'writable-compiler - (lambda _ (make-file-writable "photutils/_compiler.c"))) - (add-before 'check 'writable-compiler - (lambda _ (make-file-writable "photutils/_compiler.c")))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; This file is opened in both install and check phases. + (add-before 'install 'writable-compiler + (lambda _ (make-file-writable "photutils/_compiler.c"))) + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running + ;; the tests. If it's not build it fails with error: + ;; + ;; ModuleNotFoundError: No module named + ;; 'photutils.geometry.circular_overlap' + (make-file-writable "photutils/_compiler.c") + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (propagated-inputs (list python-astropy python-numpy)) (native-inputs (list python-cython python-extension-helpers python-pytest-astropy - python-pytest-runner python-setuptools-scm)) (home-page "https://github.com/astropy/photutils") (synopsis "Source detection and photometry") -- cgit v1.3 From dc2be2652ff4f17bd4d3817091755f29ab41a192 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:30 +0100 Subject: gnu: calceph: Update to 3.5.2. * gnu/packages/astronomy.scm (calceph): Update to 3.5.2. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 791a7395957..58952263852 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -182,7 +182,7 @@ reused in several astronomical applications, such as @code{wsclean}, (define-public calceph (package (name "calceph") - (version "3.5.1") + (version "3.5.2") (source (origin (method url-fetch) @@ -190,7 +190,7 @@ reused in several astronomical applications, such as @code{wsclean}, "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-" version ".tar.gz")) (sha256 - (base32 "078wn773pwf4pg9m0h0l00g4aq744pq1rb6kz6plgdpzp3hhpk1k")))) + (base32 "1rnjlaiii4j0agbj4k242p212bqqmqdqa0lni6c3bnhgfnrbjfp4")))) (build-system gnu-build-system) (native-inputs (list gfortran)) -- cgit v1.3 From c006e9a8720765c95fc2f210549ddad0701542eb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:31 +0100 Subject: gnu: calcmysky: Update to 0.3.1. * gnu/packages/astronomy.scm (calcmysky) Update to 0.3.1. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 58952263852..5eb193ce12d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -217,7 +217,7 @@ moment, supported SPICE files are: (define-public calcmysky (package (name "calcmysky") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -226,7 +226,7 @@ moment, supported SPICE files are: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1lgn937px4am0lggniwby1f1dl3v4l3iigq72rl9rlhx58zv4lj1")))) + (base32 "14jbaf9m9wig2bs7a531dvpmdkqpd09lmyvjvj1s0mhgh9g0x9m2")))) (build-system cmake-build-system) (arguments (list #:configure-flags -- cgit v1.3 From 35ccd2f00651baa8dbbded640f6a9c9cf3588855 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:32 +0100 Subject: gnu: libxisf: Update to 0.2.8. * gnu/packages/astronomy.scm (libxisf): Update to 0.2.8. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5eb193ce12d..e6fdd5d23cf 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2769,9 +2769,7 @@ standard astronomy libraries: (define-public libxisf (package (name "libxisf") - ;; TODO: v0.2.2 (current latest) failed to build on configure phase, issue - ;; was open directly with author as he hosts source on seflhosted gitea. - (version "0.2.1") + (version "0.2.8") (source (origin (method git-fetch) @@ -2780,7 +2778,7 @@ standard astronomy libraries: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fz9mmj1nz5v7hlr53q8na7khadfn1hm0d1gfpzzw3167bqpy2xv")))) + (base32 "1j2bg53hrr2yc55qa6549vcpj7qjnwmxjcdgc98w3ygnrjy7n7v0")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DUSE_BUNDLED_LIBS=OFF"))) -- cgit v1.3 From eb9e0a72d4f31595c54e1a1ace43e7641e077930 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:33 +0100 Subject: gnu: splash: Update to 3.8.2. * gnu/packages/astronomy.scm (splash): Update to 3.8.2. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e6fdd5d23cf..1c6ccc3a920 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1002,7 +1002,7 @@ image formats.") (define-public splash (package (name "splash") - (version "3.7.2") + (version "3.8.2") (source (origin (method git-fetch) (uri (git-reference @@ -1010,7 +1010,7 @@ image formats.") (commit (string-append "v" version)))) (sha256 (base32 - "0nsm6rk0bi99xz7wclk0zy4bpqf0qcsdln5cdjb30lhpf37i2fpa")) + "0y6l135g0a3hvvh8w8sfdh1kfq2g0gbp0dgjhnmwid8bwwcjvw8v")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.3 From f9a94fee729aee3bb9751b394fb4e281578283c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:34 +0100 Subject: gnu: python-astropy: Update to 5.3.1. * gnu/packages/astronomy.scm (python-astropy): Update to 5.3.1. [snippet]: Remove trailing #t. Prevent cfitsio from deletion. [inputs]: Remove cfitsio. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1c6ccc3a920..1ae94881613 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1347,13 +1347,13 @@ accurately in real time at any rate desired.") (define-public python-astropy (package (name "python-astropy") - (version "5.2.2") + (version "5.3.1") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "170ddflli35mvhf6pla7aizfw8a7ckq66g1mi1br99dx2r3y7ag6")) + (base32 "0x4dh7wx9sn1gy6sl2d54zsd24cgfjwrlk6kfrwpzzrmbsv22lwv")) (modules '((guix build utils))) (snippet '(begin @@ -1362,9 +1362,10 @@ accurately in real time at any rate desired.") (for-each delete-file-recursively '("ply" "configobj"))) ;; Remove cextern bundles. Check bundled versions against available ;; in Guix in the future update of astropy. + ;; Linking against an external cfitsio version has been removed, + ;; see https://github.com/astropy/astropy/pull/14311 (with-directory-excursion "cextern" - (for-each delete-file-recursively '("cfitsio" "expat" "wcslib"))) - #t)))) + (for-each delete-file-recursively '("expat" "wcslib"))))))) (build-system python-build-system) (arguments `(#:phases @@ -1431,7 +1432,7 @@ accurately in real time at any rate desired.") python-skyfield python-timezonefinder)) (inputs - (list cfitsio expat wcslib)) + (list expat wcslib)) (propagated-inputs (list python-configobj python-numpy -- cgit v1.3 From 7a66ffb4c8045b1c2d6a9b0b1afd3fb5e8b4b840 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:35 +0100 Subject: gnu: python-ccdproc: Update to 2.4.1. * gnu/packages/astronomy.scm (python-ccdproc): Update to 2.4.1. [native-inputs]: Add python-semantic-version. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1ae94881613..7d611f1aa24 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1605,15 +1605,18 @@ Herschel.") (define-public python-ccdproc (package (name "python-ccdproc") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) (uri (pypi-uri "ccdproc" version)) (sha256 - (base32 "0fy1sni87cr05dkljd8wb7vgh7z9agh8wv5kiagxcpbcf8l06jv1")))) + (base32 "186plgfhrj7wivs053y65jlv1x33y8ii31jdr2rm4s6pl0j7x29z")))) (build-system pyproject-build-system) - (native-inputs (list python-memory-profiler python-pytest-astropy)) + (native-inputs + (list python-memory-profiler + python-pytest-astropy + python-semantic-version)) (propagated-inputs (list python-astropy python-astroscrappy -- cgit v1.3 From 116bffeae45ae7bb742972ddea31eb8c5886ffdc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:38 +0100 Subject: gnu: python-fitsio: Update to 1.1.10. * gnu/packages/astronomy.scm (python-fitsio): Update to 1.1.10. [native-inputs]: Add python-pytest. [propagated-inputs]: Move cfitsio from here ... [inputs]: ... to here, do not propagate as it's required only on build and link time. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 7d611f1aa24..078dc5d121c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -531,13 +531,13 @@ mining in astronomy.") (define-public python-fitsio (package (name "python-fitsio") - (version "1.1.8") + (version "1.1.10") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "1y80hgvlkjz1bijfyb2j03853yc1kc63yrf9ab7as31ad2r6kxb1")) + (base32 "0dv2vjj8qn3rq5sr99x5yjjch5h867c8q7zh73i67dzdsk7ix0jf")) (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio @@ -563,9 +563,12 @@ mining in astronomy.") (("self.use_system_fitsio") "True") (("self.system_fitsio_includedir") includedir) (("self.system_fitsio_libdir") libdir)))))))) - (inputs (list curl)) + (native-inputs + (list python-pytest)) + (inputs + (list curl cfitsio)) (propagated-inputs - (list python-numpy cfitsio)) + (list python-numpy)) (home-page "https://github.com/esheldon/fitsio") (synopsis "Python library to read from and write to FITS files") -- cgit v1.3 From f8ba0889f2a07eaac3551a5651400729b76eeec0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:39 +0100 Subject: gnu: python-fitsio: Enable tests. * gnu/packages/astronomy.scm (python-fitsio): Enable tests. [build-system]: Swap to pyproject-build-system. [arguments]: Add new phase 'build-extensions. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 078dc5d121c..4ab3a186cbf 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -545,7 +545,7 @@ mining in astronomy.") (delete-file-recursively "cfitsio3490") (substitute* "MANIFEST.in" (("recursive-include cfitsio3490.*$\n") "")))))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases @@ -562,7 +562,10 @@ mining in astronomy.") (("self.system_fitsio_libdir = None") "pass") (("self.use_system_fitsio") "True") (("self.system_fitsio_includedir") includedir) - (("self.system_fitsio_libdir") libdir)))))))) + (("self.system_fitsio_libdir") libdir))))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list python-pytest)) (inputs -- cgit v1.3 From d43b53c476b4e9322b31274b788e851d37e72302 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:37 +0100 Subject: gnu: python-drms: Update to 0.6.4. * gnu/packages/astronomy.scm (python-drms): Update to 0.6.4. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4ab3a186cbf..67ae8cf5727 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1767,13 +1767,13 @@ Cesium.") (define-public python-drms (package (name "python-drms") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (pypi-uri "drms" version)) (sha256 - (base32 "1b0w350y4wbgyy19zcf28xbb85mqq6gnhb6ppibbc4hbn2ixbcvj")))) + (base32 "0mkrmr55fgca441z7hvsyri6x9cjsh0sfas3hrj0k1k10k8vszbw")))) (build-system python-build-system) (arguments (list -- cgit v1.3 From 7c3df13f220157d2f432a9daf2a168eb954cbbef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 7 Aug 2023 16:42:24 -0400 Subject: gnu: qtbase: Fix qmake link directives. * gnu/packages/qt.scm (qtbase) [origin]: Add patch, specifying patches explicitly. [arguments] : Augment LIBRARY_PATH in check phase. * gnu/packages/patches/qtbase-qmake-use-libname.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../patches/qtbase-qmake-use-libname.patch | 53 ++++++++++++++++++++++ gnu/packages/qt.scm | 11 ++++- 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qtbase-qmake-use-libname.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 77707127a7c..9d00596f399 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1870,6 +1870,7 @@ dist_patch_DATA = \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ + %D%/packages/patches/qtbase-qmake-use-libname.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-qmake-use-libname.patch b/gnu/packages/patches/qtbase-qmake-use-libname.patch new file mode 100644 index 00000000000..0bc2094d86d --- /dev/null +++ b/gnu/packages/patches/qtbase-qmake-use-libname.patch @@ -0,0 +1,53 @@ +Patch retrieved from NixOS +https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch + +From 8880bc263a366aeb82056f0bf3f1b17b6ec26900 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Thu, 13 Apr 2023 23:42:29 +0800 +Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute + path in qmake files + +In generated qmake files, absolute paths to qt libraries are embedded +and then used in linker flags. However as the libraries can be provided +by qt modules other than the one currently being built, the ebedded +paths can be incorrect. +--- + cmake/QtFinishPrlFile.cmake | 7 ++++--- + cmake/QtGenerateLibHelpers.cmake | 3 --- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake +index 32169e418c..4e754af367 100644 +--- a/cmake/QtFinishPrlFile.cmake ++++ b/cmake/QtFinishPrlFile.cmake +@@ -61,9 +61,10 @@ foreach(line ${lines}) + endif() + list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}") + else() +- # Not a framework, transform the Qt module into relocatable relative path. +- qt_strip_library_version_suffix(relative_lib "${relative_lib}") +- list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS]/${relative_lib}") ++ # Not a framework, extract the library name and prepend an -l to make ++ # it relocatable. ++ qt_transform_absolute_library_paths_to_link_flags(lib_with_link_flag "${lib}") ++ list(APPEND adjusted_libs "${lib_with_link_flag}") + endif() + endif() + else() +diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake +index e3f4bbf881..f8bd26acc7 100644 +--- a/cmake/QtGenerateLibHelpers.cmake ++++ b/cmake/QtGenerateLibHelpers.cmake +@@ -70,9 +70,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_ + string(TOLOWER "${dir}" dir_lower) + # If library_path isn't in default link directories, we should add it to link flags. + list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index) +- if(${index} EQUAL -1) +- list(APPEND out_list "-L\"${dir}\"") +- endif() + list(APPEND out_list "${lib_name_with_link_flag}") + else() + list(APPEND out_list "${library_path}") +-- +2.39.2 + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e8654eee441..cecd6d13a1a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -609,7 +609,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") ;; are required by some internal bootstrap target ;; used for the tools. (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))))) + "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-moc-ignore-gcc-macro.patch" + "qtbase-absolute-runpath.patch" + "qtbase-qmake-use-libname.patch")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) @@ -716,6 +720,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") (string-append #$output ":" (getenv "CMAKE_PREFIX_PATH"))) (setenv "QMAKEPATH" (string-append #$output "/lib/qt6")) + ;; It is necessary to augment LIBRARY_PATH with that of the + ;; freshly installed qtbase because of the + ;; 'qtbase-qmake-use-libname.patch' patch. + (setenv "LIBRARY_PATH" (string-append #$output "/lib:" + (getenv "LIBRARY_PATH"))) (setenv "QML2_IMPORT_PATH" (string-append #$output "/lib/qt6/qml")) (setenv "QT_PLUGIN_PATH" -- cgit v1.3 From 98c17c14829349d4838186400541a7cd650b64d0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 7 Aug 2023 16:46:17 -0400 Subject: gnu: qtbase: Avoid retaining a reference to gcc-final. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/qt.scm (qtbase) [configure-flags]: Add the "-DQT_EMBED_TOOLCHAIN_COMPILER=OFF" flag. Reported-by: Ludovic Courtès --- gnu/packages/qt.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cecd6d13a1a..5d7af0d0c87 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -627,6 +627,11 @@ developers using C++ or QML, a CSS & JavaScript like language.") (string-append "-DINSTALL_EXAMPLESDIR=" out "/share/doc/qt6/examples") (string-append "-DINSTALL_INCLUDEDIR=" out "/include/qt6") + + ;; Do not embed an absolute reference to compilers, to reduce + ;; the closure size. + "-DQT_EMBED_TOOLCHAIN_COMPILER=OFF" + ;; Link with DBus and OpenSSL so they don't get dlopen'ed. "-DINPUT_dbus=linked" "-DINPUT_openssl=linked" -- cgit v1.3 From d8ef4eef3db26f22391f6114b397de4dc91c8b7d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:43 +0100 Subject: gnu: python-reproject: Update to 0.11.0. * gnu/packages/astronomy.scm (python-reproject): Update to 0.11.0. [native-inputs]: Move python-pyvo, python-gwcs, python-shapely from here ... [propagated-inputs]: ... to here. Add python-click, python-cloudpickle, python-dask, python-fsspec, python-zarr. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 67ae8cf5727..a22d2706f49 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2141,13 +2141,13 @@ Virtual observatory (VO) using Python.") (define-public python-reproject (package (name "python-reproject") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "reproject" version)) (sha256 - (base32 "1ha0a1ja7k09ysd05adffgsapfwzc6m6az34a0av2mhmlwy4zb1q")))) + (base32 "0p07qlqinb826m4n5b5invyfyv4z750sai2caqaf598mgj04l61p")))) (build-system pyproject-build-system) (arguments (list @@ -2170,21 +2170,26 @@ Virtual observatory (VO) using Python.") (lambda _ (setenv "HOME" (getcwd))))))) (propagated-inputs - (list python-astropy + (list python-asdf + python-astropy python-astropy-healpix + python-click + python-cloudpickle + python-dask + python-fsspec + python-gwcs python-numpy - python-scipy)) + python-pyvo + python-scipy + python-shapely + python-zarr)) (native-inputs - (list python-asdf - python-cython + (list python-cython python-extension-helpers - python-gwcs python-pytest-astropy - python-pyvo python-semantic-version python-pytest - python-setuptools-scm - python-shapely)) + python-setuptools-scm)) (home-page "https://reproject.readthedocs.io") (synopsis "Astronomical image reprojection in Python") (description -- cgit v1.3 From 6f0d48ac7141714ab18bac08fa7b0419721682e3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:44 +0100 Subject: gnu: python-stcal: Update to 1.4.2. * gnu/packages/astronomy.scm (python-stcal): Update to 1.4.2. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a22d2706f49..be339c21040 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2491,13 +2491,13 @@ image processing functions: @code{xyxymatch}, @code{geomap}.") (define-public python-stcal (package (name "python-stcal") - (version "1.3.7") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "stcal" version)) (sha256 (base32 - "0yy0pwi3krvhxfby6nzgpgyz5il3sl1j29ihbk81dh9fdh3ys2n9")))) + "163vyqcd9qv2knf8jik8y449z7ljl2lvbd7im82bq61prgi3z2hj")))) (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases -- cgit v1.3 From 130c154737f2f9f693df9802a68d2407bf55551f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:45 +0100 Subject: gnu: python-stdatamodels: Update to 1.7.1. * gnu/packages/astronomy.scm (python-stdatamodels): Update to 1.7.1. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index be339c21040..a124d9f6267 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2520,13 +2520,13 @@ image processing functions: @code{xyxymatch}, @code{geomap}.") (define-public python-stdatamodels (package (name "python-stdatamodels") - (version "1.5.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (pypi-uri "stdatamodels" version)) (sha256 (base32 - "1lssz5mnkzgraqa9mdg1w39scsikymcp3zpmsjb146r0pqnwnpzw")))) + "0d7a27myl3xgri3z7yx26mr4dpqnlfhdh5i2ql2miwymi0mx3ij5")))) (build-system pyproject-build-system) (arguments (list -- cgit v1.3 From 042c64f5cc85f8dbe5a0b43972db915f811aefae Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:36 +0100 Subject: gnu: python-cdflib: Update to 1.0.5. * gnu/packages/astronomy.scm (python-cdflib): Update to 1.0.5. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a124d9f6267..9801d8da052 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1640,7 +1640,7 @@ bad pixel tracking throughout the reduction process.") (define-public python-cdflib (package (name "python-cdflib") - (version "0.4.9") + (version "1.0.5") (source (origin (method git-fetch) ; no tests in pypi archive @@ -1649,7 +1649,7 @@ bad pixel tracking throughout the reduction process.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1k557najk7ln293zwyghnhw48ays3nqf9s94kibsc7r70c2q7p08")))) + (base32 "1pkda9gmpjhbqxl2jj5q9rjx77lv5c908mgf20lw3rz4nvfaa2wn")))) (build-system pyproject-build-system) (arguments (list #:phases -- cgit v1.3 From 113efafd5bd7fe04bff0dd54f73765a820d145ba Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:46 +0100 Subject: gnu: python-sunpy: Update to 5.0.0. * gnu/packages/astronomy.scm (python-sunpy): Update to 5.0.0. Drop some failing tests. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9801d8da052..81fd8ea22ac 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -2231,13 +2231,13 @@ orbits described in TLE files.") (define-public python-sunpy (package (name "python-sunpy") - (version "4.1.5") + (version "5.0.0") (source (origin (method url-fetch) (uri (pypi-uri "sunpy" version)) (sha256 - (base32 "1j5g0ivsrc5ji9s7jc3kcbi2injfs3y31pm3priycljwcsxspkpm")))) + (base32 "1w75yc8az86pwbf79h083j4kc2ycfk76ky5kzlmcwgp0ih23mhym")))) (build-system pyproject-build-system) (arguments (list @@ -2245,7 +2245,10 @@ orbits described in TLE files.") #~(list "-k" (string-append ;; XXX: Failed: DID NOT RAISE "not test_main_nonexisting_module" - " and not test_main_stdlib_module")) + " and not test_main_stdlib_module" + ;; XXX: packaging.version.InvalidVersion: Invalid version: 'unknown' + " and not test_read_cdf" + " and not test_read_empty_cdf")) #:phases #~(modify-phases %standard-phases (add-before 'install 'writable-compiler -- cgit v1.3 From bc7a8ebcd8ea0b6d5f5da33ec62024ff55e5597b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:40 +0100 Subject: gnu: python-pyerfa: Update to 2.0.0.3. * gnu/packages/astronomy.scm (python-pyerfa): Update to 2.0.0.3. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 81fd8ea22ac..65739f6bd13 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3242,13 +3242,13 @@ exposures and high-level data products (mosaics, extracted spectra, etc.).") (define-public python-pyerfa (package (name "python-pyerfa") - (version "2.0.0.1") + (version "2.0.0.3") (source (origin (method url-fetch) (uri (pypi-uri "pyerfa" version)) (sha256 - (base32 "0c6y1rm51kj8ahbr1vwbswck3ix77dc3zhc2fkg6w7iczrzn7m1g")) + (base32 "0f8zykzxjsiwv5ibdn5asla2ng2xl0xdkrcrrd61j31mb3xbnzyp")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 296a1570926b2449c515ca3ce385103c436e058b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:41 +0100 Subject: gnu: python-pyerfa: Fix tests. * gnu/packages/astronomy.scm (python-pyerfa): Fix tests. [build-system]: Change to pyproject-build-system. [arguments]: Disable a failing test. Add 'build-extensions phase. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 65739f6bd13..a3d71c09af6 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3255,13 +3255,19 @@ exposures and high-level data products (mosaics, extracted spectra, etc.).") ;; Remove bundled submodule library. (delete-file-recursively "liberfa") #t)))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases + `(;; Disable only one failing test: + ;; AttributeError: __warningregistry__ + #:test-flags '("-k" "not test_errwarn_reporting") + #:phases (modify-phases %standard-phases (add-before 'build 'use-system-liberfa (lambda _ - (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1")))))) + (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1"))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list python-pytest-doctestplus python-pytest python-setuptools-scm)) (inputs -- cgit v1.3 From dc3c9ddc0850c633aa9f194ec941fa529a308743 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:42 +0100 Subject: gnu: python-pyerfa: Use G-expressions. * gnu/packages/astronomy.scm (python-pyerfa): Use G-expressions. [snippet]: Remove trailing #t. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a3d71c09af6..556ba8c6a2a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3251,23 +3251,23 @@ exposures and high-level data products (mosaics, extracted spectra, etc.).") (base32 "0f8zykzxjsiwv5ibdn5asla2ng2xl0xdkrcrrd61j31mb3xbnzyp")) (modules '((guix build utils))) (snippet - '(begin - ;; Remove bundled submodule library. - (delete-file-recursively "liberfa") - #t)))) + #~(begin + ;; Remove bundled submodule library. + (delete-file-recursively "liberfa"))))) (build-system pyproject-build-system) (arguments - `(;; Disable only one failing test: - ;; AttributeError: __warningregistry__ - #:test-flags '("-k" "not test_errwarn_reporting") - #:phases - (modify-phases %standard-phases - (add-before 'build 'use-system-liberfa - (lambda _ - (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1"))) - (add-before 'check 'build-extensions - (lambda _ - (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (list + ;; Disable only one failing test: + ;; AttributeError: __warningregistry__ + #:test-flags #~(list "-k" "not test_errwarn_reporting") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'use-system-liberfa + (lambda _ + (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1"))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list python-pytest-doctestplus python-pytest python-setuptools-scm)) (inputs -- cgit v1.3 From 6081c8699bf4040811b35e39402af50d41a6c771 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:47 +0100 Subject: gnu: python-synphot: Update to 1.2.1. * gnu/packages/astronomy.scm (python-synphot): Update to 1.2.1. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 556ba8c6a2a..1f84ed4e629 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3413,13 +3413,13 @@ datetime object.") (define-public python-synphot (package (name "python-synphot") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (pypi-uri "synphot" version)) (sha256 (base32 - "02pjp1bnbyq7zi1bxqv56nif4ijd8fscmnn9ldrs8yvgsbmgdvlc")))) + "10kcdg2gqmi1w2hsjx9hfizwbff3kll10s68hys13nzh4i8b7cc4")))) (build-system pyproject-build-system) (arguments (list -- cgit v1.3 From 692f24d739fffb719350a9c8615c133f933c4512 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 27 Jul 2023 00:15:48 +0100 Subject: gnu: python-astroalign: Fix build. * gnu/packages/astronomy.scm (python-astroalign)[native-inputs]: Add python-pytest, python-semantic-version. Signed-off-by: Andreas Enge --- gnu/packages/astronomy.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1f84ed4e629..e5c318c8bfa 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3886,7 +3886,12 @@ pipelines.") (sha256 (base32 "0hly20a65540hr3l1lsd1i4d90a0vdrbwnn6zx3z8s89ha9lq3pb")))) (build-system pyproject-build-system) - (native-inputs (list python-astropy python-ccdproc python-pillow)) + (native-inputs + (list python-astropy + python-ccdproc + python-pillow + python-pytest + python-semantic-version)) (propagated-inputs (list python-bottleneck python-numpy -- cgit v1.3 From c7d9fb58a76d38356c8f9b06c17f9085a3fef968 Mon Sep 17 00:00:00 2001 From: cage Date: Sat, 5 Aug 2023 12:10:17 +0200 Subject: gnu: cl-tooter: Update to 1.0.0-4.2e1b22f05. * gnu/packages/lisp-xyz.scm (sbcl-tooter): Update to 1.0.0-4.2e1b22f05. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d2596ebc2de..a825eaacdd6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2021, 2022 Aurora ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021, 2022, 2023 André A. Gomes -;;; Copyright © 2021, 2022 Cage +;;; Copyright © 2021, 2022, 2023 Cage ;;; Copyright © 2021 Cameron Chaparro ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2021, 2022 Foo Chuan Wei @@ -18552,8 +18552,8 @@ HTML documents.") (sbcl-package->cl-source-package sbcl-cl-html-diff)) (define-public sbcl-tooter - (let ((commit "ec97bee3431c55913078e532daae81eb0fd90372") - (revision "3")) + (let ((commit "2e1b22f0993419c1e7e6d10ead45d7bcafb5b6cb") + (revision "4")) (package (name "sbcl-tooter") (version (git-version "1.0.0" revision commit)) @@ -18563,9 +18563,9 @@ HTML documents.") (uri (git-reference (url "https://github.com/Shinmera/tooter") (commit commit))) - (file-name (git-file-name "tooter" version)) + (file-name (git-file-name "cl-tooter" version)) (sha256 - (base32 "02vpjaq38d6laaqmsana9f13c38xzr0xwy05fcfkmzdhh0kllpkv")))) + (base32 "02ys58gzasvk7r84jmz6k522qcw2hkbgv8p0ax5i8dggjhr04cz2")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-cl-ppcre sbcl-documentation-utils sbcl-drakma -- cgit v1.3 From b9098eaf5e7b36c96f8fb5a39f7740c0adcfca4d Mon Sep 17 00:00:00 2001 From: cage Date: Sat, 5 Aug 2023 12:22:20 +0200 Subject: gnu: cl-i18n: Update to 0.5.5-3.acb162a. * gnu/packages/lisp-xyz.scm (sbcl-cl-i18n): Update to 0.5.5-3.acb162a. [source, home-page]: Switch from Notabug to Codeberg. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a825eaacdd6..b6956f17562 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18719,20 +18719,20 @@ dynamically.") (sbcl-package->cl-source-package sbcl-sxql-composer)) (define-public sbcl-cl-i18n - (let ((commit "66b02dc2cff3ab97f924329aaf965807fe18aa20") - (revision "2")) + (let ((commit "acb162a12dac50fc46d83da8934fce85d19e31c4") + (revision "3")) (package (name "sbcl-cl-i18n") - (version (git-version "0.5.3" revision commit)) + (version (git-version "0.5.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://notabug.org/cage/cl-i18n") + (url "https://codeberg.org/cage/cl-i18n") (commit commit))) (file-name (git-file-name "cl-i18n" version)) (sha256 - (base32 "06ij1wxancsym87gg63nvjh7vfzjipi1f02h4fb2ypip60vw06lc")))) + (base32 "1y29cirmlyc406a45sdx39spvnjzbs772c977075ccicz46qaxz7")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria sbcl-babel sbcl-cl-ppcre-unicode)) @@ -18740,7 +18740,7 @@ dynamically.") (description "This is a Gettext-style internationalisation framework for Common Lisp.") - (home-page "https://notabug.org/cage/cl-i18n") + (home-page "https://codeberg.org/cage/cl-i18n") (license license:llgpl)))) (define-public ecl-cl-i18n -- cgit v1.3 From be7f5111ce41532cc954b6dacb145e0e64b2bb4c Mon Sep 17 00:00:00 2001 From: cage Date: Sat, 5 Aug 2023 12:50:03 +0200 Subject: gnu: cl-colors2: Update to 0.5.4-4.7a14107. * gnu/packages/lisp-xyz.scm (sbcl-cl-colors2): Update to 0.5.4-4.7a14107. [source, home-page]: Switch from Notabug to Codeberg. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b6956f17562..4b6a55b36bb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11755,8 +11755,8 @@ be used with @code{cl-yacc}.") (sbcl-package->ecl-package sbcl-cl-lex)) (define-public sbcl-cl-colors2 - (let ((commit "cc03badf5f69be65ae7e13c2f9a7c16838ab8241") - (revision "3")) + (let ((commit "7a1410765e5186625df19a875cebba685e9e51bd") + (revision "4")) (package (name "sbcl-cl-colors2") (version (git-version "0.5.4" revision commit)) @@ -11764,11 +11764,11 @@ be used with @code{cl-yacc}.") (origin (method git-fetch) (uri (git-reference - (url "https://notabug.org/cage/cl-colors2.git") + (url "https://codeberg.org/cage/cl-colors2.git") (commit commit))) (file-name (git-file-name "cl-colors2" version)) (sha256 - (base32 "1l7sl7nnvq13xmss9wwkhcq123bsylskxjrijwfkqp6sm02gbd15")))) + (base32 "1xk3wshp21v193wbj1gs0czxaci00wwm957vmqi2dvlv0wgb2hfr")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-clunit2)) @@ -11784,7 +11784,7 @@ be used with @code{cl-yacc}.") @item Function printing colors to HEX, RGB, RGBA, and HSL. @item Predefined colors from X11, SVG, and GDK. @end itemize\n") - (home-page "https://notabug.org/cage/cl-colors2") + (home-page "https://codeberg.org/cage/cl-colors2") (license license:boost1.0)))) (define-public cl-colors2 -- cgit v1.3 From 661cd5772d84eb4c8c4c447bd84b67e8949880e1 Mon Sep 17 00:00:00 2001 From: cage Date: Sat, 5 Aug 2023 13:00:07 +0200 Subject: gnu: cl-clunit2: Update to 0.5.2-2.5e28343. * gnu/packages/lisp-check.scm (sbcl-clunit2): Update to 0.5.2-2.5e28343. [source, home-page]: Switch from Notabug to Codeberg. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-check.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index 6bade26aeab..ee045d13879 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Charles Jackson ;;; Copyright © 2022 jgart ;;; Copyright © 2022, 2023 André A. Gomes +;;; Copyright © 2023 Cage ;;; ;;; This file is part of GNU Guix. ;;; @@ -355,26 +356,26 @@ experience.") (sbcl-package->ecl-package sbcl-clunit)) (define-public sbcl-clunit2 - (let ((commit "5e28343734eb9b7aee39306a614af92c1062d50b") - (revision "1")) + (let ((commit "c3159275a6c5af166e60b592c3b7e22eaa69c048") + (revision "2")) (package (name "sbcl-clunit2") - (version (git-version "0.2.4" revision commit)) + (version (git-version "0.5.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://notabug.org/cage/clunit2.git") + (url "https://codeberg.org/cage/clunit2.git") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-clunit2" version)) (sha256 - (base32 "1ngiapfki6nm8a555mzhb5p7ch79i3w665za5bmb5j7q34fy80vw")))) + (base32 "0n92z98dqfik3kfp25nz7yqycx4bpxlqbn69i5skcdnrj2ywmv01")))) (build-system asdf-build-system/sbcl) (synopsis "Unit testing framework for Common Lisp") (description - "CLUnit is a Common Lisp unit testing framework. It is designed to be + "CLUnit2 is a Common Lisp unit testing framework. It is designed to be easy to use so that you can quickly start testing.") - (home-page "https://notabug.org/cage/clunit2") + (home-page "https://codeberg.org/cage/clunit2") (license license:expat)))) (define-public cl-clunit2 -- cgit v1.3 From d83aa756a6ec00cadc4dda955e0c8d5a80e4fcb3 Mon Sep 17 00:00:00 2001 From: cage Date: Sat, 5 Aug 2023 13:27:36 +0200 Subject: gnu: cl-nodgui: Update to 0.4.8.5-2.4a9c2e7. * gnu/packages/lisp-xyz.scm (sbcl-nodgui): Update to 0.4.8.5-2.4a9c2e7. [source, home-page]: Switch from Notabug to Codeberg. [inputs]: Remove sbcl-cl-lex and sbcl-cl-yacc. Add sbcl-esrap and tklib. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4b6a55b36bb..e956fbe5bab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11929,34 +11929,34 @@ Scalable Vector Graphics files.") (sbcl-package->cl-source-package sbcl-cl-svg)) (define-public sbcl-nodgui - (let ((commit "4a9c2e7714b278fbe97d198c56f54ea87290001d") - (revision "1")) + (let ((commit "b1d15fa9cca8550926f7823dbdd8be3b34387f1a") + (revision "2")) (package (name "sbcl-nodgui") - (version (git-version "0.1.1" revision commit)) + (version (git-version "0.4.8.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://notabug.org/cage/nodgui.git") + (url "https://codeberg.org/cage/nodgui.git") (commit commit))) - (file-name (git-file-name "nodgui" version)) + (file-name (git-file-name "cl-nodgui" version)) (sha256 - (base32 "1vgzzw459h32v2mi41cia6i940jqmvxlc8w3xj3516hbc2mqkaib")))) + (base32 "1gsxg8igiavs8fr39vgw8ypa42wjqaq9sszwqiifpm7yvq54lls7")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("cl-colors2" ,sbcl-cl-colors2) + ("cl-esrap" ,sbcl-esrap) ("cl-jpeg" ,sbcl-cl-jpeg) - ("cl-lex" ,sbcl-cl-lex) ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) ("cl-unicode" ,sbcl-cl-unicode) - ("cl-yacc" ,sbcl-cl-yacc) ("clunit2" ,sbcl-clunit2) ("named-readtables" ,sbcl-named-readtables) ("parse-number" ,sbcl-parse-number) - ("tk" ,tk))) + ("tk" ,tk) + ("tklib" ,tklib))) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths -- cgit v1.3 From 29dc951b906213e7e34d238e51dce27afef0f3eb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 8 Aug 2023 10:08:19 +0200 Subject: gnu: cl-nodgui: Remove input labels. * gnu/packages/lisp-xyz.scm (sbcl-nodgui)[inputs]: Remove labels. [arguments]: Use gexp. --- gnu/packages/lisp-xyz.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e956fbe5bab..b3171c65437 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11945,28 +11945,28 @@ Scalable Vector Graphics files.") (base32 "1gsxg8igiavs8fr39vgw8ypa42wjqaq9sszwqiifpm7yvq54lls7")))) (build-system asdf-build-system/sbcl) (inputs - `(("alexandria" ,sbcl-alexandria) - ("bordeaux-threads" ,sbcl-bordeaux-threads) - ("cl-colors2" ,sbcl-cl-colors2) - ("cl-esrap" ,sbcl-esrap) - ("cl-jpeg" ,sbcl-cl-jpeg) - ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) - ("cl-unicode" ,sbcl-cl-unicode) - ("clunit2" ,sbcl-clunit2) - ("named-readtables" ,sbcl-named-readtables) - ("parse-number" ,sbcl-parse-number) - ("tk" ,tk) - ("tklib" ,tklib))) + (list sbcl-alexandria + sbcl-bordeaux-threads + sbcl-cl-colors2 + sbcl-cl-jpeg + sbcl-cl-ppcre-unicode + sbcl-cl-unicode + sbcl-clunit2 + sbcl-esrap + sbcl-named-readtables + sbcl-parse-number + tk + tklib)) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/wish-communication.lisp" - (("#-freebsd \"wish\"") - (string-append "#-freebsd \"" - (assoc-ref inputs "tk") - "/bin/wish\""))) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/wish-communication.lisp" + (("#-freebsd \"wish\"") + (string-append "#-freebsd \"" + (search-input-file inputs "/bin/wish") + "\"")))))))) (synopsis "Common Lisp bindings for the Tk GUI toolkit") (description "Nodgui (@emph{No Drama GUI}) is a Common Lisp binding for the Tk GUI -- cgit v1.3 From f19736e62f9ab5fba0ac5fe184a221c2a5d374c6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 8 Aug 2023 10:11:52 +0200 Subject: gnu: txr: Update to 291. * gnu/packages/lisp.scm (txr): Update to 291. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2f4fe6476da..6f425a6e4af 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -994,7 +994,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "289") + (version "291") (source (origin (method git-fetch) @@ -1003,7 +1003,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jcz5iggp4mz5bzgnifr4xdpvz0sxa8cminynhdcs2jqr073xy8b")))) + (base32 "0nsb302arpd2mw2z2l12j6yg9pp94lfb79h3sym72ih7rmklnfx7")))) (build-system gnu-build-system) (arguments (list #:configure-flags -- cgit v1.3 From b20e5bcafd9654a767ffb78eefd7494f73ca67c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 8 Aug 2023 10:42:40 +0200 Subject: gnu: goaccess: Update to 1.7.2. * gnu/packages/web.scm (goaccess): Update to 1.7.2. [source]: Patch second timestamp in parser.c. [arguments]: Enable geoip and utf8. [inputs]: Add libmaxminddb and openssl. --- gnu/packages/web.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7cc563586b8..45b4560e5a3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -131,6 +131,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) + #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -5915,23 +5916,27 @@ config files---you only have to specify the www root.") (define-public goaccess (package (name "goaccess") - (version "1.5.2") + (version "1.7.2") (source (origin (method url-fetch) (uri (string-append "http://tar.goaccess.io/goaccess-" version ".tar.gz")) (sha256 (base32 - "12hwmd9cn7yy7vj92110skjaslpxkn05msb9wj228qmjjf9jzkm0")) + "0sqjkla4fjw5h49x675qibp860bk0haajc3i31m1q782kjiap6hf")) (modules '((guix build utils))) - (snippet '(begin - (substitute* "src/error.h" - (("__DATE__") "\"1970-01-01\"") - (("__TIME__") "\"00:00:00\"")))))) + (snippet '(substitute* '("src/error.h" + "src/parser.c") + (("__DATE__") "\"1970-01-01\"") + (("__TIME__") "\"00:00:00\""))))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags + '(list "--enable-geoip=mmdb" + "--enable-utf8"))) (inputs - ;; TODO: Add dependency on geoip-tools. - (list glib ncurses)) + (list glib ncurses libmaxminddb openssl)) (native-inputs (list pkg-config)) (home-page "https://goaccess.io") -- cgit v1.3 From 782ef67a59f4b564f16101cf23c30a3777b3f734 Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Fri, 4 Aug 2023 18:51:03 +0300 Subject: gnu: webkitgtk: Update to 2.40.5. * gnu/packages/webkit.scm (webkitgtk): Update to 2.40.5. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f47fff25d29..c46bcd56629 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,13 @@ engine that uses Wayland for graphics output.") (define-public webkitgtk (package (name "webkitgtk") ; webkit2gtk4 - (version "2.40.2") + (version "2.40.5") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0070fy5crf7kngy49wz5bqwvp8z9rmnq2cm6wxp41nllv5q8i2cn")) + (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) -- cgit v1.3 From 508458de03871058d3e150545b3b02c1a6e7c2b4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 8 Aug 2023 15:19:00 +0200 Subject: gnu: blis: Provide the CBLAS interface. * gnu/packages/maths.scm (blis)[arguments]: Add #:configure-flags. --- gnu/packages/maths.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6fceddb4ad2..f87cae91a43 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4723,6 +4723,7 @@ library.") (build-system gnu-build-system) (arguments (list + #:configure-flags #~'("--enable-cblas") #:modules '((guix build gnu-build-system) (guix build utils) -- cgit v1.3 From aae69b7163e332f4ad6fa0824b01bfd3c60ddcfd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 8 Aug 2023 15:22:33 +0200 Subject: gnu: libflame: Tweak synopsis. * gnu/packages/maths.scm (libflame)[synopsis]: Expand acronym. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f87cae91a43..9abc6dbf51b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2666,7 +2666,7 @@ fixed point (16.16) format.") ("perl" ,perl) ("python" ,python-wrapper))) (home-page "https://github.com/flame/libflame") - (synopsis "High-performance object-based library for DLA computations") + (synopsis "High-performance library for @acronym{DLA, dense linear algebra} computations") (description "@code{libflame} is a portable library for dense matrix computations, providing much of the functionality present in LAPACK, developed by current and former members of the @acronym{SHPC, Science of High-Performance -- cgit v1.3 From 267e4234ff05076a67bd7fd0e7c8ddf8b6690352 Mon Sep 17 00:00:00 2001 From: Unstable Horse Date: Wed, 5 Jul 2023 18:50:05 +0200 Subject: gnu: Add gp-saml-gui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (gp-saml-gui): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/vpn.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index af070526ec2..972f9b0329c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages guile) @@ -86,6 +87,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages samba) #:use-module (gnu packages tls) + #:use-module (gnu packages webkit) #:use-module (gnu packages xml)) (define-public bitmask @@ -279,6 +281,48 @@ Networks and The Calyx Institute, where the former is default.") (home-page "https://bitmask.net/") (license license:gpl3+))) +(define-public gp-saml-gui + ;; No release. + (let ((commit "258f47cdc4a8ed57a1eef16667f6cad0d1cb49b1") + (revision "1")) + (package + (name "gp-saml-gui") + (version (git-version "0.0.0" revision commit)) + (home-page "https://github.com/dlenski/gp-saml-gui") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qj2mmi6lfkq5c4v6fbzgriajqc27k9kb1i9k2r776pn5pq14pc3")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda _ + (let ((prog (string-append #$output "/bin/gp-saml-gui"))) + (wrap-program prog + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) + (inputs + (list bash-minimal + python-pygobject + python-urllib3 + python-requests + webkitgtk-with-libsoup2)) + (propagated-inputs + (list openconnect)) + (synopsis "Interactively authenticate to GlobalProtect VPNs that require SAML") + (description "This is a helper script to allow you to interactively login +to a GlobalProtect VPN that uses SAML authentication, so that you can +subsequently connect with OpenConnect.") + (license license:gpl3+)))) + (define-public gvpe (package (name "gvpe") -- cgit v1.3 From daadcb7162d12e73e01dbd35ff5dccc925088397 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Mon, 26 Jun 2023 13:14:04 -0400 Subject: gnu: uwufetch: Fix typo in build phase name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (uwufetch) [arguments]: Fix typo in build phase name. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 32cb7007bce..4b2d94a4d93 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4023,7 +4023,7 @@ you are running, what theme or icon set you are using, etc.") #:phases #~(modify-phases %standard-phases (delete 'configure) - (add-before 'build 'path-source-paths + (add-before 'build 'patch-source-paths (lambda _ (substitute* "uwufetch.c" (("(/usr(/local)?)(.*;)" all _ _ rest) -- cgit v1.3 From 1a2cf676df87e8a112db00968ed0734f2b1a0e6e Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Mon, 26 Jun 2023 13:14:05 -0400 Subject: gnu: uwufetch: Manually create missing include dir. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (uwufetch) [arguments]: Manually create missing include dir. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4b2d94a4d93..33f9b703a7f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4027,7 +4027,11 @@ you are running, what theme or icon set you are using, etc.") (lambda _ (substitute* "uwufetch.c" (("(/usr(/local)?)(.*;)" all _ _ rest) - (string-append #$output rest)))))))) + (string-append #$output rest))))) + ;; TODO this will be fixed in the next release of uwufetch + (add-before 'install 'make-include-dir + (lambda _ + (mkdir-p (string-append #$output "/include"))))))) (inputs (list lshw ;; viu XXX not yet packaged in Guix xwininfo)) -- cgit v1.3 From 4547bc6fa3142dca77f7fc912368aeff31bd6e53 Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Mon, 6 Mar 2023 18:45:56 +0800 Subject: gnu: Add savane. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (savane): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 55 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 27be78b3ac1..c6bfaad4dbf 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -90,6 +90,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages cook) #:use-module (gnu packages curl) + #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages ed) #:use-module (gnu packages file) @@ -105,6 +106,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) #:use-module (gnu packages mail) #:use-module (gnu packages man) @@ -117,6 +119,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-build) @@ -1292,12 +1295,54 @@ high-level like git-porcelain, or low-level like git-plumbing. It provides abstractions of Git objects for easy access of repository data, and additionally allows you to access the Git repository more directly using either a pure Python implementation, or the faster, but more resource intensive -@command{git} command implementation.") - (license license:bsd-3))) - -(define-public shflags + @command{git} command implementation.") + (license license:bsd-3))) + +(define-public savane (package - (name "shflags") + (name "savane") + (version "3.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/administration/savane") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10jg264wqmkc87nz0d8d2pq4hvradwqrvrpvgpz3h409y6c6v78z")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf + automake + gettext-minimal + imagemagick)) + (inputs + (list exim + gnupg + httpd + mariadb + php)) + (propagated-inputs + (list perl + perl-dbd-mysql + perl-dbi + perl-date-calc + perl-digest-md5 + perl-mailtools + perl-file-find-rule + perl-xml-writer)) + (synopsis "Web-based software hosting system") + (description + "Savane is a Web-based software hosting system. It includes issue +tracking (bugs, tasks, support, news and documentation), project member +management by roles and individual account maintenance.") + (home-page "https://savannah.nongnu.org/p/administration") + (license license:agpl3+))) + + (define-public shflags + (package + (name "shflags") (version "1.2.3") (source (origin (method git-fetch) -- cgit v1.3 From 210bbf9c59355218fec1484a686cc2ecdc218506 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 9 Aug 2023 00:51:14 +0200 Subject: gnu: Add awslogs. * gnu/packages/web.scm (awslogs): New variable. --- gnu/packages/web.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 45b4560e5a3..b56fad1876e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -190,6 +190,7 @@ #:use-module (gnu packages syncthing) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages version-control) @@ -8890,6 +8891,45 @@ snapshots of the URLs you feed it in several formats.") (home-page "https://archivebox.io/") (license license:expat))) +(define-public awslogs + (package + (name "awslogs") + (version "0.14.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "awslogs" version)) + (sha256 + (base32 + "0zpp72ixxz18mf1kay7l07sbmf80mik30zw6p4wsxpraza3ry90v")))) + ;; XXX: doesn't work with pyproject-build-system + (build-system python-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + (("'jmespath>=0.7.1.*',") + "'jmespath>=0.7.1',")))) + (add-after 'unpack 'patch-tests + (lambda _ + ;; XXX These tests fail for unknown reasons, and we can't easily + ;; figure out why, because stdout is redirected to a string. + (substitute* "tests/test_it.py" + (("test_main_get_with_color") + "_skip_test_main_get_with_color") + (("test_main_get_query") + "_skip_test_main_get_query"))))))) + (propagated-inputs + (list python-boto3 python-jmespath python-dateutil python-termcolor)) + (home-page "https://github.com/jorgebastida/awslogs") + (synopsis "Command line tool to read AWS CloudWatch logs") + (description + "This package provides awslogs, a simple command line tool to download +and read AWS CloudWatch logs.") + (license license:bsd-3))) + (define-public orcania (package (name "orcania") -- cgit v1.3 From 90f2d40b3ef8f8143d18d3c528b271a3f5c303fe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:35:00 -0400 Subject: gnu: linux-libre 6.4: Update to 6.4.8. * gnu/packages/linux.scm (linux-libre-6.4-version): Update to 6.4.8. (linux-libre-6.4-pristine-source, deblob-scripts-6.4): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0be849f39d9..67fddc5d156 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -487,17 +487,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.4-version "6.4.3") +(define-public linux-libre-6.4-version "6.4.8") (define-public linux-libre-6.4-gnu-revision "gnu") (define deblob-scripts-6.4 (linux-libre-deblob-scripts linux-libre-6.4-version linux-libre-6.4-gnu-revision - (base32 "1hfircard99kmf81416xnln0chs6hskpjqz0p55ic8alm4rdlljs") - (base32 "1566506bmci15i80y0l0s93dgpgima0lqfmkg5ql7gd671aawkra"))) + (base32 "012d16rjprxdv9frf7kcakpikvw7l0s3kvj4kkp9flzdg3j8wxpz") + (base32 "1ya2qz8jf9b6v0vkqclz7snxf9gjx8a2mcgmc844djmlxyk8s0b8"))) (define-public linux-libre-6.4-pristine-source (let ((version linux-libre-6.4-version) - (hash (base32 "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i"))) + (hash (base32 "1djqqhw542jphqsicpbn1259sgw9pwd08wwkdch31nw4kvhk97y5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.4))) -- cgit v1.3 From cb0272852e47594d2fba5182ca3e1e23879dad1a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:36:20 -0400 Subject: gnu: linux-libre 6.1: Update to 6.1.43. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.43. (linux-libre-6.1-pristine-source, deblob-scripts-6.1): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 67fddc5d156..a133607bca8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -520,17 +520,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.38") +(define-public linux-libre-6.1-version "6.1.43") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision - (base32 "1b96867b46m36l88qnq2d4i9y43ghw97z9jajrh11cvb6kq4xi67") - (base32 "1qq3nsznblz5fkwahxwq26csmrmjbxh8xknm2z4zw6b6k9svzb1b"))) + (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") + (base32 "1liv6s1f1k52nkljsak0i42wyvfsj2b0156rhdh3cmginb98xb37"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r"))) + (hash (base32 "02588pl1z8jxgxpa03rsdyg5pr0r3v0aylzp8r5ykm32193lhli4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit v1.3 From 7deb16739a89ddd3f8d03277b4b19f8374d9dddf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:37:11 -0400 Subject: gnu: linux-libre 6.15: Update to 6.15.124. * gnu/packages/linux.scm (linux-libre-6.15-version): Update to 6.15.124. (linux-libre-6.15-pristine-source, deblob-scripts-6.15): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a133607bca8..07a12457242 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -535,17 +535,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.120") +(define-public linux-libre-5.15-version "5.15.124") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision - (base32 "0w5wyw8zp124nwydjvpnih7q3lp7gadlgsw60syw45nqq0afvlz3") - (base32 "1zljgvzr8irs3acq436i2iyana9vgx4k1pm3id4rz0fbaqfma602"))) + (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") + (base32 "03sd5z0ip16fmbgvzf69ib5iql0fsglaixcbz50jhqljv9grhacc"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4"))) + (hash (base32 "1v927z1grqwcwj6769qm14828fzjzi58lsd86al2l0ddc016l0q0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.3 From b0c332963277c7dcfbb1c02ce1f4a9f6b1d07931 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:37:58 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.188. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.188. (linux-libre-5.10-pristine-source, deblob-scripts-5.10): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 07a12457242..3f308670f32 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -550,17 +550,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.186") +(define-public linux-libre-5.10-version "5.10.188") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision - (base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf") - (base32 "1739xvyzi3i7d12mvsvnqa7208pvwfss43kzin71l9svw0405vp5"))) + (base32 "0hirc87hgyy9qhgiipp5iahmdk4wwhiml6rp1naphz9d1vw3kb35") + (base32 "1bqgabl185i74y1n5pbvkqn3r0ydmrqhfyhkd9n3s0gqqzkw2vjp"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"))) + (hash (base32 "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.3 From 1a369d8b796c9d89225477d57db529214e3fe867 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:38:43 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.251. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.251. (linux-libre-5.4-pristine-source, deblob-scripts-5.4): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3f308670f32..ba6e51488d3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -565,17 +565,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.249") +(define-public linux-libre-5.4-version "5.4.251") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version linux-libre-5.4-gnu-revision - (base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj") - (base32 "0ll19zlgx5sbr7gvi93lgavrnzlgv6dpj2yp2x63fj6vdba5iwgc"))) + (base32 "0xg5cz82k2cb0ikxvwv1hp5c3h377jkb5sd6aszvsk7hnabhk62v") + (base32 "00vv7rw1dg624xm08r8fl34z1k4rxdxhrblyhjadkx3js0m700y9"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w"))) + (hash (base32 "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.3 From 2cd153ff9b6388ea04fa8bbd54ba452af0a4ce65 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:39:22 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.289. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.289. (linux-libre-4.19-pristine-source, deblob-scripts-4.19): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ba6e51488d3..8ad115934ef 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -580,17 +580,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.288") +(define-public linux-libre-4.19-version "4.19.289") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version linux-libre-4.19-gnu-revision - (base32 "06pqv050bkii0hc2v7ymny5264w1bca8db0dp1pw9mfmjg865am5") - (base32 "05yqb59gj7mq5ha9xg045bz517sdg6janfa2yjq70qa6ahpc5fac"))) + (base32 "0ghdizzs6969872rnjcv9p6sl9rcbs29v3ismk125yyvjaczd428") + (base32 "0sxxr38bsh22sf98mvvlvbj6pnql9jn7ih04sdg386hb5iyi1xqr"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk"))) + (hash (base32 "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.3 From 3dfd78a8932dbeaa483588ced5fbd3e4172422d4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 9 Aug 2023 13:30:31 -0400 Subject: Revert broken kernel update commits. This reverts commits: 90f2d40b3ef8f8143d18d3c528b271a3f5c303fe^..2cd153ff9b6388ea04fa8bbd54ba452af0a4ce65 These commits contained a mistake that would break the build of the changed packages. --- gnu/packages/linux.scm | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8ad115934ef..0be849f39d9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -487,17 +487,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.4-version "6.4.8") +(define-public linux-libre-6.4-version "6.4.3") (define-public linux-libre-6.4-gnu-revision "gnu") (define deblob-scripts-6.4 (linux-libre-deblob-scripts linux-libre-6.4-version linux-libre-6.4-gnu-revision - (base32 "012d16rjprxdv9frf7kcakpikvw7l0s3kvj4kkp9flzdg3j8wxpz") - (base32 "1ya2qz8jf9b6v0vkqclz7snxf9gjx8a2mcgmc844djmlxyk8s0b8"))) + (base32 "1hfircard99kmf81416xnln0chs6hskpjqz0p55ic8alm4rdlljs") + (base32 "1566506bmci15i80y0l0s93dgpgima0lqfmkg5ql7gd671aawkra"))) (define-public linux-libre-6.4-pristine-source (let ((version linux-libre-6.4-version) - (hash (base32 "1djqqhw542jphqsicpbn1259sgw9pwd08wwkdch31nw4kvhk97y5"))) + (hash (base32 "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.4))) @@ -520,77 +520,77 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.43") +(define-public linux-libre-6.1-version "6.1.38") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision - (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "1liv6s1f1k52nkljsak0i42wyvfsj2b0156rhdh3cmginb98xb37"))) + (base32 "1b96867b46m36l88qnq2d4i9y43ghw97z9jajrh11cvb6kq4xi67") + (base32 "1qq3nsznblz5fkwahxwq26csmrmjbxh8xknm2z4zw6b6k9svzb1b"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "02588pl1z8jxgxpa03rsdyg5pr0r3v0aylzp8r5ykm32193lhli4"))) + (hash (base32 "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.124") +(define-public linux-libre-5.15-version "5.15.120") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision - (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") - (base32 "03sd5z0ip16fmbgvzf69ib5iql0fsglaixcbz50jhqljv9grhacc"))) + (base32 "0w5wyw8zp124nwydjvpnih7q3lp7gadlgsw60syw45nqq0afvlz3") + (base32 "1zljgvzr8irs3acq436i2iyana9vgx4k1pm3id4rz0fbaqfma602"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1v927z1grqwcwj6769qm14828fzjzi58lsd86al2l0ddc016l0q0"))) + (hash (base32 "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.188") +(define-public linux-libre-5.10-version "5.10.186") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision - (base32 "0hirc87hgyy9qhgiipp5iahmdk4wwhiml6rp1naphz9d1vw3kb35") - (base32 "1bqgabl185i74y1n5pbvkqn3r0ydmrqhfyhkd9n3s0gqqzkw2vjp"))) + (base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf") + (base32 "1739xvyzi3i7d12mvsvnqa7208pvwfss43kzin71l9svw0405vp5"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9"))) + (hash (base32 "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.251") +(define-public linux-libre-5.4-version "5.4.249") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version linux-libre-5.4-gnu-revision - (base32 "0xg5cz82k2cb0ikxvwv1hp5c3h377jkb5sd6aszvsk7hnabhk62v") - (base32 "00vv7rw1dg624xm08r8fl34z1k4rxdxhrblyhjadkx3js0m700y9"))) + (base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj") + (base32 "0ll19zlgx5sbr7gvi93lgavrnzlgv6dpj2yp2x63fj6vdba5iwgc"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w"))) + (hash (base32 "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.289") +(define-public linux-libre-4.19-version "4.19.288") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version linux-libre-4.19-gnu-revision - (base32 "0ghdizzs6969872rnjcv9p6sl9rcbs29v3ismk125yyvjaczd428") - (base32 "0sxxr38bsh22sf98mvvlvbj6pnql9jn7ih04sdg386hb5iyi1xqr"))) + (base32 "06pqv050bkii0hc2v7ymny5264w1bca8db0dp1pw9mfmjg865am5") + (base32 "05yqb59gj7mq5ha9xg045bz517sdg6janfa2yjq70qa6ahpc5fac"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi"))) + (hash (base32 "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.3 From d2d7ea3f562b77fb809038af66674b8367dcec3e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:35:00 -0400 Subject: gnu: linux-libre 6.4: Update to 6.4.8. * gnu/packages/linux.scm (linux-libre-6.4-version): Update to 6.4.8. (linux-libre-6.4-pristine-source, deblob-scripts-6.4): Update hashes. (linux-libre-6.4-source): Remove obsolete patch 'linux-libre-wireguard-postup-privkey.patch'. --- gnu/packages/linux.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0be849f39d9..370ff22974d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -487,17 +487,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.4-version "6.4.3") +(define-public linux-libre-6.4-version "6.4.8") (define-public linux-libre-6.4-gnu-revision "gnu") (define deblob-scripts-6.4 (linux-libre-deblob-scripts linux-libre-6.4-version linux-libre-6.4-gnu-revision - (base32 "1hfircard99kmf81416xnln0chs6hskpjqz0p55ic8alm4rdlljs") - (base32 "1566506bmci15i80y0l0s93dgpgima0lqfmkg5ql7gd671aawkra"))) + (base32 "012d16rjprxdv9frf7kcakpikvw7l0s3kvj4kkp9flzdg3j8wxpz") + (base32 "1ya2qz8jf9b6v0vkqclz7snxf9gjx8a2mcgmc844djmlxyk8s0b8"))) (define-public linux-libre-6.4-pristine-source (let ((version linux-libre-6.4-version) - (hash (base32 "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i"))) + (hash (base32 "1djqqhw542jphqsicpbn1259sgw9pwd08wwkdch31nw4kvhk97y5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.4))) @@ -641,9 +641,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-6.4-source (source-with-patches linux-libre-6.4-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch - "linux-libre-wireguard-postup-privkey.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-6.3-source (source-with-patches linux-libre-6.3-pristine-source -- cgit v1.3 From 8d3217d42dbd93f1c87a2b06d57669030ba49bea Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:36:20 -0400 Subject: gnu: linux-libre 6.1: Update to 6.1.43. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.43. (linux-libre-6.1-pristine-source, deblob-scripts-6.1): Update hashes. (linux-libre-6.1-source): Remove obsolete patch 'linux-libre-wireguard-postup-privkey.patch'. --- gnu/packages/linux.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 370ff22974d..6ef79af6da1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -520,17 +520,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.38") +(define-public linux-libre-6.1-version "6.1.43") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision - (base32 "1b96867b46m36l88qnq2d4i9y43ghw97z9jajrh11cvb6kq4xi67") - (base32 "1qq3nsznblz5fkwahxwq26csmrmjbxh8xknm2z4zw6b6k9svzb1b"))) + (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") + (base32 "1liv6s1f1k52nkljsak0i42wyvfsj2b0156rhdh3cmginb98xb37"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r"))) + (hash (base32 "02588pl1z8jxgxpa03rsdyg5pr0r3v0aylzp8r5ykm32193lhli4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) @@ -656,8 +656,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch) (search-patches - "linux-libre-infodocs-target.patch" - "linux-libre-wireguard-postup-privkey.patch")))) + "linux-libre-infodocs-target.patch")))) (define-public linux-libre-5.15-source (source-with-patches linux-libre-5.15-pristine-source -- cgit v1.3 From 25c3ad0cf6d86f7a5f7147010fef7b809ca016c7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:37:11 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.124. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.124. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. (linux-libre-5.15-source): Remove obsolete patch 'linux-libre-wireguard-postup-privkey.patch'. --- gnu/packages/linux.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6ef79af6da1..c76e24157c1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -535,17 +535,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.120") +(define-public linux-libre-5.15-version "5.15.124") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision - (base32 "0w5wyw8zp124nwydjvpnih7q3lp7gadlgsw60syw45nqq0afvlz3") - (base32 "1zljgvzr8irs3acq436i2iyana9vgx4k1pm3id4rz0fbaqfma602"))) + (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") + (base32 "03sd5z0ip16fmbgvzf69ib5iql0fsglaixcbz50jhqljv9grhacc"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4"))) + (hash (base32 "1v927z1grqwcwj6769qm14828fzjzi58lsd86al2l0ddc016l0q0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) @@ -661,9 +661,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.15-source (source-with-patches linux-libre-5.15-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch - "linux-libre-wireguard-postup-privkey.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-5.10-source (source-with-patches linux-libre-5.10-pristine-source -- cgit v1.3 From d47bcc0f09bbd6c0bf60a503e1a3d4a1a4bb4757 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Aug 2023 10:35:57 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.188. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.188. (linux-libre-5.10-pristine-source, deblob-scripts-5.10): Update hashes. (linux-libre-5.15-source): Remove obsolete patch 'linux-libre-wireguard-postup-privkey.patch'. --- gnu/packages/linux.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c76e24157c1..1df59c50a75 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -550,17 +550,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.186") +(define-public linux-libre-5.10-version "5.10.188") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision - (base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf") - (base32 "1739xvyzi3i7d12mvsvnqa7208pvwfss43kzin71l9svw0405vp5"))) + (base32 "0hirc87hgyy9qhgiipp5iahmdk4wwhiml6rp1naphz9d1vw3kb35") + (base32 "1bqgabl185i74y1n5pbvkqn3r0ydmrqhfyhkd9n3s0gqqzkw2vjp"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y"))) + (hash (base32 "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) @@ -666,9 +666,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.10-source (source-with-patches linux-libre-5.10-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch - "linux-libre-wireguard-postup-privkey.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source -- cgit v1.3 From bff1f2d4d07e934ea296f9c724b5337996a27c44 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Aug 2023 10:37:16 -0400 Subject: gnu: linux-libre: Update to 6.4.8. * gnu/packages/linux.scm (linux-libre-version, linux-libre-gnu-revision, linux-libre-pristine-source, linux-libre-source, linux-libre, linux-libre-with-bpf): Update to linux-libre 6.4. --- gnu/packages/linux.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1df59c50a75..273b5cf9a27 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1127,11 +1127,11 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-6.3-version) -(define-public linux-libre-gnu-revision linux-libre-6.3-gnu-revision) -(define-public linux-libre-pristine-source linux-libre-6.3-pristine-source) -(define-public linux-libre-source linux-libre-6.3-source) -(define-public linux-libre linux-libre-6.3) +(define-public linux-libre-version linux-libre-6.4-version) +(define-public linux-libre-gnu-revision linux-libre-6.4-gnu-revision) +(define-public linux-libre-pristine-source linux-libre-6.4-pristine-source) +(define-public linux-libre-source linux-libre-6.4-source) +(define-public linux-libre linux-libre-6.4) (define-public linux-libre-6.1 (make-linux-libre* linux-libre-6.1-version @@ -1364,9 +1364,9 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") (define-public linux-libre-with-bpf (let ((base-linux-libre (make-linux-libre* - linux-libre-6.3-version - linux-libre-6.3-gnu-revision - linux-libre-6.3-source + linux-libre-6.4-version + linux-libre-6.4-gnu-revision + linux-libre-6.4-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:extra-version "bpf" -- cgit v1.3 From d3a269932ad8226f153679f5602292a29824925d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:38:43 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.251. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.251. (linux-libre-5.4-pristine-source, deblob-scripts-5.4): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 273b5cf9a27..cb7c110fd10 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -565,17 +565,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.249") +(define-public linux-libre-5.4-version "5.4.251") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version linux-libre-5.4-gnu-revision - (base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj") - (base32 "0ll19zlgx5sbr7gvi93lgavrnzlgv6dpj2yp2x63fj6vdba5iwgc"))) + (base32 "0xg5cz82k2cb0ikxvwv1hp5c3h377jkb5sd6aszvsk7hnabhk62v") + (base32 "00vv7rw1dg624xm08r8fl34z1k4rxdxhrblyhjadkx3js0m700y9"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w"))) + (hash (base32 "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.3 From 4f9778998cb54f59dd1010630a733b0879dd3b9f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 7 Aug 2023 19:39:22 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.289. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.289. (linux-libre-4.19-pristine-source, deblob-scripts-4.19): Update hashes. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cb7c110fd10..0f08c00a6a9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -580,17 +580,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.288") +(define-public linux-libre-4.19-version "4.19.289") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version linux-libre-4.19-gnu-revision - (base32 "06pqv050bkii0hc2v7ymny5264w1bca8db0dp1pw9mfmjg865am5") - (base32 "05yqb59gj7mq5ha9xg045bz517sdg6janfa2yjq70qa6ahpc5fac"))) + (base32 "0ghdizzs6969872rnjcv9p6sl9rcbs29v3ismk125yyvjaczd428") + (base32 "0sxxr38bsh22sf98mvvlvbj6pnql9jn7ih04sdg386hb5iyi1xqr"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk"))) + (hash (base32 "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.3 From ef919436f6f042d134aeff68ac0c6bb43f1b987f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Aug 2023 02:00:00 +0200 Subject: gnu: xfstests: Update to 1.1.0-3.8de535c. * gnu/packages/file-systems.scm (xfstests): Update to 1.1.0-3.8de535c. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 4589db965d0..8a36faea9f6 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1201,8 +1201,8 @@ APFS.") (define-public xfstests ;; The last release (1.1.0) is from 2011. - (let ((revision "2") - (commit "87f90a2dae7a4adb7a0a314e27abae9aa1de78fb")) + (let ((revision "3") + (commit "8de535c53887bb49adae74a1b2e83e77d7e8457d")) (package (name "xfstests") (version (git-version "1.1.0" revision commit)) @@ -1214,7 +1214,7 @@ APFS.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "11p690k7h4f00bd14r60xa8sw34x14bh5rfd6x7j8gbkpsgsidli")))) + (base32 "1sbkryl04xflrk6jb4fsl3h2whilj5m3vpdkpwwb26idp7ckjjv6")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.3 From bf587a2094ef07547181f7e650d60d00357eb232 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Aug 2023 02:00:00 +0200 Subject: gnu: xfstests: Update package style. * gnu/packages/file-systems.scm (xfstests)[arguments]: Rewrite as G-expressions. Never refer to inputs by label. [inputs]: Remove input labels. --- gnu/packages/file-systems.scm | 216 +++++++++++++++++++++--------------------- 1 file changed, 106 insertions(+), 110 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 8a36faea9f6..e6c6cb28532 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1217,121 +1217,117 @@ APFS.") (base32 "1sbkryl04xflrk6jb4fsl3h2whilj5m3vpdkpwwb26idp7ckjjv6")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tool-locations - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "common/config" - ;; Make absolute file names relative. - (("(MKFS_PROG=\").*(\")" _ pre post) - (string-append pre "mkfs" post))) - (for-each (lambda (file) - (substitute* file - (("( -s|#.|[= ])(/bin/sh|/bin/bash)" _ pre match) - (string-append pre - (assoc-ref inputs "bash") - match)) - (("/bin/(rm|true)" match) - (search-input-file inputs match)) - (("/usr(/bin/time)" _ match) - (search-input-file inputs match)))) - (append (find-files "common" ".*") - (find-files "tests" ".*") - (find-files "tools" ".*") - (find-files "src" "\\.(c|sh)$"))))) - (replace 'bootstrap - (lambda* (#:key make-flags #:allow-other-keys) - (substitute* "Makefile" - ;; Avoid a mysterious (to me) ‘permission denied’ error. - (("cp ") "cp -f ")) - (substitute* "m4/package_utilies.m4" - ;; Fix the bogus hard-coded paths for every single binary. - (("(AC_PATH_PROG\\(.*, ).*(\\))" _ pre post) - (string-append pre (getenv "PATH") post))) - (apply invoke "make" "configure" make-flags))) - (add-after 'install 'wrap-xfstests/check - ;; Keep wrapping distinct from 'create-helper-script below: users - ;; must be able to invoke xfstests/check directly if they prefer. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/xfstests/check") - ;; Prefix the user's PATH with the minimum required tools. - ;; The suite has many other optional dependencies and will - ;; automatically select tests based on the original PATH. - `("PATH" ":" prefix - ,(map (lambda (name) - (let ((input (assoc-ref inputs name))) - (string-append input "/bin:" - input "/sbin"))) - (list "acl" - "attr" - "coreutils" - "inetutils" - "xfsprogs"))))))) - (add-after 'install 'create-helper - ;; Upstream installs only a ‘check’ script that's not in $PATH and - ;; would try to write to the store without explaining how to change - ;; that. Install a simple helper script to make it discoverable. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (check (string-append out "/xfstests/check")) - (bin (string-append out "/bin")) - (helper (string-append bin "/xfstests-check"))) - (mkdir-p bin) - (with-output-to-file helper - (lambda _ - (format #t "#!~a --no-auto-compile\n!#\n" - (search-input-file inputs "/bin/guile")) - (write - `(begin - (define (try proc dir) - "Try to PROC DIR. Return DIR on success, else #f." - (with-exception-handler (const #f) - (lambda _ (proc dir) dir) - #:unwind? #t)) - - (define args - (cdr (command-line))) - - (when (or (member "--help" args) - (member "-h" args)) - (format #t "Usage: ~a [OPTION]... + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tool-locations + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "common/config" + ;; Make absolute file names relative. + (("(MKFS_PROG=\").*(\")" _ pre post) + (string-append pre "mkfs" post))) + (for-each (lambda (file) + (substitute* file + (("( -s|#.|[= ])(/bin/sh|/bin/bash)" _ pre match) + (string-append pre + (search-input-file inputs match))) + (("/bin/(rm|true)" match) + (search-input-file inputs match)) + (("/usr(/bin/time)" _ match) + (search-input-file inputs match)))) + (append (find-files "common" ".*") + (find-files "tests" ".*") + (find-files "tools" ".*") + (find-files "src" "\\.(c|sh)$"))))) + (replace 'bootstrap + (lambda* (#:key make-flags #:allow-other-keys) + (substitute* "Makefile" + ;; Avoid a mysterious (to me) ‘permission denied’ error. + (("cp ") "cp -f ")) + (substitute* "m4/package_utilies.m4" + ;; Fix the bogus hard-coded paths for every single binary. + (("(AC_PATH_PROG\\(.*, ).*(\\))" _ pre post) + (string-append pre (getenv "PATH") post))) + (apply invoke "make" "configure" make-flags))) + (add-after 'install 'wrap-xfstests/check + ;; Keep wrapping distinct from 'create-helper-script below: users + ;; must be able to invoke xfstests/check directly if they prefer. + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/xfstests/check") + ;; Prefix the user's PATH with the minimum required tools. + ;; The suite has many other optional dependencies and will + ;; automatically select tests based on the original PATH. + `("PATH" ":" prefix + ,(map (lambda (file) + (dirname (search-input-file inputs file))) + (list "bin/setfacl" ; acl + "bin/attr" ; attr + "bin/ls" ; coreutils + "bin/hostname" ; inetutils + "sbin/mkfs.xfs")))))) ; xfsprogs + (add-after 'install 'create-helper + ;; Upstream installs only a ‘check’ script that's not in $PATH and + ;; would try to write to the store without explaining how to change + ;; that. Install a simple helper script to make it discoverable. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((check (string-append #$output "/xfstests/check")) + (bin (string-append #$output "/bin")) + (helper (string-append bin "/xfstests-check"))) + (mkdir-p bin) + (with-output-to-file helper + (lambda _ + (format #t "#!~a --no-auto-compile\n!#\n" + (search-input-file inputs "/bin/guile")) + (write + `(begin + (define (try proc dir) + "Try to PROC DIR. Return DIR on success, else #f." + (with-exception-handler (const #f) + (lambda _ (proc dir) dir) + #:unwind? #t)) + + (define args + (cdr (command-line))) + + (when (or (member "--help" args) + (member "-h" args)) + (format #t "Usage: ~a [OPTION]... This Guix helper sets up a new writable RESULT_BASE if it's unset, then executes xfstest's \"~a\" command (with any OPTIONs) as documented below.\n\n" - ,(basename helper) - ,(basename check))) - - (let* ((gotenv-base (getenv "RESULT_BASE")) - (base (or gotenv-base - (let loop ((count 0)) - (or (try mkdir - (format #f "xfstests.~a" - count)) - (loop (+ 1 count)))))) - (result-base (if (string-prefix? "/" base) - base - (string-append (getcwd) "/" - base)))) - (setenv "RESULT_BASE" result-base) - ;; CHECK must run in its own directory or will fail. - (chdir ,(dirname check)) - (let ((status - (status:exit-val (apply system* ,check args)))) - (unless gotenv-base - (try rmdir result-base)) - status)))))) - (chmod helper #o755))))))) + ,(basename helper) + ,(basename check))) + + (let* ((gotenv-base (getenv "RESULT_BASE")) + (base (or gotenv-base + (let loop ((count 0)) + (or (try mkdir + (format #f "xfstests.~a" + count)) + (loop (+ 1 count)))))) + (result-base (if (string-prefix? "/" base) + base + (string-append (getcwd) "/" + base)))) + (setenv "RESULT_BASE" result-base) + ;; CHECK must run in its own directory or will fail. + (chdir ,(dirname check)) + (let ((status + (status:exit-val (apply system* ,check args)))) + (unless gotenv-base + (try rmdir result-base)) + status)))))) + (chmod helper #o755))))))) (native-inputs (list autoconf automake libtool)) (inputs - `(("acl" ,acl) - ("attr" ,attr) - ("guile" ,guile-3.0) ; for our xfstests-check helper script - ("inetutils" ,inetutils) ; for ‘hostname’ - ("libuuid" ,util-linux "lib") - ("perl" ,perl) ; to automagically patch shebangs - ("time" ,time) - ("xfsprogs" ,xfsprogs))) + (list acl + attr + guile-3.0 ; for our xfstests-check helper script + inetutils + `(,util-linux "lib") + perl + time + xfsprogs)) (home-page "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git") (synopsis "File system @acronym{QA, Quality Assurance} test suite") (description -- cgit v1.3 From 90e34d25d5e7c14b7f3293a78f3cdad676c0d035 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Aug 2023 02:00:00 +0200 Subject: gnu: xfstests: Add inputs. * gnu/packages/file-systems.scm (xfstests)[arguments]: Search for bc, df, and perl. [inputs]: Add bc. --- gnu/packages/file-systems.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index e6c6cb28532..90e00d75923 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) + #:use-module (gnu packages algebra) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) @@ -1262,8 +1263,10 @@ APFS.") (dirname (search-input-file inputs file))) (list "bin/setfacl" ; acl "bin/attr" ; attr - "bin/ls" ; coreutils + "bin/bc" ; bc + "bin/df" ; coreutils "bin/hostname" ; inetutils + "bin/perl" ; perl "sbin/mkfs.xfs")))))) ; xfsprogs (add-after 'install 'create-helper ;; Upstream installs only a ‘check’ script that's not in $PATH and @@ -1322,6 +1325,7 @@ xfstest's \"~a\" command (with any OPTIONs) as documented below.\n\n" (inputs (list acl attr + bc guile-3.0 ; for our xfstests-check helper script inetutils `(,util-linux "lib") -- cgit v1.3 From 66158f535a032137bf0fc88df562defab9cbeb91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Aug 2023 09:23:32 +0200 Subject: gnu: Do not use (gnu packages commencement) in engineering.scm. This avoids a circular dependency evidenced by the following commit. * gnu/packages/engineering.scm (freehdl)[inputs]: Resolve 'gcc-toolchain' from here rather than by using (gnu packages commencement). --- gnu/packages/engineering.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 79ba1e45360..9fb96580782 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016, 2018, 2020-2023 Efraim Flashner ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès +;;; Copyright © 2016-2019, 2021, 2023 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -84,7 +84,6 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages code) - #:use-module (gnu packages commencement) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages curl) @@ -2242,7 +2241,11 @@ parallel computing platforms. It also supports serial execution.") #t))))) (inputs (list coreutils - gcc-toolchain + + ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. + (module-ref (resolve-interface '(gnu packages commencement)) + 'gcc-toolchain) + guile-2.2 perl pkg-config -- cgit v1.3 From 5d77091cfc80b1f4b622ada760f54a3bae844e74 Mon Sep 17 00:00:00 2001 From: reza Date: Sat, 24 Jun 2023 21:38:04 +0000 Subject: gnu: Add openfoam-org. Deprecate openfoam. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/openfoam-4.1-cleanup.patch: Delete file. * gnu/local.mk: Remove it. * gnu/packages/simulation.scm (openfoam-org): New variable. (openfoam): Mark as deprecated. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/patches/openfoam-4.1-cleanup.patch | 243 ------------- gnu/packages/simulation.scm | 465 ++++++++++++++++-------- 3 files changed, 304 insertions(+), 405 deletions(-) delete mode 100644 gnu/packages/patches/openfoam-4.1-cleanup.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9d00596f399..e8555a2c525 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1677,7 +1677,6 @@ dist_patch_DATA = \ %D%/packages/patches/openboardview-use-system-mpc.patch \ %D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/opencolorio-fix-build-with-gcc11.patch \ - %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-9-pointer-comparison.patch \ %D%/packages/patches/openjdk-9-setsignalhandler.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ diff --git a/gnu/packages/patches/openfoam-4.1-cleanup.patch b/gnu/packages/patches/openfoam-4.1-cleanup.patch deleted file mode 100644 index 37effa5c9c2..00000000000 --- a/gnu/packages/patches/openfoam-4.1-cleanup.patch +++ /dev/null @@ -1,243 +0,0 @@ -# This patch removes all need for the ThirdParty files of OpenFOAM. - -# Derived from EasyBuild patch by Ward Poelmans . -# Modified for GNU Guix by Paul Garlick . - -diff -ur OpenFOAM-4.x-version-4.1.org/applications/utilities/mesh/manipulation/setSet/Allwmake OpenFOAM-4.x-version-4.1/applications/utilities/mesh/manipulation/setSet/Allwmake ---- OpenFOAM-4.x-version-4.1.org/applications/utilities/mesh/manipulation/setSet/Allwmake -+++ OpenFOAM-4.x-version-4.1/applications/utilities/mesh/manipulation/setSet/Allwmake -@@ -9,7 +9,7 @@ - # - # use readline if available - # --if [ -f /usr/include/readline/readline.h ] -+if true - then - echo "Found -- enabling readline support." - export COMP_FLAGS="-DHAS_READLINE" -diff -ur OpenFOAM-4.x-version-4.1.org/etc/bashrc OpenFOAM-4.x-version-4.1/etc/bashrc ---- OpenFOAM-4.x-version-4.1.org/etc/bashrc -+++ OpenFOAM-4.x-version-4.1/etc/bashrc -@@ -43,8 +43,10 @@ - # Please set to the appropriate path if the default is not correct. - # - [ $BASH_SOURCE ] && \ --export FOAM_INST_DIR=$(cd ${BASH_SOURCE%/*/*/*} && pwd -P) || \ -+export FOAM_INST_DIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P) || \ - export FOAM_INST_DIR=$HOME/$WM_PROJECT -+# For GNU Guix: set initially for build then re-set at runtime -+# - # export FOAM_INST_DIR=~$WM_PROJECT - # export FOAM_INST_DIR=/opt/$WM_PROJECT - # export FOAM_INST_DIR=/usr/local/$WM_PROJECT -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/CGAL OpenFOAM-4.x-version-4.1/etc/config.sh/CGAL ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/CGAL -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/CGAL -@@ -36,37 +36,7 @@ - # - #------------------------------------------------------------------------------ - --boost_version=boost-system --cgal_version=cgal-system --#cgal_version=CGAL-4.8 -- --if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ] --then -- -- common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER -- -- export BOOST_ARCH_PATH=$common_path/$boost_version -- export CGAL_ARCH_PATH=$common_path/$cgal_version -- -- if [ "$FOAM_VERBOSE" -a "$PS1" ] -- then -- echo "Using CGAL and boost" 1>&2 -- echo " $cgal_version at $CGAL_ARCH_PATH" 1>&2 -- echo " $boost_version at $BOOST_ARCH_PATH" 1>&2 -- fi -- -- if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ] -- then -- _foamAddLib $CGAL_ARCH_PATH/lib -- fi -- -- if [ -d "$BOOST_ARCH_PATH" -a "$boost_version" != "boost-system" ] -- then -- _foamAddLib $BOOST_ARCH_PATH/lib -- fi -- -- unset boost_version cgal_version common_path -- --fi -+export CGAL_ARCH_PATH=$CGAL_ROOT -+export BOOST_ARCH_PATH=$BOOST_ROOT - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/gperftools OpenFOAM-4.x-version-4.1/etc/config.sh/gperftools ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/gperftools -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/gperftools -@@ -29,13 +29,5 @@ - # - #------------------------------------------------------------------------------ - --version=svn --gperftools_install=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER -- --GPERFTOOLS_VERSION=gperftools-$version --GPERFTOOLS_ARCH_PATH=$gperftools_install/$GPERFTOOLS_VERSION -- --export PATH=$GPERFTOOLS_ARCH_PATH/bin:$PATH --export LD_LIBRARY_PATH=$GPERFTOOLS_ARCH_PATH/lib:$LD_LIBRARY_PATH - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/metis OpenFOAM-4.x-version-4.1/etc/config.sh/metis ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/metis -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/metis -@@ -34,7 +34,7 @@ - # - #------------------------------------------------------------------------------ - --export METIS_VERSION=metis-5.1.0 --export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION -+export METIS_VERSION=metis-$METISVERSION -+export METIS_ARCH_PATH=$METIS_ROOT - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/scotch OpenFOAM-4.x-version-4.1/etc/config.sh/scotch ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/scotch -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/scotch -@@ -37,7 +37,7 @@ - # - #------------------------------------------------------------------------------ - --export SCOTCH_VERSION=scotch_6.0.3 --export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION -+export SCOTCH_VERSION=scotch_$SCOTCHVERSION -+export SCOTCH_ARCH_PATH=$SCOTCH_ROOT - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/settings OpenFOAM-4.x-version-4.1/etc/config.sh/settings ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/settings -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/settings -@@ -279,6 +279,9 @@ - ;; - system) - # Use system compiler -+ # Use system GMP and MPFR packages -+ export GMP_ARCH_PATH=$GMP_ROOT -+ export MPFR_ARCH_PATH=$MPFR_ROOT - ;; - *) - echo "Warn: WM_COMPILER_TYPE='$WM_COMPILER_TYPE' is unsupported" 1>&2 -diff -ur OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/ptscotchDecomp/Make/options OpenFOAM-4.x-version-4.1/src/parallel/decompose/ptscotchDecomp/Make/options ---- OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/ptscotchDecomp/Make/options -+++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/ptscotchDecomp/Make/options -@@ -5,8 +5,7 @@ - $(PFLAGS) $(PINC) \ - -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt -+ -L$(SCOTCH_ROOT)/lib -L$(MPI_ARCH_PATH)/lib -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt -diff -ur OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/scotchDecomp/Make/options OpenFOAM-4.x-version-4.1/src/parallel/decompose/scotchDecomp/Make/options ---- OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/scotchDecomp/Make/options -+++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/scotchDecomp/Make/options -@@ -9,8 +9,7 @@ - $(PFLAGS) $(PINC) \ - -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt -+ -L$(SCOTCH_ROOT)/lib -lscotch -lscotcherrexit -lrt -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/makefiles/general OpenFOAM-4.x-version-4.1/wmake/makefiles/general ---- OpenFOAM-4.x-version-4.1.org/wmake/makefiles/general -+++ OpenFOAM-4.x-version-4.1/wmake/makefiles/general -@@ -33,7 +33,6 @@ - # The Makefile uses a POSIX shell - #------------------------------------------------------------------------------ - --SHELL = /bin/sh - - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/wmake OpenFOAM-4.x-version-4.1/wmake/wmake ---- OpenFOAM-4.x-version-4.1.org/wmake/wmake -+++ OpenFOAM-4.x-version-4.1/wmake/wmake -@@ -163,7 +163,7 @@ - then - if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ] - then -- lockDir=$HOME/.$WM_PROJECT/.wmake -+ lockDir=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)/.$WM_PROJECT/.wmake - - if [ -d $lockDir ] - then -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/wmakeScheduler OpenFOAM-4.x-version-4.1/wmake/wmakeScheduler ---- OpenFOAM-4.x-version-4.1.org/wmake/wmakeScheduler -+++ OpenFOAM-4.x-version-4.1/wmake/wmakeScheduler -@@ -53,7 +53,7 @@ - # csh sets HOST, bash sets HOSTNAME - : ${HOST:=$HOSTNAME} - --lockDir=$HOME/.$WM_PROJECT/.wmake -+lockDir=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)/.$WM_PROJECT/.wmake - - # Fallback - 1 core on current host - : ${WM_HOSTS:=$HOST:1} -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/wmakeSchedulerUptime OpenFOAM-4.x-version-4.1/wmake/wmakeSchedulerUptime ---- OpenFOAM-4.x-version-4.1.org/wmake/wmakeSchedulerUptime -+++ OpenFOAM-4.x-version-4.1/wmake/wmakeSchedulerUptime -@@ -53,7 +53,7 @@ - # csh sets HOST, bash sets HOSTNAME - : ${HOST:=$HOSTNAME} - --lockDir=$HOME/.$WM_PROJECT/.wmake -+lockDir=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)/.$WM_PROJECT/.wmake - # Fallback - 1 core on current host - : ${WM_HOSTS:=$HOST:1} - -diff -ur OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/metisDecomp/metisDecomp.C OpenFOAM-4.x-version-4.1/src/parallel/decompose/metisDecomp/metisDecomp.C ---- OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/metisDecomp/metisDecomp.C -+++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/metisDecomp/metisDecomp.C -@@ -67,7 +67,7 @@ - - // Processor weights initialised with no size, only used if specified in - // a file -- Field processorWeights; -+ Field processorWeights; - - // Cell weights (so on the vertices of the dual) - List