Compare commits

...

25 commits

Author SHA1 Message Date
Hugo Buddelmeijer
7c7bc37b6e
gnu: python-devtools: Disable failing tests.
* gnu/packages/python-xyz.scm (python-devtools): Disable failing tests.
[arguments] <test-flags>: Disable failing tests.

Change-Id: I1c6533a4a912d5dc4bde3610ccce7d38837caac4
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-09-25 23:47:33 +01:00
ColdSideOfYourPillow
bcbc4cf384
gnu: mpv: Remove redundant phase.
* gnu/packages/video.scm (mpv): [arguments]: Remove phase
`build-reproducibly`.

Change-Id: I60291e4bc9e644d1d846f77e79028b7858d34652
Signed-off-by: Vagrant Cascadian <vagrant@reproducible-builds.org>
2025-09-25 14:42:30 -07:00
Ludovic Courtès
0971788c0b
gnu: guix: Update to 679c9b0.
This is a followup to 6e12325bf3 and
7d1d1d1f7c.

* gnu/packages/package-management.scm (guix): Update to 679c9b0.

Change-Id: I96aa3ab3c0e5a9bdc11157e982815d5cb6816127
2025-09-25 23:23:15 +02:00
Hugo Buddelmeijer
758808cd9d
gnu: python-iterable-io: Fix tests.
* gnu/packages/python-xyz.scm (python-iterable-io): Fix tests.
[native-inputs]: Remove python-wheel; add python-pytest.

Change-Id: I8c525653b8277c39b3a4b74c82c5eb864f9b032d
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2025-09-25 13:58:53 -07:00
Hugo Buddelmeijer
7382948978
gnu: python-noiseprotocol: Fix tests.
* gnu/packages/python-web.scm (python-noiseprotocol): Fix tests.
[native-inputs]: Remove python-wheel; add python-pytest.
[source]: Switch to git-fetch to have tests.

Change-Id: I474ef101c1d645dea06c6a953928793d70c7caf2
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2025-09-25 13:58:50 -07:00
Nguyễn Gia Phong
679c9b0d8b
gnu: aflplusplus: Update to 4.33c.
* gnu/packages/debug.scm (aflplusplus): Update to 4.33c.

Change-Id: I8b4cd403926ffe9cb39fd340baf341a5b438e39d
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-09-25 22:04:26 +02:00
pinoaffe
8580847f8a
gnu: Add bookmarkfs.
* gnu/packages/web.scm (bookmarkfs): New variable.

Change-Id: I83cfb30e26c58b258a85d085431eeed128995af9
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-09-25 22:04:26 +02:00
Giacomo Leidi
40c2edf91b
build-system: mix: Allow passing test flags.
* guix/build-system/mix.scm (mix-build): Add test-flags keyword
argument and pass it on.
* guix/build/mix-build-system.scm (check): Add test-flags keyword
argument and pass it to Mix.

Change-Id: Ib8243aaaf7a7d02df993cee44f33b36566049e83
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-09-25 22:04:26 +02:00
Hugo Buddelmeijer
6e4ac11633
doc: Clarify depth argument of build -P is non-optional.
* doc/guix.texi (Additional Build Options): Depth in guix build -P is required.

Change-Id: I2cbc149a9fc59a198ceedb06cc1fa5496b4f4c91
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-09-25 22:04:26 +02:00
Hennadii Stepanov
5e89d39601
gnu: libsecp256k1: Fix cross-compiling.
* gnu/packages/crypto.scm (libsecp256k1)
[source]: Remove snippet deleting "src/precomputed_ecmult.c" and
"src/precomputed_ecmult_gen.c".
[arguments]: Add conditional phase 'delete-precomputed-files' that
deletes them only when not cross-compiling.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2025-09-25 22:04:25 +02:00
Simon Tournier
6e12325bf3
git: Fix update cached checkout when not a symref.
Follow up of 66463356ce.

* guix/git.scm (update-cached-checkout)[symref?]: New procedure.
[ref->refspecs]: New procedure.
Use them.

Change-Id: Ia2cb7db45222d59d61a2349bec277fd06456844b
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Modified-by: Ludovic Courtès <ludo@gnu.org>
2025-09-25 22:04:25 +02:00
Trevor Arjeski
052fab5f0b
gnu: mash: Update to 2.3 and fix build with gcc-14.
* gnu/packages/bioinformatics.scm (mash): Update to 2.3.
[arguments]<#:phases>{fix-includes}: Add file to substitutions.
* gnu/packages/patches/mash-add-missing-headers.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register new file.

Fixes: guix/guix#2986
Change-Id: I6a37a6b65b0abe9b72663bcafbc034dac0cff0c0
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-09-25 21:39:21 +02:00
Trevor Arjeski
8c7d8cbd2f
gnu: capnproto: Update to 1.2.0.
* gnu/packages/serialization.scm (capnproto): Update to 1.2.0.
* changed: gnu to cmake build system to get a test to pass (unsure why).
* moved: /tmp dir patch to after 'unpack phase.

Change-Id: I6a27587f8126eeb0cfeb7b9f26dc436bd66b5f92
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-09-25 21:20:00 +02:00
Andreas Enge
b97049b29c
gnu: Remove references to (gnu packages fcitx).
This is a follow-up to commit 04a4f8cc9d .

* etc/teams.scm (localization): Unregister removed file.
* CODEOWNERS: Regenerate file.

Change-Id: Id7196e36aab79ecdb65f9e4a1f18e81e92fb6994
2025-09-25 21:11:39 +02:00
Hilton Chain
4a16a264e9
gnu: Remove use of (gnu packages fcitx) module.
Follow-up to module removal in 04a4f8cc9d.

* gnu/packages/freedesktop.scm,
* gnu/packages/telegram.scm: Remove use of (gnu packages fcitx) module.

Change-Id: I36208bf8cb7ccb13bb4e55ec8262a8614adc5f16
2025-09-26 03:02:28 +08:00
Distopico
2ae4c32a74
gnu: direnv: Update to 2.37.1.
* gnu/packages/shellutils.scm (direnv): Update to 2.37.1.

Change-Id: I156b641435b0b0e134e9f4be206daa4275c89d51
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-09-25 20:53:40 +02:00
Andreas Enge
04a4f8cc9d
gnu: Remove (gnu packages fcitx).
* gnu/packages/fcitx.scm: Remove file.
* gnu/local.mk (GNU_SYSTEM_MODULES), po/packages/POTFILES.in: Unregister
file.

Fixes: guix/guix#2260
Change-Id: I70cdffb1dc5f8112afbdf556f457d647d788db9e
2025-09-25 20:33:34 +02:00
Andreas Enge
7ed492c5a8
gnu: Remove presage.
* gnu/packages/fcitx.scm (presage): Delete variable.

Change-Id: I37bb83d8c6dcb949103a57827f4cac8a97fab3b1
2025-09-25 20:31:45 +02:00
Andreas Enge
03b630d95b
gnu: Remove maliit-framework.
* gnu/packages/freedesktop.scm (maliit-framework): Delete variable.

Change-Id: Ia8d25c29a86befd5859f39693ed67e659ed1f68d
2025-09-25 20:31:14 +02:00
Andreas Enge
ab26bff569
gnu: Remove maliit-keyboard.
* gnu/packages/freedesktop.scm (maliit-keyboard): Delete variable.

Change-Id: I445aa513f75727c68860547e53d6ef378563d024
2025-09-25 20:29:09 +02:00
Simon Tournier
00799525e7
gnu: Add r-tesseract.
* gnu/packages/cran.scm (r-tesseract): New variable.

Change-Id: Ia4227bee7f02de4901c5a6542b6a3b8c2d880cd8
Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-09-25 20:16:51 +02:00
Hilton Chain
fff8271db4
gnu: emacs-org-rainbow-tags: Update to 0.1-pre-1.dfe3604.
This change also fixes build failure of the package.

* gnu/packages/emacs-xyz.scm (emacs-org-rainbow-tags): Update to
0.1-pre-1.dfe3604.

Change-Id: Ia678db34fa9211ae100416b5e172d2b0dc35851b
2025-09-26 02:10:34 +08:00
Hilton Chain
896872cba8
gnu: python-mpv-jsonipc: Disable tests explicitly.
* gnu/packages/python-xyz.scm (python-mpv-jsonipc) [arguments] <#:tests?>:
Disable.

Change-Id: I921848852c7963951092e9beee0c630d954320b7
2025-09-26 02:06:11 +08:00
jgart
ace78713a9
gnu: trealla: Update to 2.83.8.
* gnu/packages/prolog.scm (trealla): Update to 2.83.8.

Change-Id: I190612b48e6a69e31384bb12d81465a668f2de59
2025-09-25 10:55:50 -05:00
Baptiste Strazzulla
29d364498e
gnu: git-lfs: Fix build.
This change is to bypass combination of go-build-system and custom make
targets where the import path is set manually, see discussion in
guix/guix#2133.

* gnu/packages/version-control.scm (git-lfs): Rename binary and home page

Change-Id: Ic87627412f715ebed07cf79ddd298e777746975f
Reviewed-by: Nicolas Graves <ngraves@ngraves.fr>
Reviewed-by: Maxim Cournoyer <maxim@guixotic.coop>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-09-25 16:39:34 +01:00
26 changed files with 217 additions and 256 deletions

View file

@ -240,7 +240,6 @@ guix/build-system/asdf\.scm @guix/lisp
gnu/packages/anthy\.scm @guix/localization gnu/packages/anthy\.scm @guix/localization
gnu/packages/fcitx5\.scm @guix/localization gnu/packages/fcitx5\.scm @guix/localization
gnu/packages/fcitx\.scm @guix/localization
gnu/packages/fonts\.scm @guix/localization gnu/packages/fonts\.scm @guix/localization
gnu/packages/ibus\.scm @guix/localization gnu/packages/ibus\.scm @guix/localization

View file

@ -13983,7 +13983,7 @@ natively.
@cindex building the dependents of a package @cindex building the dependents of a package
@anchor{build-dependents} @anchor{build-dependents}
@item --dependents[=@var{depth}] @item --dependents[=@var{depth}]
@itemx -P [@var{depth}] @itemx -P @var{depth}
Build the dependents of the following package. By default, build all Build the dependents of the following package. By default, build all
the direct and indirect dependents; when @var{depth} is provided, limit the direct and indirect dependents; when @var{depth} is provided, limit
to dependents at that distance: 1 for direct dependents, 2 for to dependents at that distance: 1 for direct dependents, 2 for

View file

@ -797,7 +797,6 @@ asdf-build-system."
"Localization of your system to specific languages." "Localization of your system to specific languages."
#:scope (list "gnu/packages/anthy.scm" #:scope (list "gnu/packages/anthy.scm"
"gnu/packages/fcitx5.scm" "gnu/packages/fcitx5.scm"
"gnu/packages/fcitx.scm"
"gnu/packages/fonts.scm" "gnu/packages/fonts.scm"
"gnu/packages/ibus.scm"))) "gnu/packages/ibus.scm")))

View file

@ -276,7 +276,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/erlang-xyz.scm \ %D%/packages/erlang-xyz.scm \
%D%/packages/esolangs.scm \ %D%/packages/esolangs.scm \
%D%/packages/fabric-management.scm \ %D%/packages/fabric-management.scm \
%D%/packages/fcitx.scm \
%D%/packages/fcitx5.scm \ %D%/packages/fcitx5.scm \
%D%/packages/fediverse.scm \ %D%/packages/fediverse.scm \
%D%/packages/figlet.scm \ %D%/packages/figlet.scm \
@ -1830,6 +1829,7 @@ dist_patch_DATA = \
%D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/makem-replace-git.patch \ %D%/packages/patches/makem-replace-git.patch \
%D%/packages/patches/marisa-fix-MARISA_WORD_SIZE.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-disable-webpack.patch \
%D%/packages/patches/mathjax-no-a11y.patch \ %D%/packages/patches/mathjax-no-a11y.patch \
%D%/packages/patches/mathjax-3.1.2-no-a11y.patch \ %D%/packages/patches/mathjax-3.1.2-no-a11y.patch \

View file

@ -10463,7 +10463,7 @@ technology. Its features include:
(define-public mash (define-public mash
(package (package
(name "mash") (name "mash")
(version "2.1") (version "2.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -10472,12 +10472,13 @@ technology. Its features include:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"049hwcc059p2fd9vwndn63laifvvsi0wmv84i6y1fr79k15dxwy6")) "00x4pvxwp3isf0qign1qmxwxc9rwzn5b3igjw9hyn3vx17bsx92q"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete bundled kseq. ;; Delete bundled kseq.
;; TODO: Also delete bundled murmurhash and open bloom filter. ;; 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) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests. `(#:tests? #f ; No tests.
@ -10496,7 +10497,8 @@ technology. Its features include:
(lambda _ (lambda _
(substitute* '("src/mash/Sketch.cpp" (substitute* '("src/mash/Sketch.cpp"
"src/mash/CommandFind.cpp" "src/mash/CommandFind.cpp"
"src/mash/CommandScreen.cpp") "src/mash/CommandScreen.cpp"
"src/mash/CommandTaxScreen.cpp")
(("^#include \"kseq\\.h\"") (("^#include \"kseq\\.h\"")
"#include \"htslib/kseq.h\"")))) "#include \"htslib/kseq.h\""))))
(add-after 'fix-includes 'use-c++14 (add-after 'fix-includes 'use-c++14

View file

@ -31,7 +31,7 @@
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net> ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Magali Lemes <magalilemes00@gmail.com> ;;; Copyright © 2020 Magali Lemes <magalilemes00@gmail.com>
;;; Copyright © 2020, 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020-2023, 2025 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com> ;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com>
;;; Copyright © 2021 Marcel Schilling <marcel.schilling@uni-luebeck.de> ;;; Copyright © 2021 Marcel Schilling <marcel.schilling@uni-luebeck.de>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@ -103,6 +103,7 @@
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages node) #:use-module (gnu packages node)
#:use-module (gnu packages ocr)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages pdf) #:use-module (gnu packages pdf)
#:use-module (gnu packages perl) #: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.") matching or aggregation, retrieving coordinates, print, summary, etc.")
(license license:gpl2+))) (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 (define-public r-gstat
(package (package
(name "r-gstat") (name "r-gstat")

View file

@ -1136,20 +1136,26 @@ trivial to build for local use. Portability is emphasized over performance.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1d0cnd2s607j642h64821mpklfvvzy70mkyl2dlsm5s9lgvndn2p")) "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")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--enable-module-recovery" (list #:configure-flags
"--enable-experimental" #~(list
"--enable-shared" "--enable-module-recovery"
"--disable-static" "--enable-experimental"
"--disable-benchmark"))) "--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 (native-inputs
(list autoconf automake libtool)) (list autoconf automake libtool))
(synopsis "C library for EC operations on curve secp256k1") (synopsis "C library for EC operations on curve secp256k1")

View file

@ -528,7 +528,7 @@ server and embedded PowerPC, and S390 guests.")
(package (package
(inherit american-fuzzy-lop) (inherit american-fuzzy-lop)
(name "aflplusplus") (name "aflplusplus")
(version "4.32c") (version "4.33c")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -537,7 +537,7 @@ server and embedded PowerPC, and S390 guests.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1a92mbwk51pih5jb944wqhvmbpy0acpxgvdfbq3c4xw7gisgn5qn")))) "1h4ya82s1wd11c04r0g0wsq56asl1np3nmsf6yk4vyic9nm0hsq0"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments american-fuzzy-lop) (substitute-keyword-arguments (package-arguments american-fuzzy-lop)
((#:make-flags _ ''()) ((#:make-flags _ ''())

View file

@ -9432,11 +9432,11 @@ inline PDF preview in Org buffers by using @command{pdf2svg}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-org-rainbow-tags (define-public emacs-org-rainbow-tags
;; Upstream didn't tag version. (let ((commit "dfe36047bc9646b621452f3e2e97170e99e2b43f")
(let ((commit "c6040d228c5e8c5c6d33c7f81fc09d935ad1bcbd")) (revision "1"))
(package (package
(name "emacs-org-rainbow-tags") (name "emacs-org-rainbow-tags")
(version "0.1-pre") (version (git-version "0.1-pre" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -9445,7 +9445,7 @@ inline PDF preview in Org buffers by using @command{pdf2svg}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"006nx01sby8k0fc9lf63ldf0sl94ihldyrvqr9r18fb1gpzvivl6")))) "1rhgvbhsbm999l5kg19747dxwscd5h5sl330d6a422f0dxvvxqrq"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/KaratasFurkan/org-rainbow-tags") (home-page "https://github.com/KaratasFurkan/org-rainbow-tags")
(synopsis "Colorize Org tags automatically") (synopsis "Colorize Org tags automatically")

View file

@ -1,96 +0,0 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; 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 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+)))

View file

@ -94,7 +94,6 @@
#:use-module (gnu packages disk) #:use-module (gnu packages disk)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages fcitx)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
@ -380,95 +379,6 @@ inappropriate content.")
license:gpl2+ license:gpl2+
license:lgpl2.1+)))) 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. ;; Private package used by shared-mime-info.
(define xdgmime (define xdgmime
;; No public release, match commit to the one used in the ;; No public release, match commit to the one used in the

View file

@ -194,8 +194,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "1.4.0") (let ((version "1.4.0")
(commit "a68bcfd2f53a409c530629d8ec0d9d152a56e16b") (commit "679c9b0d8b02710f286b7fb3e65835eefa9f1890")
(revision 44)) (revision 45))
(package (package
(name "guix") (name "guix")
@ -211,7 +211,7 @@
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"10ri7f1pwq43ix0k59fqrrgdipz67sx9kyi3yw9x9n89v3k1ns62")) "0mzflm74kllhfr4gbb1r93l6v8l6r9ak6f46bakpxfpv763bp719"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments

View file

@ -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 <cstdlib>
#include <cstring>
#include <functional>
+#include <limits>
#include <memory> // only to support hash of smart pointers
#include <stdexcept>
#include <string>
--- a/src/mash/Command.cpp
+++ b/src/mash/Command.cpp
@@ -8,6 +8,7 @@
#include <sys/ioctl.h>
#include <sstream>
#include <fstream>
+#include <cstdint>
#include "Command.h"
#include "version.h"

View file

@ -185,7 +185,7 @@ it.")
(define-public trealla (define-public trealla
(package (package
(name "trealla") (name "trealla")
(version "2.83.5") (version "2.83.8")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -194,7 +194,7 @@ it.")
(url "https://github.com/trealla-prolog/trealla") (url "https://github.com/trealla-prolog/trealla")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "04d1h8331dsb1gbrp28h2sqkwqh3cfzbdlziczwqk2kyyp9sf9f8")) (base32 "1bpfzrwsgbmjl1maiaw5b8ixkgh548gw1lkiznsjgkjm7dxr4ns4"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs

View file

@ -5220,13 +5220,16 @@ sanitizer Rust crate.")
(version "0.3.1") (version "0.3.1")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (pypi-uri "noiseprotocol" version)) (uri (git-reference
(url "https://github.com/plizonczyk/noiseprotocol")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "0ifnj0mpbqsfqba9n12vf5yzxj4qf2gxql3ry43qyshgnrqsi4mh")))) (base32 "1mk0rqpjifdv3v1cjwkdnjbrfmzzjm9f3qqs1r8vii4j2wvhm6am"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(propagated-inputs (list python-cryptography)) (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") (home-page "https://github.com/plizonczyk/noiseprotocol")
(synopsis "Implementation of Noise Protocol Framework") (synopsis "Implementation of Noise Protocol Framework")
(description (description

View file

@ -29198,6 +29198,7 @@ submitting it.")
(sha256 (sha256
(base32 "0ymdwrx544a6gn6wm9dixpgzbfrbpxvcj5ys7m41cgb4lvpvx691")))) (base32 "0ymdwrx544a6gn6wm9dixpgzbfrbpxvcj5ys7m41cgb4lvpvx691"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (list #:tests? #f)) ;No test suite.
(native-inputs (list python-setuptools python-wheel)) (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/iwalton3/python-mpv-jsonipc") (home-page "https://github.com/iwalton3/python-mpv-jsonipc")
(synopsis "Python API to control MPV using JSON IPC") (synopsis "Python API to control MPV using JSON IPC")
@ -34263,7 +34264,19 @@ and have a maximum lifetime built-in.")
(list (list
#:test-flags #:test-flags
;; Disable some failing tests. ;; 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"))) "--ignore=tests/test_insert_assert.py")))
(native-inputs (native-inputs
(list python-hatchling python-pytest python-pytest-mock)) (list python-hatchling python-pytest python-pytest-mock))
@ -38711,7 +38724,7 @@ parsing rules in a single place.")
(sha256 (sha256
(base32 "0g4cn522n4dv6ly8pwf97dc62rr4f7my38v0bh6vmac7jmrip7pv")))) (base32 "0g4cn522n4dv6ly8pwf97dc62rr4f7my38v0bh6vmac7jmrip7pv"))))
(build-system pyproject-build-system) (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") (home-page "https://github.com/pR0Ps/iterable-io")
(synopsis "Adapt generators and other iterables to a file-like interface") (synopsis "Adapt generators and other iterables to a file-like interface")
(description (description

View file

@ -660,7 +660,7 @@ This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.")
(define-public capnproto (define-public capnproto
(package (package
(name "capnproto") (name "capnproto")
(version "1.0") (version "1.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -668,13 +668,13 @@ This package also provides @samp{kdlpp}, a C++20 wrapper around @samp{ckdl}.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i")) "1vs2zpk4l55hb4lq4kldbwdqcjnwm1jblhcaqxmii9dxrd7f807d"))
(patches (search-patches "capnproto-fix-test.patch")))) (patches (search-patches "capnproto-fix-test.patch"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'use-tmp-for-temporary-files (add-after 'unpack 'use-tmp-for-temporary-files
(lambda _ (lambda _
;; Use /tmp for temporary files, as the default /var/tmp directory ;; Use /tmp for temporary files, as the default /var/tmp directory
;; doesn't exist. ;; doesn't exist.

View file

@ -16,7 +16,7 @@
;;; Copyright © 2021 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2021 Wiktor Żelazny <wzelazny@vurv.cz>
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com> ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net> ;;; Copyright © 2023, 2025 Camilo Q.S. (Distopico) <distopico@riseup.net>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
;;; Copyright © 2024 Brian Kubisiak <brian@kubisiak.com> ;;; Copyright © 2024 Brian Kubisiak <brian@kubisiak.com>
@ -744,7 +744,7 @@ Latin script and other languages.")
(define-public direnv (define-public direnv
(package (package
(name "direnv") (name "direnv")
(version "2.36.0") (version "2.37.1")
(source (source
(origin (method git-fetch) (origin (method git-fetch)
(uri (git-reference (uri (git-reference
@ -753,7 +753,7 @@ Latin script and other languages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0p6n9zi3p9frj3ndnpdc1cz51hq0nkyjc9b1rqg7967l8vhdr8f6")))) "08wywbj5niqhpy6m4y8xw065w3rgpi8khfy5qzqfxr6752h66v7p"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:install-source? #f (list #:install-source? #f

View file

@ -39,7 +39,6 @@
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages digest) #:use-module (gnu packages digest)
#:use-module (gnu packages fcitx)
#:use-module (gnu packages fcitx5) #:use-module (gnu packages fcitx5)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)

View file

@ -4224,7 +4224,11 @@ will reconstruct the object along its delta-base chain and return it.")
(install-file manpage (install-file manpage
(string-append #$output "/share/man/man1"))) (string-append #$output "/share/man/man1")))
(find-files "." "^git-lfs.*\\.1$")))))) (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 (native-inputs
(append (list git-minimal (append (list git-minimal
go-github-com-avast-retry-go 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) (if (supported-package? ruby-asciidoctor/minimal)
(list ronn-ng 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") (synopsis "Git extension for versioning large files")
(description (description
"Git Large File Storage (LFS) replaces large files such as audio samples, "Git Large File Storage (LFS) replaces large files such as audio samples,

View file

@ -2696,14 +2696,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
(substitute* "player/lua/ytdl_hook.lua" (substitute* "player/lua/ytdl_hook.lua"
(("\"yt-dlp\",") (("\"yt-dlp\",")
(string-append (string-append
"\"" (search-input-file inputs "bin/yt-dlp") "\","))))) "\"" (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 <https://github.com/mpv-player/mpv/issues/7855>.
;; Set PYTHONHASHSEED as a workaround for deterministic results.
(setenv "PYTHONHASHSEED" "1"))))
#:configure-flags #:configure-flags
#~(list "-Dlibmpv=true" #~(list "-Dlibmpv=true"
"-Dcdda=enabled" "-Dcdda=enabled"

View file

@ -77,6 +77,7 @@
;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com> ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se> ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr> ;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
;;; Copyright © 2025 pinoaffe <pinoaffe@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -138,6 +139,7 @@
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages digest)
#:use-module (gnu packages django) #:use-module (gnu packages django)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
@ -188,6 +190,7 @@
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages markup) #:use-module (gnu packages markup)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages nettle)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages node) #:use-module (gnu packages node)
#:use-module (gnu packages nss) #:use-module (gnu packages nss)
@ -215,6 +218,8 @@
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages skribilo) #:use-module (gnu packages skribilo)
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tcl)
#:use-module (gnu packages telephony) #:use-module (gnu packages telephony)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
@ -6742,6 +6747,66 @@ and similar services.")
(home-page "http://surfraw.org/") (home-page "http://surfraw.org/")
(license license:public-domain)))) (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 (define-public darkhttpd
(package (package
(name "darkhttpd") (name "darkhttpd")

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com> ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
;;; Copyright © 2025 Giacomo Leidi <goodoldpaul@autistici.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -73,6 +74,7 @@ See: https://github.com/hexpm/specifications/blob/main/endpoints.md"
#:key #:key
source source
(tests? #t) (tests? #t)
(test-flags ''())
(mix-path #f) ;See MIX_PATH. (mix-path #f) ;See MIX_PATH.
(mix-exs "mix.exs") ;See MIX_EXS. (mix-exs "mix.exs") ;See MIX_EXS.
(build-per-environment #t) ;See :build_per_environment. (build-per-environment #t) ;See :build_per_environment.
@ -107,6 +109,7 @@ See: https://github.com/hexpm/specifications/blob/main/endpoints.md"
#:source #+source #:source #+source
#:system #$system #:system #$system
#:tests? #$tests? #:tests? #$tests?
#:test-flags #$test-flags
#:mix-path #$mix-path #:mix-path #$mix-path
#:mix-exs #$mix-exs #:mix-exs #$mix-exs
#:mix-environments '#$mix-environments #:mix-environments '#$mix-environments

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com> ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org> ;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2024, 2025 Giacomo Leidi <goodoldpaul@autistici.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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")) "--no-prune-code-paths"))
mix-environments)) mix-environments))
(define* (check #:key (tests? #t) #:allow-other-keys) (define* (check #:key (tests? #t) (test-flags '()) #:allow-other-keys)
"Test the Mix project." "Test the Mix project."
(if tests? (if tests?
(begin (begin
(setenv "MIX_ENV" "test") (setenv "MIX_ENV" "test")
(invoke "mix" "do" "compile" "--no-deps-check" "--no-prune-code-paths" "+" (apply invoke "mix" "do" "compile" "--no-deps-check"
"test" "--no-deps-check")) "--no-prune-code-paths" "+" "test"
"--no-deps-check" test-flags))
(format #t "tests? = ~a~%" tests?))) (format #t "tests? = ~a~%" tests?)))
(define* (remove-mix-dirs . _) (define* (remove-mix-dirs . _)

View file

@ -5,7 +5,7 @@
;;; Copyright © 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2023, 2025 Simon Tournier <zimon.toutoune@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -575,10 +575,16 @@ current settings unchanged."
(string-append "origin/" branch)))) (string-append "origin/" branch))))
(_ ref))) (_ ref)))
(define symref-list (define symref?
(match ref (match-lambda
(('symref . symref) (list symref)) (('symref . _) #t)
(_ '()))) (_ #f)))
(define ref->refspecs
(match-lambda
(('symref . symref)
(list (string-append "+" symref ":" symref)))
(_ '())))
(with-libgit2 (with-libgit2
(set-git-timeouts connection-timeout read-timeout) (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 ;; When using symrefs, fetch remote again even if it has been cloned just
;; before as the requested reference are not fetched when cloning. ;; 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))) (not (reference-available? repository ref)))
(remote-fetch (remote-lookup repository "origin") (remote-fetch (remote-lookup repository "origin")
#:fetch-options (make-default-fetch-options #:fetch-options (make-default-fetch-options
@ -603,9 +609,7 @@ current settings unchanged."
verify-certificate?) verify-certificate?)
;; Build refspecs from symbolic references so they are ;; Build refspecs from symbolic references so they are
;; created locally and updated if necessary. ;; created locally and updated if necessary.
#:refspecs (map (lambda (ref) #:refspecs (ref->refspecs ref)))
(string-append "+" ref ":" ref))
symref-list)))
(when recursive? (when recursive?
(update-submodules repository #:log-port log-port (update-submodules repository #:log-port log-port
#:fetch-options #:fetch-options

View file

@ -146,7 +146,6 @@ gnu/packages/erlang-xyz.scm
gnu/packages/erlang.scm gnu/packages/erlang.scm
gnu/packages/esolangs.scm gnu/packages/esolangs.scm
gnu/packages/fabric-management.scm gnu/packages/fabric-management.scm
gnu/packages/fcitx.scm
gnu/packages/fcitx5.scm gnu/packages/fcitx5.scm
gnu/packages/fediverse.scm gnu/packages/fediverse.scm
gnu/packages/figlet.scm gnu/packages/figlet.scm