diff options
Diffstat (limited to 'gnu/packages')
58 files changed, 2504 insertions, 1296 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4dba607bd6..f0aa6adc85 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2024 dan <i@dan.games> ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2862,13 +2863,13 @@ specified directories.") (define-public ansible-core (package (name "ansible-core") - (version "2.15.5") + (version "2.17.1") (source (origin (method url-fetch) - (uri (pypi-uri "ansible-core" version)) + (uri (pypi-uri "ansible_core" version)) (sha256 - (base32 "00hnwjk4dxgxbz4xlza2wqx20yks5xr7074hzlzsyja3ip5kkicc")))) + (base32 "007ginimzbizx2c3fp3vccizscyki0fp4yg3bzl3qz6ipdqrsi26")))) (build-system python-build-system) (arguments `(#:modules ((guix build python-build-system) @@ -3000,13 +3001,13 @@ provides the following commands: (define-public ansible (package (name "ansible") - (version "8.5.0") + (version "10.1.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "0bazj5h12wraf30bb2schzwk553y20n9vh45km4b5kgmvadm0z1j")))) + (base32 "0apj783acx4jzkf3bnibn4y5jc6jd8ly7l0rdqq8f1jpgxal933x")))) (build-system python-build-system) (propagated-inputs (list ansible-core)) ;; The Ansible collections are found by ansible-core via the Python search diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ad1e70c62c..0a928cd631 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -922,7 +922,7 @@ algorithms from the FORTRAN library MINPACK.") (define-public symengine (package (name "symengine") - (version "0.11.2") + (version "0.12.0") (source (origin (method git-fetch) @@ -931,7 +931,7 @@ algorithms from the FORTRAN library MINPACK.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j6vd72hjj9fnsw5iiykmkrw8vyjcyyycgib2zxlmlzi6sj4618b")))) + (base32 "0vi9d0isfpdhraigpw5zffcqh5fy08anax7kji7csm3n6jx9zy29")))) (build-system cmake-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/aux-files/emacs/comp-integrity-next.el b/gnu/packages/aux-files/emacs/comp-integrity-next.el new file mode 100644 index 0000000000..74ee0952f4 --- /dev/null +++ b/gnu/packages/aux-files/emacs/comp-integrity-next.el @@ -0,0 +1,121 @@ +(require 'ert) + +(eval-when-compile + (defmacro expect-feature (&optional feature) + `(progn + (eval-when-compile + (or (not ',feature) + (require ',feature))))) + + (defmacro expect-native (fun &optional feature) + `(progn + (expect-feature ,feature) + (should (native-comp-function-p (symbol-function ',fun))))) + + + (defmacro expect-native-if-bound (fun &optional feature) + `(and (expect-feature ,feature) + (boundp ',fun) + (should (native-comp-function-p (symbol-function ',fun))))) + + (defmacro expect-builtin (fun &optional feature) + `(should (primitive-function-p (symbol-function ',fun))))) + +(expect-native abbrev-mode) +(expect-native backquote-process) +(expect-native mode-line-widen) +(expect-native buffer-menu) +(expect-native button-mode) +(expect-native byte-run-strip-symbol-positions) +(expect-native case-table-get-table) +(expect-native cconv-convert) +(expect-native use-default-char-width-table) +(expect-native cl-generic-p) +(expect-native cl-struct-define) +(expect-native-if-bound x-setup-function-keys) +(expect-native encode-composition-rule) +(expect-native custom-declare-face) +(expect-native minibuffer-prompt-properties--setter) +(expect-native custom-add-choice) +(expect-native debug-early) +(expect-native display-table-slot disp-table) +(expect-native dnd-open-file) +(expect-native dos-mode25 dos-fns) +(expect-native find-file-text dos-w32) +(expect-native-if-bound dynamic-setting-handle-config-changed-event) +(expect-native easy-menu-item-present-p) +(expect-native eldoc-mode) +(expect-native electric-indent-mode) +(expect-native elisp-mode-syntax-propertize) +(expect-native getenv) +(expect-native epa-file-find-file-hook) +(expect-native face-list) +(expect-native find-file-noselect) +(expect-native fill-region) +(expect-native font-lock-change-mode) +(expect-native font-lock-add-keywords) +(expect-native-if-bound fontset-plain-name) +(expect-native format-read) +(expect-native frame-edges) +(expect-native-if-bound fringe-mode) +(expect-native help-quick) +(expect-native-if-bound image-type) +(expect-native indent-region) +(expect-native indian-compose-regexp) +(expect-native msdos-setup-keyboard term/internal) +(expect-native isearch-abort) +(expect-native iso-transl-set-language) +(expect-native jit-lock-mode) +(expect-native jka-compr-build-file-regexp) +(expect-native keymap-global-set) +(expect-native forward-sexp) +(expect-native lisp-string-in-doc-position-p) +(expect-native ls-lisp-set-options ls-lisp) +(expect-native macroexp-compiling-p) +(expect-native map-y-or-n-p) +(expect-native menu-find-file-existing) +(expect-native completion-boundaries) +(expect-native egyptian-shape-grouping) +(expect-native mouse-double-click-time) +(expect-native convert-define-charset-argument) +(expect-native coding-system-change-eol-conversion) +(expect-native store-substring mule-util) +(expect-native-if-bound mouse-wheel-change-button) +(expect-native advice-function-mapc) +(expect-native comment-string-strip) +(expect-builtin obarray-make) +(expect-native obarray-map) +(expect-native oclosure-type) +(expect-native forward-page) +(expect-native sentence-end) +(expect-native show-paren-function) +(expect-native pgtk-dnd-init-frame pgtk-dnd) +(expect-native prog-context-menu) +(expect-native-if-bound regexp-opt) +(expect-native get-register) +(expect-native query-replace-descr) +(expect-native rfn-eshadow-setup-minibuffer) +(expect-native read-multiple-choice) +(expect-native-if-bound scroll-bar-scale) +(expect-native gui-select-text) +(expect-native seq-first) +(expect-native hack-read-symbol-shorthands) +(expect-native next-error-find-buffer) +(expect-native exit-splash-screen) +(expect-native buffer-local-boundp) +(expect-native syntax-propertize-multiline) +(expect-native tab-bar-mode) +(expect-native tabulated-list-put-tag) +(expect-native text-mode) +(expect-native timer-activate) +(expect-native tool-bar-mode) +(expect-native tooltip-mode) +(expect-native tty-color-desc) +(expect-native ucs-normalize-hfs-nfd-comp-p ucs-normalize) +(expect-native uniquify-item-p) +(expect-native vc-mode) +(expect-native emacs-version) +(expect-native define-widget) +(expect-native window-right) +(expect-native x-dnd-init-frame x-dnd) +(expect-native-if-bound x-handle-no-bitmap-icon) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index db582fa821..47edc56e87 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -130,8 +130,9 @@ Scheme machine types, or '#f' if none is defined." #f) ((target-ppc32? system) "ppc32") - ((target-riscv64? system) - "rv64") + ;; This is apparently not ready in chez-scheme-for-racket. + ;((target-riscv64? system) + ; "rv64") ((string-prefix? "loongarch64-" system) "la64") (else @@ -297,7 +298,7 @@ will name the threaded machine type unless THREADS? is provided as #f." (name "chez-scheme-for-racket") ;; The version should match `(scheme-version-number #t)`. ;; See s/cmacros.ss c. line 360. - (version "9.9.9-pre-release.23") + (version "10.1.0-pre-release.1") (source #f) (build-system gnu-build-system) (inputs `(,@(if (nix-system->native-chez-machine-type) @@ -329,8 +330,6 @@ will name the threaded machine type unless THREADS? is provided as #f." (ice-9 match) (srfi srfi-34)) #:out-of-source? #t - ;; Intermittent failures: https://github.com/cisco/ChezScheme/issues/809 - #:tests? #f #:test-target "test" ; test-one test-some-fast test-some test test-more #:configure-flags #~`(,@(let* ((chez+version (strip-store-file-name #$output)) @@ -509,6 +508,7 @@ version of Chez Scheme.") "1q66vafhiwk617z51qkm1v64r3bxqhhf5lzrmsa4l9d5yhvlyk09")) (file-name (git-file-name name version)) (patches (search-patches "chez-scheme-backport-configure.patch" + "chez-scheme-backport-signal.patch" "chez-scheme-bin-sh.patch")) (snippet #~(begin (use-modules (guix build utils)) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4bcc198bcb..1a95a5e6b5 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -60,8 +60,8 @@ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass - (let ((commit "e4b42065046b5d19d5c16647933326df476b0a79") - (revision "4")) + (let ((commit "2365ba786c805477fcbae6eaeb358b0dd0501598") + (revision "5")) (package (name "cuirass") (version (git-version "1.2.0" revision commit)) @@ -74,7 +74,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "14k849w00h0n13n1xq9hwxpa9n9mg8laa45sbxb7r8ibxd525gf5")))) + "1ffkn97b3nxfi2lhj7r2jli88xkhxazwn5fk2pyqchmls2ldpj5s")))) (build-system gnu-build-system) (arguments (list #:modules `((guix build utils) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index c57f249ebd..72acfaba45 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz> +;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ <jean@foundation.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -392,12 +393,15 @@ configure network interfaces in Linux containers.") (list #:make-flags `(list ,(string-append "GIT_VERSION=v" version)) #:test-target "test" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) + ;; Add -trimpath flag to avoid keeping references to go package + ;; in the store. + (add-after 'unpack 'patch-go-reference + (lambda _ + (substitute* "Makefile" + (("go build") "go build -trimpath")))) (add-before 'build 'setenv (lambda _ ;; For golang toolchain. @@ -408,9 +412,7 @@ configure network interfaces in Linux containers.") (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin")))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references))))) + (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor") @@ -454,7 +456,7 @@ Its main purpose is to support the key usage by @code{docker-init}: (define-public podman (package (name "podman") - (version "5.1.0") + (version "5.1.1") (source (origin (method git-fetch) @@ -462,7 +464,7 @@ Its main purpose is to support the key usage by @code{docker-init}: (url "https://github.com/containers/podman") (commit (string-append "v" version)))) (sha256 - (base32 "0ldzrrz8jba6ka1xfs8msiy08iz4m674xhfxbcdsnc9lmxi3ys4f")) + (base32 "1rhlwd350ll472jn7gm4nbkfkbm609d5s97wdqfb7lfagqwi1vny")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -472,12 +474,10 @@ Its main purpose is to support the key usage by @code{docker-init}: (string-append "PREFIX=" #$output) (string-append "HELPER_BINARIES_DIR=" #$output "/_guix") (string-append "GOMD2MAN=" - #$go-github-com-go-md2man "/bin/go-md2man")) + #$go-github-com-go-md2man "/bin/go-md2man") + (string-append "BUILDFLAGS=-trimpath")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -529,17 +529,6 @@ Its main purpose is to support the key usage by @code{docker-init}: ,(string-append #$passt "/bin") ,(string-append #$procps "/bin") ; ps "/run/setuid-programs"))))) - (add-after 'install 'remove-go-references - (lambda* (#:key inputs #:allow-other-keys) - (let ((go (assoc-ref inputs "go"))) - (for-each - (lambda (file) - (when (executable-file? file) - ((@@ (guix build go-build-system) remove-store-reference) - file go))) - (append (find-files (string-append #$output "/bin")) - (find-files (string-append #$output "/libexec")) - (find-files (string-append #$output "/lib"))))))) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" @@ -629,9 +618,6 @@ being rootless and not requiring any daemon to be running.") #$go-github-com-go-md2man "/bin/go-md2man")) #:tests? #f ; /sys/fs/cgroup not set up in guix sandbox #:test-target "test-unit" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -643,6 +629,12 @@ being rootless and not requiring any daemon to be running.") ;; Make <4.4 causing CC not to be propagated into $(shell ...) ;; calls. Can be removed once we update to >4.3. (setenv "CC" #$(cc-for-target)))) + ;; Add -trimpath to build flags to avoid keeping references to go + ;; packages. + (add-after 'set-env 'patch-buildflags + (lambda _ + (substitute* "Makefile" + (("BUILDFLAGS :=") "BUILDFLAGS := -trimpath ")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -670,8 +662,6 @@ being rootless and not requiring any daemon to be running.") ,(string-append #$gcc "/bin") ; cpp ,(string-append #$passt "/bin") "/run/setuid-programs"))))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references)) (add-after 'install 'install-completions (lambda _ (invoke "make" "install.completions" diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 61328fec39..e6fabaa223 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -59,7 +59,7 @@ ;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org> ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de> -;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne +;;; Copyright © 2023, 2024 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> @@ -195,7 +195,7 @@ (define-public duckdb (package (name "duckdb") - (version "0.9.2") + (version "1.0.0") (source (origin (method git-fetch) @@ -205,7 +205,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0dbsxyiz7c8sxflbfj87qv0b2s69zk802vsk5h00ra8w8fcbqlj0")) + "11yqgnf354g3fjj0rvsw8zzz915vf9i3jxmpchpwy09yzxd72cbg")) (modules '((guix build utils))) (snippet #~(begin @@ -614,6 +614,38 @@ the API, and provides features such as: @end itemize") (license license:bsd-3))) +(define-public python-adbc-driver-manager + (package + (name "python-adbc-driver-manager") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "adbc_driver_manager" version)) + (sha256 + (base32 "00i3zg6rbzdz767j9w22ajw8rxwbhkrmzwwlmx11q56cvnig0cm3")))) + (build-system pyproject-build-system) + (arguments + (list + ;; TODO: Pack arrow-adbc/c/driver/sqlite for tests. + #:tests? #f + #:build-backend "setuptools.build_meta")) + (propagated-inputs + (list python-typing-extensions)) + (native-inputs + (list python-cython-3 + python-pytest)) + (home-page "https://arrow.apache.org/adbc/") + (synopsis "Generic entrypoint for ADBC drivers in Python") + (description + "This package contains bindings for the ADBC Driver Manager, as well as a +@url{https://peps.python.org/pep-0249/,DBAPI 2.0/PEP 249-compatible} interface +on top. This can be used to load ADBC drivers at runtime and use them from +Python. Backend-specific packages like @code{adbc_driver_postgresql} wrap +this package in a more convenient interface, and should be preferred where +they exist.") + (license license:asl2.0))) + (define-public python-prisma (package (name "python-prisma") diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index e82fce1fa9..e85f228119 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -75,7 +75,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "269") + (version "272") (source (origin (method git-fetch) @@ -84,7 +84,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0q2yy6aznb4sjkza06gpi01p9npp9crhcnkl5fgh32jlx1ab8sbq")))) + (base32 "1dq0q41vsmnwnf8049r962x818cgm4aq5gfjavj9yjmc3dxfc76c")))) (build-system python-build-system) (arguments (list diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 12fbaf1d0c..2a047ba790 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer@gmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024 Felix Gruber <felgru@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,52 +411,49 @@ the Net to search for documents which are not on the local system.") (license license:lgpl2.1+))) (define-public zeal - (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2") - (revision "1")) - (package - (name "zeal") - (version (git-version "0.6.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zealdocs/zeal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3")))) - (build-system qt-build-system) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases + (package + (name "zeal") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zealdocs/zeal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp")))) + (build-system qt-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases (add-after 'wrap 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/zeal")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin/zeal")) + (qt-process-path + (search-input-file inputs + "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) - (native-inputs - (list extra-cmake-modules pkg-config)) - (inputs - `(("libarchive" ,libarchive) - ("sqlite" ,sqlite) - ("qtbase" ,qtbase-5) - ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine-5" ,qtwebengine-5) - ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtx11extras" ,qtx11extras) - ("xcb-util-keyms" ,xcb-util-keysyms))) - (home-page "https://zealdocs.org/") - (synopsis "Offline documentation browser inspired by Dash") - (description "Zeal is a simple offline documentation browser + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list libarchive + sqlite + qtbase-5 + qtdeclarative-5 + qtwebchannel-5 + qtwebengine-5 + qtquickcontrols-5 + qtx11extras + xcb-util-keysyms)) + (home-page "https://zealdocs.org/") + (synopsis "Offline documentation browser inspired by Dash") + (description "Zeal is a simple offline documentation browser inspired by Dash.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public markdeep (package diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76cd340e5e..ae588f4913 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1269,6 +1269,25 @@ out of the box.") is based off of Slim mode.") (license license:gpl3+))) +(define-public emacs-sed-mode + (package + (name "emacs-sed-mode") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/sed-mode-" version + ".tar")) + (sha256 + (base32 "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn")))) + (build-system emacs-build-system) + (home-page "https://elpa.gnu.org/packages/sed-mode.html") + (synopsis "Major mode to edit sed scripts") + (description + "The Sed major mode provides basic support for sed scripts. The +functionalities supported are font-locking and auto-indentation.") + (license license:gpl3+))) + (define-public emacs-spaceline-all-the-icons (package (name "emacs-spaceline-all-the-icons") @@ -3730,6 +3749,43 @@ framework as the user interface, which integrates well with Vertico or Selectrum.") (license license:gpl3+))) +(define-public emacs-empv + (let ((commit "8cc9b0a425b6989d30f91bf90e9b09bd00581f07") + (revision "1")) + (package + (name "emacs-empv") + (version (git-version "4.3.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/isamert/empv.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06dphwj9vi39dbpif3kzp6azs80klh13s9l22a6ddz91kmds2myy")))) + (build-system emacs-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-default-binaries + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "empv.el" + ("empv-fd-binary" (search-input-file inputs "/bin/fd")) + ("empv-mpv-binary" (search-input-file inputs "/bin/mpv")))))))) + (inputs (list fd mpv)) + (propagated-inputs (list emacs-compat emacs-consult emacs-s)) + (home-page "https://github.com/isamert/empv.el") + (synopsis + "Emacs multimedia player, media library manager, YouTube frontend") + (description + "This package is an Emacs multimedia player based on mpv. It offers +a comprehensive interface to mpv, including convenient features such as an +embedded radio manager, YouTube integration, and a local music and video +library manager.") + (license license:gpl3+)))) + (define-public emacs-marginalia-emprise (package (name "emacs-marginalia-emprise") @@ -17983,6 +18039,31 @@ files in Emacs. Files of this type (e.g., @file{BUILD.gn} or @file{*.gni}) are common in Chromium-derived projects.") (license license:bsd-3))) +(define-public emacs-gnosis + (package + (name "emacs-gnosis") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.thanosapollo.org/gnosis") + (commit version))) + (sha256 + (base32 + "19mzyg4hg6mplv3s2kb8xiaw06zkbj7a3gvfvy51cwvb8k979ap6")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-compat emacs-emacsql)) + (home-page "https://thanosapollo.org/projects/gnosis") + (synopsis "Spaced repetition system for GNU Emacs") + (description + "Gnosis is a spaced repetition system for note-taking and self-testing +where notes are formatted as Question/Answer/Explanation. Notes are reviewed +at spaced intervals based on the success or failure in recalling the answer to +each question.") + (license license:gpl3+))) + (define-public emacs-drag-stuff (package (name "emacs-drag-stuff") @@ -20272,8 +20353,8 @@ one if it fails.") (define-public emacs-jabber ;; No releases available. - (let ((commit "af0315e174fa6446d5c4dd3e6465d48912950e58") - (revision "0")) + (let ((commit "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2") + (revision "1")) (package (name "emacs-jabber") (version (git-version "0.8.92" revision commit)) @@ -20285,7 +20366,7 @@ one if it fails.") (file-name (git-file-name name version)) (sha256 (base32 - "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq")))) + "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn")))) (build-system emacs-build-system) (arguments (list @@ -23246,8 +23327,8 @@ object has been freed.") (license license:unlicense))) (define-public emacs-emacsql - (let ((commit "29194a63ede3ee24c7457c2fde03b0f1320ca4b1") - (revision "1")) + (let ((commit "efddd69c5e69214dbbe921fbf90f938501414894") + (revision "2")) (package (name "emacs-emacsql") (version (git-version "3.1.1" revision commit)) @@ -23259,7 +23340,7 @@ object has been freed.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "14yj53xxqi3009bdj39k2fqwyc896yp2m7gdkgyv47wlkh1xwzxh")))) + (base32 "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg")))) (build-system emacs-build-system) (arguments (list @@ -26400,6 +26481,27 @@ perform regression test for packages that provide font-lock rules.") It follows DrRacket concepts where applicable.") (license license:gpl2+)))) +(define-public emacs-ob-racket + (package + (name "emacs-ob-racket") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hasu/emacs-ob-racket") + (commit version))) + (sha256 + (base32 + "0bqhxi1nikxwc0gyqsnxc7ya2s41vc06w39s24qz64kja8zqzzya")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/hasu/emacs-ob-racket") + (synopsis "Org Babel support for Racket") + (description + "This package adds spport for working with Racket code blocks with +Org Babel in Org mode.") + (license license:gpl3+))) + (define-public emacs-grep-context (let ((commit "5a4e3efdf775755c1bbefcfe4b461c1166d81d7d") (revision "1")) @@ -29210,10 +29312,10 @@ and comments.") (license license:gpl3+)))) (define-public emacs-yeetube - (let ((commit "c9721a295f4fd30a44e94b3424151fa8a14d22ae")) ;version bump + (let ((commit "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640")) ;version bump (package (name "emacs-yeetube") - (version "2.1.6") + (version "2.1.7") (source (origin (method git-fetch) @@ -29222,7 +29324,7 @@ and comments.") (commit commit))) (sha256 (base32 - "0lrcs0n30h800sm6py4av44a3fcfgasmj223mnl76q34syyrgz6k")) + "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -29244,13 +29346,12 @@ and comments.") (inputs (list mpv torsocks yt-dlp)) (propagated-inputs (list emacs-compat)) (home-page "https://thanosapollo.org/projects/yeetube/") - (synopsis "Youtube and Invidious front-end for Emacs") + (synopsis "Youtube front-end for Emacs") (description - "This package offers an Emacs interface that allows you to search YouTube -or an Invidious instance for a specific query. The search results are shown -as links in an Org mode buffer. The videos can be opened to a user-defined + "This package provides the ability to scrape YouTube, with the results +displayed in a tabulated list format. The videos can be opened with a user-defined video player (by default @command{mpv}) or downloaded using @command{yt-dlp}. -This package also includes a @code{yt-dlp} front-end.") +This package also includes a minimal @code{yt-dlp} wrapper.") (license license:gpl3+)))) (define-public emacs-org-web-tools @@ -34861,43 +34962,45 @@ contrast and few colors.") (license license:gpl3+)))) (define-public emacs-doom-themes - (package - (name "emacs-doom-themes") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hlissner/emacs-doom-themes") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "120pcas0l1m6w551qxfcl2fx0aysjqp91nn47zdxrr8rs01654wr")))) - (build-system emacs-build-system) - (native-inputs - (list emacs-ert-runner)) - (arguments - (list #:tests? #t - #:test-command #~(list "ert-runner") - #:modules '((guix build emacs-build-system) - (guix build utils) - (guix build emacs-utils) - (srfi srfi-1)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'move-themes - (lambda _ - ;; Move the source files to the top level, which is in the - ;; EMACSLOADPATH. - (for-each (lambda (f) - (rename-file f (basename f))) - (append - (find-files "./themes" ".*\\.el$") - (find-files "./extensions" ".*\\.el$")))))))) - (synopsis "Wide collection of color themes for Emacs") - (description "Emacs-doom-themes contains numerous popular color themes for + (let ((commit "188ab05eefe2bdc46b4464aadb4a52ff9cb42f7f") + (revision "0")) + (package + (name "emacs-doom-themes") + (version (git-version "2.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/doomemacs/themes") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08avm5jfp887r2l77s6i0zn72wlv4kp47b2vzv3kywf3d0gkpgp8")))) + (build-system emacs-build-system) + (native-inputs + (list emacs-ert-runner)) + (arguments + (list #:tests? #t + #:test-command #~(list "ert-runner") + #:modules '((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-1)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-themes + (lambda _ + ;; Move the source files to the top level, which is in the + ;; EMACSLOADPATH. + (for-each (lambda (f) + (rename-file f (basename f))) + (append + (find-files "./themes" ".*\\.el$") + (find-files "./extensions" ".*\\.el$")))))))) + (synopsis "Wide collection of color themes for Emacs") + (description "Emacs-doom-themes contains numerous popular color themes for Emacs that integrate with major modes like Org-mode.") - (home-page "https://github.com/hlissner/emacs-doom-themes") - (license license:expat))) + (home-page "https://github.com/doomemacs/themes") + (license license:expat)))) (define-public emacs-modus-themes (package @@ -35182,6 +35285,28 @@ when the command was not found in Eshell. The suggestions are found after the commands that bear resemblance to the input command.") (license license:gpl3+))) +(define-public emacs-eshell-git-prompt + (package + (name "emacs-eshell-git-prompt") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xuchunyang/eshell-git-prompt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13b7nr0819pgzyvh0szi0zjyazgpxmsbqcz65cccyhh2pq48zb7j")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-dash)) + (home-page "https://github.com/xuchunyang/eshell-git-prompt") + (synopsis "Themes for Emacs Shell (Eshell) prompt") + (description + "This package provides a variety of themes for Emacs Shell (Eshell) +prompt.") + (license license:gpl3+))) + (define-public emacs-unfill (package (name "emacs-unfill") diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6557180139..ed186d221c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -566,12 +566,12 @@ editor (with wide ints)" ) #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42") - (revision "2")) + (let ((commit "4e22ef870c4b650f29c4441ac51b6a2ac506ea57") + (revision "1")) (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "30.0.50" revision commit)) + (version (git-version "30.0.60" revision commit)) (source (origin (method git-fetch) @@ -580,7 +580,7 @@ editor (with wide ints)" ) (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk")) + (base32 "1zl9ffj3ph4msr1r4qw09x1wljpv2lbr7ypqd0p3q89m2qpvfn80")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -598,7 +598,28 @@ editor (with wide ints)" ) (string-drop (package-name emacs) (string-length "emacs")))))) (version version) - (source source))) + (source source) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'validate-comp-integrity + (lambda* (#:key outputs #:allow-other-keys) + #$(cond + ((%current-target-system) + #~(display + "Cannot validate native compilation on cross builds.\n")) + ((member (%current-system) '("armhf-linux" "i686-linux")) + #~(display "Integrity test is broken on 32 bit systems.\n")) + (else + #~(invoke + (string-append (assoc-ref outputs "out") "/bin/emacs") + "--batch" + "--load" + #$(local-file + (search-auxiliary-file + "emacs/comp-integrity-next.el")) + "-f" "ert-run-tests-batch-and-exit"))))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 64335d89f7..cc9020c6fd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1670,7 +1670,7 @@ fully-vectorial and three-dimensional methods.") (define-public meep (package (name "meep") - (version "1.28.0") + (version "1.29.0") (source (origin (method url-fetch) (uri @@ -1679,7 +1679,7 @@ fully-vectorial and three-dimensional methods.") version "/meep-" version ".tar.gz")) (sha256 (base32 - "199a29mb64cfv89azzdh8arpy9ib6050cqh86yw5ypm5jhy6178v")))) + "1511849g6wlpa42kfrj6zvmc3ivad9ync8r01xp2ld7r5j39y9v8")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -1787,6 +1787,7 @@ analyzer (FFT) and frequency sweep plot.") (version "5.0.1") (source (origin (method git-fetch) + (patches (search-patches "capstone-fix-python-constants.patch")) (uri (git-reference (url "https://github.com/capstone-engine/capstone") (commit version))) @@ -1798,7 +1799,7 @@ analyzer (FFT) and frequency sweep plot.") (arguments `(#:tests? #f #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc") + (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2629,7 +2630,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (define-public python-scikit-rf (package (name "python-scikit-rf") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) ;PyPI misses some files required for tests (uri (git-reference @@ -2637,7 +2638,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (commit (string-append "v" version)))) (sha256 (base32 - "0qfijh2r93jn3za2h9wdv2y49gd4alcww35zrdvmxrx6kbv67m2f")) + "0ji1c8b9cbgb0w18dx976hza690npkypz8kav4a3yin2wysjvf64")) (file-name (git-file-name name version)))) (build-system pyproject-build-system) (propagated-inputs (list python-matplotlib diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 767de69823..82c746a526 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -296,14 +296,14 @@ Accounting.") (define-public homebank (package (name "homebank") - (version "5.7.4") + (version "5.8.1") (source (origin (method url-fetch) (uri (string-append "https://www.gethomebank.org/public/sources" "/homebank-" version ".tar.gz")) (sha256 (base32 - "1r2lpf2qjvyc9l4llgy6453dn527pylvd49kr6ihrskmr1373kj2")))) + "00fwadn6q2hryx7q1xf5fhb5q3ywfnlb1r4xxn7yq6ilzvm5zhv0")))) (build-system glib-or-gtk-build-system) (native-inputs (list pkg-config intltool)) @@ -2175,15 +2175,15 @@ editing on the Web.") (define-public quantlib (package (name "quantlib") - (version "1.26") + (version "1.34") (source (origin (method url-fetch) (uri (string-append - "https://github.com/lballabio/QuantLib/releases/download/QuantLib-v" + "https://github.com/lballabio/QuantLib/releases/download/v" version "/QuantLib-" version ".tar.gz")) (sha256 - (base32 "1sbk6rg51x5xpa93xmqmrj32a1l9vba51xck0017cxzblg0nrzh4")))) + (base32 "0l7yn9bal0csyix0ydzcfj003kma4sx7w5hyfxhh6mbnxn6am1zb")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -2228,13 +2228,13 @@ interactive controls. This package provides a GTK+ graphical user interface (define-public python-ta-lib (package (name "python-ta-lib") - (version "0.4.21") + (version "0.4.32") (source (origin (method url-fetch) (uri (pypi-uri "TA-Lib" version)) (sha256 - (base32 "17sf222mq2vx924f15qlz5czkkq5vsnsjy9ibwkrk8lalr6g5lkl")))) + (base32 "186sgkpggy50gs2pa2p22zppl57xgfhpmja5l13xiskv44iw6x7v")))) (build-system python-build-system) (inputs (list ta-lib)) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index a21c6b4d5a..8d9e5ff3d1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -197,6 +197,26 @@ fonts have been designed to work well in user interface (UI) environments as well as other mediums.") (license license:silofl1.1))) +(define-public font-lilex + (package + (name "font-lilex") + (version "2.510") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mishamyrt/Lilex/releases/download/" + version + "/Lilex.zip")) + (sha256 + (base32 + "0dq54qk4q1ymdqnp0skxdxzhx475g2gihzs8ijx0nffa29fwzn9g")))) + (build-system font-build-system) + (home-page "https://github.com/mishamyrt/Lilex") + (synopsis "IBM Plex typeface with extended character sets and ligatures") + (description "Lilex is a modern programming font containing a set of +ligatures for common programming multi-character combinations.") + (license license:silofl1.1))) + (define-public font-inconsolata (package (name "font-inconsolata") @@ -2498,6 +2518,34 @@ formatting.") (home-page "https://madmalik.github.io/mononoki/") (license license:silofl1.1))) +(define-public font-paytone-one + (let ((version "0") + (commit "b1438bc11966d48a1e9e8943b7b8a32dcb0c533c") + (revision "0")) + (package + (name "font-paytone-one") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlefonts/paytoneFont") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gbmrjx8yj8xjh6fs0pzh8j0kxvwvhhjlp16gmv5c7i6b8s7r4r2")))) + (build-system font-build-system) + (home-page "https://github.com/googlefonts/paytoneFont") + (synopsis "Sans serif typeface") + (description "Paytone One is a sans serif typeface developed for +use as a display and headlining webfont. + +The face has a slight casual appearance with ample round bowls. The +slanted stroke terminals add some visual play to the overall appearance +of the font.") + (license license:silofl1.1)))) + (define-public font-plemoljp (package (name "font-plemoljp") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1146939408..9923ca9195 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1489,13 +1489,13 @@ surface (i.e., gridding) with a hint of machine learning.") (define-public python-cartopy (package (name "python-cartopy") - (version "0.22.0") + (version "0.23.0") (source (origin (method url-fetch) (uri (pypi-uri "Cartopy" version)) (sha256 - (base32 "0jdv92az0b7qxdvalh29kasw3knsl570cz7q3vql67ck400zj05k")))) + (base32 "0xknmq73pvkm3k718zrsx8p4r83dbskwqna9v4qvmwh1ayrkf7r3")))) (build-system pyproject-build-system) (arguments (list @@ -1506,8 +1506,16 @@ surface (i.e., gridding) with a hint of machine learning.") "-m" "not natural_earth and not network" "-k" (string-append - ;; This one too but it's not marked as such. - "not test_gridliner_labels_bbox_style" + ;; These ones too but are not marked as such. + "not test_feature_artist_draw" + " and not test_feature_artist_draw_facecolor_list" + " and not test_feature_artist_draw_cmap" + " and not test_feature_artist_draw_styled_feature" + " and not test_feature_artist_draw_styler" + " and not test_gridliner_constrained_adjust_datalim" + " and not test_gridliner_remove" + " and not test_gridliner_title_adjust" + " and not test_gridliner_labels_bbox_style" ;; Accuracy problems " and not test_single_spole" " and not test_single_npole" diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b4caaf29a7..452b1f1eef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13510,17 +13510,17 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "1.34.2") + (version "1.46.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/valos/Komikku/") + (url "https://codeberg.org/valos/Komikku/") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "044m3z7h1hi2avx4z6qgjzhgn1fkf1iclxhr4j7pb6flbqvwnxhs")))) + "1ggg4hgd1kyc69b06kcgvvjwmz72xgjakva19gs3nrszr4cinank")))) (build-system meson-build-system) (arguments (list @@ -13546,7 +13546,9 @@ profiler via Sysprof, debugging support, and more.") (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/komikku") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) (inputs (list bash-minimal gtk @@ -13572,7 +13574,8 @@ profiler via Sysprof, debugging support, and more.") python-rarfile python-requests python-unidecode - webkitgtk)) + webkitgtk + webp-pixbuf-loader)) (native-inputs (list blueprint-compiler desktop-file-utils @@ -13580,7 +13583,7 @@ profiler via Sysprof, debugging support, and more.") `(,glib "bin") gobject-introspection pkg-config)) - (home-page "https://gitlab.com/valos/Komikku") + (home-page "https://apps.gnome.org/Komikku") (synopsis "Manga reader for GNOME") (description "Komikku is an online/offline manga reader for GNOME, developed with the aim of being used with the Librem 5 phone.") @@ -13752,7 +13755,7 @@ Document Analysis and Recognition program.") (define-public libadwaita (package (name "libadwaita") - (version "1.4.0") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libadwaita/" @@ -13760,7 +13763,7 @@ Document Analysis and Recognition program.") "libadwaita-" version ".tar.xz")) (sha256 (base32 - "1hj7kxza6263x662v4ffndlz8dhfx19cz3y4iwhnhdflaj50j6p5")))) + "05icswk84kf4pbcybv8j9r9n98q1dgr1m7zn6k72p4dlbh0fxyn9")))) (build-system meson-build-system) (arguments `(#:phases diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e6d29d5f90..3e7818ba43 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -532,9 +532,9 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-base-version "115.12.0") -(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) -(define %icecat-build-id "20240611000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-base-version "115.13.0") +(define %icecat-version (string-append %icecat-base-version "-guix1")) +(define %icecat-build-id "20240709000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -554,12 +554,12 @@ variable defined below. It requires guile-json to be installed." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1vx88wc10fjkvqdqf3ab65qk3km7z0mlyf9plxjhabxvl0jid7mm")))) + "0p2x1prwa1yn2d3i7vgjc4gg64x4si43l68aav9881hhjwc0v8iz")))) ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. - (upstream-icecat-base-version "115.12.0") - (gnuzilla-commit "f200ffe88821f66234591096bcbe87b0c11f8da0") + (upstream-icecat-base-version "115.13.0") + (gnuzilla-commit "445980b18666c8214e5c62db3ae7108d5694242f") (gnuzilla-source (origin (method git-fetch) @@ -571,7 +571,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "154rjpn4vr2hqyrfbpwp6dvkzsv1cwisdf82v7dsda55012qaxg7")))) + "12jdlr86kr26h2ml5j8pjsjc8lpjxw05hqpirvlgj317xv0amyz1")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -1142,11 +1142,7 @@ variable defined below. It requires guile-json to be installed." software, which does not recommend non-free plugins and addons. It also features built-in privacy-protecting features. This package also includes the @command{geckodriver} command, which can be useful for automated web -testing. - -WARNING: IceCat 115 has not yet been released by the upstream IceCat project. -This is a preview release, and does not currently meet the privacy-respecting -standards of the IceCat project.") +testing.") (license license:mpl2.0) ;and others, see toolkit/content/license.html (properties `((ftp-directory . "/gnu/gnuzilla") diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index dd0b71ff13..328d0796a3 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -62,10 +62,37 @@ ;;; Libraries: ;;; +(define-public go-atomicgo-dev-assert + (package + (name "go-atomicgo-dev-assert") + (version "0.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicgo/assert") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ra5bx3w6vynwbxgsz5knibk2xwmfi6654fsi29zsmk77f39g8vv")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "atomicgo.dev/assert")) + (home-page "https://atomicgo.dev/assert") + (synopsis "Go package with tons of assertions") + (description + "Package assert provides obj set of assertion functions. Every assertion +function returns obj boolean. This package does not integrate into the +testing package automatically and requires to check the returning boolean +value and call @code{t.Fatal()} if the assertion fails.") + (license license:expat))) + (define-public go-github-com-alecthomas-assert-v2 (package (name "go-github-com-alecthomas-assert-v2") - (version "2.5.0") + (version "2.10.0") (source (origin (method git-fetch) @@ -74,7 +101,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz")))) + (base32 "05jak1v9s2wrwrn6ar0s4388f7qg15q0qfmhfcswgl88720196z3")))) (build-system go-build-system) (arguments (list #:go go-1.18 @@ -577,6 +604,51 @@ Many times certain facilities are not available, or tests must run differently.") (license license:expat))) +(define-public go-github-com-marvinjwendt-testza + (package + (name "go-github-com-marvinjwendt-testza") + (version "0.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MarvinJWendt/testza") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mqvs9142wx3a352yj0zxcm8f3mclyqzzxjlpn1rsb3vrskgs8v9")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/MarvinJWendt/testza" + #:phases + #~(modify-phases %standard-phases + ;; An error that should be nil is not nil. Error message: "creating + ;; snapshot failed: <...> permission denied + (add-before 'check 'writable-test-file + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" + import-path + "/testdata/snapshots") + (for-each make-file-writable + (list "TestSnapshotCreate_file_content.testza" + "TestSnapshotCreate_file_content_string.testza")))))))) + (propagated-inputs + (list go-atomicgo-dev-assert + go-github-com-sergi-go-diff + go-github-com-davecgh-go-spew + go-github-com-klauspost-cpuid-v2 + go-github-com-pterm-pterm)) + (home-page "https://github.com/MarvinJWendt/testza") + (synopsis "Full-featured test framework for Golang") + (description + "Package testza is a full-featured testing framework for Go. It +integrates with the default test runner, so you can use it with the standard +@code{go test} tool. Testza contains easy to use methods, like assertions, +output capturing, mocking, and much more.") + (license license:expat))) + (define-public go-github-com-onsi-ginkgo (package (name "go-github-com-onsi-ginkgo") @@ -670,6 +742,31 @@ Gomega matcher library.") framework.") (license license:expat))) +(define-public go-github-com-otiai10-mint + (package + (name "go-github-com-otiai10-mint") + (version "1.6.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/otiai10/mint") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g5zhz4znp68427p2a1yvrxbq90y7caagdd7zsb4iygnhdszfm7w")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/otiai10/mint")) + (home-page "https://github.com/otiai10/mint") + (synopsis "Minimal assertion for Golang testing framework") + (description + "Mint (@code{mint.Mint}) is wrapper for @code{*testing.T} blending +testing type to omit repeated @code{t}.") + (license license:expat))) + (define-public go-github-com-pkg-profile (package (name "go-github-com-pkg-profile") diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index ddeb65a967..67ae28abe5 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -63,6 +63,56 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) +(define-public go-github-com-dsnet-compress + (package + (name "go-github-com-dsnet-compress") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dsnet/compress") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/dsnet/compress" + #:phases + #~(modify-phases %standard-phases + ;; Testdata directories contains some compressed files requiring + ;; for running tests but not required on run time. + (add-after 'check 'remove-testdata + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/bzip2/testdata")) + (delete-file-recursively + (string-append "src/" import-path "/brotli/testdata")) + (delete-file-recursively + (string-append "src/" import-path "/testdata"))))))) + (propagated-inputs + (list go-github-com-dsnet-golib + go-github-com-klauspost-compress + go-github-com-ulikunitz-xz)) + (home-page "https://github.com/dsnet/compress") + (synopsis "Collection of compression libraries for Golang") + (description + "Package compress is a collection of compression libraries implementing +Golang moduels: +@table @code +@item brotli +Implements the Brotli format, described in RFC 7932. +@item bzip2 +Implements the BZip2 compressed data format. +@item flate +Implements the DEFLATE format, described in RFC 1951. +@item xflate +Implements the XFLATE format, an random-access extension to DEFLATE. +@end table") + (license license:bsd-3))) + (define-public go-github-com-golang-snappy (package (name "go-github-com-golang-snappy") @@ -171,7 +221,7 @@ time, as otherwise the internal gzip library will likely be faster.") (define-public go-github-com-nwaples-rardecode (package (name "go-github-com-nwaples-rardecode") - (version "2.0.0-beta.2") + (version "1.1.3") (source (origin (method git-fetch) @@ -180,7 +230,7 @@ time, as otherwise the internal gzip library will likely be faster.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1344mxfdgs5fps6mqxk6352arrfszi33kmq394rgmqpf4394f1y7")))) + (base32 "0s00b8a9gppka3yxkxh7z5wy0ahygl8wbb0fbyx2r0rj879a1c2z")))) (build-system go-build-system) (arguments (list @@ -191,6 +241,24 @@ time, as otherwise the internal gzip library will likely be faster.") "This package provides a library for reading RAR archives with Golang.") (license license:bsd-2))) +(define-public go-github-com-nwaples-rardecode-v2 + (package + (inherit go-github-com-nwaples-rardecode) + (name "go-github-com-nwaples-rardecode-v2") + (version "2.0.0-beta.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nwaples/rardecode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1344mxfdgs5fps6mqxk6352arrfszi33kmq394rgmqpf4394f1y7")))) + (arguments + (list + #:import-path "github.com/nwaples/rardecode/v2")))) + (define-public go-github-com-pierrec-lz4 (package (name "go-github-com-pierrec-lz4") diff --git a/gnu/packages/golang-maths.scm b/gnu/packages/golang-maths.scm new file mode 100644 index 0000000000..2348255119 --- /dev/null +++ b/gnu/packages/golang-maths.scm @@ -0,0 +1,98 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages golang-maths) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system go) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) + #:use-module (gnu packages)) + +;;; Commentary: +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +;;; +;;; Libraries: +;;; + +(define-public go-github-com-montanaflynn-stats + (package + (name "go-github-com-montanaflynn-stats") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/montanaflynn/stats") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0y38cvp7r6fb6291k82j781dbykx00mxw8ca0v9d0fijzc1x81fi")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/montanaflynn/stats")) + (home-page "https://github.com/montanaflynn/stats") + (synopsis "Statistics library for Golang") + (description + "This package provides a statistical library for Golang.") + (license license:expat))) + +(define-public go-github-com-shopspring-decimal + (package + (name "go-github-com-shopspring-decimal") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shopspring/decimal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1p1iz0ybsjvc8k3w6lf92drs51fgrcbz0ib1p4ihp3gmdq5rnzjk")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/shopspring/decimal")) + (home-page "https://github.com/shopspring/decimal") + (synopsis "Arbitrary-precision fixed-point decimal numbers in Golang") + (description + "Package decimal implements an arbitrary precision fixed-point decimal. +Features: +@itemize +@item the zero-value is 0, and is safe to use without initialization +@item addition, subtraction, multiplication with no loss of precision +@item division with specified precision +@item database/sql serialization/deserialization +@item JSON and XML serialization/deserialization +@end itemize") + (license license:expat))) + +;;; +;;; Executables: +;;; + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above in alphabetic order. +;;; diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e64f20801c..051fa75b92 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2848,6 +2848,68 @@ encoding library for the MessagePack, CBOR, JSON and the Binc formats.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-whyrusleeping-cbor + (package + (name "go-github-com-whyrusleeping-cbor") + (version "0.0.0-20171005072247-63513f603b11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/cbor") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v3kgzk8grz17my2vhv12qi9dgpx3z86hy9ff1c4qw83mg8hm67s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/cbor" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + ;; No test vectors were provided with git checkout: + ;; var errpath string = "../test-vectors/appendix_a.json" + (substitute* "go/cbor_test.go" + (("TestDecodeVectors") "offTestDecodeVectors")) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://github.com/whyrusleeping/cbor") + (synopsis "Concise Binary Object Representation in Golang") + (description + "@acronym{Concise Binary Object Representation,CBOR} is a superset of +JSON's schema that's faster and more compact.") + (license license:asl2.0))) + +(define-public go-github-com-whyrusleeping-chunker + (package + (name "go-github-com-whyrusleeping-chunker") + (version "0.0.0-20181014151217-fe64bd25879f") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/chunker") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13q4flp9iwwyi0izqar786h42713rf3m22qlvg0masbmdi69qjr2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/chunker")) + (home-page "https://github.com/whyrusleeping/chunker") + (synopsis "Implementation of Content Defined Chunking in Golang") + (description + "Package chunker implements @acronym{Content Defined Chunking,CDC} based +on a rolling Rabin Checksum. This package provides a modified fork of +https://github.com/restic/restic project.") + (license license:bsd-2))) + (define-public go-github-com-whyrusleeping-json-filter (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") (revision "0")) @@ -2873,6 +2935,33 @@ replacement for native @code{net/http} module.") @command{map[string]interface{}}.") (license license:expat)))) +(define-public go-github-com-whyrusleeping-multiaddr-filter + (package + (name "go-github-com-whyrusleeping-multiaddr-filter") + (version "0.0.0-20160516205228-e903e4adabd7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/multiaddr-filter") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640")))) + (build-system go-build-system) + (arguments + (list + ;; (*testing.common).Fatalf format %s has arg val of wrong type bool + #:tests? #f + #:import-path "github.com/whyrusleeping/multiaddr-filter")) + (home-page "https://github.com/whyrusleeping/multiaddr-filter") + (synopsis "Parsing ip filters and masks in the multiaddr format") + (description + "This module creates very simple +@url{https://github.com/jbenet/go-multiaddr,multiaddr} formatted cidr +netmasks.") + (license license:expat))) + (define-public go-github-com-xeipuuv-gojsonpointer (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") (revision "0")) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index dafa4b2904..ee2585c68d 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-crypto) + #:use-module (gnu packages golang-maths) #:use-module (gnu packages golang-web) #:use-module (gnu packages linux) #:use-module (gnu packages specifications)) @@ -85,6 +86,88 @@ ;;; Libraries: ;;; +(define-public go-atomicgo-dev-cursor + (package + (name "go-atomicgo-dev-cursor") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicgo/cursor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ds85nyd3dnjr961x9g5kflx1qdb92vn7n6wc4jbk0fjjzbrnh5s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "atomicgo.dev/cursor")) + (home-page "https://atomicgo.dev/cursor") + (synopsis "Moving terminal cursor in Golang") + (description + "Package cursor contains cross-platform methods to move the terminal cursor in +different directions. This package can be used to create interactive CLI tools +and games, live charts, algorithm visualizations and other updatable output of +any kind.") + (license license:expat))) + +(define-public go-atomicgo-dev-keyboard + (package + (name "go-atomicgo-dev-keyboard") + (version "0.2.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicgo/keyboard") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0axhs1ji87szirv91vvwy0l0h5f468pllp8zap2dpcy05krmi9jf")))) + (build-system go-build-system) + (arguments + (list + ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza + ;; -> go-atomicgo-dev-keyboard -> go-github-com-pterm-pterm + #:tests? #f + #:import-path "atomicgo.dev/keyboard")) + (propagated-inputs + (list go-github-com-containerd-console)) + (home-page "https://atomicgo.dev/keyboard") + (synopsis "Read keyboard events in CLI applications") + (description + "This package provides a functionality to read key presses from the keyboard, +while in a terminal application, which may be combined to check for ctrl+c, +alt+4, ctrl-shift, alt+ctrl+right, etc. It can also be used to +simulate (mock) keypresses for CI testing.") + (license license:expat))) + +(define-public go-atomicgo-dev-schedule + (package + (name "go-atomicgo-dev-schedule") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicgo/schedule") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13zrmf9jagqjvjjckyqlvr889y2gxf22iz42l6j2zmgy9klbn6vl")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.18 + #:import-path "atomicgo.dev/schedule")) + (home-page "https://atomicgo.dev/schedule") + (synopsis "Easily schedule non-blocking tasks in Golang") + (description + "This package provides a simple scheduler which, can run a function at a +given time, in a given duration, or repeatedly at a given interval.") + (license license:expat))) + (define-public go-bazil-org-fuse (package (name "go-bazil-org-fuse") @@ -290,6 +373,72 @@ Golang.") substitution.") (license license:expat))) +(define-public go-github-com-adrg-strutil + (package + (name "go-github-com-adrg-strutil") + (version "0.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adrg/strutil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xkjzjllv8b2m3lgn66cb09b0f5xqy2bk8ny3lkn4z0ywlchawj9")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/adrg/strutil")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/adrg/strutil") + (synopsis "Golang string utility functions") + (description + "Package strutil provides string metrics for calculating string +similarity as well as other string utility functions.") + (license license:expat))) + +(define-public go-github-com-adrg-xdg + (package + (name "go-github-com-adrg-xdg") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adrg/xdg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xbkb8wmr6phj2ppr75akc58jdzrv20gc3mkxa1mmb968isy8s6c")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/adrg/xdg" + #:phases + #~(modify-phases %standard-phases + ;; Tests need HOME to be set: could not create any of the following + ;; paths: /homeless-shelter/.local/data, + ;; /homeless-shelter/.local/data, /usr/share + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://github.com/adrg/xdg") + (synopsis "XDG specification implementation for Golang") + (description + "Package xdg provides an implementation of the @acronym{XDG, X Desktop +Group} Base Directory Specification. The specification defines a set of +standard paths for storing application files including data and configuration +files. For portability and flexibility reasons, applications should use the +XDG defined locations instead of hardcoding paths. The package also includes +the locations of well known user directories.") + (license license:expat))) + (define-public go-github-com-alecthomas-chroma (package (name "go-github-com-alecthomas-chroma") @@ -324,7 +473,7 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (package (inherit go-github-com-alecthomas-chroma) (name "go-github-com-alecthomas-chroma-v2") - (version "2.12.0") + (version "2.14.0") (source (origin (method git-fetch) @@ -333,16 +482,60 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j9zz77ppi4r4ncnanzj84h7bsg0qdqrhgd5kkjiv09afm31jx83")))) + (base32 "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) (arguments - (list #:go go-1.19 - #:import-path "github.com/alecthomas/chroma/v2")) + (list + #:go go-1.19 + #:import-path "github.com/alecthomas/chroma/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-testdata-and-cmd-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file-recursively + (list "lexers/testdata/python2/test_complex_file1.actual" + ;; Executible is packed as separate package. + "cmd"))))) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-dlclark-regexp2)) (native-inputs (list go-github-com-alecthomas-assert-v2 go-github-com-alecthomas-repr)))) +(define-public go-github-com-alecthomas-colour + (package + (name "go-github-com-alecthomas-colour") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/colour") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10zbm12j40ppia4b5ql2blmsps5jhh5d7ffphxx843qk7wlbqnjb")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/alecthomas/colour")) + (native-inputs + (list go-github-com-mattn-go-isatty)) + (home-page "https://github.com/alecthomas/colour/") + (synopsis "Colour terminal text for Go") + (description + "Package colour provides Quake-style colour formatting for Unix +terminals. The package level functions can be used to write to stdout (or +strings or other files). If stdout is not a terminal, colour formatting will +be stripped.") + (license license:expat))) + (define-public go-github-com-alecthomas-kingpin (package (name "go-github-com-alecthomas-kingpin") @@ -394,6 +587,37 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (native-inputs (list go-github-com-stretchr-testify)))) +(define-public go-github-com-alecthomas-kong + (package + (name "go-github-com-alecthomas-kong") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/kong") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a9arf30h84ll8k612jh50c3vjmvdfj6i7dbvfnw3dalm6dn2aan")))) + (build-system go-build-system) + (arguments + (list + ;; One test failed when set to go-1.18 o lower, see + ;; <https://github.com/alecthomas/kong/issues/437> + #:go go-1.19 + #:import-path "github.com/alecthomas/kong")) + (native-inputs + (list go-github-com-alecthomas-assert-v2)) + (propagated-inputs + (list go-github-com-alecthomas-repr)) + (home-page "https://github.com/alecthomas/kong") + (synopsis "Command-line parser for Golang") + (description + "Package kong aims to support arbitrarily complex command-line structures +with as little developer effort as possible.") + (license license:expat))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") @@ -422,6 +646,33 @@ structs. The approach is similar to how other marshallers work in Golang, \"unmarshalling\" an instance of a grammar into a struct.") (license license:expat))) +(define-public go-github-com-alecthomas-repr + (package + (name "go-github-com-alecthomas-repr") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/repr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ikvl78dighkn87bxk6gki4wcz9f138n7kbqkagj5vbdb690yjkl")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.18 + #:import-path "github.com/alecthomas/repr")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/alecthomas/repr/") + (synopsis "Represent Go values in an almost direct form") + (description + "This package attempts to represent Go values in a form that can be used +almost directly in Go source code.") + (license license:expat))) + (define-public go-github-com-alecthomas-template ;; No release, see <https://github.com/alecthomas/template/issues/7>. (let ((commit "a0175ee3bccc567396460bf5acd36800cb10c49c") @@ -1091,6 +1342,49 @@ metrics to Graphite.") structs in the Go programming language.") (license license:expat))) +(define-public go-github-com-d5-tengo-v2 + (package + (name "go-github-com-d5-tengo-v2") + (version "2.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/d5/tengo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12h7fg2hj9s64hzsv5mz0pl9q1hf1lw3b5k9fr40nfqlq1bw84da")))) + (build-system go-build-system) + (outputs '("out" "doc")) + (arguments + (list + #:import-path "github.com/d5/tengo/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let* ((data (string-append #$output:doc "/share")) + (doc (string-append data "/doc/" #$name "-" #$version))) + (copy-recursively "docs/" doc)))))))) + (home-page "https://github.com/d5/tengo") + (synopsis "Script language for Go") + (description + "Tengo is a small, dynamic, fast, secure script language for Go. +Features: +@itemize +@item simple and highly readable syntax +@item dynamic typing with type coercion +@item higher-order functions and closures +@item immutable values +@item securely embeddable and extensible +@item compiler/runtime written in native Go (no external deps or cgo) +@item executable as a standalone language/REPL +@item use cases: rules engine, state machine, data pipeline, transpiler +@end itemize") + (license license:expat))) + (define-public go-github-com-danwakefield-fnmatch (let ((commit "cbb64ac3d964b81592e64f957ad53df015803288") (revision "0")) @@ -1290,6 +1584,46 @@ help message which may simplify crating CLI applications, it's Golang implementation of http://docopt.org/.") (license license:expat)))) +(define-public go-github-com-dsnet-golib + (package + (name "go-github-com-dsnet-golib") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dsnet/golib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1f314wzr16w6ix3bs7ginjkizgyl3b1r3j2gvvqzr8dv53r4s5cq")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/dsnet/golib")) + (home-page "https://github.com/dsnet/golib") + (synopsis "Collection of helper libraries for Golang") + (description + "@code{golib} is a collection of unrelated libraries. +This package provides a following list of Golang models: +@table @code +@item bufpipe +Implements a buffered pipe. +@item cron +Parses and runs cron schedules. +@item hashmerge +Merges hash checksums. +@item jsoncs +Implements JSON Canonicalization Scheme (JCS) as specified in RFC 8785. +@item jsonfmt +Implements a JSON formatter. +@item memfile +Implements an in-memory emulation of @code{os.File}. +@item unitconv +Implements string conversion functionality for unit prefixes. +@end table") + (license license:bsd-3))) + (define-public go-github-com-dustin-gojson (package (name "go-github-com-dustin-gojson") @@ -1351,6 +1685,128 @@ scanner API made public.") for @code{Set}, @code{Get}, @code{Delete} and @code{Len}.") (license license:expat))) +(define-public go-github-com-errata-ai-ini + (package + (name "go-github-com-errata-ai-ini") + (version "1.63.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/errata-ai/ini") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zs9dwxh8mzxm1zfck4ghs7hma1lz5ajh98kmyh888rn3npvrnm5")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/errata-ai/ini")) + (home-page "https://github.com/errata-ai/ini") + (synopsis "INI file read and write functionality in Golang") + (description + "This Package provides a functionality of INI file read and write, +implementing features: +@itemize +@item load from multiple data sources(file, @code{[]byte}, @code{io.Reader} +and @code{io.ReadCloser}) with overwrites +@item read with recursion values +@item read with parent-child sections +@item read with auto-increment key names +@item read with multiple-line values +@item read with tons of helper methods +@item read and convert values to Go types +@item read and WRITE comments of sections and keys +@item manipulate sections, keys and comments with ease +@item keep sections and keys in order as you parse and save +@end itemize") + (license license:asl2.0))) + +(define-public go-github-com-errata-ai-regexp2 + (package + (inherit go-github-com-dlclark-regexp2) + (name "go-github-com-errata-ai-regexp2") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/errata-ai/regexp2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p28af5c7dn4knnksl9dxjb44cicsmadzb8kwzyyf20kr7hrq53q")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/errata-ai/regexp2")) + (home-page "https://github.com/errata-ai/regexp2") + (description + (string-append (package-description go-github-com-dlclark-regexp2) + " This package is a fork of dlclark/regexp2 providing a +more similar API to regexp.")))) + +(define-public go-github-com-expr-lang-expr + (package + (name "go-github-com-expr-lang-expr") + (version "1.16.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/expr-lang/expr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08p7gcxm7psgn1rzhhy2s2va59ssy77x8wd706gdp2pif7wln883")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/expr-lang/expr")) + (home-page "https://expr-lang.org/") + (synopsis "Expression language and expression evaluation for Go") + (description + "The package @strong{Expr} provides a Go-centric expression language +designed to deliver dynamic configurations with unparalleled accuracy, safety, +and speed.") + (license license:expat))) + +(define-public go-github-com-facebookgo-atomicfile + (package + (name "go-github-com-facebookgo-atomicfile") + (version "0.0.0-20151019160806-2de1f203e7d5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebookarchive/atomicfile") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vsx6r6y601jxvjqc8msbpr5v1037dfxxdd8h1q3s8wm6xhvj2v6")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/facebookgo/atomicfile")) + (home-page "https://github.com/facebookgo/atomicfile") + (synopsis "Atomically written/replaced file") + (description + "Package atomicfile provides the ability to write a file with an eventual +rename on Close (using @code{os.Rename}). This allows for a file to always be +in a consistent state and never represent an in-progress write.") + ;; patents + ;; + ;; Additional Grant of Patent Rights Version 2 + ;; <...> + ;; Facebook, Inc. ("Facebook") hereby grants to each recipient of the + ;; Software ("you") a perpetual, worldwide, royalty-free, non-exclusive, + ;; irrevocable (subject to the termination provision below) license under + ;; any Necessary Claims, to make, have made, use, sell, offer to sell, + ;; import, and otherwise transfer the Software. + ;; <...> + (license license:bsd-3))) + (define-public go-github-com-facette-natsort (package (name "go-github-com-facette-natsort") @@ -1597,6 +2053,118 @@ the library more lightweight.") "This package provides a Go implementation of globs.") (license license:expat))) +(define-public go-github-com-goccy-go-yaml + (package + (name "go-github-com-goccy-go-yaml") + (version "1.11.3") + (home-page "https://github.com/goccy/go-yaml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.18 + #:import-path "github.com/goccy/go-yaml" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-benchmarks + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/benchmarks")))) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (native-inputs + (list go-github-com-go-playground-validator-v10 + go-github-com-google-go-cmp-cmp)) + (propagated-inputs + (list go-github-com-fatih-color + go-golang-org-x-xerrors)) + (synopsis "YAML support for the Go language") + (description + "This package provides features beyond the +@uref{https://github.com/go-yaml/yaml, defacto YAML library} including: + +@itemize +@item Pretty format for error notifications +@item Support Scanner or Lexer or Parser as public API +@item Support Anchor and Alias to Marshaler +@item Allow referencing elements declared in another file via anchors +@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath) +@end itemize") + (license license:expat))) + +(define-public go-github-com-gookit-color + (package + (name "go-github-com-gookit-color") + (version "1.5.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gookit/color") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "012naz084chvdqzrrzv9pklqfh259hi2jcp2f3n39fppvjwmzgkf")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/gookit/color" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + ;; Error: Received unexpected + ;; error: open README.md: permission denied. + ;; Reported upstream, see + ;; <https://github.com/gookit/color/pull/91>. + (substitute* "utils_test.go" + (("os.O_WRONLY") "os.O_RDONLY")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-xo-terminfo + go-golang-org-x-sys)) + (home-page "https://github.com/gookit/color") + (synopsis "Terminal color rendering library") + (description + "This package provides a command-line color library with 16/256/True +color support, universal API methods and Windows support. + +Features: +@itemize +@item supports rich color output: 16-color (4-bit), 256-color (8-bit), true +color (24-bit, RGB) +@item support converts HEX HSL value to RGB color +@item generic API methods: @code{Print}, @code{Printf}, @code{Println}, +@code{Sprint}, @code{Sprintf} +@item supports HTML tag-style color rendering, such as @code{<green>message</> +<fg=red;bg=blue>text</>} +@item basic colors: @code{Bold}, @code{Black}, @code{White}, @code{Gray}, +@code{Red}, @code{Green}, @code{Yellow}, @code{Blue}, @code{Magenta}, +@code{Cyan} +@item additional styles: @code{Info}, @code{Note}, @code{Light}, @code{Error}, +@code{Danger}, @code{Notice}, @code{Success}, @code{Comment}, @code{Primary}, +@code{Warning}, @code{Question}, @code{Secondary} +@item support by set @code{NO_COLOR} for disable color or use +@code{FORCE_COLOR} for force open color render +@item support RGB, 256, 16 color conversion +@end itemize") + (license license:expat))) + (define-public go-github-com-hashicorp-errwrap (package (name "go-github-com-hashicorp-errwrap") @@ -1998,6 +2566,56 @@ more like a Context-WaitGroup hybrid. @code{goprocess} is about being able to s and stop units of work, which may receive @code{Close} signals from many clients.") (license license:expat))) +(define-public go-github-com-jdkato-twine + (package + (name "go-github-com-jdkato-twine") + (version "0.10.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jdkato/twine") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hbpxcrcsbi975lklrhzyzk0fzn79pxicvfyf2sckmd2n6jb4ayy")))) + (build-system go-build-system) + (arguments + (list + ;; FIXME: Adjust tests sute or check with upstram: + ;; === Failed + ;; === FAIL: nlp/segment TestGoldenRules (0.00s) + ;; segment_test.go:143: 25. Double quotations inside sentence + ;; segment_test.go:144: Actual: [She turned to him, "This is great." she said.] + ;; segment_test.go:145: Actual: 2, Expected: 1 + ;; segment_test.go:146: === + #:tests? #f + #:go go-1.21 + #:import-path "github.com/jdkato/twine" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-module-import-path + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\.go$") + (("gopkg.in/neurosnap/sentences.v1") + "github.com/neurosnap/sentences"))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "build" "-v" "-x" "-ldflags=-s -w" "-trimpath" "./..."))))))) + (native-inputs + (list gotestsum)) + (propagated-inputs + (list go-github-com-montanaflynn-stats + go-github-com-neurosnap-sentences + go-github-com-errata-ai-regexp2)) + (home-page "https://github.com/jdkato/twine") + (synopsis "NLP-related string utilities") + (description + "NLP-related string utility functions for Golang.") + (license license:expat))) + (define-public go-github-com-jinzhu-copier (package (name "go-github-com-jinzhu-copier") @@ -2447,7 +3065,7 @@ semantic versions. Specifically it provides the ability to: (define-public go-github-com-masterminds-sprig-v3 (package (name "go-github-com-masterminds-sprig-v3") - (version "3.1.0") + (version "3.2.3") (source (origin (method git-fetch) @@ -2456,7 +3074,7 @@ semantic versions. Specifically it provides the ability to: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wwi8n2adjc5jlga25lqq0hrz4jcgd5vpll68y2dfji034caaq18")))) + (base32 "1gkwalx8j8h1jdhk6dz8bq8zp7vivxvcivr83dcq0h6nrn4xjqnl")))) (build-system go-build-system) (arguments (list @@ -2479,6 +3097,7 @@ semantic versions. Specifically it provides the ability to: go-github-com-masterminds-semver-v3 go-github-com-mitchellh-copystructure go-github-com-mitchellh-reflectwalk + go-github-com-shopspring-decimal go-github-com-spf13-cast go-golang-org-x-crypto)) (home-page "https://github.com/Masterminds/sprig/") @@ -3202,6 +3821,31 @@ posts the metrics to the Prometheus client registry and just updates the registry.") (license license:asl2.0))) +(define-public go-github-com-neurosnap-sentences + (package + (name "go-github-com-neurosnap-sentences") + (version "1.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neurosnap/sentences") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qkq635x54mqzydxmifh2l0kicacgqcbkw4vli1cnwwcs0x902f2")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/neurosnap/sentences")) + (home-page "https://github.com/neurosnap/sentences") + (synopsis "Multilingual command line sentence tokenizer in Golang") + (description + "This package provides functionality of converting a blob of text into a +list of sentences.") + (license license:expat))) + (define-public go-github-com-nsqio-go-diskqueue (package (name "go-github-com-nsqio-go-diskqueue") @@ -3327,6 +3971,44 @@ comparison library, to Go. Both a library and a command-line tool are included in this package.") (license license:expat))) +(define-public go-github-com-otiai10-copy + (package + (name "go-github-com-otiai10-copy") + (version "1.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/otiai10/copy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fv4cwk4k5fsd3hq5akqxrd5qxj9qm6a2wlp6s1knblhzkm1jxzb")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/otiai10/copy" + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'make-test-directory-writable + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each make-file-writable (find-files "./test"))))) + (add-after 'check 'remove-test-data + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "./test"))))))) + (native-inputs + (list go-github-com-otiai10-mint)) + (propagated-inputs + (list go-golang-org-x-sync go-golang-org-x-sys)) + (home-page "https://github.com/otiai10/copy") + (synopsis "Go copy directory recursively") + (description + "This package implments recursive copy functinoality for directory.") + (license license:expat))) + (define-public go-github-com-pbnjay-memory (let ((commit "7b4eea64cf580186c0eceb10dc94ba3a098af46c") (revision "2")) @@ -3458,6 +4140,44 @@ Pion}.") (home-page "https://github.com/prometheus/client_model") (license license:asl2.0))) +(define-public go-github-com-pterm-pterm + (package + (name "go-github-com-pterm-pterm") + (version "0.12.79") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pterm/pterm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xvc4ywc2998r8vsi3zpp49z04kc79q60bsvxv88cjvamxfjxrvk")))) + (build-system go-build-system) + (arguments + (list + ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza + ;; -> go-github-com-pterm-pterm + #:tests? #f + #:go go-1.21 + #:import-path "github.com/pterm/pterm")) + (propagated-inputs + (list go-atomicgo-dev-cursor + go-atomicgo-dev-keyboard + go-atomicgo-dev-schedule + go-github-com-gookit-color + go-github-com-lithammer-fuzzysearch + go-github-com-mattn-go-runewidth + go-golang-org-x-term + go-golang-org-x-text)) + (home-page "https://github.com/pterm/pterm") + (synopsis "Configurable consol outputs in Golang") + (description + "Package pterm is a modern go module to beautify console output. It can be used +without configuration, but if desired, everything can be customized down to the +smallest detail.") + (license license:expat))) + (define-public go-github-com-rcrowley-go-metrics (let ((commit "cac0b30c2563378d434b5af411844adff8e32960") (revision "2")) @@ -3488,6 +4208,33 @@ Metrics library.") (home-page "https://github.com/rcrowley/go-metrics") (license license:bsd-2)))) +(define-public go-github-com-remeh-sizedwaitgroup + (package + (name "go-github-com-remeh-sizedwaitgroup") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/remeh/sizedwaitgroup") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xwdzby27xzcghsqhli3il165iz3vkx3g4abgvkl99wysyhcvn0a")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/remeh/sizedwaitgroup")) + (home-page "https://github.com/remeh/sizedwaitgroup") + (synopsis "Goroutines limit amount implementation of standard @code{sync.WaitGroup}") + (description + "This package implements a feature of limiting the maximum number of +concurrently started routines which has the same role and API as +@code{sync.WaitGroup}. It could for example be used to start multiples +routines querying a database but without sending too much queries in order to +not overload the given database.") + (license license:expat))) + (define-public go-github-com-schollz-progressbar-v3 (package (name "go-github-com-schollz-progressbar-v3") @@ -3702,7 +4449,7 @@ Use waterutil with it to work with TUN/TAP packets/frames.") #:go go-1.21 #:import-path "github.com/Songmu/gitconfig")) (propagated-inputs - (list go-github-com-goccy-yaml)) + (list go-github-com-goccy-go-yaml)) (home-page "https://github.com/songmu/gitconfig") (synopsis "Go library to get configuration values from gitconfig") (description @@ -3758,9 +4505,9 @@ well as a program to generate applications and command files.") (home-page "https://github.com/stathat/go") (license license:expat)))) -(define-public go-github-com-syndtr-goleveldb-leveldb +(define-public go-github-com-syndtr-goleveldb (package - (name "go-github-com-syndtr-goleveldb-leveldb") + (name "go-github-com-syndtr-goleveldb") (version "1.0.0") (source (origin @@ -3775,8 +4522,16 @@ well as a program to generate applications and command files.") (arguments (list #:go go-1.21 - #:import-path "github.com/syndtr/goleveldb/leveldb" - #:unpack-path "github.com/syndtr/goleveldb")) + #:import-path "github.com/syndtr/goleveldb" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-onsi-gomega go-github-com-onsi-ginkgo @@ -4091,6 +4846,57 @@ encoded values to create the picture in a code with no inherent errors.") weighted moving averages}.") (license license:expat))) +(define-public go-github-com-whyrusleeping-base32 + (package + (name "go-github-com-whyrusleeping-base32") + (version "0.0.0-20170828182744-c30ac30633cc") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/base32") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "060jj8j9rnm3m47vv7jfz9ddybch3ryvn1p9vhc63bqn73knalhf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/base32")) + (home-page "https://github.com/whyrusleeping/base32") + (synopsis "BASE32 encoding package from go with NoPadding option") + (description + "This package provides a base32 encoding package from go with NoPadding +option.") + ;; No license provided, see + ;; <https://github.com/whyrusleeping/base32/issues/5> + (license license:public-domain))) + +(define-public go-github-com-whyrusleeping-go-keyspace + (package + (name "go-github-com-whyrusleeping-go-keyspace") + (version "0.0.0-20160322163242-5b898ac5add1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/go-keyspace") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fkk7i7qxwbz1g621mm6a6inb69lr57cyc9ayyfiwhnjwfz78rbb")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/go-keyspace")) + (home-page "https://github.com/whyrusleeping/go-keyspace") + (synopsis "Comparing key metrics within a given keyspace") + (description + "This is a package extracted from @code{go-ipfs}. Its purpose to be used +to compare a set of keys based on a given metric. The primary metric used is +XOR, as in kademlia.") + (license license:expat))) + (define-public go-github-com-whyrusleeping-go-sysinfo (package (name "go-github-com-whyrusleeping-go-sysinfo") @@ -4440,6 +5246,40 @@ values.") ;;; Executables: ;;; +(define-public go-chroma + (package + (name "go-chroma") + (version "2.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/chroma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.19 + #:install-source? #f + #:import-path "github.com/alecthomas/chroma/cmd/chroma")) + (native-inputs + (list go-github-com-alecthomas-assert-v2 + go-github-com-alecthomas-chroma-v2 + go-github-com-alecthomas-kong + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty)) + (home-page "https://github.com/alecthomas/chroma") + (synopsis "General purpose syntax highlighter in pure Golang") + (description + (string-append (package-description go-github-com-alecthomas-chroma-v2) + " This package provides an command line interface (CLI) +tool.")) + (license license:asl2.0))) + (define-public go-hclogvet (package (inherit go-github-com-hashicorp-go-hclog) @@ -4484,6 +5324,34 @@ go-github-com-tklauser-numcpus source."))) "This package provides a CLI build from the go-github-com-orisano-pixelmatch source."))) +(define-public go-sentences + (package + (inherit go-github-com-neurosnap-sentences) + (name "go-sentences") + (arguments + (list + #:import-path "github.com/neurosnap/sentences/cmd/sentences" + #:unpack-path "github.com/neurosnap/sentences" + #:install-source? #f)) + (description + (string-append (package-description go-github-com-neurosnap-sentences) + " This package provides an command line interface (CLI) +tool.")))) + +(define-public go-tengo + (package + (inherit go-github-com-d5-tengo-v2) + (name "tengo") + (arguments + (list + #:import-path "github.com/d5/tengo/cmd/tengo" + #:unpack-path "github.com/d5/tengo" + #:install-source? #f)) + (description + (string-append (package-description go-github-com-d5-tengo-v2) + "\nThis package provides an command line interface (CLI) +tool.")))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d9145e9ac4..eed7126873 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6706,59 +6706,6 @@ matching and globbing with support for \"doublestar\" patterns.") (list #:import-path "github.com/bmatcuk/doublestar/v4")))) -(define-public go-github-com-alecthomas-colour - (package - (name "go-github-com-alecthomas-colour") - (version "0.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/colour") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10zbm12j40ppia4b5ql2blmsps5jhh5d7ffphxx843qk7wlbqnjb")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/colour")) - (native-inputs - (list go-github-com-mattn-go-isatty)) - (home-page "https://github.com/alecthomas/colour/") - (synopsis "Colour terminal text for Go") - (description "Package colour provides Quake-style colour formatting for -Unix terminals. - -The package level functions can be used to write to stdout (or strings or -other files). If stdout is not a terminal, colour formatting will be -stripped.") - (license license:expat))) - -(define-public go-github-com-alecthomas-repr - (package - (name "go-github-com-alecthomas-repr") - (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/repr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zq30b36vvg4kzxkff64gjwvcjaw0d13dqzfjfai66hkh3ijdzwl")))) - (build-system go-build-system) - (arguments - `(#:go ,go-1.18 - #:import-path "github.com/alecthomas/repr")) - (native-inputs - (list go-github-com-stretchr-testify)) - (home-page "https://github.com/alecthomas/repr/") - (synopsis "Represent Go values in an almost direct form") - (description "This package attempts to represent Go values in a form that -can be used almost directly in Go source code.") - (license license:expat))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") @@ -7904,49 +7851,6 @@ systems can import this package to enable running programs as services without modifying them.") (license license:zlib))) -(define-public go-github-com-goccy-yaml - (package - (name "go-github-com-goccy-yaml") - (version "1.11.3") - (home-page "https://github.com/goccy/go-yaml") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf")))) - (build-system go-build-system) - (arguments - (list - #:go go-1.18 - #:import-path "github.com/goccy/go-yaml" - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-benchmarks - (lambda* (#:key import-path #:allow-other-keys) - (delete-file-recursively - (string-append "src/" import-path "/benchmarks"))))))) - (propagated-inputs - (list go-github-com-fatih-color go-golang-org-x-xerrors)) - (native-inputs - (list go-github-com-go-playground-validator-v10 - go-github-com-google-go-cmp-cmp)) - (synopsis "YAML support for the Go language") - (description - "This package provides features beyond the -@uref{https://github.com/go-yaml/yaml, defacto YAML library} including: - -@itemize -@item Pretty format for error notifications -@item Support Scanner or Lexer or Parser as public API -@item Support Anchor and Alias to Marshaler -@item Allow referencing elements declared in another file via anchors -@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath) -@end itemize") - (license license:expat))) - (define-public go-github-com-tekwizely-go-parsing (let ((commit "1548cfb17df54d365ce9febed0677c06a40a8ceb") (revision "0")) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f609118c01..d85ac8bfa6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -496,14 +496,14 @@ typically encountered in feature film production.") (define-public blender (package (name "blender") - (version "3.6.10") ;3.6.x is the current LTS version + (version "3.6.13") ;3.6.x is the current LTS version (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs")))) + "1sx2yz1y37h8g2p6k8cjf2935p3nlvn9nvjc9yfzp79bg4ypfpbz")))) (build-system cmake-build-system) (arguments (list @@ -715,7 +715,7 @@ baking tools to produce normal maps.") (define-public openshadinglanguage (package (name "openshadinglanguage") - (version "1.13.8.0") + (version "1.13.10.0") (source (origin (method git-fetch) @@ -724,7 +724,7 @@ baking tools to produce normal maps.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02")))) + (base32 "1x97w4infifw33r4ii53q3v1ia0p21lbacd7z01vsz4vq7sy0dxn")))) (build-system cmake-build-system) (arguments (list #:configure-flags @@ -1325,16 +1325,17 @@ with strong support for multi-part, multi-channel use cases.") (define-public openimageio (package (name "openimageio") - (version "2.5.10.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OpenImageIO/oiio") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06x3lqj9qjh5m0zbr5g2g9ii6jk340pgzrhr4fb353y1y2pkx5sw")))) + (version "2.5.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AcademySoftwareFoundation/OpenImageIO") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bqalfcfjjk31a7zv2hyx0jz8jpdhpsmc3sqwmfl4zf431g45hpb")))) (build-system cmake-build-system) (arguments (list #:tests? #f ; half the tests require online data or use redirection @@ -1344,14 +1345,22 @@ with strong support for multi-part, multi-channel use cases.") (list pkg-config)) (inputs (list boost + dcmtk fmt + freetype giflib imath + libglvnd libheif libjpeg-turbo libpng + libraw libtiff + libwebp + opencolorio openexr + openjpeg + ;; openvdb ; OpenVDB needs OIIO to be built with C++17 or higher pugixml pybind11 python-wrapper @@ -1363,7 +1372,7 @@ with strong support for multi-part, multi-channel use cases.") related classes, utilities, and applications. There is a particular emphasis on formats and functionality used in professional, large-scale animation and visual effects work for film.") - (home-page "https://www.openimageio.org") + (home-page "https://github.com/AcademySoftwareFoundation/OpenImageIO") (license license:bsd-3))) (define-public openscenegraph diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 56763cd835..fb10351849 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2970,7 +2970,7 @@ Unix desktop environment under X11 as well as Wayland.") (define-public webp-pixbuf-loader (package (name "webp-pixbuf-loader") - (version "0.0.4") + (version "0.2.4") (source (origin (method git-fetch) @@ -2979,7 +2979,7 @@ Unix desktop environment under X11 as well as Wayland.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1kshsz91mirjmnmv796nba1r8jg8a613anhgd38dhh2zmnladcwn")))) + (base32 "0dsdkw0i8fg3051653zmz68s068a2w23d708av64afzvav1xvhv0")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 65fe793f2d..65bf701f09 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -813,14 +813,14 @@ due to its architecture which automatically parallelises the image workflows.") (define-public gmic (package (name "gmic") - (version "3.3.5") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append "https://gmic.eu/files/source/gmic_" version ".tar.gz")) (sha256 - (base32 "06vcwn8c8zhr1j0jy79an1f6vvjh47ipm19a20g3qsnxv7h5c905")))) + (base32 "0akrrpkwkc8d7f2r3nqr36cjd926zk221yppi1bmv4yvydx0hvyz")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;there are no tests diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 5c6618c706..3541be530b 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -179,7 +179,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") (define-public feh (package (name "feh") - (version "3.10.2") + (version "3.10.3") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -187,7 +187,7 @@ YouTube videos without requiring API and opens/downloads them using mpv/ytdl.") name "-" version ".tar.bz2")) (sha256 (base32 - "0sc9dqcqz33pkc9x4m5i9lpq8avq5mhk3x0cdy3rhlsww9ysg52z")))) + "1j79850gwrjamgc22cv1hiynia4w5lc8qbhww3qpl8bhjxwy49jl")))) (build-system gnu-build-system) (arguments (list #:phases diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index d75a99c4e1..daf68903c2 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -270,6 +270,80 @@ throughout its lifetime.") "Common utilities used by @code{go-ipfs} and other related Go packages.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipld-cbor + (package + (name "go-github-com-ipfs-go-ipld-cbor") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-cbor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxk4sbf1fk9aaizzpz3h30049wqvaz0s3jnbdd5akhj7wg89h21")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/ipfs/go-ipld-cbor")) + (propagated-inputs + (list go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-ipfs-util + go-github-com-ipfs-go-ipld-format + go-github-com-multiformats-go-multihash + go-github-com-polydawn-refmt + go-github-com-whyrusleeping-cbor-gen)) + (home-page "https://github.com/ipfs/go-ipld-cbor") + (synopsis "A cbor implementation of the @code{go-ipld-format}") + (description + "An implementation of a @url{https://cbor.io/, CBOR} encoded merkledag object.") + (license license:expat))) + +(define-public go-github-com-ipfs-go-ipld-git + (package + (name "go-github-com-ipfs-go-ipld-git") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v52qzgmx7qym0qzkzkry2kfj58f9hh7c8qycg74sqbd9zb1ynjj")))) + (build-system go-build-system) + (arguments + (list + ;; XXX: It requires .git/objects, check if it's applicable to generate + ;; git repo during check phase with make-test-repo.sh. + #:tests? #f + #:import-path "github.com/ipfs/go-ipld-git" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-data-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "testdata.tar.gz" + "codecov.yml" + "make-test-repo.sh")))))))) + (propagated-inputs + (list go-github-com-multiformats-go-multihash + go-github-com-ipld-go-ipld-prime + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-block-format)) + (home-page "https://github.com/ipfs/go-ipld-git") + (synopsis "IPLD handlers for git objects") + (description + "This is an IPLD codec which handles git objects. Objects are transformed into +IPLD graph as detailed below. Objects are demonstrated here using both +@url{https://ipld.io/docs/schemas/,IPLD Schemas} and example JSON forms.") + (license license:expat))) + (define-public go-github-com-ipfs-go-ipld-format (package (name "go-github-com-ipfs-go-ipld-format") @@ -449,6 +523,34 @@ their levels to be controlled individually.") #:go go-1.21 #:import-path "github.com/ipfs/go-log")))) +(define-public go-github-com-whyrusleeping-cbor-gen + (package + (name "go-github-com-whyrusleeping-cbor-gen") + (version "v0.0.0-20230818171029-f91ae536ca25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/cbor-gen") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08by7pqh4fcwf2va01iif75yqkfssi6d48334404mmv9jmhzim60")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/cbor-gen")) + (propagated-inputs + (list go-github-com-ipfs-go-cid + go-github-com-google-go-cmp-cmp + go-golang-org-x-xerrors)) + (home-page "https://github.com/whyrusleeping/cbor-gen") + (synopsis "Codegen for CBOR codecs on the specified types") + (description + "Basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs for +types.") + (license license:expat))) + (define-public gx (package (name "gx") @@ -586,6 +688,7 @@ written in Go.") "vendor/github.com/docker" "vendor/github.com/dustin" "vendor/github.com/elgris" + "vendor/github.com/facebookgo" "vendor/github.com/felixge" "vendor/github.com/flynn" "vendor/github.com/francoispqt" @@ -609,7 +712,9 @@ written in Go.") "vendor/github.com/ipfs/go-detect-race" "vendor/github.com/ipfs/go-ipfs-delay" "vendor/github.com/ipfs/go-ipfs-util" + "vendor/github.com/ipfs/go-ipld-cbor" "vendor/github.com/ipfs/go-ipld-format" + "vendor/github.com/ipfs/go-ipld-git" "vendor/github.com/ipfs/go-log" "vendor/github.com/ipld/go-ipld-prime" "vendor/github.com/jackpal" @@ -638,7 +743,7 @@ written in Go.") "vendor/github.com/stretchr" "vendor/github.com/syndtr" "vendor/github.com/tidwall" - "vendor/github.com/whyrusleeping/go-sysinfo" + "vendor/github.com/whyrusleeping" "vendor/go.uber.org" "vendor/golang.org" "vendor/gopkg.in" @@ -679,7 +784,7 @@ written in Go.") go-github-com-coreos-go-systemd-v22 go-github-com-dustin-go-humanize go-github-com-elgris-jsondiff - ;;go-github-com-facebookgo-atomicfile + go-github-com-facebookgo-atomicfile go-github-com-fsnotify-fsnotify go-github-com-google-uuid go-github-com-hashicorp-go-multierror @@ -688,15 +793,16 @@ written in Go.") go-github-com-ipfs-go-cid go-github-com-ipfs-go-cidutil go-github-com-ipfs-go-datastore + go-github-com-ipfs-go-detect-race ;;go-github-com-ipfs-go-ds-badger ;;go-github-com-ipfs-go-ds-flatfs ;;go-github-com-ipfs-go-ds-leveldb ;;go-github-com-ipfs-go-ds-measure ;;go-github-com-ipfs-go-fs-lock ;;go-github-com-ipfs-go-ipfs-cmds - ;;go-github-com-ipfs-go-ipld-cbor + go-github-com-ipfs-go-ipld-cbor go-github-com-ipfs-go-ipld-format - ;;go-github-com-ipfs-go-ipld-git + go-github-com-ipfs-go-ipld-git ;;go-github-com-ipfs-go-ipld-legacy go-github-com-ipfs-go-log go-github-com-ipfs-go-log-v2 @@ -724,7 +830,6 @@ written in Go.") ;;go-github-com-libp2p-go-libp2p-routing-helpers ;;go-github-com-libp2p-go-libp2p-testing ;;go-github-com-libp2p-go-socket-activation - go-github-com-ipfs-go-ipfs-util go-github-com-mitchellh-go-homedir go-github-com-multiformats-go-multiaddr-0.12 go-github-com-multiformats-go-multiaddr-dns @@ -733,13 +838,13 @@ written in Go.") go-github-com-multiformats-go-multihash go-github-com-opentracing-opentracing-go go-github-com-pbnjay-memory - go-github-com-pkg-errors go-github-com-prometheus-client-golang go-github-com-stretchr-testify - go-github-com-syndtr-goleveldb-leveldb + go-github-com-syndtr-goleveldb + go-github-com-tidwall-gjson go-github-com-tidwall-sjson go-github-com-whyrusleeping-go-sysinfo - ;;go-github-com-whyrusleeping-multiaddr-filter + go-github-com-whyrusleeping-multiaddr-filter ;;go-go-opencensus-io ;;go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp ;;go-go-opentelemetry-io-contrib-propagators-autoprop @@ -756,7 +861,6 @@ written in Go.") go-golang-org-x-sync go-golang-org-x-sys go-google-golang-org-protobuf - go-gopkg-in-yaml-v3 ;; ;; A list of indirect dependencies required for the vendored @@ -781,6 +885,10 @@ written in Go.") go-github-com-multiformats-go-multiaddr-fmt ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multistream ; github.com/libp2p/go-libp2p go-github-com-quic-go-quic-go ; github.com/libp2p/go-libp2p + go-github-com-whyrusleeping-base32 ; github.com/ipfs/boxo + go-github-com-whyrusleeping-cbor ; github.com/ipld/go-car + go-github-com-whyrusleeping-chunker ; github.com/ipfs/boxo + go-github-com-whyrusleeping-go-keyspace ; github.com/libp2p/go-libp2p-kad-dht go-golang-org-x-oauth2 ; github.com/ipfs/boxo go-golang-org-x-term ; github.com/ipfs/go-ipfs-cmds go-golang-org-x-xerrors ; github.com/whyrusleeping/cbor-gen diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 7cfea42938..72e91503c1 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -366,14 +366,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.") (define-public weechat (package (name "weechat") - (version "4.3.3") + (version "4.3.4") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "1n2y20mv7nj4n71qmzvnr87qxh4zkv8acihw23d5p29kx9ndp1sm")))) + "0rvzp9sgv1hn5vx8b5ycb61ygl648srn5q3jgl5i56a65w15im6a")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index c84bcaf3ce..3e46477724 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz> ;;; Copyright © 2023 Ian Eure <ian@retrospec.tv> +;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,7 +262,10 @@ "--disable-crashreporter" "--allow-addon-sideload" "--with-unsigned-addon-scopes=app,system" - "--disable-eme" + + ;; switch only available on x86, whereas EME + ;; is not supported on other targets + ,@(if #$(target-x86?) '("--disable-eme") '()) ;; Build details "--disable-debug" diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1fde34b251..5cf0300339 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -512,7 +512,7 @@ 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.9-version "6.9.7") +(define-public linux-libre-6.9-version "6.9.8") (define-public linux-libre-6.9-gnu-revision "gnu") (define deblob-scripts-6.9 (linux-libre-deblob-scripts @@ -522,7 +522,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0b8hsr0s4f3hps27bmd5qj1yknhd73q4zplr4v3lmq7sr57mgly6"))) (define-public linux-libre-6.9-pristine-source (let ((version linux-libre-6.9-version) - (hash (base32 "1y01w26sas7pl24l09yczdr8mzzy2nadykz1wmhx9ygfj76qixg4"))) + (hash (base32 "109j8f69bsvk2a61ihs3r77jv05fm4aqvih8lyf6qcc8gdxjcj7h"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.9))) @@ -532,7 +532,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.6-version "6.6.36") +(define-public linux-libre-6.6-version "6.6.37") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts @@ -542,12 +542,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "05ypqx1sz54yhb8jyxphvg5pwgb2cnzb4zqqaiyyywpqsrnya9kq"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr"))) + (hash (base32 "051j3ydf54bb027a6f7hb2y6r8y82p1hf4wd3x5gx546f1vnx5zk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -(define-public linux-libre-6.1-version "6.1.96") +(define-public linux-libre-6.1-version "6.1.97") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -557,27 +557,27 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0nq8b6rnn031wl0qz7ahyfs3hcb0qsr7hzdmxi2g33ycsm9955lk"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry"))) + (hash (base32 "1bs1pv9h5lwjadl4wjylrl3zd125ccxqkpb2drqjh8s56rgq82w9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.161") +(define-public linux-libre-5.15-version "5.15.162") (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 "121shkzgixmywa19xx5f2yxg1primarpg4bxin3jyw0214xbfh2n"))) + (base32 "0p6spfkf3smm4wlgfmqahzcfnlzij5nkhqh297h91r3xqxis0l1y"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0k277hz6nq62v0xfc1n2hc69cyvmnxpl0qcbszinajywh23gfafn"))) + (hash (base32 "0z0s5gk8akcbpb99jp08px78fhr8r6kkb7dpl01b3rrc2pmc1gwi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.220") +(define-public linux-libre-5.10-version "5.10.221") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -587,12 +587,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw"))) + (hash (base32 "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.278") +(define-public linux-libre-5.4-version "5.4.279") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -602,12 +602,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875"))) + (hash (base32 "0pja69n66hsl1r5jbzqww1hwsmqdlxmq6qv9rqx5qnrr4rml765j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.316") +(define-public linux-libre-4.19-version "4.19.317") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -617,7 +617,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0lmyhwr4la7kvim7jqdi29scjkvqp9crpvdbhpb4j8d7mj5kgzz4"))) + (hash (base32 "109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 841418d6bf..d85f83fbea 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2977,8 +2977,8 @@ definition objects.") (sbcl-package->ecl-package sbcl-cesdi)) (define-public sbcl-cf - (let ((commit "dc5d98ffacafd4ff40c3df27488754585c585c94") - (revision "5")) + (let ((commit "2bf64feadf63569149b7ee6e9dc25572704d8939") + (revision "6")) (package (name "sbcl-cf") (version (git-version "1.0" revision commit)) @@ -2990,7 +2990,7 @@ definition objects.") (commit commit))) (file-name (git-file-name "cl-cf" version)) (sha256 - (base32 "00hqbxrxpymrxpk3yi1igkbd9wryd8fz7wdvkjblq3ivx01fbwa1")))) + (base32 "0zp9699wvf2ylk6s5j9k9mcds1g1yxb2wnlm27rvnb5m6nfrxbzv")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiveam)) (synopsis "Continued fractions library") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1b985362b1..943fa6e5db 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -628,7 +628,7 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") (define-public eisl (package (name "eisl") - (version "3.90") + (version "4.00") (source (origin (method git-fetch) @@ -637,7 +637,7 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1c4gy7ys6kk6hw4px8rdrw3nj81jm6cvhx0nnzi7jbbzhbapm3n1")))) + (base32 "0bksy893hvhxn308h3vfj4k0pb7ryizn74lmcswxdk7jmyfccdx1")))) (build-system gnu-build-system) (inputs (list bash-minimal freeglut gdbm libiconv ncurses tcl tk)) @@ -1569,7 +1569,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "294") + (version "295") (source (origin (method git-fetch) @@ -1578,7 +1578,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cd0ah6lzwszn4jjxrbwknhscdm6rgsprpiybzlikcckgcylpkdn")))) + (base32 "0fpvsz31ark1gyhzyg2x85fxfssfjfc6k0v9hvqdp0y1q5bf66az")))) (build-system gnu-build-system) (arguments (list #:configure-flags diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6eaf74e087..8ca9a6376e 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2169,13 +2169,13 @@ data by providing clean labels during training.") (define-public python-cma (package (name "python-cma") - (version "3.3.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (pypi-uri "cma" version)) (sha256 (base32 - "1v31b2vnnr4v6ack7zfmw7zb47vbzjr9nyvx2lbfhyjf7zhbhj5p")))) + "0v0gs46n4ividm9viml09sllxw2cymxlp8nm2lvvwwcqp5lxksx1")))) (build-system python-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -2388,13 +2388,13 @@ discrete, and conditional dimensions.") (define-public python-deepxde (package (name "python-deepxde") - (version "1.11.0") + (version "1.11.1") (source (origin (method url-fetch) - (uri (pypi-uri "DeepXDE" version)) + (uri (pypi-uri "deepxde" version)) (sha256 (base32 - "0qx6iq8n2j8ab80bs2n85v8g6xi2bnq83vfiaj7a4nsmf62rhkzg")))) + "1dkhgka0ris2fkqkm3riwsqrq2q9rk7lk36gaf4av1mhz6c0sa64")))) (build-system pyproject-build-system) (arguments (list #:tests? #f ; there are no tests @@ -5579,22 +5579,22 @@ linear algebra routines needed for structured matrices (or operators).") (define-public python-gpytorch (package (name "python-gpytorch") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (pypi-uri "gpytorch" version)) (sha256 (base32 - "0q17bml53vixk3cwj3p893809927hz81fprwsmxpxqv5i4mvgyvj")))) + "1pwsccll1hrgkifdmlxzcn6cvnwvyq2cimqzbfgihr13yw51cb6w")))) (build-system pyproject-build-system) (arguments (list #:test-flags - ;; The error message in test_t_matmul_matrix suggests the error may - ;; be due to a bug in gpytorch. test_deprecated_methods fails with - ;; an AssertionError. - #~(list "-k" (string-append "not test_deprecated_methods" - " and not test_t_matmul_matrix")))) - (propagated-inputs (list python-linear-operator python-scikit-learn)) + ;; test_deprecated_methods fails with an AssertionError. + #~(list "-k" (string-append "not test_deprecated_methods")))) + (propagated-inputs (list python-linear-operator + python-mpmath + python-scikit-learn + python-scipy)) (native-inputs (list python-coverage python-flake8 python-flake8-print diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6aacdcb73c..b7b06c1d99 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3316,6 +3316,10 @@ from the Cyrus IMAP project.") ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names (lambda _ + ;; avoids warning smtpd: couldn't enqueue offline message + ;; smtpctl exited abnormally + (substitute* "usr.sbin/smtpd/smtpd.h" + (("/usr/bin/smtpctl") "/run/setuid-programs/smtpctl")) (substitute* "usr.sbin/smtpd/smtpctl.c" ;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't. (("/bin/cat") (which "cat"))) @@ -5097,7 +5101,7 @@ remote SMTP server.") go-github-com-creack-pty go-github-com-arran4-golang-ical go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb-leveldb + go-github-com-syndtr-goleveldb go-git-sr-ht-sircmpwn-getopt go-git-sr-ht-rockorager-tcell-term python diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d39292e825..983266b5dd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1459,7 +1459,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (define-public primesieve (package (name "primesieve") - (version "11.1") + (version "12.3") (source (origin (method git-fetch) (uri (git-reference @@ -1468,7 +1468,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (file-name (git-file-name name version)) (sha256 (base32 - "0ja3kxvpya7bwrib40hnyahsiiiavf65ppk7i7afvc093b7gg9bg")))) + "1lxvs1jgch0zgpa5axx6zlvgab4rmm3lqpbah75072xpj8ndhhld")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_STATIC_LIBS=off" @@ -1486,7 +1486,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (define-public cminpack (package (name "cminpack") - (version "1.3.8") + (version "1.3.9") (source (origin (method git-fetch) (uri (git-reference @@ -1495,7 +1495,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (file-name (git-file-name name version)) (sha256 (base32 - "1bg0954mwry22izsvikpai16pkfp8srz4z34n267bhkmrvvb0zgy")))) + "05cjb54in7kks70rrnmvczwkg4nsxhwyf23abxqdj143zwbz4yyr")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"))) @@ -3529,7 +3529,8 @@ September 2004}") "--with-openblas=1" (string-append "--with-openblas-dir=" #$(this-package-input "openblas")) - "--with-superlu=1") + "--with-superlu=1" + "--with-debugging=0") #:make-flags ;; Honor (parallel-job-count) for build. Do not use --with-make-np, ;; whose value is dumped to $out/lib/petsc/conf/petscvariables. diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index efe0b2a784..54845d11da 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -154,14 +154,14 @@ parsers to allow execution with Guile as extension languages."))) (define-public mes (package (name "mes") - (version "0.26.2") + (version "0.27") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "120a7ljnyi9127inaarlqv6cl98cmk72s3gmyad7cjrwy6cvzf1g")))) + "1a5ag8i303yhf76sg05rpcans9vadvnpxcpa4sl09z4cv5bfcgh3")))) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux" "riscv64-linux")) (propagated-inputs (list mescc-tools nyacc-1.00.2)) diff --git a/gnu/packages/patches/capstone-fix-python-constants.patch b/gnu/packages/patches/capstone-fix-python-constants.patch new file mode 100644 index 0000000000..75100c6652 --- /dev/null +++ b/gnu/packages/patches/capstone-fix-python-constants.patch @@ -0,0 +1,84 @@ +Backport upstream patch fixing various constants in the Python bindings. + +Taken from: https://github.com/capstone-engine/capstone/commit/f180e176de3efb060db62820ff981d0291ea8525 + +diff --git a/bindings/python/capstone/__init__.py b/bindings/python/capstone/__init__.py +index bda2fdb6..52353c28 100755 +--- a/bindings/python/capstone/__init__.py ++++ b/bindings/python/capstone/__init__.py +@@ -113,7 +113,6 @@ __all__ = [ + 'CS_OPT_SYNTAX_NOREGNAME', + 'CS_OPT_SYNTAX_MASM', + 'CS_OPT_SYNTAX_MOTOROLA', +- 'CS_OPT_SYNTAX_CS_REG_ALIAS', + + 'CS_OPT_DETAIL', + 'CS_OPT_MODE', +@@ -152,19 +151,6 @@ __all__ = [ + 'CS_OP_REG', + 'CS_OP_IMM', + 'CS_OP_FP', +- 'CS_OP_PRED', +- 'CS_OP_RESERVED_5', +- 'CS_OP_RESERVED_6', +- 'CS_OP_RESERVED_7', +- 'CS_OP_RESERVED_8', +- 'CS_OP_RESERVED_9', +- 'CS_OP_RESERVED_10', +- 'CS_OP_RESERVED_11', +- 'CS_OP_RESERVED_12', +- 'CS_OP_RESERVED_13', +- 'CS_OP_RESERVED_14', +- 'CS_OP_RESERVED_15', +- 'CS_OP_SPECIAL', + 'CS_OP_MEM', + + 'CS_GRP_INVALID', +@@ -298,26 +284,13 @@ CS_OPT_NO_BRANCH_OFFSET = 9 # ARM, prints branch immediates without offset. + + # Capstone option value + CS_OPT_OFF = 0 # Turn OFF an option - default option of CS_OPT_DETAIL +-CS_OPT_ON = 1 << 0 # Turn ON an option (CS_OPT_DETAIL) ++CS_OPT_ON = 3 # Turn ON an option (CS_OPT_DETAIL) + + # Common instruction operand types - to be consistent across all architectures. + CS_OP_INVALID = 0 # uninitialized/invalid operand. + CS_OP_REG = 1 # Register operand. + CS_OP_IMM = 2 # Immediate operand. + CS_OP_FP = 3 # Floating-Point operand. +-CS_OP_PRED = 4 # Predicate operand. +-CS_OP_RESERVED_5 = 5 +-CS_OP_RESERVED_6 = 6 +-CS_OP_RESERVED_7 = 7 +-CS_OP_RESERVED_8 = 8 +-CS_OP_RESERVED_9 = 9 +-CS_OP_RESERVED_10 = 10 +-CS_OP_RESERVED_11 = 11 +-CS_OP_RESERVED_12 = 12 +-CS_OP_RESERVED_13 = 13 +-CS_OP_RESERVED_14 = 14 +-CS_OP_RESERVED_15 = 15 +-CS_OP_SPECIAL = 0x10 # Special operands from archs + CS_OP_MEM = 0x80 # Memory operand. Can be ORed with another operand type. + + # Common instruction groups - to be consistent across all architectures. +@@ -336,13 +309,12 @@ CS_AC_READ = (1 << 0) # Operand that is read from. + CS_AC_WRITE = (1 << 1) # Operand that is written to. + + # Capstone syntax value +-CS_OPT_SYNTAX_DEFAULT = 1 << 1 # Default assembly syntax of all platforms (CS_OPT_SYNTAX) +-CS_OPT_SYNTAX_INTEL = 1 << 2 # Intel X86 asm syntax - default syntax on X86 (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_ATT = 1 << 3 # ATT asm syntax (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_NOREGNAME = 1 << 4 # Asm syntax prints register name with only number - (CS_OPT_SYNTAX, CS_ARCH_PPC, CS_ARCH_ARM) +-CS_OPT_SYNTAX_MASM = 1 << 5 # MASM syntax (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_MOTOROLA = 1 << 6 # MOS65XX use $ as hex prefix +-CS_OPT_SYNTAX_CS_REG_ALIAS = 1 << 7 # Prints common register alias which are not defined in LLVM (ARM: r9 = sb etc.) ++CS_OPT_SYNTAX_DEFAULT = 0 # Default assembly syntax of all platforms (CS_OPT_SYNTAX) ++CS_OPT_SYNTAX_INTEL = 1 # Intel X86 asm syntax - default syntax on X86 (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_ATT = 2 # ATT asm syntax (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_NOREGNAME = 3 # Asm syntax prints register name with only number - (CS_OPT_SYNTAX, CS_ARCH_PPC, CS_ARCH_ARM) ++CS_OPT_SYNTAX_MASM = 4 # MASM syntax (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_MOTOROLA = 5 # MOS65XX use $ as hex prefix + + # Capstone error type + CS_ERR_OK = 0 # No error: everything was fine diff --git a/gnu/packages/patches/chez-scheme-backport-signal.patch b/gnu/packages/patches/chez-scheme-backport-signal.patch new file mode 100644 index 0000000000..1fee32b167 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-backport-signal.patch @@ -0,0 +1,87 @@ +From e416651d8b53fa2eca6edde764a9131d128cd166 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Sat, 2 Mar 2024 07:18:41 -0700 +Subject: [PATCH] constrain signal delivery to Scheme to the main thread (#813) + +The intent is to avoid crashes when a signal gets delimited to a +thread that might not even be a Scheme thread. Also, we don't try to +queue the event directly in the main thread's context, because then +we'd need more of a lock (while signal handling is otherwise an +implicit lock). + +(cherry picked from commit fc081fc447a786dd53286e5d7314b7217631cb68) +--- + +Notes: + This should fix intermittent test failures experienced by Guix: + see <https://github.com/cisco/ChezScheme/issues/809>. + + c/globals.h | 1 + + c/schsig.c | 10 ++++++++++ + c/thread.c | 1 + + csug/system.stex | 2 ++ + 4 files changed, 14 insertions(+) + +diff --git a/c/globals.h b/c/globals.h +index d2a08299..eb2965c5 100644 +--- a/c/globals.h ++++ b/c/globals.h +@@ -49,6 +49,7 @@ EXTERN int S_num_preserve_ownership_threads; + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + EXTERN s_thread_mutex_t S_implicit_mutex; + # endif ++EXTERN s_thread_t S_main_thread_id; + #endif + + /* segment.c */ +diff --git a/c/schsig.c b/c/schsig.c +index a89ab62a..04677730 100644 +--- a/c/schsig.c ++++ b/c/schsig.c +@@ -666,6 +666,16 @@ ptr S_dequeue_scheme_signals(ptr tc) { + static void forward_signal_to_scheme(INT sig) { + ptr tc = get_thread_context(); + ++#ifdef PTHREADS ++ /* deliver signals to the main thread, only; depending ++ on the threads that are running, `tc` might even be NULL */ ++ if (tc != TO_PTR(&S_G.thread_context)) { ++ pthread_kill(S_main_thread_id, sig); ++ RESET_SIGNAL ++ return; ++ } ++#endif ++ + if (enqueue_scheme_signal(tc, sig)) { + SIGNALINTERRUPTPENDING(tc) = Strue; + SOMETHINGPENDING(tc) = Strue; +diff --git a/c/thread.c b/c/thread.c +index 9a341b22..f130f44d 100644 +--- a/c/thread.c ++++ b/c/thread.c +@@ -40,6 +40,7 @@ void S_thread_init(void) { + s_thread_cond_init(&S_terminated_cond); + S_alloc_mutex.owner = 0; + S_alloc_mutex.count = 0; ++ S_main_thread_id = s_thread_self(); + + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + s_thread_mutex_init(&S_implicit_mutex); +diff --git a/csug/system.stex b/csug/system.stex +index d4f2bcbb..bb89f419 100644 +--- a/csug/system.stex ++++ b/csug/system.stex +@@ -547,6 +547,8 @@ After a signal handler for a given signal has been registered, receipt + of the specified signal results in a call to the handler. + The handler is passed the signal number, allowing the same handler to + be used for different signals while differentiating among them. ++In a threaded version of the system, signals are always delivered to ++the main thread. + + Signals handled in this fashion are treated like keyboard interrupts in + that the handler is not called immediately when the signal is delivered + +base-commit: 253230f7dfbb4fe777277d6bbf93f39f9567f086 +-- +2.41.0 + diff --git a/gnu/packages/patches/clasp-hide-event-ids.patch b/gnu/packages/patches/clasp-hide-event-ids.patch new file mode 100644 index 0000000000..9587f9ff3f --- /dev/null +++ b/gnu/packages/patches/clasp-hide-event-ids.patch @@ -0,0 +1,41 @@ +From a4c4e4f3c410834c3e56f644841f5bcbb084225c Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> +Date: Fri, 28 Jun 2024 11:15:16 +0200 +Subject: [PATCH] clasp: Hide Event_t<T>::id_s. + +This patch helps build clingo with non-local clasp while keeping the +event system working as intended. +--- + clasp/util/misc_types.h | 2 ++ + src/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clasp/util/misc_types.h b/clasp/util/misc_types.h +index 3677873..09c2075 100644 +--- a/clasp/util/misc_types.h ++++ b/clasp/util/misc_types.h +@@ -432,7 +432,9 @@ struct Event_t : Event { + Event_t(Subsystem sys, Verbosity verb) : Event(sys, id_s, verb) {} + static const uint32 id_s; + }; ++#if _BUILDING_CLASP_ + template <class T> const uint32 Event_t<T>::id_s = Event::nextId(); ++#endif + + template <class ToType, class EvType> const ToType* event_cast(const EvType& ev) { return ev.id == ToType::id_s ? static_cast<const ToType*>(&ev) : 0; } + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8439d12..4f55990 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -123,6 +123,7 @@ source_group("${ide_header}\\mt" FILES ${header_mt}) + endif() + + add_library(libclasp ${header} ${header_util} ${header_cli} ${header_mt} ${src}) ++target_compile_definitions(libclasp PRIVATE _BUILDING_CLASP_) + if (CLASP_BUILD_WITH_THREADS) + target_link_libraries(libclasp PUBLIC Threads::Threads) + target_compile_options(libclasp PRIVATE +-- +2.45.1 + diff --git a/gnu/packages/patches/python-scikit-optimize-1148.patch b/gnu/packages/patches/python-scikit-optimize-1148.patch deleted file mode 100644 index 6ad854ab1e..0000000000 --- a/gnu/packages/patches/python-scikit-optimize-1148.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3a5d5eb90ec9d8d4905c05387748486157cadbbb Mon Sep 17 00:00:00 2001 -From: valtron <valtron2000@gmail.com> -Date: Tue, 14 Feb 2023 09:56:10 -0700 -Subject: [PATCH] `np.int` -> `int` - -`np.int is int` and it was deprecated in numpy 1.20: https://numpy.org/doc/1.20/release/1.20.0-notes.html#deprecations ---- - skopt/space/transformers.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/space/transformers.py b/skopt/space/transformers.py -index 68892952..f2dfb164 100644 ---- a/skopt/space/transformers.py -+++ b/skopt/space/transformers.py -@@ -259,7 +259,7 @@ def transform(self, X): - if (self.high - self.low) == 0.: - return X * 0. - if self.is_int: -- return (np.round(X).astype(np.int) - self.low) /\ -+ return (np.round(X).astype(int) - self.low) /\ - (self.high - self.low) - else: - return (X - self.low) / (self.high - self.low) -@@ -272,7 +272,7 @@ def inverse_transform(self, X): - raise ValueError("All values should be greater than 0.0") - X_orig = X * (self.high - self.low) + self.low - if self.is_int: -- return np.round(X_orig).astype(np.int) -+ return np.round(X_orig).astype(int) - return X_orig - - diff --git a/gnu/packages/patches/python-scikit-optimize-1150.patch b/gnu/packages/patches/python-scikit-optimize-1150.patch deleted file mode 100644 index 0cdf361a80..0000000000 --- a/gnu/packages/patches/python-scikit-optimize-1150.patch +++ /dev/null @@ -1,275 +0,0 @@ -From cd74e00d0e4f435d548444e1a5edc20155e371d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 15 Feb 2023 18:47:52 +0100 -Subject: [PATCH 1/5] Update RandomForesetRegressor criterion to be inline with - scikit-learn change from mse to squared error this has the same funcitonality - ---- - requirements.txt | 6 +++--- - setup.py | 6 +++--- - skopt/learning/forest.py | 30 +++++++++++++++--------------- - 3 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 1eaa3083a..23ab3d856 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,6 @@ --numpy>=1.13.3 --scipy>=0.19.1 --scikit-learn>=0.20 -+numpy>=1.23.2 -+scipy>=1.10.0 -+scikit-learn>=1.2.1 - matplotlib>=2.0.0 - pytest - pyaml>=16.9 -diff --git a/setup.py b/setup.py -index 8879da880..e7f921765 100644 ---- a/setup.py -+++ b/setup.py -@@ -42,9 +42,9 @@ - classifiers=CLASSIFIERS, - packages=['skopt', 'skopt.learning', 'skopt.optimizer', 'skopt.space', - 'skopt.learning.gaussian_process', 'skopt.sampler'], -- install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.13.3', -- 'scipy>=0.19.1', -- 'scikit-learn>=0.20.0'], -+ install_requires=['joblib>=0.11', 'pyaml>=16.9', 'numpy>=1.23.2', -+ 'scipy>=1.10.0', -+ 'scikit-learn>=1.2.1'], - extras_require={ - 'plots': ["matplotlib>=2.0.0"] - } -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index 096770c1d..ebde568f5 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -27,7 +27,7 @@ def _return_std(X, trees, predictions, min_variance): - ------- - std : array-like, shape=(n_samples,) - Standard deviation of `y` at `X`. If criterion -- is set to "mse", then `std[i] ~= std(y | X[i])`. -+ is set to "squared_error", then `std[i] ~= std(y | X[i])`. - - """ - # This derives std(y | x) as described in 4.3.2 of arXiv:1211.0906 -@@ -61,9 +61,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - n_estimators : integer, optional (default=10) - The number of trees in the forest. - -- criterion : string, optional (default="mse") -+ criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "mse" for the mean squared error, which is equal to variance -+ are "squared_error" for the mean squared error, which is equal to variance - reduction as feature selection criterion, and "mae" for the mean - absolute error. - -@@ -194,7 +194,7 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='mse', max_depth=None, -+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, - min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., -@@ -228,20 +228,20 @@ def predict(self, X, return_std=False): - Returns - ------- - predictions : array-like of shape = (n_samples,) -- Predicted values for X. If criterion is set to "mse", -+ Predicted values for X. If criterion is set to "squared_error", - then `predictions[i] ~= mean(y | X[i])`. - - std : array-like of shape=(n_samples,) - Standard deviation of `y` at `X`. If criterion -- is set to "mse", then `std[i] ~= std(y | X[i])`. -+ is set to "squared_error", then `std[i] ~= std(y | X[i])`. - - """ - mean = super(RandomForestRegressor, self).predict(X) - - if return_std: -- if self.criterion != "mse": -+ if self.criterion != "squared_error": - raise ValueError( -- "Expected impurity to be 'mse', got %s instead" -+ "Expected impurity to be 'squared_error', got %s instead" - % self.criterion) - std = _return_std(X, self.estimators_, mean, self.min_variance) - return mean, std -@@ -257,9 +257,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - n_estimators : integer, optional (default=10) - The number of trees in the forest. - -- criterion : string, optional (default="mse") -+ criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "mse" for the mean squared error, which is equal to variance -+ are "squared_error" for the mean squared error, which is equal to variance - reduction as feature selection criterion, and "mae" for the mean - absolute error. - -@@ -390,7 +390,7 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='mse', max_depth=None, -+ def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, - min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., -@@ -425,19 +425,19 @@ def predict(self, X, return_std=False): - Returns - ------- - predictions : array-like of shape=(n_samples,) -- Predicted values for X. If criterion is set to "mse", -+ Predicted values for X. If criterion is set to "squared_error", - then `predictions[i] ~= mean(y | X[i])`. - - std : array-like of shape=(n_samples,) - Standard deviation of `y` at `X`. If criterion -- is set to "mse", then `std[i] ~= std(y | X[i])`. -+ is set to "squared_error", then `std[i] ~= std(y | X[i])`. - """ - mean = super(ExtraTreesRegressor, self).predict(X) - - if return_std: -- if self.criterion != "mse": -+ if self.criterion != "squared_error": - raise ValueError( -- "Expected impurity to be 'mse', got %s instead" -+ "Expected impurity to be 'squared_error', got %s instead" - % self.criterion) - std = _return_std(X, self.estimators_, mean, self.min_variance) - return mean, std - -From 6eb2d4ddaa299ae47d9a69ffb31ebc4ed366d1c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Thu, 16 Feb 2023 11:34:58 +0100 -Subject: [PATCH 2/5] Change test to be consistent with code changes. - ---- - skopt/learning/tests/test_forest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/learning/tests/test_forest.py b/skopt/learning/tests/test_forest.py -index 0711cde9d..c6ed610f3 100644 ---- a/skopt/learning/tests/test_forest.py -+++ b/skopt/learning/tests/test_forest.py -@@ -35,7 +35,7 @@ def test_random_forest(): - assert_array_equal(clf.predict(T), true_result) - assert 10 == len(clf) - -- clf = RandomForestRegressor(n_estimators=10, criterion="mse", -+ clf = RandomForestRegressor(n_estimators=10, criterion="squared_error", - max_depth=None, min_samples_split=2, - min_samples_leaf=1, - min_weight_fraction_leaf=0., -@@ -80,7 +80,7 @@ def test_extra_forest(): - assert_array_equal(clf.predict(T), true_result) - assert 10 == len(clf) - -- clf = ExtraTreesRegressor(n_estimators=10, criterion="mse", -+ clf = ExtraTreesRegressor(n_estimators=10, criterion="squared_error", - max_depth=None, min_samples_split=2, - min_samples_leaf=1, min_weight_fraction_leaf=0., - max_features="auto", max_leaf_nodes=None, - -From 52c620add07d845debbaff2ce2b1c5faf3eae79b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 22 Feb 2023 16:59:03 +0100 -Subject: [PATCH 3/5] Update skopt/learning/forest.py -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix max line width - -Co-authored-by: Roland Laurès <roland@laures-valdivia.net> ---- - skopt/learning/forest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index ebde568f5..07dc42664 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -194,8 +194,8 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, -- min_samples_split=2, min_samples_leaf=1, -+ def __init__(self, n_estimators=10, criterion='squared_error', -+ max_depth=None, min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., - bootstrap=True, oob_score=False, - -From 52a7db95cb567186fb4e9003139fea4592bdbf05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 22 Feb 2023 17:03:25 +0100 -Subject: [PATCH 4/5] Fix line widht issues - ---- - skopt/learning/forest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index 07dc42664..d4c24456b 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -390,8 +390,8 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - .. [1] L. Breiman, "Random Forests", Machine Learning, 45(1), 5-32, 2001. - - """ -- def __init__(self, n_estimators=10, criterion='squared_error', max_depth=None, -- min_samples_split=2, min_samples_leaf=1, -+ def __init__(self, n_estimators=10, criterion='squared_error', -+ max_depth=None, min_samples_split=2, min_samples_leaf=1, - min_weight_fraction_leaf=0.0, max_features='auto', - max_leaf_nodes=None, min_impurity_decrease=0., - bootstrap=False, oob_score=False, - -From 6b185e489fb4a56625e8505292a20c80434f0633 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonas=20T=C3=B8rnes?= <jonas.tornes@gmail.com> -Date: Wed, 22 Feb 2023 18:37:11 +0100 -Subject: [PATCH 5/5] Fix lin width issues for comments. - ---- - skopt/learning/forest.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/skopt/learning/forest.py b/skopt/learning/forest.py -index d4c24456b..eb3bd6648 100644 ---- a/skopt/learning/forest.py -+++ b/skopt/learning/forest.py -@@ -63,9 +63,9 @@ class RandomForestRegressor(_sk_RandomForestRegressor): - - criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "squared_error" for the mean squared error, which is equal to variance -- reduction as feature selection criterion, and "mae" for the mean -- absolute error. -+ are "squared_error" for the mean squared error, which is equal to -+ variance reduction as feature selection criterion, and "mae" for the -+ mean absolute error. - - max_features : int, float, string or None, optional (default="auto") - The number of features to consider when looking for the best split: -@@ -259,9 +259,9 @@ class ExtraTreesRegressor(_sk_ExtraTreesRegressor): - - criterion : string, optional (default="squared_error") - The function to measure the quality of a split. Supported criteria -- are "squared_error" for the mean squared error, which is equal to variance -- reduction as feature selection criterion, and "mae" for the mean -- absolute error. -+ are "squared_error" for the mean squared error, which is equal to -+ variance reduction as feature selection criterion, and "mae" for the -+ mean absolute error. - - max_features : int, float, string or None, optional (default="auto") - The number of features to consider when looking for the best split: diff --git a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch b/gnu/packages/patches/racket-backport-8.12-chez-configure.patch deleted file mode 100644 index 483948fec9..0000000000 --- a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch +++ /dev/null @@ -1,423 +0,0 @@ -From 82157f5b3fb9f71ad7fc978c428d423d06a4a0df Mon Sep 17 00:00:00 2001 -From: Philip McGrath <philip@philipmcgrath.com> -Date: Wed, 28 Feb 2024 19:41:22 -0500 -Subject: [PATCH 1/2] Chez Scheme: Repairs and improvements for building with - external dependencies - -* configure: support `ZUO=<zuo>` - -Supplying `ZUO=<zuo>` skips the submodule check in `configure` -and configures the generated makefile not to build or remove Zuo. - -* configure: support `STEXLIB=<stex>` - -For compatibility with older scripts, when not explicitly configured, -continue to honor the `STEXLIB` environment variable at build time. - -(cherry picked from commit 694fbd47a125c7fde10a328c6fda199dac19f802) ---- - racket/src/ChezScheme/BUILDING | 5 ++-- - racket/src/ChezScheme/build.zuo | 13 +++++++--- - racket/src/ChezScheme/configure | 27 ++++++++++++++++++++- - racket/src/ChezScheme/makefiles/Makefile.in | 6 ++--- - 4 files changed, 40 insertions(+), 11 deletions(-) - -diff --git a/racket/src/ChezScheme/BUILDING b/racket/src/ChezScheme/BUILDING -index 50fde27771..2df29b5bd8 100644 ---- a/racket/src/ChezScheme/BUILDING -+++ b/racket/src/ChezScheme/BUILDING -@@ -155,7 +155,8 @@ information on the supported options. - The generated makefile mostly just ensures that a `zuo` executable is - built in a `bin` directory, and then it defers the actual build work - to `zuo`, which uses the "main.zuo" file. If you have `zuo` installed, --you can use `zuo` directly instead of `make`. In general, instead of -+you can use `zuo` directly instead of `make`: in that case, you may -+wish to use `./configure ZUO=<zuo>`. In general, instead of - the command `make X` to build target `X` as described below, you can - use `zuo . X` (or `bin/zuo . X` after `bin/zuo` is built). - -@@ -339,7 +340,7 @@ The makefile supports several targets: - * `make clean` - - Removes all built elements from the workarea, and then removes -- `bin/zuo`. -+ `bin/zuo` (unless configured with `ZUO=<zuo>`). - - - WINDOWS VIA COMMAND PROMPT -diff --git a/racket/src/ChezScheme/build.zuo b/racket/src/ChezScheme/build.zuo -index a211632a89..432cc6e5a1 100644 ---- a/racket/src/ChezScheme/build.zuo -+++ b/racket/src/ChezScheme/build.zuo -@@ -218,10 +218,15 @@ - token)) - - (define stexlib -- (let ((found (assoc "STEXLIB" (hash-ref (runtime-env) 'env)))) -- (if found -- (cdr found) -- (at-source "stex")))) -+ (let ([configured (hash-ref config 'STEXLIB "")] -+ [env (assoc "STEXLIB" (hash-ref (runtime-env) 'env))]) -+ (cond -+ [(not (equal? "" configured)) -+ configured] -+ [env -+ (cdr env)] -+ [else -+ (at-source "stex")]))) - (define stex-sources - (source-tree stexlib)) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index 721d1d1335..f88c6f7625 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -93,6 +93,7 @@ default_warning_flags="-Wpointer-arith -Wall -Wextra -Wno-implicit-fallthrough" - CFLAGS_ADD= - zlibLib= - LZ4Lib= -+STEXLIB= - Kernel=KernelLib - buildKernelOnly=no - enableFrompb=yes -@@ -102,6 +103,7 @@ empetite=no - moreBootFiles= - preloadBootFiles= - alwaysUseBootFile= -+zuoExternal= - - CONFIG_UNAME=`uname` - -@@ -442,6 +444,12 @@ while [ $# != 0 ] ; do - LZ4=*) - LZ4Lib=`echo $1 | sed -e 's/^LZ4=//'` - ;; -+ STEXLIB=*) -+ STEXLIB=`echo $1 | sed -e 's/^STEXLIB=//'` -+ ;; -+ ZUO=*) -+ zuoExternal=`echo $1 | sed -e 's/^ZUO=//'` -+ ;; - *) - echo "option '$1' unrecognized or missing an argument; try $0 --help" - exit 1 -@@ -667,6 +675,8 @@ if [ "$help" = "yes" ]; then - echo " STRIP=<strip> executable stripper" - echo " ZLIB=<lib> link to <lib> instead of own zlib" - echo " LZ4=<lib> link to <lib> instead of own LZ4" -+ echo " STEXLIB=<stex> build docs with <stex> instead of own stex" -+ echo " ZUO=<zuo> build with <zuo> instead of own Zuo" - echo "" - echo "Available machine types: $machs" - echo "" -@@ -869,6 +879,16 @@ if [ "$addflags" = "yes" ] ; then - fi - fi - -+if [ "${zuoExternal}" = "" ] ; then -+ ZUO="bin/zuo" -+ RM_ZUO="rm -f bin/zuo" -+ ZUO_TARGET="bin/zuo" -+else -+ ZUO="${zuoExternal}" -+ RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" -+ ZUO_TARGET="DoNotBuildZuo" -+fi -+ - # more compile and link flags for c/Mf-unix and mats/Mf-unix - mdinclude= - mdcppflags= -@@ -1039,7 +1059,7 @@ cp "$srcdir"/makefiles/buildmain.zuo main.zuo - # Some idea, but in the workarea, so it refers to "workarea.zuo" here: - cp "$srcdir"/makefiles/workmain.zuo $w/main.zuo - --# The content of "$w/Makefile" records configuration decisions, -+# The content of "$w/Mf-config" records configuration decisions, - # and the Zuo build script takes it from there - cat > $w/Mf-config << END - srcdir=$srcdir -@@ -1075,6 +1095,7 @@ cursesLib=$cursesLib - ncursesLib=$ncursesLib - zlibLib=$zlibLib - LZ4Lib=$LZ4Lib -+STEXLIB=$STEXLIB - warningFlags=$warningFlags - Kernel=$Kernel - installscriptname=$installscriptname -@@ -1086,6 +1107,10 @@ preloadBootFiles=$preloadBootFiles - alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - -+ZUO=$ZUO -+RM_ZUO=$RM_ZUO -+ZUO_TARGET=$ZUO_TARGET -+ - InstallBin=$installbin - InstallLib=$installlib - InstallMan=$installman/man1 -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index cfdd0230a3..4865bf2e2f 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -3,8 +3,6 @@ workarea=$(w) - - include $(workarea)/Mf-config - --ZUO=bin/zuo -- - .PHONY: build - build: $(ZUO) - + $(ZUO) $(workarea) MAKE="$(MAKE)" -@@ -140,9 +138,9 @@ pkg: $(ZUO) - .PHONY: clean - clean: $(ZUO) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" -- rm -f bin/zuo -+ $(RM_ZUO) - - # Using `+` here means that $(ZUO) gets built even if `-n`/`--dry-run` is provided to `make` --$(ZUO): $(srcdir)/../zuo/zuo.c -+$(ZUO_TARGET): $(srcdir)/../zuo/zuo.c - + mkdir -p bin - + $(CC_FOR_BUILD) -DZUO_LIB_PATH='"'"$(upsrcdir)/../zuo/lib"'"' -o $(ZUO) $(srcdir)/../zuo/zuo.c - -base-commit: 78fef00d4d16a79fdf6ab31924b3a80cadf4b368 --- -2.41.0 - - -From e2bc69c5ce7437dd9a1b30ac1b12b3a56872c491 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt <mflatt@racket-lang.org> -Date: Sun, 10 Mar 2024 09:13:40 -0600 -Subject: [PATCH 2/2] Chez Scheme: adjust `configure ZUO=<command>` support - -Continuing from 694fbd47a1, adjust the generated makefile so the -supplied `<command>` is not a makefile dependency. That way, `ZUO=zuo` -works if `zuo` is installed and the current build directory is not the -source directory. (The `zuo` executable is a dependency in a real and -relevant sense, but not in the sense of dependencies that we normally -track in makefiles.) - -Also adapt the makefile for the case that `ZUO=...` is not supplied -and the build directory is not the source directory, in which case -`ZUO_LIB_PATH` needs to be relative to the source directory. - -Using `make ZUO=zuo` can also work, but in that case, `bin/zuo` is -still built as a dependency. It's possible that some portable makefile -magic could overcome that limitation, but it doesn't seem important. - -(cherry picked from commit 28157ba88d48fe645563f46f6c00d6626b3428fa) ---- - racket/src/ChezScheme/configure | 3 + - racket/src/ChezScheme/makefiles/Makefile.in | 70 +++++++++++---------- - 2 files changed, 40 insertions(+), 33 deletions(-) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index f88c6f7625..201dbe580f 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -881,10 +881,12 @@ fi - - if [ "${zuoExternal}" = "" ] ; then - ZUO="bin/zuo" -+ ZUO_DEP="${ZUO}" - RM_ZUO="rm -f bin/zuo" - ZUO_TARGET="bin/zuo" - else - ZUO="${zuoExternal}" -+ ZUO_DEP="" - RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" - ZUO_TARGET="DoNotBuildZuo" - fi -@@ -1108,6 +1110,7 @@ alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - - ZUO=$ZUO -+ZUO_DEP=$ZUO_DEP - RM_ZUO=$RM_ZUO - ZUO_TARGET=$ZUO_TARGET - -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index 4865bf2e2f..5ce237178e 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -4,51 +4,55 @@ workarea=$(w) - include $(workarea)/Mf-config - - .PHONY: build --build: $(ZUO) -+build: $(ZUO_DEP) - + $(ZUO) $(workarea) MAKE="$(MAKE)" - - .PHONY: run --run: $(ZUO) -+run: $(ZUO_DEP) - + $(ZUO) $(workarea) run - - .PHONY: kernel --kernel: $(ZUO) -+kernel: $(ZUO_DEP) - + $(ZUO) $(workarea) kernel MAKE="$(MAKE)" - - .PHONY: install --install: $(ZUO) -+install: $(ZUO_DEP) - $(ZUO) $(workarea) install MAKE="$(MAKE)" - - .PHONY: uninstall --uninstall: $(ZUO) -+uninstall: $(ZUO_DEP) - + $(ZUO) $(workarea) uninstall MAKE="$(MAKE)" - --.PHONY: test --test: $(ZUO) -- + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+.PHONY: test-one -+test-one: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test-one MAKE="$(MAKE)" - - .PHONY: test-some-fast --test-some-fast: $(ZUO) -+test-some-fast: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some-fast MAKE="$(MAKE)" - - .PHONY: test-some --test-some: $(ZUO) -+test-some: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some MAKE="$(MAKE)" - -+.PHONY: test -+test: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+ - .PHONY: test-more --test-more: $(ZUO) -+test-more: $(ZUO_DEP) - + $(ZUO) $(workarea) test-more MAKE="$(MAKE)" - - .PHONY: coverage --coverage: $(ZUO) -+coverage: $(ZUO_DEP) - + $(ZUO) $(workarea) coverage MAKE="$(MAKE)" - - .PHONY: bootfiles --bootfiles: $(ZUO) -+bootfiles: $(ZUO_DEP) - + $(ZUO) $(workarea) bootfiles MAKE="$(MAKE)" - - .PHONY: reset --reset: $(ZUO) -+reset: $(ZUO_DEP) - + $(ZUO) $(workarea) reset MAKE="$(MAKE)" - - # Supply XM=<machine> to build boot files for <machine> -@@ -57,86 +61,86 @@ boot: - + $(ZUO) $(workarea) boot "$(XM)" MAKE="$(MAKE)" - - # `<machine>.boot` as alias for `boot XM=<machine>` --%.boot: $(ZUO) -+%.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot $* MAKE="$(MAKE)" - - .PHONY: auto.boot --auto.boot: $(ZUO) -+auto.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot MAKE="$(MAKE)" - - SCHEME=scheme - - .PHONY: cross.boot --cross.boot: $(ZUO) -+cross.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot SCHEME="$(SCHEME)" MAKE="$(MAKE)" - - .PHONY: re.boot --re.boot: $(ZUO) -+re.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) reboot SCHEME="$(SCHEME)" - - # Supply XM=<machine> to build boot files for <machine> - # with o=3 d=0 for the cross compiler, and only after - # building the kernel for the configured machine - .PHONY: bootquick --bootquick: $(ZUO) -+bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick "$(XM)" MAKE="$(MAKE)" - - # `<machine>.bootquick` as alias for `boot XM=<machine>` --%.bootquick: $(ZUO) -+%.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick $* MAKE="$(MAKE)" - --auto.bootquick: $(ZUO) -+auto.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick MAKE="$(MAKE)" - - # Supply XM=<machine>-<tag>.bootpbchunk to repackage boot files for - # <machine> with pbchunk sources, including additional - # boot files - .PHONY: bootpbchunk --bootpbchunk: $(ZUO) -+bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk "$(XM)" $(ARGS) MAKE="$(MAKE)" - - # `<machine>.bootpbchunk` as alias for `pbchunk XM=<machine>` --%.bootpbchunk: $(ZUO) -+%.bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk $* $(ARGS) MAKE="$(MAKE)" - - .PHONY: docs --docs: build $(ZUO) -+docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) docs MAKE="$(MAKE)" - - .PHONY: csug --csug: build $(ZUO) -+csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) csug MAKE="$(MAKE)" - - .PHONY: release_notes --release_notes: build $(ZUO) -+release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) release_notes MAKE="$(MAKE)" - - .PHONY: install-docs --install-docs: build $(ZUO) -+install-docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-docs MAKE="$(MAKE)" - - .PHONY: install-csug --install-csug: build $(ZUO) -+install-csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-csug MAKE="$(MAKE)" - - .PHONY: install-release_notes --install-release_notes: build $(ZUO) -+install-release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-release_notes MAKE="$(MAKE)" - - .PHONY: bintar --bintar: $(ZUO) -+bintar: $(ZUO_DEP) - + $(ZUO) $(workarea) bintar MAKE="$(MAKE)" - - .PHONY: rpm --rpm: $(ZUO) -+rpm: $(ZUO_DEP) - + $(ZUO) $(workarea) rpm MAKE="$(MAKE)" - - .PHONY: pkg --pkg: $(ZUO) -+pkg: $(ZUO_DEP) - + $(ZUO) $(workarea) pkg MAKE="$(MAKE)" - - .PHONY: clean --clean: $(ZUO) -+clean: $(ZUO_DEP) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" - $(RM_ZUO) - --- -2.41.0 - diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index e69721ef10..4d29535054 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -530,7 +530,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "4.6.1") + (version "4.8.0") (source (origin (method url-fetch) @@ -538,7 +538,7 @@ photographic equipment.") "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "1zbsrx5cfyifzbi657izw8rfkgd9pm4hx8afv8y2sgi9f2hc1v8n")))) + (base32 "0mcjgz8kmsmj5icik3zsrk61qg9dafswch93bw3y8w2j07llk621")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index b7cfca2eec..5432fc10c3 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -112,6 +112,7 @@ between aspif and smodels format or to a human-readable text format.") (url "https://github.com/potassco/clasp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "clasp-hide-event-ids.patch")) (sha256 (base32 "0qap7rar8a5mkqz28n2hnvr4cfv5x0rh4zs3wdp919dw4d034chr")))) @@ -200,22 +201,7 @@ satisfiability checking (SAT).") (substitute* "cmake/ClingoConfig.cmake.in" (("find_package\\(Clasp") "find_package(clasp")) (rename-file "cmake/ClingoConfig.cmake.in" - "cmake/clingo-config.cmake.in"))) - (add-after 'unpack 'skip-failing-tests - (lambda _ - (with-directory-excursion "libclingo/tests" - (substitute* "CMakeLists.txt" - (("COMMAND test_clingo" all) - (string-append all - " -f " - "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) - (call-with-output-file "good.txt" - (lambda (port) - (for-each (lambda (test) (format port "~s~%" test)) - '("parse-ast-v2" "add-ast-v2" "build-ast-v2" - "unpool-ast-v2" "parse_term" - "propagator" "propgator-sequence-mining" - "symbol" "visitor")))))))))) + "cmake/clingo-config.cmake.in")))))) (inputs (list catch2-3 clasp libpotassco)) (native-inputs (list bison re2c mpark-variant @@ -465,10 +451,7 @@ directly from the python command line."))) (lambda _ ;; noclingo tests rely on this being set (setenv "CLORM_NOCLINGO" "1") - (delete-file "tests/test_mypy_query.py") - (substitute* "tests/test_clingo.py" - (("self\\.assertTrue\\(os_called\\)" all) - (string-append "# " all)))))))) + (delete-file "tests/test_mypy_query.py")))))) (propagated-inputs (list python-clingo)) (native-inputs (list python-typing-extensions)) (home-page "https://potassco.org") @@ -627,14 +610,6 @@ which allows user interfaces to be specified entirely as a logic program.") (base32 "0xzbby9ram55h87ykm652kgm45b8rlhbjc8gjkz308h1jnjllmmy")))) (build-system pyproject-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'delete-failing-tests - (lambda _ - ;; XXX: Clingo statistics are broken in dependencies already. - (for-each delete-file '("tests/test_solver.py" - "tests/test_test.py"))))))) (inputs (list python-clingo)) (native-inputs (list python-pytest)) (home-page "https://potassco.org/clintest/") diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index a5e68964f9..f82dc5e3dc 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -180,7 +180,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.53.10") + (version "2.53.47") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "15lbzbqsam4832jnynsj7ksn17xrwqwdhs66ajpi4jf8hy4bqh15")) + (base32 "0h2lqy918i1qgymxyyswxb6pbnjw2rfq1rnclagiqnsz4ymzp9jp")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index fb83031094..d79427f28a 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2363,7 +2363,7 @@ help in debugging failures and optimizing the scheduler to improve speed.") (lambda _ (substitute* "setup.py" (("websockets.*<11.0") - "websockets<12.0"))))))) + "websockets<13.0"))))))) (propagated-inputs (list python-httpx python-async-generator python-pytest python-websockets)) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 57b852c2bd..8ba3432637 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -567,29 +567,16 @@ swarm algorithm.") (define-public python-scikit-optimize (package (name "python-scikit-optimize") - (version "0.9.0") + (version "0.10.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/scikit-optimize/scikit-optimize") + (url "https://github.com/holgern/scikit-optimize") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1")) - (patches - ;; These are for compatibility with more recent versions of - ;; numpy and scikit-learn. - (search-patches "python-scikit-optimize-1148.patch" - "python-scikit-optimize-1150.patch")) - (modules '((guix build utils))) - (snippet - ;; Since scikit-learn 1.3 max_features no longer supports - ;; 'auto', which is identical to 'sqrt' - '(substitute* '("skopt/learning/forest.py" - "skopt/learning/tests/test_forest.py") - (("max_features=['\"]auto['\"]") - "max_features='sqrt'"))))) + "0pc6avzxz8l32km5jvv3maih0a5x2akxybvxl2hdg04qz2l0kz8b")))) (build-system pyproject-build-system) (propagated-inputs (list python-joblib diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1363e6ccdf..eef63351ef 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3603,6 +3603,32 @@ APIs.") than Python’s urllib2 library.") (license license:asl2.0))) +(define-public python-requests-next + (package + (name "python-requests") + (version "2.31.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "requests" version)) + (sha256 + (base32 + "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l")))) + (build-system python-build-system) + (propagated-inputs + (list python-certifi + python-charset-normalizer + python-idna + python-urllib3)) + (arguments + ;; FIXME: Some tests require network access. + '(#:tests? #f)) + (home-page "http://python-requests.org/") + (synopsis "Python HTTP library") + (description + "Requests is a Python HTTP client library. It aims to be easier to use +than Python’s urllib2 library.") + (license license:asl2.0))) + (define-public python-requests-kerberos (package (name "python-requests-kerberos") @@ -3998,6 +4024,41 @@ can reuse the same socket connection for multiple requests, it can POST files, supports url redirection and retries, and also gzip and deflate decoding.") (license license:expat))) +(define-public python-urllib3-next + (package + (name "python-urllib3") + (version "1.26.17") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urllib3" version)) + (sha256 + (base32 + "08fzhaf77kbjj5abpl9xag6fpfxkdp1k5s7sqd3ayacdq91a5mi4")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) + (propagated-inputs + (append + ;; These 5 inputs are used to build urrlib3[secure] + (list python-certifi) + (if (member (%current-system) + (package-transitive-supported-systems python-cryptography)) + (list python-cryptography) + '()) + (list python-idna) + (if (member (%current-system) + (package-transitive-supported-systems python-pyopenssl)) + (list python-pyopenssl) + '()) + (list python-pysocks))) + (home-page "https://urllib3.readthedocs.io/") + (synopsis "HTTP library with thread-safe connection pooling") + (description + "Urllib3 supports features left out of urllib and urllib2 libraries. It +can reuse the same socket connection for multiple requests, it can POST files, +supports url redirection and retries, and also gzip and deflate decoding.") + (license license:expat))) + (define-public awscli (package ;; Note: updating awscli typically requires updating botocore as well. @@ -6693,7 +6754,7 @@ files.") (define-public python-websockets (package (name "python-websockets") - (version "11.0.3") + (version "12.0") (source (origin (method git-fetch) @@ -6703,7 +6764,7 @@ files.") (file-name (git-file-name name version)) (sha256 (base32 - "1hn1qzpk1fvhi5j5nz4xlvzwkj9y16c9gryrb4n4dza84qi1pna5")))) + "1a587a1knjsy9zmgab9v2yncx0803pg2hfcvf7kz6vs8ixaggqmh")))) (build-system python-build-system) (arguments (list #:phases diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 36f75b4b40..93eeab8ea9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20017,7 +20017,7 @@ encoding algorithms to do fuzzy string matching.") (define-public python-pdfminer-six (package (name "python-pdfminer-six") - (version "20201018") + (version "20231228") ;; There are no tests in the PyPI tarball. (source (origin @@ -20027,23 +20027,19 @@ encoding algorithms to do fuzzy string matching.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr")))) - (build-system python-build-system) + (base32 "1anyr0gm7amwls8qifflql1viz5rq6q95lfwcg43v3180h4w8wrd")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Tests write to the source tree. - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (replace 'check - (lambda _ - (invoke "make" "test")))))) + (list #:phases + #~(modify-phases %standard-phases + ;; Tests write to the source tree. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) (propagated-inputs - (list python-chardet python-cryptography python-sortedcontainers)) + (list python-charset-normalizer python-cryptography)) (native-inputs - (list python-nose python-tox)) + (list python-pytest)) (home-page "https://github.com/pdfminer/pdfminer.six") (synopsis "PDF parser and analyzer") (description "@code{pdfminer.six} is a community maintained fork of @@ -23331,23 +23327,32 @@ efficient as possible on all supported Python versions.") Mustache templating language renderer.") (license license:expat))) +;; XXX: Try to inherit from duckdb and build from source with all extentions. (define-public python-duckdb (package (name "python-duckdb") - (version "0.8.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "duckdb" version)) (sha256 (base32 - "1sgfmii5xlkbx3hzyjxg80gl2ni1rxpabahl4gww9by2mgs3fkd5")))) + "0lyl6di1c7j31i2mk384j711kzyyf9rjd3nqx5mbgmf7gfvmk852")))) (build-system pyproject-build-system) (arguments (list #:test-flags - '(list "--ignore=tests/slow/test_h2oai_arrow.py" - ;; Don't install anything, thank you. - "-k" "not test_install_non_existent_extension") + #~(list "--ignore=tests/slow/test_h2oai_arrow.py" + ;; Do not relay on mypy. + "--ignore=tests/stubs/test_stubs.py" + "-k" (string-append + ;; Don't install anything, thank you. + "not test_install_non_existent_extension" + ;; See <https://github.com/duckdb/duckdb/issues/11961>. + " and not test_fetchmany" + ;; See <https://github.com/duckdb/duckdb/issues/10702>. + " and not test_connection_interrupt" + " and not test_query_interruption")) #:phases #~(modify-phases %standard-phases ;; Tests need this @@ -23366,11 +23371,12 @@ Mustache templating language renderer.") "pyfilesystem.hpp" "pybind11/conversions/pyconnection_default.hpp") (("const_name") "_")))))))) + (propagated-inputs + (list python-adbc-driver-manager)) (native-inputs (list pybind11 python-fsspec python-google-cloud-storage - python-mypy python-numpy python-pandas python-psutil @@ -33804,6 +33810,38 @@ instructions up to AVX-512 and SHA (including 3dnow!+, XOP, FMA3, FMA4, TBM and BMI2).") (license license:bsd-2)))) +(define-public python-itanium-demangler + (package + (name "python-itanium-demangler") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; PyPI only provides wheels and no source code. + (url "https://github.com/whitequark/python-itanium_demangler") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q47aqm5z3db6pasdzw05d6236vnb8hnapfy88fcmn9dr5ym98r3")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/whitequark/python-itanium_demangler/") + (synopsis "Pure Python Itanium C++ ABI demangler") + (description +"This Python module provides an implementation of the Itanium C++ ABI symbol +mangling language. The demangler generates an abstract syntax tree from +mangled symbols, which can be used for directly extracting type information.") + (license license:bsd-0))) + (define-public python-peachpy ;; There is no tag in this repo. (let ((commit "913d74c35a6b1d330e90bfc055208ce5b06b35a0") diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2b20353159..f43a314983 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -201,7 +201,7 @@ ;; ;; CODE: -(define %racket-version "8.12") ; Remember to update chez-scheme-for-racket! +(define %racket-version "8.13") ; Remember to update chez-scheme-for-racket! (define %racket-commit (string-append "v" %racket-version)) (define %racket-origin @@ -211,10 +211,9 @@ (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "1f52yadmrsd2ddry47s68kxig185a58n19j23458wkck19nawjz5")) + (base32 "0pf9lmch7bz3gs4dbn2qb7mraxzjfiz50aij9zsli9jc022ybqb9")) (file-name (git-file-name "racket" %racket-version)) (patches (search-patches "racket-chez-scheme-bin-sh.patch" - "racket-backport-8.12-chez-configure.patch" "racket-rktio-bin-sh.patch")) (modules '((guix build utils))) (snippet @@ -243,7 +242,7 @@ (define-public zuo (package (name "zuo") - (version "1.9") ; defined in racket/src/zuo/zuo.c or the following + (version "1.10") ; defined in racket/src/zuo/zuo.c or the following #;(displayln (~a (hash-ref (runtime-env) 'version) "." (hash-ref (runtime-env) 'minor-version))) (source (origin @@ -252,7 +251,7 @@ (url "https://github.com/racket/zuo") (commit (string-append "v" version)))) (sha256 - (base32 "0zasir33nx1qi1ciz9dn6h8k39i443lr6apw5d1i6mjmhpzxmdhp")) + (base32 "007bjbhxbw3dq75klaa6f6ljhri2qxi43q6n74wyy50vr9yhx4s1")) (file-name (git-file-name name version)) (patches (search-patches "zuo-bin-sh.patch")))) (outputs '("out" "debug")) @@ -709,7 +708,7 @@ DrRacket IDE, are not included.") "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") '(("contract-profile" "."))) (simple-racket-origin - "data" (base32 "01sinnsnjiazvkj83k84izdnp38pd2aglbrs14mrdkwajgmpampk") + "data" (base32 "11ai6c9h0brbblc6xn045ajj4gyrvbjpk1pqcqm1m0dy9q2rzd4a") '("data" "data-doc" "data-enumerate-lib" "data-lib")) (simple-racket-origin "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") @@ -718,7 +717,7 @@ DrRacket IDE, are not included.") "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "0f41sh90i4mml95x2gcmfvl2rc7m77vjbagmgjx270ng7xvz16lj") + "deinprogramm" (base32 "05l643h1mc4v7jhs4fq7yi84zl24nk1zx6ld07a6zgn85kik3vzb") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") @@ -727,7 +726,7 @@ DrRacket IDE, are not included.") "draw" (base32 "1h7mckay8yjcgmj3r0jkf1csn430gn43n8jl1l956q9gcprlmncl") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "17bdbvsf5l8z96bwzg1q75gg70c6svbhw0g1k239fsjd3mivmki4") + "drracket" (base32 "155qzbg2jg5kbv580z30z4w1ac3p527ixk0daan86wkgpl0lxnzn") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -741,13 +740,13 @@ DrRacket IDE, are not included.") "eli-tester" (base32 "0icx6wn14gjm8kdmq1jppqgq87sxkras4qb5xmdr6wigxafhjqyk") '(("eli-tester" "."))) (simple-racket-origin - "eopl" (base32 "1n8lzvhggp6bp2hg4n51zg8f4ya10isb92pfzngss2ch7299zfj2") + "eopl" (base32 "0qihajdpwf2q7hbs6fsw6mmmzy57kgzgry3vyp9z8w7ay8df3w15") '(("eopl" "."))) (simple-racket-origin "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin - "expeditor" (base32 "10841c60nxqvwnjn6f9c6dcp4vsqbvi7n8nvi59vjk7d3b2qfpbq") + "expeditor" (base32 "0m9ga4scg49pbv60gnl0ky5al72012psa4dfgnkzq0bnf5lwwm2i") '("expeditor" "expeditor-doc" "expeditor-lib")) (simple-racket-origin "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5") @@ -761,13 +760,13 @@ DrRacket IDE, are not included.") "games" (base32 "13z7fnbr48s98lmfxc0nbfhbqkd4hphymy2r63hqm783xzn6ylzi") '(("games" "."))) (simple-racket-origin - "gui" (base32 "08kzyscqc8hgc1f8q0bhibl44fkq8iiyz12f8bqdhqkcz8nx44sw") + "gui" (base32 "1vz3h9mwmycl9sbx19dsfkx5sqh71nwv360g80khwyvnsx99fxfs") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "13d8xsvs60d7797w93g14dbdm98bixgy65akayij256pyiwnqwdc") + "htdp" (base32 "0z58askwixx0vh99dmpbjvv099hkhykgnlgfs679vxbjcnfwafd6") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -791,7 +790,7 @@ DrRacket IDE, are not included.") "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") '(("make" "."))) (simple-racket-origin - "math" (base32 "1l0r4xpbbjz0b2s6v3kn490zgs2q1dnj3ga95y1505jmcwgb2hl9") + "math" (base32 "03ybjcp1w38f539dzsh8qb5cw0mb2hslpyqwbcsqxj3l9vqjlm8y") '("math" "math-doc" "math-lib")) (simple-racket-origin "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") @@ -809,7 +808,7 @@ DrRacket IDE, are not included.") (url "https://github.com/RenaissanceBug/racket-cookies") (commit %racket-commit))) (sha256 (base32 - "1zr31y1gqa3kkrwlf9bnw08nzij00x1l70qhfbpz0239bksn4mmb")) + "1fbl717w5801bydx3nzwxddd1rh1cc0gxwpjc7ka9zh5ak09sb0w")) (file-name (git-file-name "RenaissanceBug-racket-cookies" %racket-version))) '("net-cookies" "net-cookies-doc" "net-cookies-lib")) @@ -826,7 +825,7 @@ DrRacket IDE, are not included.") (git-file-name "stamourv-optimization-coach" %racket-version))) '(("optimization-coach" "."))) (simple-racket-origin - "option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww") + "option-contract" (base32 "1914dcxy6qzpg3cpnzdm9lj0kwyw8xdb85mwiamqfkbg0xlyyhpa") '("option-contract" "option-contract-doc" "option-contract-lib")) (simple-racket-origin "parser-tools" (base32 "1lp7wixmxcnha7cz834xfqqr48c2nldjbn9lng69bihpw01h9zms") @@ -835,7 +834,7 @@ DrRacket IDE, are not included.") "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "1ghds5by8i0k2djbig82xqp2ssy3nvdwm45l8ibsr99y0ay6z7gv") + "pict" (base32 "1swnwihfnbsz9k11515i0fbfhx1gn7qcygn1dxkrdvb89g4h1pf3") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -844,13 +843,13 @@ DrRacket IDE, are not included.") "picturing-programs" (base32 "1g6xr39hx1j03gb3d4dljm3v91xcj2gfpq3dgy5xvplzr6cmmxgr") '(("picturing-programs" "."))) (simple-racket-origin - "plai" (base32 "18kz31pj4lanlf9mn2yc0q9sxis264wb4f9v85ga23wd7g1hrzbq") + "plai" (base32 "1vcplmrzk2wr0n0m4fa0nq9ir986d5nk3dvcd7h1rv2jvhkcqdaq") '("plai" "plai-doc" "plai-lib")) (simple-racket-origin "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") '("planet" "planet-doc" "planet-lib")) (simple-racket-origin - "plot" (base32 "0jq9a366g7b2c9vp6yvpqikvklgyd6p4xj6v224g99yj8cgip40b") + "plot" (base32 "0skmir4njxmh3yx3ng23dvwkal79dd3fd23ijk6lyk8b013w1kj2") '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) (simple-racket-origin "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") @@ -889,7 +888,7 @@ DrRacket IDE, are not included.") "racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032") '(("racklog" "."))) (simple-racket-origin - "rackunit" (base32 "06kpl51alm7akgmmh110ya28zgmx3as0szykfv2gwqmf7xcms1b7") + "rackunit" (base32 "18s2rg5y5i68m83z3b81dwv6ixm67iyv3varm9azmnr7di0gflzj") '("rackunit" "rackunit-doc" "rackunit-gui" @@ -905,7 +904,7 @@ DrRacket IDE, are not included.") "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "1mwnxbfk2vbalndlq0996rzdi3a2z48m5xnb1ywzlsvnydrnkrk2") + "redex" (base32 "083ql7xx7slnpvyr0a8z2wdyib84lh155frjx8gmcisri5895z28") '("redex" "redex-benchmark" "redex-doc" @@ -920,7 +919,7 @@ DrRacket IDE, are not included.") "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "0rk5q9r9fw826ag0npk5cwkzkapj2p243wwm9gn2l7j7cr6z1rvb") + "scribble" (base32 "03sgcgq8s0dk2zbn4jm514lx720rdx2pj8plr0sy7j0wnvm3rzsi") '("scribble" "scribble-doc" "scribble-html-lib" @@ -949,10 +948,10 @@ DrRacket IDE, are not included.") "slideshow" (base32 "147s7si6lxx6hm84wk2rfplk6wprladl9zni9pdvaxfa25chrabf") '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) (simple-racket-origin - "snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d") + "snip" (base32 "1aikzimkxvdvf81jxacm2zm8xir7nx1j6l6539pywl3xaf3nb2fm") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "0vdsyr0qhpvac6h8mfdy6vqrsqsfa7kpg39n3h637hccxyfxv63f") + "typed-racket" (base32 "1r746jaxi5xxrk2zsn6v7bhb0drnlf7nx1ni0lvf7mvhqw7f97ci") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -960,7 +959,7 @@ DrRacket IDE, are not included.") "typed-racket-lib" "typed-racket-more")) (simple-racket-origin - "srfi" (base32 "1l3nr3a8mlp505aaxlyp4i8jfijmpyl9h1wwv8hzm4kzzjv4sl8p") + "srfi" (base32 "0z7kchsz9m6cb4qmbznzqs2px45fz1g81amg9zn7n1sa31x3jzch") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin "string-constants" (base32 "0225f1wmq1n9f2x1pg50fssdnd4bpc11q1jgsykwf4ik4fnaa520") @@ -978,7 +977,7 @@ DrRacket IDE, are not included.") "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y") '("unix-socket" "unix-socket-doc" "unix-socket-lib")) (simple-racket-origin - "web-server" (base32 "1i4sxmcgj00ml7czsbyx1433hgf091n1p54xyal2f1fsskx5fg0y") + "web-server" (base32 "0wpsgdz38zxjrs4kazad71dl9y11cvn6jj4fz2maba77021byzyn") '("web-server" "web-server-doc" "web-server-lib")) (simple-racket-origin "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index ae4e73956e..28d5670a1d 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2023 David Pflug <david@pflug.io> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2024 Tanguy Le Carrour <tanguy@bioneland.org> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crates-crypto) #:use-module (gnu packages crates-graphics) @@ -65,11 +67,14 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) #:use-module (gnu packages scheme) + #:use-module (gnu packages terminals) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) @@ -79,6 +84,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -547,18 +553,18 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.15.1") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "0427mimr4k75myg5mnig564kq7xbb5f5hws2ly3gxxl6g8mk79il")) + "17jhhxwm1nbh7yq72y7d4n880x46817iami7lvcj3ywdbzrfg6r9")) (modules '((guix build utils))) (snippet #~(begin - (substitute* "setup.py" + (substitute* "pyproject.toml" (("\"xonsh\\.ply\\.ply\",") "")) ;; Use our properly packaged PLY instead. (substitute* (list "setup.py" @@ -566,28 +572,65 @@ ksh, and tcsh.") "xonsh/lexer.py" "xonsh/parsers/base.py" "xonsh/parsers/completion_context.py" + "xonsh/parsers/v310.py" "xonsh/xonfig.py") (("from xonsh\\.ply\\.(.*) import" _ module) (format #f "from ~a import" module)) - (("from xonsh\\.ply import") "import")) - #t)))) - (build-system python-build-system) + (("from xonsh\\.ply import") "import")))))) + (build-system pyproject-build-system) (arguments - (list ;; TODO Try running run the test suite. - ;; See 'requirements-tests.txt' in the source distribution for more - ;; information. - #:tests? #f + ;; Some tests are failing for reasons like not accessing parent directory + ;; with os.getcwd(), not activating virtual environments, not finding + ;; some commands (man, echo), and not running subprocesses. + (list #:test-flags + #~(list "-k" + (string-append + "not " + (string-join + (list "test_aliases_print" + "test_argv0" + "test_bash_and_is_alias_is_only_functional_alias" + "test_bash_completer" + "test_bash_completer_empty_prefix" + "test_complete_command" + "test_complete_dots" + "test_dirty_working_directory" + "test_equal_sign_arg" + "test_man_completion" + "test_parser_show" + "test_printfile" + "test_printname" + "test_quote_handling" + "test_script" + "test_skipper_command" + "test_sourcefile" + "test_spec_modifier_alias_output_format" + "test_vc_get_branch" + "test_xonsh_activator" + "test_xonsh_lexer") + " and not "))) #:phases #~(modify-phases %standard-phases (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (invoke "python" "-m" "compileall" - "--invalidation-mode=unchecked-hash" out) - (invoke "python" "setup.py" "install" "--root=/" - (string-append "--prefix=" out)))))))) + (lambda _ + (invoke "python" "-m" "compileall" + "--invalidation-mode=unchecked-hash" #$output) + (invoke "python" "setup.py" "install" "--root=/" + (string-append "--prefix=" #$output)))) + ;; Some tests run os.mkdir(). + (add-before 'check 'writable-home + (lambda _ + (setenv "HOME" "/tmp")))))) (native-inputs - (list python-setuptools ;needed at build time + (list git-minimal + python-pyte + python-pytest + python-pytest-mock + python-pytest-rerunfailures + python-pytest-subprocess + python-pytest-timeout + python-requests + python-setuptools ;needed at build time python-wheel)) (inputs (list python-distro diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index f4c80347a1..b45885ff87 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -510,7 +510,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.") (define-public dropbear (package (name "dropbear") - (version "2022.83") + (version "2024.85") (source (origin (method url-fetch) @@ -518,7 +518,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.") "https://matt.ucc.asn.au/dropbear/releases/" "dropbear-" version ".tar.bz2")) (sha256 - (base32 "0fs495ks354qcfj4k5bwg6m50vbl8az03gjymmqm2jy9zcgi4nmw")) + (base32 "00m5dmajx0za1zmya4qdz763hxy4cmfk7bpba778k7d66g23dc46")) (modules '((guix build utils))) (snippet '(begin @@ -536,7 +536,7 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'enable-x11-forwarding (lambda _ - (substitute* "default_options.h" + (substitute* "src/default_options.h" (("#define DROPBEAR_X11FWD 0") "#define DROPBEAR_X11FWD 1"))))))) (inputs (list libtomcrypt libtommath zlib)) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fe352f1b4e..5fe9634934 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2180,7 +2181,7 @@ machine learning, computer vision, and high-dimensional statistics.") (define-public python-arviz (package (name "python-arviz") - (version "0.17.1") + (version "0.18.0") (source (origin (method git-fetch) ; PyPI misses some test files (uri (git-reference @@ -2189,7 +2190,7 @@ machine learning, computer vision, and high-dimensional statistics.") (file-name (git-file-name name version)) (sha256 (base32 - "1rpm2a9swzhnqn84dfsbc8kvz6qnn8w2icr3p08gwax9h9pg4ksp")))) + "1bdj2mm8zdd83ln9ka9p6bln3n5kkpfmrhgqyy018h51l156m529")))) (build-system pyproject-build-system) (arguments ;; FIXME: matplotlib tests fail because of the "--save" test flag. @@ -2208,7 +2209,8 @@ machine learning, computer vision, and high-dimensional statistics.") ;; 3 tests require write permission. (setenv "HOME" "/tmp")))))) (native-inputs (list python-cloudpickle python-pytest)) - (propagated-inputs (list python-h5netcdf + (propagated-inputs (list python-dm-tree + python-h5netcdf python-matplotlib python-numpy python-packaging @@ -2386,13 +2388,13 @@ Meier, Nelson Aalen and regression.") (define-public python-mapie (package (name "python-mapie") - (version "0.8.3") + (version "0.8.6") (source (origin (method url-fetch) (uri (pypi-uri "MAPIE" version)) (sha256 (base32 - "13kgyqk1hp603n9zym835kp1pqs83k0j7ymayw4fk0zx4z1nmvdx")))) + "013ljcjjl3k9yb3166fnvr6nsb9ph4rhidpdjjks78qw0w1j7faa")))) (build-system pyproject-build-system) ;; See https://github.com/scikit-learn-contrib/MAPIE/issues/432 (arguments @@ -2416,13 +2418,13 @@ conformal prediction methods intervals.") (define-public python-emcee (package (name "python-emcee") - (version "3.1.4") + (version "3.1.6") (source (origin (method url-fetch) (uri (pypi-uri "emcee" version)) (sha256 - (base32 "1vbz67cwzig28dlndkm6g246p1vcvj6yy2w65z8cdyffigf1j3lf")))) + (base32 "0zb3ihja3hyj6zjbhkpxhyyppnv58q2jjg0yd1lwmydqdaplvbqi")))) (build-system pyproject-build-system) (propagated-inputs (list python-numpy)) (native-inputs (list python-coverage diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index fe188ed71d..5f8a3655b0 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -32,39 +32,44 @@ (define-public libunibreak (package (name "libunibreak") - (version "5.0") + (version "6.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/adah1972/libunibreak") (commit (string-append "libunibreak_" - (string-replace-substring version "." "_"))))) + (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) (sha256 (base32 - "0r5dndhwsiy65lmavz3vdgal9nl8g97hbmdjg6zyq3zh5hs87vwf")))) + "0mhkbji89cyjg4g1rviyprchxzpv8pmlmqw4m10cvgfjwmpmwa7k")))) (build-system gnu-build-system) (native-inputs - (list autoconf-wrapper - automake - libtool - ucd)) + (list autoconf-wrapper + automake + libtool + ucd)) (arguments `(#:parallel-tests? #f ; parallel tests cause non-deterministic - ; build failures - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (file) - (copy-file - (search-input-file inputs - (string-append "/share/ucd/auxiliary/" - file)) - (string-append "src/" file))) - '("LineBreakTest.txt" - "WordBreakTest.txt" - "GraphemeBreakTest.txt"))))))) + ;; see https://github.com/adah1972/libunibreak/issues/41 + ;; There is currently no plan to implement full Unicode 15.1 support for + ;; line breaking, mostly because tailoring for Brahmic scripts, as + ;; described in LB28a of UAX #14-51, is problematic within the current + ;; framework. + ;; #:phases + ;; (modify-phases %standard-phases + ;; (add-before 'check 'pre-check + ;; (lambda* (#:key inputs #:allow-other-keys) + ;; (for-each (lambda (file) + ;; (copy-file + ;; (search-input-file inputs + ;; (string-append "/share/ucd/auxiliary/" + ;; file)) + ;; (string-append "src/" file))) + ;; '("LineBreakTest.txt" + ;; "WordBreakTest.txt" + ;; "GraphemeBreakTest.txt"))))) + )) (home-page "https://vimgadgets.sourceforge.net/libunibreak/") (synopsis "Unicode line breaking and word breaking algorithms") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 411ad4c2bf..382ad0ba59 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2332,13 +2332,13 @@ It is usually a complement to @code{ffmpeg-normalize}.") (define-public ffmpeg-normalize (package (name "ffmpeg-normalize") - (version "1.27.7") + (version "1.28.2") (source (origin (method url-fetch) (uri (pypi-uri "ffmpeg-normalize" version)) (sha256 (base32 - "0idqqgsr3p840vx2x3idn851qwghjdbm6v4yrq2kprppyfvglni7")))) + "129jicvifh5bpxrn62mpfanv5z2266bryxd6cd5xhhi4vfwcinx5")))) (build-system pyproject-build-system) (arguments (list #:phases @@ -3136,9 +3136,9 @@ YouTube.com and many more sites.") (license license:public-domain))) (define-public yt-dlp - (package/inherit youtube-dl + (package (name "yt-dlp") - (version "2023.10.13") + (version "2024.05.27") (source (origin (method git-fetch) @@ -3147,66 +3147,63 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1cy8cpqwq6yfsbrnln3qqp9lsjckn20m6w7b890ha7jahyir5m1n")))) + (base32 "13j6vg0kxfw3hppq7gzbz2d72g415071gh5arkwzj902rh0c7777")))) + (build-system pyproject-build-system) (arguments - (substitute-keyword-arguments (package-arguments youtube-dl) - ((#:tests? _) (not (%current-target-system))) - ((#:phases phases) - #~(modify-phases #$phases - ;; See the comment for the corresponding phase in youtube-dl. - (replace 'default-to-the-ffmpeg-input - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "yt_dlp/postprocessor/ffmpeg.py" - (("location = self.get_param(.*)$") - (string-append - "location = '" - (dirname (search-input-file inputs "bin/ffmpeg")) - "'\n"))))) - (replace 'build-generated-files - (lambda* (#:key inputs #:allow-other-keys) - (if (assoc-ref inputs "pandoc") - (invoke "make" - "PYTHON=python" - "yt-dlp" - "yt-dlp.1" - "completions") - (invoke "make" - "PYTHON=python" - "yt-dlp" - "completions")))) - (replace 'fix-the-data-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((prefix (assoc-ref outputs "out"))) - (substitute* "setup.py" - (("'etc/") - (string-append "'" prefix "/etc/")) - (("'share/") - (string-append "'" prefix "/share/")))))) - (delete 'install-completion) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-k" "not download")))))))) - (inputs (modify-inputs (package-inputs youtube-dl) - (append python-brotli - python-certifi - python-mutagen - python-pycryptodomex - python-websockets))) + `(#:tests? ,(not (%current-target-system)) + #:phases + (modify-phases %standard-phases + ;; See <https://issues.guix.gnu.org/43418#5>. + ;; ffmpeg is big but required to request free formats from, e.g., + ;; YouTube so pull it in unconditionally. Continue respecting the + ;; --ffmpeg-location argument. + (add-after 'unpack 'default-to-the-ffmpeg-input + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "yt_dlp/postprocessor/ffmpeg.py" + (("location = self.get_param(.*)$") + (string-append + "location = '" + (dirname (search-input-file inputs "bin/ffmpeg")) + "'\n"))))) + (add-before 'build 'build-generated-files + (lambda* (#:key inputs #:allow-other-keys) + (if (assoc-ref inputs "pandoc") + (invoke "make" + "PYTHON=python" + "yt-dlp" + "yt-dlp.1" + "completions") + (invoke "make" + "PYTHON=python" + "yt-dlp" + "completions")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-k" "not download"))))))) + (inputs (list ffmpeg python-brotli + python-certifi + python-mutagen + python-pycryptodomex + python-requests-next ; TODO Remove this special package + python-urllib3-next ; TODO Remove this one too + python-websockets)) (native-inputs (append ;; To generate the manpage. (if (supported-package? pandoc) (list pandoc) '()) - (list python-pytest zip))) + (list python-hatchling python-pytest zip))) + (synopsis "Download videos from YouTube.com and other sites") (description "yt-dlp is a small command-line program to download videos from YouTube.com and many more sites. It is a fork of youtube-dl with a focus on adding new features while keeping up-to-date with the original project.") (properties '((release-monitoring-url . "https://pypi.org/project/yt-dlp/"))) - (home-page "https://github.com/yt-dlp/yt-dlp"))) + (home-page "https://github.com/yt-dlp/yt-dlp") + (license license:public-domain))) (define-public you-get (package diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 90f7330f2b..0c670cb184 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -533,6 +533,7 @@ the same, being completely separated from the Internet.") "--with-http_sub_module" "--with-pcre-jit" "--with-debug" + "--with-compat" "--with-stream" "--with-stream_ssl_module" "--with-http_stub_status_module" @@ -5448,7 +5449,7 @@ you'd expect.") go-github-com-elliotchance-orderedmap go-github-com-fatih-color go-github-com-goccy-go-json - go-github-com-goccy-yaml + go-github-com-goccy-go-yaml go-github-com-jinzhu-copier go-github-com-magiconair-properties go-github-com-pelletier-go-toml-v2 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 505ce09c1a..eecaaa2cf7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2024 bigbug <bigbookofbug@proton.me> ;;; Copyright © 2024 dan <i@dan.games> +;;; Copyright © 2024 Wamm K. D. <jaft.r@outlook.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,6 +146,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages mpd) #:use-module (gnu packages pciutils) #:use-module (gnu packages music) @@ -3910,3 +3912,25 @@ configuration.")))) for short) for X11 and Wayland, that goes to great lengths to be both CPU and battery efficient---polling is only done when absolutely necessary.") (license license:expat))) + +(define-public wf-config + (package + (name "wf-config") + (version "0.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/WayfireWM/" name "/")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 + "07x6dapv2xyg0cn44dd2faw5gpk7mwfpbkpld9kyiaa9d44362z1")))) + (build-system meson-build-system) + (native-inputs (list pkg-config)) + (inputs (list glm libxml2 wlroots libevdev)) + (home-page "https://github.com/WayfireWM/wf-config") + (synopsis "Library for managing configuration files for Wayfire") + (description "The package provides a library for managing the +configuration files of Wayifre. It can set key and mouse bindings, +configure input, and customize Wayfire plugins.") + (license license:expat))) |