mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/bioinformatics.scm gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/emacs-xyz.scm gnu/packages/gpodder.scm gnu/packages/music.scm gnu/packages/patches/glibc-bootstrap-system.patch gnu/packages/python-xyz.scm gnu/packages/shells.scm gnu/packages/statistics.scm
This commit is contained in:
commit
b029be2ee0
100 changed files with 5664 additions and 43929 deletions
|
@ -30,6 +30,7 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
|
@ -37,6 +38,7 @@
|
|||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages groff)
|
||||
#:use-module (gnu packages mp3)
|
||||
#:use-module (gnu packages music)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
|
@ -68,12 +70,14 @@
|
|||
("python-pytest-httpserver" ,python-pytest-httpserver)
|
||||
("which" ,which)))
|
||||
(inputs
|
||||
`(("gtk+" ,gtk+)
|
||||
`(("bash-minimal" ,bash-minimal)
|
||||
("gtk+" ,gtk+)
|
||||
("python-pygobject" ,python-pygobject)
|
||||
("python-pycairo" ,python-pycairo)
|
||||
("python-requests" ,python-requests)
|
||||
("python-dbus" ,python-dbus)
|
||||
("python-html5lib" ,python-html5lib)
|
||||
("python-mutagen" ,python-mutagen)
|
||||
("python-mygpoclient" ,python-mygpoclient)
|
||||
("python-podcastparser" ,python-podcastparser)
|
||||
("youtube-dl" ,youtube-dl)
|
||||
|
@ -89,8 +93,9 @@
|
|||
(("xdg-open") (string-append xdg-utils "/bin/xdg-open")))
|
||||
#t)))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "make" "unittest")))
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "make" "unittest"))))
|
||||
;; 'msgmerge' introduces non-determinism by resetting the
|
||||
;; POT-Creation-Date in .po files.
|
||||
(add-before 'install 'do-not-run-msgmerge
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue