[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Wed, 31 Jan 2024 14:09:47 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 73939b9f3c9816af1705f7160c0128abdac72755
Merge: c41121d604 023c3e0ac4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 31 13:31:14 2024 -0500
Merge remote-tracking branch 'origin/master' into core-updates
Resolved conflicts in:
gnu/packages/astronomy.scm
gnu/packages/axoloti.scm
gnu/packages/games.scm
gnu/packages/guile-xyz.scm
gnu/packages/mail.scm
gnu/packages/photo.scm
gnu/packages/sphinx.scm
gnu/packages/tls.scm
gnu/packages/web-browsers.scm
Change-Id: I726fb6139d70ccead1b0f59afc72ccc523a1217d
Makefile.am | 10 +-
doc/guix.texi | 431 +-
etc/git/gitconfig | 1 +
etc/news.scm | 13 +
etc/teams.scm | 12 +-
gnu/ci.scm | 1 +
gnu/home/services.scm | 1 +
gnu/home/services/dotfiles.scm | 117 +
gnu/local.mk | 29 +-
gnu/packages/algebra.scm | 92 +-
gnu/packages/astronomy.scm | 401 +-
.../linux-libre/{4.14-arm.conf => 6.7-arm.conf} | 7552 ++++++++-----
.../linux-libre/{4.14-arm.conf => 6.7-arm64.conf} | 8565 ++++++++------
.../linux-libre/{4.14-i686.conf => 6.7-i686.conf} | 7565 ++++++++-----
.../{4.14-x86_64.conf => 6.7-x86_64.conf} | 11098 ++++++++++++-------
gnu/packages/axoloti.scm | 208 +-
gnu/packages/backup.scm | 1 +
gnu/packages/bioconductor.scm | 886 +-
gnu/packages/bioinformatics.scm | 468 +-
gnu/packages/books.scm | 21 +-
gnu/packages/bootloaders.scm | 12 +-
gnu/packages/c.scm | 4 +-
gnu/packages/calendar.scm | 8 +-
gnu/packages/check.scm | 96 +-
gnu/packages/cpp.scm | 19 +-
gnu/packages/cran.scm | 744 +-
gnu/packages/crates-io.scm | 31 +
gnu/packages/cross-base.scm | 4 +-
gnu/packages/cross-toolchain.scm | 3 +
gnu/packages/curl.scm | 4 +-
gnu/packages/debug.scm | 55 +
gnu/packages/dlang.scm | 213 +-
gnu/packages/emacs-xyz.scm | 721 +-
gnu/packages/emacs.scm | 59 +-
gnu/packages/engineering.scm | 10 +-
gnu/packages/fcitx5.scm | 41 +-
gnu/packages/file-systems.scm | 1 +
gnu/packages/firmware.scm | 191 +-
gnu/packages/game-development.scm | 8 +-
gnu/packages/games.scm | 143 +-
gnu/packages/gcc.scm | 12 +
gnu/packages/geo.scm | 169 +-
gnu/packages/gnome-xyz.scm | 32 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/golang-check.scm | 88 +
gnu/packages/golang-crypto.scm | 978 ++
gnu/packages/golang-web.scm | 55 +
gnu/packages/golang-xyz.scm | 97 +
gnu/packages/golang.scm | 991 +-
gnu/packages/graph.scm | 95 +-
gnu/packages/guile-xyz.scm | 225 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/high-availability.scm | 28 +-
gnu/packages/image-processing.scm | 18 +-
gnu/packages/image.scm | 37 +-
gnu/packages/ipfs.scm | 11 +-
gnu/packages/kde-frameworks.scm | 380 +-
gnu/packages/kde.scm | 13 +-
gnu/packages/license.scm | 28 +-
gnu/packages/linux.scm | 171 +-
gnu/packages/lisp-xyz.scm | 356 +-
gnu/packages/lisp.scm | 14 +-
gnu/packages/machine-learning.scm | 380 +-
gnu/packages/mail.scm | 157 +-
gnu/packages/networking.scm | 56 +-
gnu/packages/package-management.scm | 12 +-
gnu/packages/password-utils.scm | 1 +
.../converseen-hide-non-free-pointers.patch | 147 +-
gnu/packages/patches/dynaconf-unvendor-deps.patch | 172 +-
.../patches/emacs-shx-byte-compilation-test.patch | 35 +
.../patches/emacs-yasnippet-fix-tests.patch | 127 -
gnu/packages/patches/lugaru-fix-sound.patch | 32 +
.../patches/notmuch-emacs-test-output.patch | 89 -
gnu/packages/patches/python-flint-includes.patch | 131 -
gnu/packages/patches/r-sapa-lapack.patch | 23 +
gnu/packages/patches/s7-flint-3.patch | 31 +
.../patches/u-boot-allow-disabling-openssl.patch | 64 +-
.../patches/u-boot-build-without-libcrypto.patch | 123 +
gnu/packages/patches/u-boot-patman-change-id.patch | 232 -
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl.scm | 4 +-
gnu/packages/photo.scm | 30 +-
gnu/packages/python-science.scm | 700 +-
gnu/packages/python-web.scm | 109 +-
gnu/packages/python-xyz.scm | 278 +-
gnu/packages/qt.scm | 85 +-
gnu/packages/quantum.scm | 180 +
gnu/packages/sagemath.scm | 27 -
gnu/packages/shells.scm | 4 +-
gnu/packages/sphinx.scm | 43 +
gnu/packages/statistics.scm | 524 +-
gnu/packages/syncthing.scm | 31 -
gnu/packages/tex.scm | 10 +-
gnu/packages/textutils.scm | 1 +
gnu/packages/tor.scm | 194 +-
gnu/packages/uucp.scm | 1 +
gnu/packages/version-control.scm | 5 +-
gnu/packages/video.scm | 85 +-
gnu/packages/web-browsers.scm | 24 +-
gnu/packages/web.scm | 42 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/xorg.scm | 9 +-
gnu/services/certbot.scm | 185 +-
gnu/services/cuirass.scm | 22 +-
gnu/services/networking.scm | 255 +-
gnu/services/shepherd.scm | 14 +
gnu/system/image.scm | 3 +-
gnu/tests/base.scm | 4 -
guix/build-system/perl.scm | 4 +-
guix/channels.scm | 132 +-
guix/import/cran.scm | 82 +-
manifest.scm => guix/platforms/or1k.scm | 22 +-
guix/scripts/describe.scm | 2 +
guix/scripts/download.scm | 167 +-
guix/scripts/weather.scm | 9 +-
manifest.scm | 7 +-
po/guix/POTFILES.in | 1 +
tests/channels.scm | 57 +-
tests/guix-download.sh | 45 +-
120 files changed, 31654 insertions(+), 17220 deletions(-)
diff --cc gnu/packages/axoloti.scm
index b99dca0f2f,a36210b7d4..88276335fd
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@@ -229,113 -231,109 +231,109 @@@ runtime."
(sxml simple)
(sxml xpath)
(sxml transform))
- #:imported-modules ((guix build ant-build-system)
+ #:imported-modules `((guix build ant-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'make-git-checkout-writable
- (lambda _
- (for-each make-file-writable (find-files "."))
- #t))
- (delete 'configure)
- (replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "JAVA_HOME" (assoc-ref inputs "icedtea"))
- ;; We want to use our own jar files instead of the pre-built
- ;; stuff in lib. So we replace the zipfileset tags in the
- ;; build.xml with new ones that reference our jars.
- (let* ((build.xml (with-input-from-file "build.xml"
- (lambda _
- (xml->sxml #:trim-whitespace? #t))))
- (jars (append-map (match-lambda
- (((? (cut string-prefix? "java-"
<>)
- label) . directory)
- (find-files directory
"\\.jar$"))
- (_ '()))
- inputs))
- (classpath (string-join jars ":"))
- (fileset (map (lambda (jar)
- `(zipfileset (@ (excludes
"META-INF/*.SF")
- (src ,jar))))
- jars)))
- (call-with-output-file "build.xml"
- (lambda (port)
- (sxml->xml
- (pre-post-order
- build.xml
- `(;; Remove all zipfileset tags from the "jar" tree and
- ;; inject our own tags.
- (jar . ,(lambda (tag . kids)
- `(jar ,@(append-map
- (filter (lambda (e)
- (not (eq? 'zipfileset
(car e)))))
- kids)
- ,@fileset)))
- ;; Skip the "bundle" target (and the "-post-jar" target
- ;; that depends on it), because we don't need it and it
- ;; confuses sxml->xml.
- (target . ,(lambda (tag . kids)
- (let ((name ((sxpath '(name *text*))
- (car kids))))
- (if (or (member "bundle" name)
- (member "-post-jar" name))
- '() ; skip
- `(,tag ,@kids)))))
- (*default* . ,(lambda (tag . kids) `(,tag ,@kids)))
- (*text* . ,(lambda (_ txt)
- (match txt
- ;; Remove timestamp.
- ("${TODAY}" "(unknown)")
- (_ txt))))))
- port)))
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "JAVA_HOME" (assoc-ref inputs "icedtea"))
+ ;; We want to use our own jar files instead of the pre-built
+ ;; stuff in lib. So we replace the zipfileset tags in the
+ ;; build.xml with new ones that reference our jars.
+ (let* ((build.xml (with-input-from-file "build.xml"
+ (lambda _
+ (xml->sxml #:trim-whitespace? #t))))
+ (jars (append-map (match-lambda
+ (((? (cut string-prefix?
"java-" <>)
+ label) . directory)
+ (find-files directory
"\\.jar$"))
+ (_ '()))
+ inputs))
+ (classpath (string-join jars ":"))
+ (fileset (map (lambda (jar)
+ `(zipfileset (@ (excludes
"META-INF/*.SF")
+ (src ,jar))))
+ jars)))
+ (call-with-output-file "build.xml"
+ (lambda (port)
+ (sxml->xml
+ (pre-post-order
+ build.xml
+ `( ;; Remove all zipfileset tags from the "jar" tree
and
+ ;; inject our own tags.
+ (jar . ,(lambda (tag . kids)
+ `(jar ,@(append-map
+ (filter (lambda (e)
+ (not (eq? 'zipfileset
(car e)))))
+ kids)
+ ,@fileset)))
+ ;; Skip the "bundle" target (and the "-post-jar"
target
+ ;; that depends on it), because we don't need it and
it
+ ;; confuses sxml->xml.
+ (target . ,(lambda (tag . kids)
+ (let ((name ((sxpath '(name *text*))
+ (car kids))))
+ (if (or (member "bundle" name)
+ (member "-post-jar" name))
+ '() ; skip
+ `(,tag ,@kids)))))
+ (*default* . ,(lambda (tag . kids) `(,tag ,@kids)))
+ (*text* . ,(lambda (_ txt)
+ (match txt
+ ;; Remove timestamp.
+ ("${TODAY}" "(unknown)")
+ (_ txt))))))
+ port)))
- ;; Build it!
- (invoke "ant"
- (string-append "-Djavac.classpath=" classpath)
- "-Dbuild.runtime=true"
- "-Dbuild.time=01/01/1970 00:00:00"
- "-Djavac.source=1.7"
- "-Djavac.target=1.7"
- (string-append "-Dtag.short.version="
- ,version)))))
- (replace 'install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (share (string-append out "/share/axoloti/")))
- (install-file "dist/Axoloti.jar" share)
+ ;; Build it!
+ (invoke "ant"
+ (string-append "-Djavac.classpath=" classpath)
+ "-Dbuild.runtime=true"
+ "-Dbuild.time=01/01/1970 00:00:00"
+ "-Djavac.source=1.7"
+ "-Djavac.target=1.7"
+ (string-append "-Dtag.short.version="
+ #$version)))))
+ (replace 'install
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((share (string-append #$output "/share/axoloti/")))
+ (install-file "dist/Axoloti.jar" share)
- ;; We do this to ensure that this package retains references to
- ;; other Java packages' jar files.
- (install-file "build.xml" share)
+ ;; We do this to ensure that this package retains references
to
+ ;; other Java packages' jar files.
+ (install-file "build.xml" share)
- ;; Create a launcher script
- (mkdir (string-append out "/bin"))
- (let ((target (string-append out "/bin/Axoloti")))
- (with-output-to-file target
- (lambda ()
- (let* ((dir (string-append (assoc-ref outputs
"out")
- "/share/axoloti"))
- (runtime (search-input-directory inputs
-
"share/axoloti"))
- (toolchain (assoc-ref inputs "cross-toolchain"))
- (includes (string-append
- toolchain
- "/arm-none-eabi/include/c++:"
- toolchain
-
"/arm-none-eabi/include/c++/arm-none-eabi/armv7e-m")))
- (display
- (string-append "#!" (which "sh") "\n"
- "export CROSS_CPATH=" includes "\n"
- "export CROSS_CPLUS_INCLUDE_PATH="
includes "\n"
- "export CROSS_LIBRARY_PATH="
- toolchain "/arm-none-eabi/lib" "\n"
- (which "java")
- " -Daxoloti_release=" runtime
- " -Daxoloti_runtime=" runtime
- " -jar " dir "/Axoloti.jar")))))
- (chmod target #o555)))))
- (add-after 'install 'strip-jar-timestamps
- (assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))
+ ;; Create a launcher script
+ (mkdir (string-append #$output "/bin"))
+ (let ((target (string-append #$output "/bin/Axoloti")))
+ (with-output-to-file target
+ (lambda ()
+ (let* ((dir (string-append #$output
"/share/axoloti"))
+ (runtime (search-input-directory inputs
+
"share/axoloti"))
+ (toolchain (assoc-ref inputs "cross-toolchain"))
+ (includes (string-append
+ toolchain
+ "/arm-none-eabi/include/:"
+ toolchain
+ "/arm-none-eabi/include/c++:"
+ toolchain
+
"/arm-none-eabi/include/c++/arm-none-eabi/armv7e-m")))
+ (display
+ (string-append "#!" (which "sh") "\n"
+ "export CROSS_CPATH=" includes "\n"
+ "export CROSS_CPLUS_INCLUDE_PATH="
includes "\n"
+ "export CROSS_LIBRARY_PATH="
+ toolchain "/arm-none-eabi/lib" "\n"
+ (which "java")
+ " -Daxoloti_release=" runtime
+ " -Daxoloti_runtime=" runtime
+ " -jar " dir "/Axoloti.jar")))))
+ (chmod target #o555)))))
+ (add-after 'install 'strip-jar-timestamps
+ (assoc-ref ant:%standard-phases 'strip-jar-timestamps)))))
(inputs
`(("icedtea" ,icedtea "jdk")
("cross-toolchain" ,(make-arm-none-eabi-nano-toolchain-4.9))
diff --cc gnu/packages/bioinformatics.scm
index 4c6db1da6b,4db6987763..02c65eb99a
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -21335,11 -21756,17 +21758,17 @@@ single-cell data named @url{https://git
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-modules)
#:imported-modules ((guix build guile-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
#:phases
(modify-phases %standard-phases
+ (add-after 'patch-source-shebangs 'patch-more-source-shebangs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "scripts/ccwl"
+ (("^exec guile")
+ (string-append "exec "
+ (search-input-file inputs "/bin/guile"))))))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
diff --cc gnu/packages/games.scm
index 66a7e30f1c,06ba868f35..a7d08986c0
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -72,7 -72,7 +72,7 @@@
;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
;;; Copyright © 2022, 2023 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
- ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
++;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Hendursaga <hendursaga@aol.com>
;;; Copyright © 2022 Parnikkapore <poomklao@yahoo.com>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
diff --cc gnu/packages/graph.scm
index 48435eb1b5,fd684ca77d..573b41279f
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@@ -735,12 -826,12 +826,12 @@@ transformed into common image formats f
version ".tar.bz2"))
(sha256
(base32
- "05vsk2600wn790hk7gr2f0609bzcslyhhv9x157n43vxy4y6r8vj"))))
+ "1bmck5fcihj9lr5kd8x624bdi9xhfc13pl4mwzv74jr5lz07kr6d"))))
(build-system gnu-build-system)
(arguments
- `(#:imported-modules (,@%gnu-build-system-modules
+ `(#:imported-modules (,@%default-gnu-imported-modules
(guix build python-build-system))
- #:modules (,@%gnu-build-system-modules
+ #:modules (,@%default-gnu-modules
((guix build python-build-system) #:select (site-packages)))
#:configure-flags
(list (string-append "--with-boost="
diff --cc gnu/packages/guile-xyz.scm
index 267dfae919,d773313636..3dd5b9008c
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@@ -2051,71 -2103,69 +2103,69 @@@ above command-line parameters."
(replace "guile" guile-2.2)))))
(define-public guile-hall
- (package
- (name "guile-hall")
- (version "0.4.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/a-sassmannshausen/guile-hall";)
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0yrrik1v1xbik5h5q7w2cxrx6gvkmcdm32dl36i7xqdq8pr8sh2d"))))
- (build-system gnu-build-system)
- (arguments
- `(#:modules
- ((ice-9 match)
- (ice-9 ftw)
- ,@%default-gnu-modules)
+ ;; There are many unreleased bug fixes; use the latest commit for now.
+ (let ((commit "7558ba906d4281a5b825e3c1c87f2810312414b6")
+ (revision "1"))
+ (package
+ (name "guile-hall")
+ (version (git-version "0.4.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/a-sassmannshausen/guile-hall";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0sqm6nyzc37p0xgjj21m9dar2iqik9gfwlcacp2v6y10lh2f1yps"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:modules `(((guix build guile-build-system)
+ #:select
+ (target-guile-effective-version))
- ,@%gnu-build-system-modules)
++ ,@%default-gnu-modules)
#:phases
- (modify-phases
- %standard-phases
- (add-after 'install 'hall-wrap-binaries
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((compiled-dir
- (lambda (out version)
- (string-append
- out "/lib/guile/" version "/site-ccache")))
- (uncompiled-dir
- (lambda (out version)
- (string-append
- out "/share/guile/site"
- (if (string-null? version) "" "/") version)))
- (dep-path
- (lambda (env modules path)
- (list env ":" 'prefix
- (cons modules
- (map (lambda (input)
- (string-append
- (assoc-ref inputs input)
- path))
- ,''("guile-config"))))))
- (out (assoc-ref outputs "out"))
- (bin (string-append out "/bin/"))
- (site (uncompiled-dir out "")))
- (match (scandir site)
- (("." ".." version)
- (for-each
- (lambda (file)
- (wrap-program
- (string-append bin file)
- (dep-path
- "GUILE_LOAD_PATH"
- (uncompiled-dir out version)
- (uncompiled-dir "" version))
- (dep-path
- "GUILE_LOAD_COMPILED_PATH"
- (compiled-dir out version)
- (compiled-dir "" version))))
- ,''("hall"))))))))))
- (native-inputs (list autoconf automake pkg-config texinfo))
- (inputs (list bash-minimal guile-3.0))
- (propagated-inputs (list guile-config))
- (synopsis "Guile project tooling")
- (description
- "Hall is a command-line application and a set of Guile libraries that
+ (with-imported-modules `((guix build guile-build-system)
- ,@%gnu-build-system-modules)
++ ,@%default-gnu-imported-modules)
+ #~(modify-phases %standard-phases
+ (add-after 'install 'hall-wrap-binaries
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((version (target-guile-effective-version))
+ (site-ccache (string-append "/lib/guile/"
+ version "/site-ccache"))
+ (site (string-append "/share/guile/site/" version))
+ (dep-path
+ (lambda (env path)
+ (list env ":" 'prefix
+ (cons (string-append #$output path)
+ (map (lambda (input)
+ (string-append
+ (assoc-ref inputs input)
+ path))
+ (list "guile-config"
+ "guile-lib"))))))
+ (bin (string-append (ungexp output) "/bin/")))
+ (wrap-program (string-append bin "hall")
+ (dep-path "GUILE_LOAD_PATH" site)
+ (dep-path "GUILE_LOAD_COMPILED_PATH"
site-ccache)))))))))
+ (native-inputs
+ (list autoconf
+ automake
+ gettext-minimal
+ guile-3.0
+ pkg-config
+ texinfo))
+ (inputs
+ (list bash-minimal
+ guile-3.0
+ guile-config
+ guile-lib))
+ (propagated-inputs
+ (list guile-config))
+ (synopsis "Guile project tooling")
+ (description
+ "Hall is a command-line application and a set of Guile libraries that
allow you to quickly create and publish Guile projects. It allows you to
transparently support the GNU build system, manage a project hierarchy &
provides tight coupling to Guix.")
diff --cc gnu/packages/mail.scm
index 36d725a3af,76f379a710..095969747e
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@@ -4108,80 -4104,78 +4107,78 @@@ It is a replacement for the @command{ur
(license license:gpl2+)))
(define-public mumi
- (let ((commit "2453a5a6686c035854e4d523b8faa8c47405bd76")
- (revision "3"))
- (package
- (name "mumi")
- (version (git-version "0.0.5" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.savannah.gnu.org/git/guix/mumi.git/";)
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0dq87qn77c6qganhck048qxq5ghj3fh2v604f87hwv530lxifabr"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:modules '((guix build gnu-build-system)
- ((guix build guile-build-system)
- #:select (target-guile-effective-version))
- (guix build utils))
- #:imported-modules `((guix build guile-build-system)
- ,@%default-gnu-imported-modules)
-
- #:configure-flags '(list "--localstatedir=/var")
-
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'install-picocss
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((pico (dirname (search-input-file inputs
"/scss/pico.scss"))))
- (mkdir-p "assets/pico/scss")
- (copy-recursively pico "assets/pico/scss"))))
- (add-after 'install 'wrap-executable
- (lambda _
- (let* ((bin (string-append #$output "/bin"))
- (version (target-guile-effective-version))
- (scm (string-append #$output "/share/guile/site/"
version))
- (go (string-append #$output "/lib/guile/" version
- "/site-ccache")))
- (wrap-program (string-append bin "/mumi")
- `("GUILE_LOAD_PATH" ":" prefix
- (,scm ,(getenv "GUILE_LOAD_PATH")))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))))))))
- (inputs
- (list bash-minimal
- guile-email
- guile-fibers
- guile-gcrypt
- guile-gnutls
- guile-json-4
- guile-kolam
- guile-redis
- guile-syntax-highlight
- guile-webutils
- guile-xapian
- guile-3.0
- mailutils))
- (native-inputs
- (list autoconf automake pkg-config sassc
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/picocss/pico.git";)
- (commit "3052db4bd3439e236479dc0f98069f7d3b559486")))
- (file-name (git-file-name "pico" "1.5.6"))
- (sha256
- (base32
- "1gs1li48hqizx7lc4n2fdxn9i2v4vafkqpza7svvfpcamfz29jpi")))))
- (home-page "https://git.savannah.gnu.org/cgit/guix/mumi.git/";)
- (synopsis "Debbugs web interface")
- (description "Mumi is a Debbugs web interface.")
- (license license:agpl3+))))
+ (package
+ (name "mumi")
+ (version "0.0.8")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/guix/mumi.git/";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z556pxsz0zx95gd5b4hwkmwcvf3jyz7njkb3zwbhrwnpgygnbyl"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:modules '((guix build gnu-build-system)
+ ((guix build guile-build-system)
+ #:select (target-guile-effective-version))
+ (guix build utils))
+ #:imported-modules `((guix build guile-build-system)
- ,@%gnu-build-system-modules)
++ ,@%default-gnu-imported-modules)
+
+ #:configure-flags '(list "--localstatedir=/var")
+
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'install-picocss
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((pico (dirname (search-input-file inputs
"/scss/pico.scss"))))
+ (mkdir-p "assets/pico/scss")
+ (copy-recursively pico "assets/pico/scss"))))
+ (add-after 'install 'wrap-executable
+ (lambda _
+ (let* ((bin (string-append #$output "/bin"))
+ (version (target-guile-effective-version))
+ (scm (string-append #$output "/share/guile/site/"
version))
+ (go (string-append #$output "/lib/guile/" version
+ "/site-ccache")))
+ (wrap-program (string-append bin "/mumi")
+ `("GUILE_LOAD_PATH" ":" prefix
+ (,scm ,(getenv "GUILE_LOAD_PATH")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))))))))
+ (inputs
+ (list bash-minimal
+ guile-email
+ guile-fibers
+ guile-gcrypt
+ guile-gnutls
+ guile-json-4
+ guile-kolam
+ guile-redis
+ guile-syntax-highlight
+ guile-webutils
+ guile-xapian
+ guile-3.0
+ mailutils))
+ (native-inputs
+ (list autoconf automake pkg-config sassc
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/picocss/pico.git";)
+ (commit "3052db4bd3439e236479dc0f98069f7d3b559486")))
+ (file-name (git-file-name "pico" "1.5.6"))
+ (sha256
+ (base32
+ "1gs1li48hqizx7lc4n2fdxn9i2v4vafkqpza7svvfpcamfz29jpi")))))
+ (home-page "https://git.savannah.gnu.org/cgit/guix/mumi.git/";)
+ (synopsis "Debbugs web interface")
+ (description "Mumi is a Debbugs web interface.")
+ (license license:agpl3+)))
(define-public ytnef
(package
diff --cc gnu/packages/pdf.scm
index 7a31f435ad,e0d8e1f33f..d511824b1a
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -127,10 -127,11 +127,10 @@@
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32
"15l8zwc83l65xh739s0qddlv5qv537wnx74s8fcwlm1r8y7kf2x4"))))
+ (base32
"0kp1dcww5zl04wnbqbi8vjzpc5qgr8gr8rcx0s6s4xbjnzvqqw8d"))))
(build-system meson-build-system)
(arguments
- (list #:meson meson/newer
- #:configure-flags #~(list "-Dcpp_std=c++23")
+ (list #:configure-flags #~(list "-Dcpp_std=c++23")
#:test-options '(list "plainc")
#:phases
#~(modify-phases %standard-phases
diff --cc gnu/packages/photo.scm
index ce45df6f19,48f1c38695..d664bf397d
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@@ -8,8 -8,7 +8,9 @@@
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Sebastian Schott <sschott@mailbox.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020. 2021, 2022 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+ ;;; Copyright © 2020. 2021, 2022, 2024 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
diff --cc gnu/packages/sphinx.scm
index d2e87ec895,e280c06f2b..51a707554d
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@@ -18,7 -18,7 +18,8 @@@
;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+ ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/web-browsers.scm
index 5b0e4f38e4,ba95fcecba..dc3d63b0d5
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@@ -609,12 -611,9 +610,9 @@@ driven and does not detract you from yo
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'fix-common-lisp-cache-folder
- (lambda _
- (setenv "HOME" "/tmp")))
+ (lambda _ (setenv "HOME" "/tmp")))
(add-before 'check 'configure-tests
- (lambda _
- (setenv "NYXT_TESTS_NO_NETWORK" "1")
- (setenv "NYXT_TESTS_ERROR_ON_FAIL" "1")))
- (lambda _ (setenv "NYXT_TESTS_NO_NETWORK" "1") #t))
++ (lambda _ (setenv "NYXT_TESTS_NO_NETWORK" "1")))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out")
"/bin/nyxt"))