diff --git a/CODEOWNERS b/CODEOWNERS index 0c39857a5e5..1c81bec433f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -240,7 +240,6 @@ guix/build-system/asdf\.scm @guix/lisp gnu/packages/anthy\.scm @guix/localization gnu/packages/fcitx5\.scm @guix/localization -gnu/packages/fcitx\.scm @guix/localization gnu/packages/fonts\.scm @guix/localization gnu/packages/ibus\.scm @guix/localization diff --git a/doc/guix.texi b/doc/guix.texi index 3bff8c4904d..af91f02d1f1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13983,7 +13983,7 @@ natively. @cindex building the dependents of a package @anchor{build-dependents} @item --dependents[=@var{depth}] -@itemx -P [@var{depth}] +@itemx -P @var{depth} Build the dependents of the following package. By default, build all the direct and indirect dependents; when @var{depth} is provided, limit to dependents at that distance: 1 for direct dependents, 2 for diff --git a/etc/teams.scm b/etc/teams.scm index e50dec890e9..69057e16efa 100755 --- a/etc/teams.scm +++ b/etc/teams.scm @@ -797,7 +797,6 @@ asdf-build-system." "Localization of your system to specific languages." #:scope (list "gnu/packages/anthy.scm" "gnu/packages/fcitx5.scm" - "gnu/packages/fcitx.scm" "gnu/packages/fonts.scm" "gnu/packages/ibus.scm"))) diff --git a/gnu/local.mk b/gnu/local.mk index 1ef437c3a80..f02a5277bcb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -276,7 +276,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/erlang-xyz.scm \ %D%/packages/esolangs.scm \ %D%/packages/fabric-management.scm \ - %D%/packages/fcitx.scm \ %D%/packages/fcitx5.scm \ %D%/packages/fediverse.scm \ %D%/packages/figlet.scm \ @@ -1830,6 +1829,7 @@ dist_patch_DATA = \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/makem-replace-git.patch \ %D%/packages/patches/marisa-fix-MARISA_WORD_SIZE.patch \ + %D%/packages/patches/mash-add-missing-headers.patch \ %D%/packages/patches/mathjax-disable-webpack.patch \ %D%/packages/patches/mathjax-no-a11y.patch \ %D%/packages/patches/mathjax-3.1.2-no-a11y.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 36078787149..6ef2baee798 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10463,7 +10463,7 @@ technology. Its features include: (define-public mash (package (name "mash") - (version "2.1") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -10472,12 +10472,13 @@ technology. Its features include: (file-name (git-file-name name version)) (sha256 (base32 - "049hwcc059p2fd9vwndn63laifvvsi0wmv84i6y1fr79k15dxwy6")) + "00x4pvxwp3isf0qign1qmxwxc9rwzn5b3igjw9hyn3vx17bsx92q")) (modules '((guix build utils))) (snippet ;; Delete bundled kseq. ;; TODO: Also delete bundled murmurhash and open bloom filter. - '(delete-file "src/mash/kseq.h")))) + '(delete-file "src/mash/kseq.h")) + (patches (search-patches "mash-add-missing-headers.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No tests. @@ -10496,7 +10497,8 @@ technology. Its features include: (lambda _ (substitute* '("src/mash/Sketch.cpp" "src/mash/CommandFind.cpp" - "src/mash/CommandScreen.cpp") + "src/mash/CommandScreen.cpp" + "src/mash/CommandTaxScreen.cpp") (("^#include \"kseq\\.h\"") "#include \"htslib/kseq.h\"")))) (add-after 'fix-includes 'use-c++14 diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a24588f2ad6..c0a13082aff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Magali Lemes -;;; Copyright © 2020, 2021, 2022, 2023 Simon Tournier +;;; Copyright © 2020-2023, 2025 Simon Tournier ;;; Copyright © 2020 Aniket Patil ;;; Copyright © 2021 Marcel Schilling ;;; Copyright © 2021 Guillaume Le Vaillant @@ -103,6 +103,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) #:use-module (gnu packages node) + #:use-module (gnu packages ocr) #:use-module (gnu packages pcre) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -55433,6 +55434,36 @@ or animation) or multiple time series; methods for spatial and temporal matching or aggregation, retrieving coordinates, print, summary, etc.") (license license:gpl2+))) +(define-public r-tesseract + (package + (name "r-tesseract") + (version "5.2.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "tesseract" version)) + (sha256 + (base32 "181fbv1qhqxljr67phkrxahbfgsxa73gzq30zq0wvi38gzbfbnv8")))) + (properties `((upstream-name . "tesseract"))) + (build-system r-build-system) + (inputs (list tesseract-ocr + zlib)) + (propagated-inputs (list r-curl + r-digest + r-pdftools + r-rappdirs + r-rcpp)) + (native-inputs (list pkg-config + r-knitr + r-spelling)) + (home-page "https://github.com/ropensci/tesseract") + (synopsis "Open Source OCR Engine") + (description + "Bindings to @code{tesseract}: an optical character recognition (OCR) engine +that supports over 100 languages. The engine is highly configurable in order +to tune the detection algorithms and obtain the best possible results.") + (license license:asl2.0))) + (define-public r-gstat (package (name "r-gstat") diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 4155fb901ae..a6114427c80 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1136,20 +1136,26 @@ trivial to build for local use. Portability is emphasized over performance.") (file-name (git-file-name name version)) (sha256 (base32 - "1d0cnd2s607j642h64821mpklfvvzy70mkyl2dlsm5s9lgvndn2p")) - (modules '((guix build utils))) - (snippet - ;; These files are pre-generated, the build system is able to - ;; re-generate those. - #~(for-each delete-file '("src/precomputed_ecmult.c" - "src/precomputed_ecmult_gen.c"))))) + "1d0cnd2s607j642h64821mpklfvvzy70mkyl2dlsm5s9lgvndn2p")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-module-recovery" - "--enable-experimental" - "--enable-shared" - "--disable-static" - "--disable-benchmark"))) + (list #:configure-flags + #~(list + "--enable-module-recovery" + "--enable-experimental" + "--enable-shared" + "--disable-static" + "--disable-benchmark") + #:phases + (if (%current-target-system) + #~%standard-phases + #~(modify-phases %standard-phases + ;; These files are pre-generated, the build system is able to + ;; re-generate those if not cross-compiling, + (add-after 'unpack 'delete-precomputed-files + (lambda _ + (for-each delete-file '("src/precomputed_ecmult.c" + "src/precomputed_ecmult_gen.c")))))))) (native-inputs (list autoconf automake libtool)) (synopsis "C library for EC operations on curve secp256k1") diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 38e0e7bea6b..3f7b24aa478 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -528,7 +528,7 @@ server and embedded PowerPC, and S390 guests.") (package (inherit american-fuzzy-lop) (name "aflplusplus") - (version "4.32c") + (version "4.33c") (source (origin (method git-fetch) (uri (git-reference @@ -537,7 +537,7 @@ server and embedded PowerPC, and S390 guests.") (file-name (git-file-name name version)) (sha256 (base32 - "1a92mbwk51pih5jb944wqhvmbpy0acpxgvdfbq3c4xw7gisgn5qn")))) + "1h4ya82s1wd11c04r0g0wsq56asl1np3nmsf6yk4vyic9nm0hsq0")))) (arguments (substitute-keyword-arguments (package-arguments american-fuzzy-lop) ((#:make-flags _ ''()) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90e12e0690a..1c10acad067 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9432,11 +9432,11 @@ inline PDF preview in Org buffers by using @command{pdf2svg}.") (license license:gpl3+))) (define-public emacs-org-rainbow-tags - ;; Upstream didn't tag version. - (let ((commit "c6040d228c5e8c5c6d33c7f81fc09d935ad1bcbd")) + (let ((commit "dfe36047bc9646b621452f3e2e97170e99e2b43f") + (revision "1")) (package (name "emacs-org-rainbow-tags") - (version "0.1-pre") + (version (git-version "0.1-pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9445,7 +9445,7 @@ inline PDF preview in Org buffers by using @command{pdf2svg}.") (file-name (git-file-name name version)) (sha256 (base32 - "006nx01sby8k0fc9lf63ldf0sl94ihldyrvqr9r18fb1gpzvivl6")))) + "1rhgvbhsbm999l5kg19747dxwscd5h5sl330d6a422f0dxvvxqrq")))) (build-system emacs-build-system) (home-page "https://github.com/KaratasFurkan/org-rainbow-tags") (synopsis "Colorize Org tags automatically") diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm deleted file mode 100644 index 44d4d6f9203..00000000000 --- a/gnu/packages/fcitx.scm +++ /dev/null @@ -1,96 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2019 Tobias Geerinckx-Rice -;;; Copyright © 2022 Maxim Cournoyer -;;; Copyright © 2023 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages fcitx) - #:use-module ((guix licenses) #:select (gpl2+)) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system glib-or-gtk) - #:use-module (gnu packages autotools) - #:use-module (gnu packages documentation) - #:use-module (gnu packages gettext) - #:use-module (gnu packages glib) - #:use-module (gnu packages graphviz) - #:use-module (gnu packages gtk) - #:use-module (gnu packages man) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python) - #:use-module (gnu packages sqlite) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) - -(define-public presage - (package - (name "presage") - (version "0.9.1") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/presage/presage/" - version "/presage-" version ".tar.gz")) - (sha256 - (base32 "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay")))) - (build-system glib-or-gtk-build-system) - (outputs '("out" "doc")) - (arguments - `(#:configure-flags - (list - "CFLAGS=-Wno-narrowing -std=c++14" - "CXXFLAGS=-Wno-narrowing -std=c++14") - #:phases - (modify-phases %standard-phases - (add-after 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share/presage")) - (rename-file - (string-append out "/share/presage/html") - (string-append doc "/share/presage/html"))))) - (add-after 'unpack 'update-config-scripts - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (for-each (lambda (file) - (install-file - (search-input-file - (or native-inputs inputs) - (string-append "/bin/" file)) ".")) - '("config.guess" "config.sub"))))))) - (native-inputs - `(("config" ,config) - ("dot" ,graphviz) - ("doxygen" ,doxygen) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gtk+:bin" ,gtk+ "bin") - ("help2man" ,help2man) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) - (inputs - (list glib gtk+ libx11 sqlite tinyxml)) - (synopsis "Intelligent Predictive Text Entry System") - (description "Presage generates predictions by modelling natural language as -a combination of redundant information sources. It computes probabilities for -words which are most likely to be entered next by merging predictions generated -by the different predictive algorithms.") - (home-page "https://presage.sourceforge.io/") - (license gpl2+))) - diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ca107180ac5..d850c143c5a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -94,7 +94,6 @@ #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) - #:use-module (gnu packages fcitx) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) @@ -380,95 +379,6 @@ inappropriate content.") license:gpl2+ license:lgpl2.1+)))) -(define-public maliit-framework - (package - (name "maliit-framework") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/maliit/framework") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dkjxvfxg56hfy70j6ibfklfyv57jiha4vgc3ggl60r5kjx65s5b")))) - (build-system cmake-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; The Ft_MIMPluginManager::testPluginDescriptions test fails - ;; with a QFATAL error: received signal 11, while - ;; ut_mimpluginmanager fails at least on powerpc64le with a - ;; subprocess aborted error (see: - ;; https://github.com/maliit/framework/issues/120). - (invoke "ctest" "-E" - "(ft_mimpluginmanager|ut_mimpluginmanager)"))))))) - (native-inputs (list extra-cmake-modules - wayland-protocols - pkg-config - doxygen - graphviz - `(,glib "bin"))) ;for gdbus-codegen)) - (inputs (list qtbase-5 - qtdeclarative-5 - qtwayland-5 - wayland - libxkbcommon - dbus - eudev - glib)) - (home-page "https://github.com/maliit/framework") - (synopsis "Core libraries of Maliit") - (description "This package provides Maliit provides a flexible input -method framework.") - (license license:lgpl2.1+))) - -(define-public maliit-keyboard - (package - (name "maliit-keyboard") - (version "2.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/maliit/keyboard") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0g89lckl4wzwamc89hs8871fbiyrsjwzk5b6ic4vhc4d1clyqzaw")))) - (build-system cmake-build-system) - (arguments - (list #:tests? #f - #:phases #~(modify-phases %standard-phases - (add-after 'install 'install-schemas - (lambda* (#:key source outputs #:allow-other-keys) - (with-directory-excursion (string-append #$output - "/share/glib-2.0/schemas") - (invoke "glib-compile-schemas" "."))))))) - (native-inputs (list extra-cmake-modules pkg-config gettext-minimal - `(,glib "bin"))) - (inputs (list hunspell - glib - libchewing - libpinyin - maliit-framework - presage - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 - qtquickcontrols2-5)) - (home-page "https://github.com/maliit/keyboard") - (synopsis "Maliit Keyboard") - (description - "This package provides virtual keyboard for Wayland and X11 -display servers. It supports many different languages and emoji.") - (license license:gpl3+))) - ;; Private package used by shared-mime-info. (define xdgmime ;; No public release, match commit to the one used in the diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5f8217ed177..4fa251d6294 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -194,8 +194,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "a68bcfd2f53a409c530629d8ec0d9d152a56e16b") - (revision 44)) + (commit "679c9b0d8b02710f286b7fb3e65835eefa9f1890") + (revision 45)) (package (name "guix") @@ -211,7 +211,7 @@ (commit commit))) (sha256 (base32 - "10ri7f1pwq43ix0k59fqrrgdipz67sx9kyi3yw9x9n89v3k1ns62")) + "0mzflm74kllhfr4gbb1r93l6v8l6r9ak6f46bakpxfpv763bp719")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/mash-add-missing-headers.patch b/gnu/packages/patches/mash-add-missing-headers.patch new file mode 100644 index 00000000000..d4eca2a5b44 --- /dev/null +++ b/gnu/packages/patches/mash-add-missing-headers.patch @@ -0,0 +1,26 @@ +https://patch-diff.githubusercontent.com/raw/marbl/Mash/pull/181.diff + +Add missing includes to support newer compilers. +--- +diff --git a/src/mash/robin_hood.h b/src/mash/robin_hood.h +index 573607f..9141848 100644 +--- a/src/mash/robin_hood.h ++++ b/src/mash/robin_hood.h +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #include // only to support hash of smart pointers + #include + #include +--- a/src/mash/Command.cpp ++++ b/src/mash/Command.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "Command.h" + #include "version.h" \ No newline at end of file diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 62299065f0a..c6d5f42aa5b 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -185,7 +185,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.83.5") + (version "2.83.8") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "04d1h8331dsb1gbrp28h2sqkwqh3cfzbdlziczwqk2kyyp9sf9f8")) + (base32 "1bpfzrwsgbmjl1maiaw5b8ixkgh548gw1lkiznsjgkjm7dxr4ns4")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 525c7781af0..fe7f39333f1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5220,13 +5220,16 @@ sanitizer Rust crate.") (version "0.3.1") (source (origin - (method url-fetch) - (uri (pypi-uri "noiseprotocol" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/plizonczyk/noiseprotocol") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ifnj0mpbqsfqba9n12vf5yzxj4qf2gxql3ry43qyshgnrqsi4mh")))) + (base32 "1mk0rqpjifdv3v1cjwkdnjbrfmzzjm9f3qqs1r8vii4j2wvhm6am")))) (build-system pyproject-build-system) (propagated-inputs (list python-cryptography)) - (native-inputs (list python-setuptools python-wheel)) + (native-inputs (list python-setuptools python-pytest)) (home-page "https://github.com/plizonczyk/noiseprotocol") (synopsis "Implementation of Noise Protocol Framework") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 23fa9c21f7d..e8e373652f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29198,6 +29198,7 @@ submitting it.") (sha256 (base32 "0ymdwrx544a6gn6wm9dixpgzbfrbpxvcj5ys7m41cgb4lvpvx691")))) (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;No test suite. (native-inputs (list python-setuptools python-wheel)) (home-page "https://github.com/iwalton3/python-mpv-jsonipc") (synopsis "Python API to control MPV using JSON IPC") @@ -34263,7 +34264,19 @@ and have a maximum lifetime built-in.") (list #:test-flags ;; Disable some failing tests. - '(list "-k" "not test_print_subprocess" + ;; + ;; test_print_subprocess seems to inherit wrong environment, fails with + ;; E + ModuleNotFoundError: No module named 'executing' + ;; Test runs fine from local clone. + ;; + ;; test_executing_failure fails with + ;; E - [1, 2] (list) len=2 + ;; E + [x, y]: [1, 2] (list) len=2 + ;; unclear why, probably due to a dependency. + '(list "-k" "not test_print_subprocess and not test_executing_failure" + ;; test_insert_assert.py also seems to inherit a bad environment: + ;; E fixture 'pytester_pretty' not found + ;; Test runs fine from local clone. "--ignore=tests/test_insert_assert.py"))) (native-inputs (list python-hatchling python-pytest python-pytest-mock)) @@ -38711,7 +38724,7 @@ parsing rules in a single place.") (sha256 (base32 "0g4cn522n4dv6ly8pwf97dc62rr4f7my38v0bh6vmac7jmrip7pv")))) (build-system pyproject-build-system) - (native-inputs (list python-setuptools python-wheel)) + (native-inputs (list python-setuptools python-pytest)) (home-page "https://github.com/pR0Ps/iterable-io") (synopsis "Adapt generators and other iterables to a file-like interface") (description diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 481fe177bfa..b2775e795f7 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -660,7 +660,7 @@ This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.") (define-public capnproto (package (name "capnproto") - (version "1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append @@ -668,13 +668,13 @@ This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.") version ".tar.gz")) (sha256 (base32 - "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i")) + "1vs2zpk4l55hb4lq4kldbwdqcjnwm1jblhcaqxmii9dxrd7f807d")) (patches (search-patches "capnproto-fix-test.patch")))) - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'use-tmp-for-temporary-files + (add-after 'unpack 'use-tmp-for-temporary-files (lambda _ ;; Use /tmp for temporary files, as the default /var/tmp directory ;; doesn't exist. diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 462e0188201..bc52898c0ae 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2021 Wiktor Żelazny ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2023 Timo Wilken -;;; Copyright © 2023 Camilo Q.S. (Distopico) +;;; Copyright © 2023, 2025 Camilo Q.S. (Distopico) ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Artyom V. Poptsov ;;; Copyright © 2024 Brian Kubisiak @@ -744,7 +744,7 @@ Latin script and other languages.") (define-public direnv (package (name "direnv") - (version "2.36.0") + (version "2.37.1") (source (origin (method git-fetch) (uri (git-reference @@ -753,7 +753,7 @@ Latin script and other languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0p6n9zi3p9frj3ndnpdc1cz51hq0nkyjc9b1rqg7967l8vhdr8f6")))) + "08wywbj5niqhpy6m4y8xw065w3rgpi8khfy5qzqfxr6752h66v7p")))) (build-system go-build-system) (arguments (list #:install-source? #f diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 3ac19e56156..b3bf99074cc 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -39,7 +39,6 @@ #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages digest) - #:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx5) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f03994406e7..b870f7396d2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -4224,7 +4224,11 @@ will reconstruct the object along its delta-base chain and return it.") (install-file manpage (string-append #$output "/share/man/man1"))) (find-files "." "^git-lfs.*\\.1$")))))) - #~())))) + #~()) + (add-after 'install 'rename-binary + (lambda _ + (with-directory-excursion (string-append #$output "/bin") + (rename-file "v3" "git-lfs"))))))) (native-inputs (append (list git-minimal go-github-com-avast-retry-go @@ -4251,7 +4255,7 @@ will reconstruct the object along its delta-base chain and return it.") (if (supported-package? ruby-asciidoctor/minimal) (list ronn-ng ruby-asciidoctor/minimal) '()))) - (home-page "https://git-lfs.github.com/") + (home-page "https://git-lfs.com/") (synopsis "Git extension for versioning large files") (description "Git Large File Storage (LFS) replaces large files such as audio samples, diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fe1fa25ad91..0db72149759 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2696,14 +2696,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (substitute* "player/lua/ytdl_hook.lua" (("\"yt-dlp\",") (string-append - "\"" (search-input-file inputs "bin/yt-dlp") "\","))))) - (add-before 'configure 'build-reproducibly - (lambda _ - ;; Somewhere in the build system library dependencies are enumerated - ;; and passed as linker flags, but the order in which they are added - ;; varies. See . - ;; Set PYTHONHASHSEED as a workaround for deterministic results. - (setenv "PYTHONHASHSEED" "1")))) + "\"" (search-input-file inputs "bin/yt-dlp") "\",")))))) #:configure-flags #~(list "-Dlibmpv=true" "-Dcdda=enabled" diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ea3f277ca74..167651f601e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2025 Josep Bigorra ;;; Copyright © 2025 Ashish SHUKLA ;;; Copyright © 2025 Philippe Swartvagher +;;; Copyright © 2025 pinoaffe ;;; ;;; This file is part of GNU Guix. ;;; @@ -138,6 +139,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) + #:use-module (gnu packages digest) #:use-module (gnu packages django) #:use-module (gnu packages docbook) #:use-module (gnu packages datastructures) @@ -188,6 +190,7 @@ #:use-module (gnu packages man) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) + #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages node) #:use-module (gnu packages nss) @@ -215,6 +218,8 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages skribilo) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tcl) #:use-module (gnu packages telephony) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -6742,6 +6747,66 @@ and similar services.") (home-page "http://surfraw.org/") (license license:public-domain)))) +(define-public bookmarkfs + (package + (name "bookmarkfs") + (version "0.1.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/cismonx/bookmarkfs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ad7h3ffwj7dg7c788znc8b0wr6v5xx83sans8xa6f93x9c56frm")))) + (build-system gnu-build-system) + (arguments (list + #:tests? #f ; tests seem to not work in sandbox + #:configure-flags #~(list + "--enable-bookmarkfs-util" + "--enable-bookmarkfs-mount" + "--enable-bookmarkfs-fsck" + "--enable-bookmarkfs-mkfs" + "--enable-bookmarkctl" + "--enable-backend-firefox" + "--enable-backend-chromium" + "--enable-fsck-handler-tcl") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-flush + (lambda _ + (substitute* "src/fs_ops.c" + (("fi->noflush = 1;") "fi->flush = 0;")))) + (add-before 'configure 'patch-configure + (lambda _ + (substitute* "configure" + (("AX_PTHREAD") ""))))))) + (inputs (list fuse + libseccomp + nettle + jansson + readline + tcl + uriparser + zlib + xxhash + sqlite)) + (native-inputs (list autoconf-2.72 + autoconf-archive + automake + libtool + pkg-config)) + (home-page "https://www.nongnu.org/bookmarkfs/") + (synopsis "FUSE filesystem based interface to the bookmark data of web browsers") + (description "BookmarkFS is a FUSE-based pseudo-filesystem which provides an +interface to the bookmark data of web browsers. + +Currently, the following browsers (and their derivatives) are supported: +- @code{firefox} +- @code{chromium}.") + (license license:gpl3+))) + (define-public darkhttpd (package (name "darkhttpd") diff --git a/guix/build-system/mix.scm b/guix/build-system/mix.scm index f6de26adac1..4bfa4dcf0cb 100644 --- a/guix/build-system/mix.scm +++ b/guix/build-system/mix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Pierre-Henry Fröhring +;;; Copyright © 2025 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,6 +74,7 @@ See: https://github.com/hexpm/specifications/blob/main/endpoints.md" #:key source (tests? #t) + (test-flags ''()) (mix-path #f) ;See MIX_PATH. (mix-exs "mix.exs") ;See MIX_EXS. (build-per-environment #t) ;See :build_per_environment. @@ -107,6 +109,7 @@ See: https://github.com/hexpm/specifications/blob/main/endpoints.md" #:source #+source #:system #$system #:tests? #$tests? + #:test-flags #$test-flags #:mix-path #$mix-path #:mix-exs #$mix-exs #:mix-environments '#$mix-environments diff --git a/guix/build/mix-build-system.scm b/guix/build/mix-build-system.scm index 6b7541cf56c..c521657704e 100644 --- a/guix/build/mix-build-system.scm +++ b/guix/build/mix-build-system.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Pierre-Henry Fröhring ;;; Copyright © 2024 Igor Goryachev -;;; Copyright © 2024 Giacomo Leidi +;;; Copyright © 2024, 2025 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -119,13 +119,14 @@ See: https://hexdocs.pm/mix/1.15.7/Mix.html#module-environment-variables" "--no-prune-code-paths")) mix-environments)) -(define* (check #:key (tests? #t) #:allow-other-keys) +(define* (check #:key (tests? #t) (test-flags '()) #:allow-other-keys) "Test the Mix project." (if tests? (begin (setenv "MIX_ENV" "test") - (invoke "mix" "do" "compile" "--no-deps-check" "--no-prune-code-paths" "+" - "test" "--no-deps-check")) + (apply invoke "mix" "do" "compile" "--no-deps-check" + "--no-prune-code-paths" "+" "test" + "--no-deps-check" test-flags)) (format #t "tests? = ~a~%" tests?))) (define* (remove-mix-dirs . _) diff --git a/guix/git.scm b/guix/git.scm index 547585b27d3..fca7e84fbb7 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2023 Tobias Geerinckx-Rice -;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2023, 2025 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -575,10 +575,16 @@ current settings unchanged." (string-append "origin/" branch)))) (_ ref))) - (define symref-list - (match ref - (('symref . symref) (list symref)) - (_ '()))) + (define symref? + (match-lambda + (('symref . _) #t) + (_ #f))) + + (define ref->refspecs + (match-lambda + (('symref . symref) + (list (string-append "+" symref ":" symref))) + (_ '()))) (with-libgit2 (set-git-timeouts connection-timeout read-timeout) @@ -595,7 +601,7 @@ current settings unchanged." ;; When using symrefs, fetch remote again even if it has been cloned just ;; before as the requested reference are not fetched when cloning. - (when (and cache-exists? + (when (and (or cache-exists? (symref? ref)) (not (reference-available? repository ref))) (remote-fetch (remote-lookup repository "origin") #:fetch-options (make-default-fetch-options @@ -603,9 +609,7 @@ current settings unchanged." verify-certificate?) ;; Build refspecs from symbolic references so they are ;; created locally and updated if necessary. - #:refspecs (map (lambda (ref) - (string-append "+" ref ":" ref)) - symref-list))) + #:refspecs (ref->refspecs ref))) (when recursive? (update-submodules repository #:log-port log-port #:fetch-options diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 96e027dcf2f..0dfbbd6e61b 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -146,7 +146,6 @@ gnu/packages/erlang-xyz.scm gnu/packages/erlang.scm gnu/packages/esolangs.scm gnu/packages/fabric-management.scm -gnu/packages/fcitx.scm gnu/packages/fcitx5.scm gnu/packages/fediverse.scm gnu/packages/figlet.scm