Merge branch 'master' into gnome-team
This commit is contained in:
commit
da24d067d0
@ -57,8 +57,6 @@
|
||||
(name "jpoiret"))
|
||||
("017D 74E2 7F58 5696 3801 781D F663 943E 08D8 092A"
|
||||
(name "lbraun"))
|
||||
("CA4F 8CF4 37D7 478F DA05 5FD4 4213 7701 1A37 8446"
|
||||
(name "lbraun (professional)"))
|
||||
("ACC2 3BA0 59F7 CCF4 08F0 43AD 442A 84B8 C70E 2F87"
|
||||
(name "lilyp"))
|
||||
(;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0"
|
||||
|
@ -306,6 +306,7 @@ MODULES = \
|
||||
guix/scripts/archive.scm \
|
||||
guix/scripts/import.scm \
|
||||
guix/scripts/package.scm \
|
||||
guix/scripts/locate.scm \
|
||||
guix/scripts/install.scm \
|
||||
guix/scripts/remove.scm \
|
||||
guix/scripts/upgrade.scm \
|
||||
@ -595,6 +596,7 @@ SH_TESTS = \
|
||||
tests/guix-gc.sh \
|
||||
tests/guix-git-authenticate.sh \
|
||||
tests/guix-hash.sh \
|
||||
tests/guix-locate.sh \
|
||||
tests/guix-pack.sh \
|
||||
tests/guix-pack-localstatedir.sh \
|
||||
tests/guix-pack-relocatable.sh \
|
||||
|
@ -26,7 +26,7 @@ choice.
|
||||
* Packaging Guidelines:: Growing the distribution.
|
||||
* Coding Style:: Hygiene of the contributor.
|
||||
* Submitting Patches:: Share your work.
|
||||
* Tracking Bugs and Patches:: Keeping it all organized.
|
||||
* Tracking Bugs and Changes:: Keeping it all organized.
|
||||
* Commit Access:: Pushing to the official repository.
|
||||
* Updating the Guix Package:: Updating the Guix package definition.
|
||||
* Writing Documentation:: Improving documentation in GNU Guix.
|
||||
@ -617,7 +617,7 @@ A typical package definition may look like this:
|
||||
)))
|
||||
@end lisp
|
||||
|
||||
@deffn {Scheme Procedure} git-version @var{VERSION} @var{REVISION} @var{COMMIT}
|
||||
@deffn {Procedure} git-version @var{VERSION} @var{REVISION} @var{COMMIT}
|
||||
Return the version string for packages using @code{git-fetch}.
|
||||
|
||||
@lisp
|
||||
@ -626,7 +626,7 @@ Return the version string for packages using @code{git-fetch}.
|
||||
@end lisp
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme Procedure} hg-version @var{VERSION} @var{REVISION} @var{CHANGESET}
|
||||
@deffn {Procedure} hg-version @var{VERSION} @var{REVISION} @var{CHANGESET}
|
||||
Return the version string for packages using @code{hg-fetch}. It works
|
||||
in the same way as @code{git-version}.
|
||||
@end deffn
|
||||
@ -970,7 +970,7 @@ When the @var{author} contains hyphens or uppercase letters, as with
|
||||
The module @code{(guix build-system elm)} provides the following utilities for
|
||||
working with names and related conventions:
|
||||
|
||||
@deffn {Scheme procedure} elm-package-origin @var{elm-name} @var{version} @
|
||||
@deffn {Procedure} elm-package-origin @var{elm-name} @var{version} @
|
||||
@var{hash}
|
||||
Returns a Git origin using the repository naming and tagging regime required
|
||||
for a published Elm package with the upstream name @var{elm-name} at version
|
||||
@ -990,7 +990,7 @@ For example:
|
||||
@end lisp
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme procedure} elm->package-name @var{elm-name}
|
||||
@deffn {Procedure} elm->package-name @var{elm-name}
|
||||
Returns the Guix-style package name for an Elm package with upstream name
|
||||
@var{elm-name}.
|
||||
|
||||
@ -998,13 +998,13 @@ Note that there is more than one possible @var{elm-name} for which
|
||||
@code{elm->package-name} will produce a given result.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme procedure} guix-package->elm-name @var{package}
|
||||
@deffn {Procedure} guix-package->elm-name @var{package}
|
||||
Given an Elm @var{package}, returns the possibly-inferred upstream name, or
|
||||
@code{#f} the upstream name is not specified via the @code{'upstream-name}
|
||||
property and can not be inferred by @code{infer-elm-package-name}.
|
||||
@end deffn
|
||||
|
||||
@deffn {Scheme procedure} infer-elm-package-name @var{guix-name}
|
||||
@deffn {Procedure} infer-elm-package-name @var{guix-name}
|
||||
Given the @var{guix-name} of an Elm package, returns the inferred upstream
|
||||
name, or @code{#f} if the upstream name can't be inferred. If the result is
|
||||
not @code{#f}, supplying it to @code{elm->package-name} would produce
|
||||
@ -1161,11 +1161,11 @@ readability of patches. Seasoned Guix developers may also want to look
|
||||
at the section on commit access (@pxref{Commit Access}).
|
||||
|
||||
This mailing list is backed by a Debbugs instance, which allows us to
|
||||
keep track of submissions (@pxref{Tracking Bugs and Patches}). Each
|
||||
message sent to that mailing list gets a new tracking number assigned;
|
||||
people can then follow up on the submission by sending email to
|
||||
@code{@var{ISSUE_NUMBER}@@debbugs.gnu.org}, where @var{ISSUE_NUMBER} is
|
||||
the tracking number (@pxref{Sending a Patch Series}).
|
||||
keep track of submissions (@pxref{Tracking Bugs and Changes}).
|
||||
Each message sent to that mailing list gets a new tracking number
|
||||
assigned; people can then follow up on the submission by sending email
|
||||
to @code{@var{ISSUE_NUMBER}@@debbugs.gnu.org}, where @var{ISSUE_NUMBER}
|
||||
is the tracking number (@pxref{Sending a Patch Series}).
|
||||
|
||||
Please write commit logs in the ChangeLog format (@pxref{Change Logs,,,
|
||||
standards, GNU Coding Standards}); you can check the commit history for
|
||||
@ -1257,48 +1257,9 @@ and which optional dependencies should be used. In particular, avoid adding
|
||||
the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
|
||||
|
||||
@item
|
||||
For important changes, check that dependent packages (if applicable) are
|
||||
not affected by the change; @code{guix refresh --list-dependent
|
||||
@var{package}} will help you do that (@pxref{Invoking guix refresh}).
|
||||
|
||||
@c See <https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html>.
|
||||
@cindex branching strategy
|
||||
@cindex rebuild scheduling strategy
|
||||
Depending on the number of dependent packages and thus the amount of
|
||||
rebuilding induced, commits go to different branches, along these lines:
|
||||
|
||||
@table @asis
|
||||
@item 300 dependent packages or less
|
||||
@code{master} branch (non-disruptive changes).
|
||||
|
||||
@item between 300 and 1,800 dependent packages
|
||||
@code{staging} branch (non-disruptive changes). This branch is intended
|
||||
to be merged in @code{master} every 6 weeks or so. Topical changes
|
||||
(e.g., an update of the GNOME stack) can instead go to a specific branch
|
||||
(say, @code{gnome-updates}). This branch is not expected to be
|
||||
buildable or usable until late in its development process.
|
||||
|
||||
@item more than 1,800 dependent packages
|
||||
@code{core-updates} branch (may include major and potentially disruptive
|
||||
changes). This branch is intended to be merged in @code{master} every
|
||||
6 months or so. This branch is not expected to be buildable or usable
|
||||
until late in its development process.
|
||||
@end table
|
||||
|
||||
All these branches are @uref{https://@value{SUBSTITUTE-SERVER-1},
|
||||
tracked by our build farm} and merged into @code{master} once
|
||||
everything has been successfully built. This allows us to fix issues
|
||||
before they hit users, and to reduce the window during which pre-built
|
||||
binaries are not available.
|
||||
|
||||
When we decide to start building the @code{staging} or
|
||||
@code{core-updates} branches, they will be forked and renamed with the
|
||||
suffix @code{-frozen}, at which time only bug fixes may be pushed to the
|
||||
frozen branches. The @code{core-updates} and @code{staging} branches
|
||||
will remain open to accept patches for the next cycle. Please ask on
|
||||
the mailing list or IRC if unsure where to place a patch.
|
||||
@c TODO: It would be good with badges on the website that tracks these
|
||||
@c branches. Or maybe even a status page.
|
||||
Check that dependent packages (if applicable) are not affected by the
|
||||
change; @code{guix refresh --list-dependent @var{package}} will help you
|
||||
do that (@pxref{Invoking guix refresh}).
|
||||
|
||||
@item
|
||||
@cindex determinism, of build processes
|
||||
@ -1574,16 +1535,17 @@ $ guix shell -D guix
|
||||
[env]$ git send-email --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org -2
|
||||
@end example
|
||||
|
||||
@node Tracking Bugs and Patches
|
||||
@section Tracking Bugs and Patches
|
||||
@node Tracking Bugs and Changes
|
||||
@section Tracking Bugs and Changes
|
||||
|
||||
This section describes how the Guix project tracks its bug reports and
|
||||
patch submissions.
|
||||
This section describes how the Guix project tracks its bug reports,
|
||||
patch submissions and topic branches.
|
||||
|
||||
@menu
|
||||
* The Issue Tracker:: The official bug and patch tracker.
|
||||
* Debbugs User Interfaces:: Ways to interact with Debbugs.
|
||||
* Debbugs Usertags:: Tag reports with custom labels.
|
||||
* The Issue Tracker:: The official bug and patch tracker.
|
||||
* Managing Patches and Branches:: How changes to Guix are managed.
|
||||
* Debbugs User Interfaces:: Ways to interact with Debbugs.
|
||||
* Debbugs Usertags:: Tag reports with custom labels.
|
||||
@end menu
|
||||
|
||||
@node The Issue Tracker
|
||||
@ -1600,6 +1562,55 @@ email to @email{bug-guix@@gnu.org}, while patch submissions are filed
|
||||
against the @code{guix-patches} package by sending email to
|
||||
@email{guix-patches@@gnu.org} (@pxref{Submitting Patches}).
|
||||
|
||||
@node Managing Patches and Branches
|
||||
@subsection Managing Patches and Branches
|
||||
@cindex branching strategy
|
||||
@cindex rebuild scheduling strategy
|
||||
|
||||
Changes should be posted to @email{guix-patches@@gnu.org}. This mailing
|
||||
list fills the patch-tracking database (@pxref{The Issue Tracker}). It
|
||||
also allows patches to be picked up and tested by the quality assurance
|
||||
tooling; the result of that testing eventually shows up on the dashboard
|
||||
at @indicateurl{https://qa.guix.gnu.org/issue/@var{ISSUE_NUMBER}}, where
|
||||
@var{ISSUE_NUMBER} is the number assigned by the issue tracker. Leave
|
||||
time for a review, without committing anything.
|
||||
|
||||
As an exception, some changes considered ``trivial'' or ``obvious'' may
|
||||
be pushed directly to the @code{master} branch. This includes changes
|
||||
to fix typos and reverting commits that caused immediate problems. This
|
||||
is subject to being adjusted, allowing individuals to commit directly on
|
||||
non-controversial changes on parts they’re familiar with.
|
||||
|
||||
Changes which affect more than 300 dependent packages (@pxref{Invoking
|
||||
guix refresh}) should first be pushed to a topic branch other than
|
||||
@code{master}; the set of changes should be consistent---e.g., ``GNOME
|
||||
update'', ``NumPy update'', etc. This allows for testing: the branch
|
||||
will automatically show up at
|
||||
@indicateurl{https://qa.guix.gnu.org/branch/@var{branch}}, with an
|
||||
indication of its build status on various platforms.
|
||||
|
||||
To help coordinate the merging of branches, you must create a new
|
||||
guix-patches issue each time you wish to merge a branch (@pxref{The
|
||||
Issue Tracker}). Normally branches will be merged in a ``first come,
|
||||
first merged'' manner, tracked through the guix-patches issues.
|
||||
|
||||
If you agree on a different order with those involved, you can track
|
||||
this by updating which issues block@footnote{You can mark an issue as
|
||||
blocked by another by emailing @email{control@@debbugs.gnu.org} with the
|
||||
following line in the body of the email: @code{block XXXXX by YYYYY}.
|
||||
Where @code{XXXXX} is the number for the blocked issue, and @code{YYYYY}
|
||||
is the number for the issue blocking it.} which other issues.
|
||||
Therefore, to know which branch is at the front of the queue, look for
|
||||
the oldest issue, or the issue that isn't @dfn{blocked} by any other
|
||||
branch merges. An ordered list of branches with the open issues is
|
||||
available at @url{https://qa.guix.gnu.org}.
|
||||
|
||||
Once a branch is at the front of the queue, wait until sufficient time
|
||||
has passed for the build farms to have processed the changes, and for
|
||||
the necessary testing to have happened. For example, you can check
|
||||
@indicateurl{https://qa.guix.gnu.org/branch/@var{branch}} to see
|
||||
information on some builds and substitute availability.
|
||||
|
||||
@node Debbugs User Interfaces
|
||||
@subsection Debbugs User Interfaces
|
||||
|
||||
@ -1816,23 +1827,14 @@ If you get commit access, please make sure to follow the policy below
|
||||
(discussions of the policy can take place on
|
||||
@email{guix-devel@@gnu.org}).
|
||||
|
||||
Changes should be posted to @email{guix-patches@@gnu.org}. This mailing
|
||||
list fills the patch-tracking database (@pxref{Tracking Bugs and
|
||||
Patches}). It also allows patches to be picked up and tested by the
|
||||
quality assurance tooling; the result of that testing eventually shows
|
||||
up on the dashboard at
|
||||
@indicateurl{https://qa.guix.gnu.org/issue/@var{ISSUE_NUMBER}}, where
|
||||
@var{ISSUE_NUMBER} is the number assigned by the issue tracker. Leave
|
||||
time for a review, without committing anything (@pxref{Submitting
|
||||
Patches}). If you didn’t receive any reply after one week (two weeks
|
||||
for more significant changes), and if you're confident, it's OK to
|
||||
commit.
|
||||
Ensure you're aware of how the changes should be handled
|
||||
(@pxref{Managing Patches and Branches}) prior to being pushed to the
|
||||
repository, especially for the @code{master} branch.
|
||||
|
||||
As an exception, some changes considered ``trivial'' or ``obvious'' may
|
||||
be pushed directly. This includes changes to fix typos and reverting
|
||||
commits that caused immediate problems. This is subject to being
|
||||
adjusted, allowing individuals to commit directly on non-controversial
|
||||
changes on parts they’re familiar with.
|
||||
If you're committing and pushing your own changes, try and wait at least
|
||||
one week (two weeks for more significant changes) after you send them
|
||||
for review. After this, if no one else is available to review them and
|
||||
if you're confident about the changes, it's OK to commit.
|
||||
|
||||
When pushing a commit on behalf of somebody else, please add a
|
||||
@code{Signed-off-by} line at the end of the commit log message---e.g.,
|
||||
|
678
doc/guix.texi
678
doc/guix.texi
File diff suppressed because it is too large
Load Diff
49
etc/news.scm
49
etc/news.scm
@ -26,6 +26,55 @@
|
||||
(channel-news
|
||||
(version 0)
|
||||
|
||||
(entry (commit "1b7aabbc79969a89141aadd3d41d7a5329a3462e")
|
||||
(title
|
||||
(en "New @command{guix locate} command")
|
||||
(de "Neuer Befehl @command{guix locate}")
|
||||
(fr "Nouvelle commande @command{guix locate}"))
|
||||
(body
|
||||
(en "The new @command{guix locate} command lets you search for
|
||||
packages containing a given file---at long last! For instance, to find which
|
||||
package(s) provide a file named @file{ls}, run:
|
||||
|
||||
@example
|
||||
guix locate ls
|
||||
@end example
|
||||
|
||||
Currently the command relies on purely local information. It is thus unable
|
||||
to find packages that have not reached your store. This limitation will be
|
||||
lifted in a future revision.
|
||||
|
||||
Run @command{info \"(guix) Invoking guix locate\"} for more info.")
|
||||
(de "Mit dem neuen Befehl @command{guix locate} können Sie nach
|
||||
Paketen suchen, die eine angegebene Datei enthalten — endlich ist es
|
||||
soweit! Um zum Beispiel das Paket bzw.@: die Pakete zu finden, die eine
|
||||
Datei namens @file{ls} bereitstellen, führen Sie aus:
|
||||
|
||||
@example
|
||||
guix locate ls
|
||||
@end example
|
||||
|
||||
Derzeit benutzt der Befehl ausschließlich lokal vorliegende
|
||||
Informationen. Daher können Sie damit nur Pakete finden, die sich in
|
||||
Ihrem Store-Verzeichnis befinden. Diese Einschränkung werden wir in
|
||||
einer zukünftigen Version aufheben.
|
||||
|
||||
Führen Sie @command{info \"(guix) Invoking guix locate\"} aus, um mehr zu
|
||||
erfahren.")
|
||||
(fr "La nouvelle commande @command{guix locate} permet de chercher le
|
||||
ou les paquets contenant un fichier donné---enfin ! Par exemple, pour trouver
|
||||
quel paquet fournit un fichier nommé @file{ls}, on lance :
|
||||
|
||||
@example
|
||||
guix locate ls
|
||||
@end example
|
||||
|
||||
Pour le moment la commande se base uniquement sur des informations locales.
|
||||
Elle ne peut donc pas trouver des paquets absents de votre dépôt. Cette limitation
|
||||
sera levée dans une prochaine version.
|
||||
|
||||
Lancer @command{info \"(guix) Invoking guix locate\"} pour plus d'informations.")))
|
||||
|
||||
(entry (commit "ba5da5125a81307500982517e2f458d57b024668")
|
||||
(title
|
||||
(en "New @code{arguments} rule for @command{guix style}")
|
||||
|
@ -4,6 +4,7 @@
|
||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -43,6 +44,7 @@
|
||||
u-boot-puma-rk3399-bootloader
|
||||
u-boot-rock64-rk3328-bootloader
|
||||
u-boot-rockpro64-rk3399-bootloader
|
||||
u-boot-sifive-unmatched-bootloader
|
||||
u-boot-ts7970-q-2g-1000mhz-c-bootloader
|
||||
u-boot-wandboard-bootloader))
|
||||
|
||||
@ -135,6 +137,15 @@
|
||||
(install-dir (string-append mount-point "/boot")))
|
||||
(install-file u-boot.imx install-dir))))
|
||||
|
||||
(define install-sifive-unmatched-u-boot
|
||||
#~(lambda (bootloader root-index image)
|
||||
(let ((spl (string-append bootloader "/libexec/spl/u-boot-spl.bin"))
|
||||
(u-boot (string-append bootloader "/libexec/u-boot.itb")))
|
||||
(write-file-on-device spl (stat:size (stat spl))
|
||||
image (* 34 512))
|
||||
(write-file-on-device u-boot (stat:size (stat u-boot))
|
||||
image (* 2082 512)))))
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
@ -273,3 +284,9 @@
|
||||
(package u-boot-ts7970-q-2g-1000mhz-c)
|
||||
(installer install-u-boot-ts7970-q-2g-1000mhz-c-u-boot)
|
||||
(disk-image-installer #f)))
|
||||
|
||||
(define u-boot-sifive-unmatched-bootloader
|
||||
(bootloader
|
||||
(inherit u-boot-bootloader)
|
||||
(package u-boot-sifive-unmatched)
|
||||
(disk-image-installer install-sifive-unmatched-u-boot)))
|
||||
|
@ -7,6 +7,7 @@
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
|
||||
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -122,6 +123,14 @@ turn doesn't take any constant overhead into account, force a 1-MiB minimum."
|
||||
(string-append "::" file))))
|
||||
(scandir root))))
|
||||
|
||||
(define* (make-unformatted-image partition target)
|
||||
"Make an unformatted partition of a certain size."
|
||||
(let ((size (partition-size partition)))
|
||||
;; Create the file and then truncate it to the desired size.
|
||||
(with-output-to-file target
|
||||
(lambda _ (display "")))
|
||||
(truncate-file target size)))
|
||||
|
||||
(define* (make-partition-image partition-sexp target root)
|
||||
"Create and return the image of PARTITION-SEXP as TARGET. Use the given
|
||||
ROOT directory to populate the image."
|
||||
@ -134,6 +143,8 @@ ROOT directory to populate the image."
|
||||
(make-vfat-image partition target root 16))
|
||||
((string=? type "fat32")
|
||||
(make-vfat-image partition target root 32))
|
||||
((string=? type "unformatted")
|
||||
(make-unformatted-image partition target))
|
||||
(else
|
||||
(raise (condition
|
||||
(&message
|
||||
|
@ -214,9 +214,9 @@ according to time of day.")))
|
||||
(cons "DBUS_VERBOSE=1"
|
||||
(default-environment-variables))
|
||||
#:log-file
|
||||
(format #f "~a/dbus.log"
|
||||
(or (getenv "XDG_LOG_HOME")
|
||||
(format #f "~a/.local/var/log"
|
||||
(format #f "~a/log/dbus.log"
|
||||
(or (getenv "XDG_STATE_HOME")
|
||||
(format #f "~a/.local/state"
|
||||
(getenv "HOME"))))))
|
||||
(stop #~(make-kill-destructor)))))
|
||||
|
||||
@ -264,10 +264,10 @@ according to time of day.")))
|
||||
(number->string
|
||||
#$(home-unclutter-configuration-idle-timeout config)))
|
||||
#:log-file (string-append
|
||||
(or (getenv "XDG_LOG_HOME")
|
||||
(format #f "~a/.local/var/log"
|
||||
(or (getenv "XDG_STATE_HOME")
|
||||
(format #f "~a/.local/state"
|
||||
(getenv "HOME")))
|
||||
"/unclutter.log"))))))
|
||||
"/log/unclutter.log"))))))
|
||||
|
||||
(define home-unclutter-service-type
|
||||
(service-type
|
||||
|
@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
@ -99,10 +99,10 @@ Each message is also prefixed by a timestamp by GNU Shepherd."))
|
||||
#~())
|
||||
#$@files)
|
||||
#:log-file (string-append
|
||||
(or (getenv "XDG_LOG_HOME")
|
||||
(format #f "~a/.local/var/log"
|
||||
(or (getenv "XDG_STATE_HOME")
|
||||
(format #f "~a/.local/state"
|
||||
(getenv "HOME")))
|
||||
"/mcron.log")))
|
||||
"/log/mcron.log")))
|
||||
(stop #~(make-kill-destructor))
|
||||
(actions
|
||||
(list (shepherd-schedule-action mcron files)))))))))
|
||||
|
@ -128,10 +128,10 @@
|
||||
(list "-i")
|
||||
(list)))
|
||||
#:log-file (string-append
|
||||
(or (getenv "XDG_LOG_HOME")
|
||||
(format #f "~a/.local/var/log"
|
||||
(getenv "HOME")))
|
||||
"/batsignal.log")))
|
||||
(or (getenv "XDG_STATE_HOME")
|
||||
(format #f "~a/.local/state"
|
||||
(getenv "HOME")))
|
||||
"/log/batsignal.log")))
|
||||
(stop #~(make-kill-destructor))))))
|
||||
|
||||
(define home-batsignal-service-type
|
||||
|
@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
@ -108,9 +108,10 @@ as shepherd package."
|
||||
(or (getenv "XDG_RUNTIME_DIR")
|
||||
(format #f "/run/user/~a" (getuid)))
|
||||
"/shepherd/socket"))
|
||||
(let ((log-dir (or (getenv "XDG_LOG_HOME")
|
||||
(format #f "~a/.local/var/log"
|
||||
(getenv "HOME")))))
|
||||
(let* ((state-dir (or (getenv "XDG_STATE_HOME")
|
||||
(format #f "~a/.local/state"
|
||||
(getenv "HOME"))))
|
||||
(log-dir (string-append state-dir "/log")))
|
||||
;; TODO: Remove it, 0.9.2 creates it automatically?
|
||||
((@ (guix build utils) mkdir-p) log-dir)
|
||||
(system*
|
||||
|
@ -1,6 +1,8 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -38,14 +40,23 @@
|
||||
#:use-module (srfi srfi-34)
|
||||
#:use-module (srfi srfi-35)
|
||||
#:use-module (ice-9 match)
|
||||
#:autoload (ice-9 regex) (string-match match:substring)
|
||||
#:export (home-openssh-configuration
|
||||
home-openssh-configuration-authorized-keys
|
||||
home-openssh-configuration-known-hosts
|
||||
home-openssh-configuration-hosts
|
||||
home-openssh-configuration-add-keys-to-agent
|
||||
home-openssh-configuration?
|
||||
|
||||
home-ssh-agent-configuration
|
||||
home-ssh-agent-openssh
|
||||
home-ssh-agent-socket-directory
|
||||
home-ssh-agent-extra-options
|
||||
home-ssh-agent-configuration?
|
||||
|
||||
openssh-host
|
||||
openssh-host-host-name
|
||||
openssh-host-match-criteria
|
||||
openssh-host-identity-file
|
||||
openssh-host-name
|
||||
openssh-host-port
|
||||
@ -93,7 +104,11 @@
|
||||
(cond ((= family AF_INET) "inet")
|
||||
((= family AF_INET6) "inet6")
|
||||
;; The 'else' branch is unreachable.
|
||||
(else (raise (condition (&error)))))
|
||||
(else
|
||||
(raise
|
||||
(formatted-message
|
||||
(G_ "~s: invalid address family value")
|
||||
family))))
|
||||
"\n")
|
||||
""))
|
||||
|
||||
@ -104,6 +119,8 @@
|
||||
(string-append " " (serialize-field-name field) " "
|
||||
(number->string value) "\n"))
|
||||
|
||||
(define-maybe boolean)
|
||||
|
||||
(define (serialize-boolean field value)
|
||||
(string-append " " (serialize-field-name field) " "
|
||||
(if value "yes" "no") "\n"))
|
||||
@ -171,13 +188,40 @@
|
||||
(configuration-field-error (source-properties->location properties) 'proxy-command value))
|
||||
value))
|
||||
|
||||
(define ssh-match-keywords
|
||||
'(canonical final exec host originalhost user localuser))
|
||||
|
||||
(define (match-criteria? str)
|
||||
;; Rule out the case of "all" keyword.
|
||||
(if (member str '("all"
|
||||
"canonical all"
|
||||
"final all"))
|
||||
#t
|
||||
(let* ((first (string-take str (string-index str #\ )))
|
||||
(keyword (string->symbol (if (string-prefix? "!" first)
|
||||
(string-drop first 1)
|
||||
first))))
|
||||
(memq keyword ssh-match-keywords))))
|
||||
|
||||
(define-maybe match-criteria)
|
||||
|
||||
(define-configuration openssh-host
|
||||
(name
|
||||
(string)
|
||||
"Name of this host declaration.")
|
||||
maybe-string
|
||||
"Name of this host declaration. A @code{openssh-host} must define only
|
||||
@code{name} or @code{match-criteria}. Use host-name @code{\"*\"} for
|
||||
top-level options.")
|
||||
(host-name
|
||||
maybe-string
|
||||
"Host name---e.g., @code{\"foo.example.org\"} or @code{\"192.168.1.2\"}.")
|
||||
(match-criteria ;TODO implement stricter match-criteria rules
|
||||
maybe-match-criteria
|
||||
"When specified, this string denotes the set of hosts to which the entry
|
||||
applies, superseding the @code{host-name} field. Its first element must be
|
||||
all or one of @code{ssh-match-keywords}. The rest of the elements are
|
||||
arguments for the keyword, or other criteria. A @code{openssh-host} must
|
||||
define only @code{name} or @code{match-criteria}. Other host configuration
|
||||
options will apply to all hosts matching @code{match-criteria}.")
|
||||
(address-family
|
||||
maybe-address-family
|
||||
"Address family to use when connecting to this host: one of
|
||||
@ -194,19 +238,19 @@ Additionally, the field can be left unset to allow any address family.")
|
||||
maybe-string
|
||||
"User name on the remote host.")
|
||||
(forward-x11?
|
||||
(boolean #f)
|
||||
maybe-boolean
|
||||
"Whether to forward remote client connections to the local X11 graphical
|
||||
display.")
|
||||
(forward-x11-trusted?
|
||||
(boolean #f)
|
||||
maybe-boolean
|
||||
"Whether remote X11 clients have full access to the original X11 graphical
|
||||
display.")
|
||||
(forward-agent?
|
||||
(boolean #f)
|
||||
maybe-boolean
|
||||
"Whether the authentication agent (if any) is forwarded to the remote
|
||||
machine.")
|
||||
(compression?
|
||||
(boolean #f)
|
||||
maybe-boolean
|
||||
"Whether to compress data in transit.")
|
||||
(proxy-command
|
||||
maybe-string
|
||||
@ -232,33 +276,73 @@ through before connecting to the server.")
|
||||
@file{~/.ssh/config}."))
|
||||
|
||||
(define (serialize-openssh-host config)
|
||||
(define (openssh-host-name-field? field)
|
||||
(eq? (configuration-field-name field) 'name))
|
||||
(define (openssh-host-name-or-match-field? field)
|
||||
(or (eq? (configuration-field-name field) 'name)
|
||||
(eq? (configuration-field-name field) 'match-criteria)))
|
||||
|
||||
(string-append
|
||||
"Host " (openssh-host-name config) "\n"
|
||||
(if (maybe-value-set? (openssh-host-name config))
|
||||
(if (maybe-value-set? (openssh-host-match-criteria config))
|
||||
(raise
|
||||
(formatted-message
|
||||
(G_ "define either 'name' or 'match-criteria', not both")))
|
||||
(string-append "Host " (openssh-host-name config) "\n"))
|
||||
(if (maybe-value-set? (openssh-host-match-criteria config))
|
||||
(string-append
|
||||
"Match " (string-join (openssh-host-match-criteria config) " ") "\n")
|
||||
(raise
|
||||
(formatted-message
|
||||
(G_ "define either 'name' or 'match-criteria' once")))))
|
||||
(string-concatenate
|
||||
(map (lambda (field)
|
||||
((configuration-field-serializer field)
|
||||
(configuration-field-name field)
|
||||
((configuration-field-getter field) config)))
|
||||
(remove openssh-host-name-field?
|
||||
(remove openssh-host-name-or-match-field?
|
||||
openssh-host-fields)))))
|
||||
|
||||
(define-record-type* <home-openssh-configuration>
|
||||
home-openssh-configuration make-home-openssh-configuration
|
||||
home-openssh-configuration?
|
||||
(authorized-keys home-openssh-configuration-authorized-keys ;list of file-like
|
||||
(default #f))
|
||||
(known-hosts home-openssh-configuration-known-hosts ;unspec | list of file-like
|
||||
(default *unspecified*))
|
||||
(hosts home-openssh-configuration-hosts ;list of <openssh-host>
|
||||
(default '())))
|
||||
(authorized-keys home-openssh-configuration-authorized-keys ;list of file-like
|
||||
(default #f))
|
||||
(known-hosts home-openssh-configuration-known-hosts ;unspec | list of file-like
|
||||
(default *unspecified*))
|
||||
(hosts home-openssh-configuration-hosts ;list of <openssh-host>
|
||||
(default '()))
|
||||
(add-keys-to-agent home-openssh-configuration-add-keys-to-agent ;string with limited values
|
||||
(default "no")))
|
||||
|
||||
(define (serialize-add-keys-to-agent value)
|
||||
(define (valid-time-string? str)
|
||||
(and (> (string-length str) 0)
|
||||
(equal?
|
||||
str
|
||||
(match:substring
|
||||
(string-match "\
|
||||
[0-9]+|([0-9]+[Ww])?([0-9]+[Dd])?([0-9]+[Hh])?([0-9]+[Mm])?([0-9]+[Ss])?"
|
||||
str)))))
|
||||
|
||||
(string-append "AddKeysToAgent "
|
||||
(cond ((member value '("yes" "no" "confirm" "ask")) value)
|
||||
((valid-time-string? value) value)
|
||||
((and (string-prefix? "confirm" value)
|
||||
(valid-time-string?
|
||||
(cdr (string-split value #\ )))) value)
|
||||
;; The 'else' branch is unreachable.
|
||||
(else
|
||||
(raise
|
||||
(formatted-message
|
||||
(G_ "~s: invalid 'add-keys-to-agent' value")
|
||||
value))))))
|
||||
|
||||
(define (openssh-configuration->string config)
|
||||
(string-join (map serialize-openssh-host
|
||||
(home-openssh-configuration-hosts config))
|
||||
"\n"))
|
||||
(string-join
|
||||
(cons* (serialize-add-keys-to-agent
|
||||
(home-openssh-configuration-add-keys-to-agent config))
|
||||
(map serialize-openssh-host
|
||||
(home-openssh-configuration-hosts config)))
|
||||
"\n"))
|
||||
|
||||
(define* (file-join name files #:optional (delimiter " "))
|
||||
"Return a file in the store called @var{name} that is the concatenation
|
||||
|
@ -1,6 +1,7 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021, 2022 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -22,6 +23,7 @@
|
||||
#:use-module (gnu home services)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu home services utils)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix modules)
|
||||
#:use-module (guix records)
|
||||
@ -39,7 +41,7 @@
|
||||
home-xdg-base-directories-configuration-config-home
|
||||
home-xdg-base-directories-configuration-data-home
|
||||
home-xdg-base-directories-configuration-state-home
|
||||
home-xdg-base-directories-configuration-log-home
|
||||
home-xdg-base-directories-configuration-log-home ; deprecated
|
||||
home-xdg-base-directories-configuration-runtime-dir
|
||||
|
||||
home-xdg-user-directories-service-type
|
||||
@ -77,6 +79,7 @@
|
||||
|
||||
(define (serialize-path field-name val) "")
|
||||
(define path? string?)
|
||||
(define-maybe path)
|
||||
|
||||
(define-configuration home-xdg-base-directories-configuration
|
||||
(cache-home
|
||||
@ -97,12 +100,17 @@ read-only shared data, analogus to @file{/usr/share}, but for user.")
|
||||
(path "${XDG_RUNTIME_DIR:-/run/user/$UID}")
|
||||
"Base directory for programs to store user-specific runtime files,
|
||||
like sockets.")
|
||||
;; TODO: deprecated field, use $XDG_STATE_HOME(/log) instead.
|
||||
(log-home
|
||||
(path "$HOME/.local/var/log")
|
||||
maybe-path
|
||||
"Base directory for programs to store log files, analogus to
|
||||
@file{/var/log}, but for user. It is not a part of XDG Base Directory
|
||||
Specification, but helps to make implementation of home services more
|
||||
consistent.")
|
||||
consistent."
|
||||
(lambda (field-name val)
|
||||
(when (maybe-value-set? val)
|
||||
(warn-about-deprecation field-name #f #:replacement 'state-home))
|
||||
(serialize-path field-name val)))
|
||||
(state-home
|
||||
(path "$HOME/.local/state")
|
||||
"Base directory for programs to store state data that should persist
|
||||
@ -117,7 +125,13 @@ portable enough to the user to warrant storing them in
|
||||
#f "XDG_~a"
|
||||
(object->snake-case-string (configuration-field-name field) 'upper))
|
||||
((configuration-field-getter field) config)))
|
||||
home-xdg-base-directories-configuration-fields))
|
||||
;; XXX: deprecated field, remove later
|
||||
(if (maybe-value-set?
|
||||
(home-xdg-base-directories-configuration-log-home config))
|
||||
home-xdg-base-directories-configuration-fields
|
||||
(filter-configuration-fields
|
||||
home-xdg-base-directories-configuration-fields
|
||||
'(log-home) #t))))
|
||||
|
||||
(define (ensure-xdg-base-dirs-on-activation config)
|
||||
(with-imported-modules '((guix build utils))
|
||||
@ -138,7 +152,14 @@ portable enough to the user to warrant storing them in
|
||||
;; and will be provided by elogind or other service.
|
||||
(and (not (string=? "XDG_RUNTIME_DIR" variable))
|
||||
variable)))
|
||||
home-xdg-base-directories-configuration-fields)))))
|
||||
;; XXX: deprecated field, remove later
|
||||
(if (maybe-value-set?
|
||||
(home-xdg-base-directories-configuration-log-home
|
||||
config))
|
||||
home-xdg-base-directories-configuration-fields
|
||||
(filter-configuration-fields
|
||||
home-xdg-base-directories-configuration-fields
|
||||
'(log-home) #t)))))))
|
||||
|
||||
(define (last-extension-or-cfg config extensions)
|
||||
"Picks configuration value from last provided extension. If there
|
||||
@ -157,10 +178,7 @@ are no extensions use configuration instead."
|
||||
(default-value (home-xdg-base-directories-configuration))
|
||||
(compose identity)
|
||||
(extend last-extension-or-cfg)
|
||||
(description "Configure XDG base directories. This
|
||||
service introduces an additional @env{XDG_LOG_HOME} variable. It's not
|
||||
a part of XDG specification, at least yet, but are convenient to have,
|
||||
it improves the consistency between different home services. The
|
||||
(description "Configure XDG base directories. The
|
||||
services of this service-type is instantiated by default, to provide
|
||||
non-default value, extend the service-type (using @code{simple-service}
|
||||
for example).")))
|
||||
|
12
gnu/local.mk
12
gnu/local.mk
@ -58,6 +58,7 @@
|
||||
# Copyright © 2022 jgart <jgart@dismail.de>
|
||||
# Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
# Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
|
||||
# Copyright © 2023 Andy Tai <atai@atai.org>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
@ -742,6 +743,7 @@ GNU_SYSTEM_MODULES = \
|
||||
%D%/system/images/pine64.scm \
|
||||
%D%/system/images/pinebook-pro.scm \
|
||||
%D%/system/images/rock64.scm \
|
||||
%D%/system/images/unmatched.scm \
|
||||
%D%/system/images/wsl2.scm \
|
||||
\
|
||||
%D%/machine.scm \
|
||||
@ -895,6 +897,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/akonadi-not-relocatable.patch \
|
||||
%D%/packages/patches/akonadi-timestamps.patch \
|
||||
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
|
||||
%D%/packages/patches/ibus-anthy-fix-tests.patch \
|
||||
%D%/packages/patches/anki-mpv-args.patch \
|
||||
%D%/packages/patches/antiword-CVE-2014-8123.patch \
|
||||
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
|
||||
@ -1055,6 +1058,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/dezyne-add-missing-shebangs.patch \
|
||||
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
|
||||
%D%/packages/patches/diffutils-fix-signal-processing.patch \
|
||||
%D%/packages/patches/directfb-davinci-glibc-228-compat.patch \
|
||||
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
|
||||
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
|
||||
%D%/packages/patches/docbook-xsl-support-old-url.patch \
|
||||
@ -1137,7 +1141,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/firebird-riscv64-support-pt1.patch \
|
||||
%D%/packages/patches/firebird-riscv64-support-pt2.patch \
|
||||
%D%/packages/patches/flann-cmake-3.11.patch \
|
||||
%D%/packages/patches/flashrom-fix-building-on-aarch64.patch \
|
||||
%D%/packages/patches/flatpak-fix-path.patch \
|
||||
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
|
||||
%D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \
|
||||
@ -1238,6 +1241,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/glib-appinfo-watch.patch \
|
||||
%D%/packages/patches/glib-networking-gnutls-binding.patch \
|
||||
%D%/packages/patches/glib-skip-failing-test.patch \
|
||||
%D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \
|
||||
%D%/packages/patches/glibc-CVE-2019-7309.patch \
|
||||
%D%/packages/patches/glibc-CVE-2019-9169.patch \
|
||||
%D%/packages/patches/glibc-CVE-2019-19126.patch \
|
||||
@ -1317,6 +1321,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
|
||||
%D%/packages/patches/guile-fibers-fd-finalizer-leak.patch \
|
||||
%D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
|
||||
%D%/packages/patches/guile-fibers-libevent-32-bit.patch \
|
||||
%D%/packages/patches/guile-fix-invalid-unicode-handling.patch \
|
||||
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
|
||||
%D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \
|
||||
@ -1354,6 +1359,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/http-parser-CVE-2020-8287.patch \
|
||||
%D%/packages/patches/htslib-for-stringtie.patch \
|
||||
%D%/packages/patches/hubbub-sort-entities.patch \
|
||||
%D%/packages/patches/hubbub-maybe-uninitialized.patch \
|
||||
%D%/packages/patches/hueplusplus-mbedtls.patch \
|
||||
%D%/packages/patches/hurd-add-without-rump-configure-option.patch \
|
||||
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch \
|
||||
@ -1503,6 +1509,7 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/libtommath-integer-overflow.patch \
|
||||
%D%/packages/patches/libtool-grep-compat.patch \
|
||||
%D%/packages/patches/libtool-skip-tests2.patch \
|
||||
%D%/packages/patches/libtree-fix-check-non-x86.patch \
|
||||
%D%/packages/patches/libusb-0.1-disable-tests.patch \
|
||||
%D%/packages/patches/libusb-for-axoloti.patch \
|
||||
%D%/packages/patches/libutils-add-includes.patch \
|
||||
@ -1702,6 +1709,8 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/python-typeguard-python3.10.patch \
|
||||
%D%/packages/patches/python-w3lib-fix-test-failure.patch \
|
||||
%D%/packages/patches/python-wxwidgets-type-errors.patch \
|
||||
%D%/packages/patches/quodlibet-fix-invalid-glob.patch \
|
||||
%D%/packages/patches/quodlibet-fix-mtime-tests.patch \
|
||||
%D%/packages/patches/scribus-1.5.8-poppler-22.03.0.patch \
|
||||
%D%/packages/patches/scribus-1.5.8-poppler-22.04.0.patch \
|
||||
%D%/packages/patches/scribus-1.5.8-poppler-22.09.0.patch \
|
||||
@ -1794,7 +1803,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
|
||||
%D%/packages/patches/python-hiredis-fix-header.patch \
|
||||
%D%/packages/patches/python-hiredis-use-system-hiredis.patch \
|
||||
%D%/packages/patches/python-keras-integration-test.patch \
|
||||
%D%/packages/patches/python-pdoc3-tests.patch \
|
||||
%D%/packages/patches/python-peachpy-determinism.patch \
|
||||
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
|
||||
|
@ -5,7 +5,7 @@
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2021 Lars-Dominik Braun <ldb@leibniz-psychology.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
@ -28,14 +28,14 @@
|
||||
#:use-module (gnu packages attr)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python))
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix utils))
|
||||
|
||||
(define-public acl
|
||||
(package
|
||||
@ -55,7 +55,7 @@
|
||||
,@%gnu-build-system-modules)
|
||||
#:configure-flags '("--disable-static")
|
||||
#:tests? ,(not (or (%current-target-system)
|
||||
(hurd-target?)))
|
||||
(target-hurd?)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; XXX After repacking the sources the timestamps are reset to the
|
||||
|
@ -1,5 +1,5 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
|
||||
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier <bavier@posteo.net>
|
||||
@ -31,7 +31,7 @@
|
||||
;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
@ -130,7 +130,6 @@
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages guile-xyz)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages inkscape)
|
||||
@ -378,7 +377,11 @@ interface and is based on GNU Guile.")
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1720czfchg4pzw44v0zj3rc3k6jhl3ixwnpw4v4v9bqx98ad49yw"))))))
|
||||
"1720czfchg4pzw44v0zj3rc3k6jhl3ixwnpw4v4v9bqx98ad49yw"))))
|
||||
(native-inputs (modify-inputs (package-native-inputs shepherd-0.9)
|
||||
(replace "guile-fibers" guile-fibers-1.3)))
|
||||
(inputs (modify-inputs (package-inputs shepherd-0.9)
|
||||
(replace "guile-fibers" guile-fibers-1.3)))))
|
||||
|
||||
(define-public shepherd shepherd-0.9)
|
||||
|
||||
@ -909,7 +912,7 @@ re-executing them as necessary.")
|
||||
,@(if (%current-target-system)
|
||||
'("--with-path-procnet-dev=/proc/net/dev")
|
||||
'())
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'("--disable-rcp"
|
||||
"--disable-rexec"
|
||||
"--disable-rexecd"
|
||||
@ -963,7 +966,7 @@ hostname.")
|
||||
`(;; Assume System V `setpgrp (void)', which is the default on GNU
|
||||
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
|
||||
#:configure-flags
|
||||
'(,@(if (hurd-target?)
|
||||
'(,@(if (target-hurd?)
|
||||
'()
|
||||
'("--with-libpam"))
|
||||
"shadow_cv_logdir=/var/log"
|
||||
@ -1014,7 +1017,7 @@ hostname.")
|
||||
(delete-file (string-append bin "/groups"))
|
||||
(for-each delete-file (find-files man "^groups\\."))))))))
|
||||
(inputs
|
||||
`(,@(if (hurd-target?)
|
||||
`(,@(if (target-hurd?)
|
||||
'()
|
||||
`(("linux-pam" ,linux-pam)))
|
||||
,@(if (%current-target-system)
|
||||
@ -1523,7 +1526,7 @@ connection alive.")
|
||||
|
||||
(inputs `(("inetutils" ,inetutils)
|
||||
("bash" ,bash-minimal)
|
||||
,@(if (hurd-target?) '()
|
||||
,@(if (target-hurd?) '()
|
||||
`(("net-tools" ,net-tools)
|
||||
("iproute" ,iproute)))
|
||||
|
||||
@ -2033,7 +2036,7 @@ system administrator.")
|
||||
(list groff))
|
||||
(inputs
|
||||
`(("coreutils" ,coreutils)
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'()
|
||||
`(("linux-pam" ,linux-pam)))
|
||||
("zlib" ,zlib)))
|
||||
@ -5764,7 +5767,7 @@ file or files to several hosts.")
|
||||
(define-public doctl
|
||||
(package
|
||||
(name "doctl")
|
||||
(version "1.93.1")
|
||||
(version "1.94.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -5773,7 +5776,7 @@ file or files to several hosts.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18l0avbq1la1wsfwj13kq5prqz6mydhs3ihvf0f3s3vr2y9h71aq"))))
|
||||
"0a221n0x7qrq0dbhhf1saya2g7jyy1798k3rhy9nzyvqzc4vnd0x"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/digitalocean/doctl/cmd/doctl"
|
||||
|
@ -291,7 +291,7 @@ audio or video backends, ensuring good performance.")
|
||||
(define-public lightspark
|
||||
(package
|
||||
(name "lightspark")
|
||||
(version "0.8.6.1")
|
||||
(version "0.8.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -300,7 +300,7 @@ audio or video backends, ensuring good performance.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1a78l9na01pd7a77r9n8lqih893s54rllpjvrx72sh0yyal1q3gz"))))
|
||||
(base32 "156yd79dbs6lzp5jc2zd0knw6bk0g8qdm8icp7pkcn95vfvxyzx9"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;requires Adobe Flex SDK, see README.tests
|
||||
@ -340,7 +340,6 @@ audio or video backends, ensuring good performance.")
|
||||
pcre2
|
||||
rtmpdump
|
||||
sdl2
|
||||
sdl2-mixer
|
||||
zlib))
|
||||
(home-page "https://lightspark.github.io/")
|
||||
(synopsis "Flash player implementation")
|
||||
|
@ -651,7 +651,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
|
||||
(define-public gnuastro
|
||||
(package
|
||||
(name "gnuastro")
|
||||
(version "0.19")
|
||||
(version "0.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -659,7 +659,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.")
|
||||
version ".tar.lz"))
|
||||
(sha256
|
||||
(base32
|
||||
"192q3i4zlfmwfcchlf9lnpfgys9dssh7npr5qx0gzn3d2fri0xbz"))))
|
||||
"05bkad0xbax9k0m2g2507mdmjg2109sfg72dsx16f44yj55llh2n"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static")))
|
||||
@ -1355,6 +1355,38 @@ be as fast as possible so some of the readability has been sacrificed,
|
||||
specifically in the C code.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-bayesicfitting
|
||||
(package
|
||||
(name "python-bayesicfitting")
|
||||
(version "3.1.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/dokester/BayesicFitting")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"07y9dr9wxhxrvhk0jjakhbyrgal60i92m7z7q14fp12k8x0gl69l"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "python" "-m" "unittest" "discover"
|
||||
"test")))))))
|
||||
(propagated-inputs (list python-astropy python-future python-matplotlib
|
||||
python-numpy python-scipy))
|
||||
(home-page "https://www.bayesicfitting.nl")
|
||||
(synopsis "Python Toolbox for Astronimical Bayesian fitting")
|
||||
(description
|
||||
"The BayesicFitting package is a python version of the the fitter classes
|
||||
in @acronym{HCSS, Herschel Common Science System}. HCSS was the all
|
||||
encompassing software system for the operations and analysis of the ESA satelite
|
||||
Herschel.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public python-ccdproc
|
||||
(package
|
||||
(name "python-ccdproc")
|
||||
@ -1425,6 +1457,58 @@ attempting to maintain ISTP compliance
|
||||
@end itemize")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-crds
|
||||
(package
|
||||
(name "python-crds")
|
||||
(version "11.17.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "crds" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0sdz1k4hrgrc2jwihp9ns7lx23kcz7f90c222q7aaqf9g3vvpqlr"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: Tests require Internet access to https://hst-crds.stsci.edu and
|
||||
;; additional test data. See:
|
||||
;; https://github.com/spacetelescope/crds/blob/master/setup_test_cache
|
||||
#:tests? #f))
|
||||
(propagated-inputs (list python-asdf
|
||||
python-astropy
|
||||
python-boto3
|
||||
python-filelock
|
||||
python-lxml
|
||||
python-numpy
|
||||
python-parsley
|
||||
python-pysynphot
|
||||
python-roman-datamodels
|
||||
python-stsynphot
|
||||
python-requests))
|
||||
(native-inputs (list python-flake8
|
||||
python-ipython
|
||||
python-lockfile
|
||||
python-mock
|
||||
python-nose
|
||||
python-pylint
|
||||
python-pytest
|
||||
python-semantic-version
|
||||
python-setuptools-scm))
|
||||
(home-page "https://hst-crds.stsci.edu")
|
||||
(synopsis "Calibration Reference Data System for HST and JWST")
|
||||
(description
|
||||
"CRDS is a package used for working with astronomical reference files for
|
||||
the HST and JWST telescopes. CRDS is useful for performing various operations
|
||||
on reference files or reference file assignment rules. CRDS is used to assign,
|
||||
check, and compare reference files and rules, and also to predict those datasets
|
||||
which should potentially be reprocessed due to changes in reference files or
|
||||
assignment rules. CRDS has versioned rules which define the assignment of
|
||||
references for each type and instrument configuration. CRDS has web sites
|
||||
corresponding to each project (http://hst-crds.stsci.edu or
|
||||
https://jwst-crds.stsci.edu/) which record information about reference files and
|
||||
provide related services.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-czml3
|
||||
(package
|
||||
(name "python-czml3")
|
||||
@ -1493,6 +1577,53 @@ JSOC (@url{http://jsoc.stanford.edu/}) DRMS server by default, but can also be
|
||||
used with local NetDRMS sites.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public python-drizzle
|
||||
(package
|
||||
(name "python-drizzle")
|
||||
(version "1.13.7")
|
||||
(source (origin
|
||||
(method git-fetch) ;PyPi doesn't have the test data sets
|
||||
(uri (git-reference
|
||||
(url "https://github.com/spacetelescope/drizzle")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0x591d9gjasds91fvwcf37bhxp5nra28g0vq5zkykczpc70ywiy8"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: 2 of 26 tests failed with AssertionError, disable them for now.
|
||||
;; Consider mention it in upstream.
|
||||
#:test-flags #~(list "-k"
|
||||
(string-append "not test_square_with_point"
|
||||
" and not test_square_with_grid"))
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-before 'build 'set-env-version
|
||||
(lambda _
|
||||
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
|
||||
#$version)))
|
||||
(add-before 'check 'build-extensions
|
||||
(lambda _
|
||||
;; Cython extensions have to be built before running
|
||||
;; the tests.
|
||||
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
|
||||
(propagated-inputs (list python-astropy python-numpy))
|
||||
(native-inputs (list python-coverage python-flake8 python-pytest
|
||||
python-pytest-cov python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/drizzle")
|
||||
(synopsis
|
||||
"Astronomical tool for combining dithered images into a single image")
|
||||
(description
|
||||
"The drizzle library is a Python package for combining dithered images into
|
||||
a single image. This library is derived from code used in DrizzlePac. Like
|
||||
DrizzlePac, most of the code is implemented in the C language. The biggest
|
||||
change from DrizzlePac is that this code passes an array that maps the input to
|
||||
output image into the C code, while the DrizzlePac code computes the mapping by
|
||||
using a Python callback. Switching to using an array allowed the code to be
|
||||
greatly simplified.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-ephem
|
||||
(package
|
||||
(name "python-ephem")
|
||||
@ -2045,6 +2176,211 @@ spherical polygons that represent arbitrary regions of the sky.")
|
||||
;; QD_LIBRARY_LICENSE.rst for bandeled QD source
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stsci-image
|
||||
(package
|
||||
(name "python-stsci-image")
|
||||
(version "2.3.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stsci.image" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vnp4256nbdvapa69cmm80sjz11ygxa49abr9nbvssj6nyyp5icb"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-before 'check 'build-extensions
|
||||
(lambda _
|
||||
;; Cython extensions have to be built before running
|
||||
;; the tests.
|
||||
(invoke "python" "setup.py" "build_ext"
|
||||
"--inplace"))))))
|
||||
(propagated-inputs (list python-numpy python-scipy))
|
||||
(native-inputs (list python-pytest python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/stsci.image")
|
||||
(synopsis "Image array manipulation functions")
|
||||
(description
|
||||
"This package provides Python modules of @acronym{STScI, Space Telescope
|
||||
Science Institute} image array manipulation functions.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stsci-imagestats
|
||||
(package
|
||||
(name "python-stsci-imagestats")
|
||||
(version "1.6.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stsci.imagestats" version))
|
||||
(sha256
|
||||
(base32
|
||||
"14457izlbnks84dyza75ib3nvx2w8nhlqm9vc1zb7hbhknb5gjvw"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f)) ;No tests
|
||||
(propagated-inputs (list python-numpy))
|
||||
(native-inputs (list python-setuptools-scm))
|
||||
(home-page "https://stsciimagestats.readthedocs.io/en/latest/")
|
||||
(synopsis "Compute sigma-clipped statistics on data arrays")
|
||||
(description
|
||||
"@code{stsci.imagestats} is a package designed to compute various
|
||||
statistics on image data using sigma-clipping iterations. It is designed to
|
||||
replicate core behaviour of the IRAF's
|
||||
@url{http://stsdas.stsci.edu/cgi-bin/gethelp.cgi?imstatistics, imstatistics
|
||||
task}.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stsci-stimage
|
||||
(package
|
||||
(name "python-stsci-stimage")
|
||||
(version "0.2.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stsci.stimage" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i7xby1gaiplvbqqv8a4f4cw1is8fwj89mix1z3bqrykqi3n24g0"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: Fix failing tests. There are errors to load test files.
|
||||
#:tests? #f))
|
||||
(propagated-inputs (list python-numpy))
|
||||
(native-inputs (list python-codecov python-pytest python-pytest-cov
|
||||
python-setuptools-scm))
|
||||
(home-page "https://stscistimage.readthedocs.io/en/latest/")
|
||||
(synopsis "STScI image processing")
|
||||
(description "This package provides an astronomical Python package with
|
||||
image processing functions: @code{xyxymatch}, @code{geomap}.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stcal
|
||||
(package
|
||||
(name "python-stcal")
|
||||
(version "1.3.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stcal" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yy0pwi3krvhxfby6nzgpgyz5il3sl1j29ihbk81dh9fdh3ys2n9"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
;; XXX: Can't detect opencv-python version. The input
|
||||
;; opencv might not set the version correctly.
|
||||
(delete 'sanity-check))))
|
||||
(propagated-inputs (list opencv ;Provides OpenCV-Python
|
||||
python-astropy python-numpy python-scipy))
|
||||
(native-inputs (list python-psutil
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-pytest-doctestplus
|
||||
python-pytest-openfiles
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/stcal")
|
||||
(synopsis "STScI tools and algorithms used in calibration pipelines")
|
||||
(description "STScI tools and algorithms used in calibration pipelines.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stdatamodels
|
||||
(package
|
||||
(name "python-stdatamodels")
|
||||
(version "1.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stdatamodels" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lssz5mnkzgraqa9mdg1w39scsikymcp3zpmsjb146r0pqnwnpzw"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; Disable tests requiring access to CRDS servers to download ~500MiB
|
||||
;; of data.
|
||||
#:test-flags #~(list "-k" "not test_crds_selectors_vs_datamodel")
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-before 'check 'set-home
|
||||
(lambda _
|
||||
(setenv "HOME" "/tmp"))))))
|
||||
(propagated-inputs (list python-asdf
|
||||
python-asdf-astropy
|
||||
python-astropy
|
||||
python-jsonschema
|
||||
python-numpy
|
||||
python-psutil))
|
||||
(native-inputs (list python-crds
|
||||
python-pytest
|
||||
python-pytest-doctestplus
|
||||
python-pytest-openfiles
|
||||
python-scipy
|
||||
python-semantic-version
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/stdatamodels")
|
||||
(synopsis
|
||||
"Core support for DataModel classes used in calibration pipelines")
|
||||
(description
|
||||
"Provides DataModel, which is the base class for data models implemented in
|
||||
the @acronym{JWST, James Webb Space Telescope} and @acronym{Roman, Nancy Grace
|
||||
Roman Space Telescope} calibration software.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stpipe
|
||||
(package
|
||||
(name "python-stpipe")
|
||||
(version "0.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stpipe" version))
|
||||
(sha256
|
||||
(base32
|
||||
"17gnwzhl10vbg059lfprdyci19dlh3whkmb9rl7z25wr593rnvcp"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs (list python-asdf python-astropy python-crds
|
||||
python-semantic-version python-stdatamodels))
|
||||
(native-inputs (list python-pytest python-pytest-doctestplus
|
||||
python-pytest-openfiles python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/stpipe")
|
||||
(synopsis "Framework for calibration pipeline software")
|
||||
(description
|
||||
"This package provides base classes and command-line tools for
|
||||
implementing calibration pipeline software.")
|
||||
;; LICENSE Association of Universities for Research in Astronomy (AURA)
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-stsynphot
|
||||
(package
|
||||
(name "python-stsynphot")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "stsynphot" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qkdh47j84v7fzri7bmi1jcmggdqq0a8byamfm73d8mbz86v8sn4"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: Tests fails on missing file, it might need to be downloaded,
|
||||
;; disable them for now. astropy.utils.exceptions.AstropyUserWarning:
|
||||
;; Failed to load Vega spectrum from
|
||||
;; /grp/redcat/trds/calspec/alpha_lyr_stis_010.fits;
|
||||
#:tests? #f))
|
||||
(propagated-inputs (list python-astropy
|
||||
python-beautifulsoup4
|
||||
python-matplotlib
|
||||
python-numpy
|
||||
python-scipy
|
||||
python-synphot))
|
||||
(native-inputs (list python-pytest python-pytest-astropy
|
||||
python-pytest-astropy-header python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/stsynphot_refactor")
|
||||
(synopsis "Synthetic photometry using Astropy for HST and JWST")
|
||||
(description
|
||||
"This package provides a replacement for IRAF STSDAS SYNPHOT and ASTROLIB
|
||||
PYSYNPHOT, utilizing Astropy covering instrument specific portions of the old
|
||||
packages for HST.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public libnova
|
||||
(package
|
||||
(name "libnova")
|
||||
@ -2590,6 +2926,73 @@ Moon position, etc.")
|
||||
JPL ephemerides use to predict raw (x,y,z) planetary positions.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-jwst
|
||||
(package
|
||||
(name "python-jwst")
|
||||
(version "1.10.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "jwst" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lmfyw2y7c84rs9xqavah9aidj478ijiiijlz6fag11xqn1vs98y"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: Tests require access to https://jwst-crds-pub.stsci.edu server for
|
||||
;; getting data sets.
|
||||
#:tests? #f
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
;; NOTE: (Sharlatan-20230529T113448+0100): opencv-python's
|
||||
;; version can't be detected, it could the way it's packed in
|
||||
;; Guix. Review failing sanity check with more efforts,
|
||||
;; disable for now to make package buildable.
|
||||
(delete 'sanity-check))))
|
||||
;; opencv provides OpenCV-Python which is Listed as install requirement.
|
||||
(propagated-inputs (list opencv
|
||||
python-asdf
|
||||
python-asdf-astropy
|
||||
python-astropy
|
||||
python-bayesicfitting
|
||||
python-crds
|
||||
python-drizzle
|
||||
python-gwcs
|
||||
python-jsonschema
|
||||
python-numpy
|
||||
python-photutils
|
||||
python-poppy
|
||||
python-psutil
|
||||
python-pyparsing
|
||||
python-requests
|
||||
python-scikit-image
|
||||
python-scipy
|
||||
python-spherical-geometry
|
||||
python-stcal
|
||||
python-stdatamodels
|
||||
python-stpipe
|
||||
python-stsci-image
|
||||
python-stsci-imagestats
|
||||
python-tweakwcs
|
||||
python-wiimatch))
|
||||
(native-inputs (list python-codecov
|
||||
python-colorama
|
||||
python-flake8
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-pytest-doctestplus
|
||||
python-pytest-openfiles
|
||||
python-requests-mock
|
||||
python-setuptools-scm))
|
||||
(home-page "https://jwst-pipeline.readthedocs.io/en/latest/")
|
||||
(synopsis
|
||||
"Python library for science observations from the James Webb Space Telescope")
|
||||
(description
|
||||
"This package provides an access to the JWST Science Calibration Pipeline
|
||||
processes data from all JWST instruments and observing modes by applying various
|
||||
science corrections sequentially, producing both fully-calibrated individual
|
||||
exposures and high-level data products (mosaics, extracted spectra, etc.).")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-pyerfa
|
||||
(package
|
||||
(name "python-pyerfa")
|
||||
@ -2687,6 +3090,38 @@ astrophysical simulations supporting PKDGRAV/Gasoline, Gadget, Gadget4/Arepo,
|
||||
N-Chilada and RAMSES AMR outputs.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public python-pysynphot
|
||||
(package
|
||||
(name "python-pysynphot")
|
||||
(version "2.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pysynphot" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rr29m63bnj47f6gvbvg3pm1296x14ad29c6qd0sdj4f4ilrzhj5"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases #~(modify-phases %standard-phases
|
||||
(add-before 'check 'set-env-data-path
|
||||
(lambda _
|
||||
(setenv "PYSYN_CDBS"
|
||||
(string-append #$output "/crds")))))))
|
||||
(native-inputs (list python-pytest python-pytest-remotedata
|
||||
python-setuptools-scm))
|
||||
(propagated-inputs (list python-astropy python-beautifulsoup4 python-numpy
|
||||
python-pytest-astropy-header python-six))
|
||||
(home-page "https://github.com/spacetelescope/pysynphot")
|
||||
(synopsis "Python Synthetic Photometry Utilities")
|
||||
(description
|
||||
"Astrolib PySynphot (hereafter referred to only as pysynphot) is an
|
||||
object-oriented replacement for STSDAS SYNPHOT synthetic photometry package in
|
||||
IRAF. @code{pysynphot} simulates photometric data and spectra as they are
|
||||
observed with the Hubble Space Telescope (HST). Passbands for standard
|
||||
photometric systems are available, and users can incorporate their own filters,
|
||||
spectra, and data.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-sep
|
||||
(package
|
||||
(inherit libsep)
|
||||
@ -2723,6 +3158,67 @@ Takes a WGS84 (GPS) latitude/longitude as input as well as an UTC or local
|
||||
datetime object.")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public python-synphot
|
||||
(package
|
||||
(name "python-synphot")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "synphot" version))
|
||||
(sha256
|
||||
(base32
|
||||
"02pjp1bnbyq7zi1bxqv56nif4ijd8fscmnn9ldrs8yvgsbmgdvlc"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: Test needs more love to pass.
|
||||
;; ERROR collecting synphot/tests/test_utils.py
|
||||
#:tests? #f))
|
||||
(propagated-inputs (list python-astropy python-numpy python-scipy))
|
||||
(native-inputs (list python-pytest python-pytest-astropy
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/synphot_refactor")
|
||||
(synopsis "Synthetic photometry using Astropy")
|
||||
(description
|
||||
"This package provides a replacement for IRAF STSDAS SYNPHOT and ASTROLIB
|
||||
PYSYNPHOT, utilizing Astropy and covering the non-instrument specific portions
|
||||
of the old packages.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-tweakwcs
|
||||
(package
|
||||
(name "python-tweakwcs")
|
||||
(version "0.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "tweakwcs" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1500w737n9vf5hv16xkybk4shl7g4wfzb2ji9mc4vgzj41gkrwl4"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs (list python-astropy
|
||||
python-gwcs
|
||||
python-numpy
|
||||
python-packaging
|
||||
python-spherical-geometry
|
||||
python-stsci-imagestats
|
||||
python-stsci-stimage))
|
||||
(native-inputs (list python-codecov
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-scipy
|
||||
python-semantic-version
|
||||
python-setuptools-scm))
|
||||
(home-page "https://tweakwcs.readthedocs.io/en/latest/")
|
||||
(synopsis
|
||||
"Algorithms for matching and aligning catalogs and for tweaking the WCS")
|
||||
(description
|
||||
"@code{tweakwcs} is a package that provides core algorithms for computing
|
||||
and applying corrections to @code{WCS} objects such as to minimize mismatch
|
||||
between image and reference catalogs. Currently only aligning images with
|
||||
@code{FITS WCS} and @code{JWST gWCS} are supported.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-asdf
|
||||
(package
|
||||
(name "python-asdf")
|
||||
@ -3050,6 +3546,79 @@ the entire transformation pipeline from input coordinates (detector by
|
||||
default) to world coordinates.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-rad
|
||||
(package
|
||||
(name "python-rad")
|
||||
(version "0.15.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "rad" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0j51pkywxdaqrfz162rdsywlvx1mbb2h0gi5framvhf25i1im7mb"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:test-flags #~(list "-k" "not remote_data")))
|
||||
(native-inputs (list python-astropy
|
||||
python-pytest
|
||||
python-pytest-doctestplus
|
||||
python-pytest-openfiles
|
||||
python-semantic-version
|
||||
python-setuptools-scm))
|
||||
(propagated-inputs (list python-asdf python-asdf-astropy))
|
||||
(home-page "https://github.com/spacetelescope/rad")
|
||||
(synopsis "Roman Attribute Dictionary")
|
||||
(description
|
||||
"@acronym{RAD, The Roman Attribute Dictionary} is package which defines
|
||||
schemas for the Nancy Grace Roman Space Telescope shared attributes for
|
||||
processing and archive. These schemas are schemas for the ASDF file file
|
||||
format, which are used by ASDF to serialize and deserialize data for the Nancy
|
||||
Grace Roman Space Telescope.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-roman-datamodels
|
||||
(package
|
||||
(name "python-roman-datamodels")
|
||||
(version "0.15.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "roman_datamodels" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0frhm1cqqd8934yizhm4fy78y38q2w9ncm4rv1n74hfypkyis4ap"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
;; XXX: Check how to make all tests enabled, probably some more inner
|
||||
;; input chain needs to be upgraded, keep them disabled to make the build
|
||||
;; green.
|
||||
(list #:test-flags #~(list "-k"
|
||||
(string-append "not test_will_validate"
|
||||
" and not test_will_strict_validate"
|
||||
" and not test_nuke_validation"))))
|
||||
(propagated-inputs (list python-asdf
|
||||
python-asdf-astropy
|
||||
python-asdf-standard
|
||||
python-astropy
|
||||
python-gwcs
|
||||
python-numpy
|
||||
python-psutil
|
||||
python-rad))
|
||||
(native-inputs (list python-pytest python-pytest-doctestplus
|
||||
python-pytest-openfiles python-semantic-version
|
||||
python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/roman_datamodels")
|
||||
(synopsis "Roman Datamodels Support")
|
||||
(description
|
||||
"This package provides a Python package of Roman Datamodels for the
|
||||
calibration pipelines started with the @acronym{JWST, James Webb Space
|
||||
Telescope} calibration pipelines. The goal for the JWST pipelines was motivated
|
||||
primarily by the need to support FITS data files, specifically with isolating
|
||||
the details of where metadata and data were located in the FITS file from the
|
||||
representation of the same items within the Python code. That is not a concern
|
||||
for Roman since FITS format data files will not be used by the Roman calibration
|
||||
pipelines.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-astroalign
|
||||
(package
|
||||
(name "python-astroalign")
|
||||
@ -3102,3 +3671,26 @@ astronomical images, especially when there is no WCS information available.")
|
||||
"Skyfield computes positions for the stars, planets, and satellites in
|
||||
orbit around the Earth.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-wiimatch
|
||||
(package
|
||||
(name "python-wiimatch")
|
||||
(version "0.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "wiimatch" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0x6p5z6a2cqinckwlpinjxagvmswl149s1jn6ihmdxk4k0h8rrz0"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs (list python-numpy python-scipy))
|
||||
(native-inputs (list python-codecov python-pytest python-pytest-cov
|
||||
python-pytest-doctestplus python-setuptools-scm))
|
||||
(home-page "https://github.com/spacetelescope/wiimatch")
|
||||
(synopsis
|
||||
"Optimal matching of weighted N-dimensional image intensity data")
|
||||
(description
|
||||
"@code{wiimatch} is a package that provides core computational algorithms
|
||||
for optimal @code{matching} of weighted N-dimensional image intensity data
|
||||
using (multivariate) polynomials.")
|
||||
(license license:bsd-3)))
|
||||
|
@ -3,6 +3,7 @@
|
||||
;;; Copyright © 2012, 2013, 2016, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -23,10 +24,10 @@
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu))
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix utils))
|
||||
|
||||
(define-public attr
|
||||
(package
|
||||
@ -43,7 +44,7 @@
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
`((add-before 'configure 'skip-linux-syscalls
|
||||
(lambda _
|
||||
;; Starting from 2.5.1, libattr includes Linux-specific
|
||||
|
@ -738,7 +738,7 @@ purposes developed at Queen Mary, University of London.")
|
||||
(define-public ardour
|
||||
(package
|
||||
(name "ardour")
|
||||
(version "7.3")
|
||||
(version "7.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -755,7 +755,7 @@ purposes developed at Queen Mary, University of London.")
|
||||
namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
|
||||
(sha256
|
||||
(base32
|
||||
"0bkhrgswhc9y1ly8nfg8hpwad77cgbr663dgj86h3aisljc4cdkw"))
|
||||
"0v66h9fghjyjinldw9yfhhlfi3my235x6n4dpxx432z35lka2h89"))
|
||||
(file-name (string-append name "-" version))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
@ -799,7 +799,6 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
|
||||
(list alsa-lib
|
||||
atkmm
|
||||
aubio
|
||||
boost
|
||||
cairomm
|
||||
curl
|
||||
dbus
|
||||
@ -844,7 +843,8 @@ namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \
|
||||
taglib
|
||||
vamp))
|
||||
(native-inputs
|
||||
(list cppunit
|
||||
(list boost
|
||||
cppunit
|
||||
gettext-minimal
|
||||
itstool
|
||||
perl
|
||||
@ -860,7 +860,7 @@ engineers, musicians, soundtrack editors and composers.")
|
||||
(define-public audacity
|
||||
(package
|
||||
(name "audacity")
|
||||
(version "3.3.0-beta-1") ;for ffmpeg 6 support
|
||||
(version "3.3.3") ;for ffmpeg 6 support
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -869,7 +869,7 @@ engineers, musicians, soundtrack editors and composers.")
|
||||
(commit (string-append "Audacity-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1j1fy8h3vvf3pbyy2vxahf7admcqfmx7m1mxm7g48n54i2f0n1h9"))
|
||||
(base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv"))
|
||||
(patches (search-patches "audacity-ffmpeg-fallback.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -22,11 +22,13 @@
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages security-token)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix download)
|
||||
@ -34,6 +36,29 @@
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public libcotp
|
||||
(package
|
||||
(name "libcotp")
|
||||
(version "2.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/paolostivanin/libcotp")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "12ps2msclcbv53gjf936cny10an8sc70b9frp6xxjirfn5jg2h63"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs (list libgcrypt))
|
||||
(native-inputs (list pkg-config))
|
||||
(home-page "https://github.com/paolostivanin/libcotp")
|
||||
(synopsis "One-Time Passwords")
|
||||
(description "This package provides a library to generate
|
||||
@acronym{HOTP, HMAC-base One-Time Password}s as specified in RFC 4226 and
|
||||
@acronym{TOTP, Time-based One-Time Password}s as specified in RFC 6238.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public oath-toolkit
|
||||
(package
|
||||
(name "oath-toolkit")
|
||||
|
@ -6,7 +6,7 @@
|
||||
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
|
||||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
@ -132,7 +132,7 @@ command-line arguments, multiple languages, and so on.")
|
||||
(string-append bin "/fgrep"))
|
||||
(("^exec grep")
|
||||
(string-append "exec " bin "/grep"))))))
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'((add-before 'check 'skip-triple-backref-test
|
||||
(lambda _
|
||||
;; This test is marked as malfunctioning on glibc systems
|
||||
@ -144,7 +144,7 @@ command-line arguments, multiple languages, and so on.")
|
||||
(("^warn_" all)
|
||||
(string-append "exit 77\n" all))))))
|
||||
'()))
|
||||
#:make-flags ,(if (hurd-target?)
|
||||
#:make-flags ,(if (target-hurd?)
|
||||
''("XFAIL_TESTS=test-perror2 equiv-classes") ;XXX
|
||||
''())))
|
||||
(synopsis "Print lines matching a pattern")
|
||||
@ -186,7 +186,7 @@ including, for example, recursive directory searching.")
|
||||
(modules '((guix build utils)))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags ,(if (hurd-target?)
|
||||
`(#:make-flags ,(if (target-hurd?)
|
||||
''("XFAIL_TESTS=test-perror2")
|
||||
''())))
|
||||
(synopsis "Stream editor")
|
||||
@ -217,7 +217,7 @@ implementation offers several extensions over the standard utility.")
|
||||
;; Note: test suite requires ~1GiB of disk space.
|
||||
(arguments
|
||||
`(,@(cond
|
||||
((hurd-target?)
|
||||
((target-hurd?)
|
||||
'(#:make-flags
|
||||
(list (string-append
|
||||
"TESTSUITEFLAGS= -k '"
|
||||
@ -309,7 +309,7 @@ differences.")
|
||||
(patches (search-patches "diffutils-fix-signal-processing.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags ,(if (hurd-target?)
|
||||
`(#:make-flags ,(if (target-hurd?)
|
||||
''("XFAIL_TESTS=test-perror2 large-subopt")
|
||||
''())))
|
||||
(native-inputs (list perl))
|
||||
@ -347,7 +347,7 @@ interactive means to merge two files.")
|
||||
"tests/find/exec-plus-last-file.sh")
|
||||
(("#!/bin/sh")
|
||||
(string-append "#!" (which "sh")))))))
|
||||
#:make-flags ,(if (hurd-target?)
|
||||
#:make-flags ,(if (target-hurd?)
|
||||
''("XFAIL_TESTS=test-strerror_r")
|
||||
''())))
|
||||
(synopsis "Operating on files matching given criteria")
|
||||
@ -395,7 +395,7 @@ used to apply commands with arbitrarily long arguments.")
|
||||
(outputs '("out" "debug"))
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; help2man may be called too early
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'(#:make-flags ; these tests fail deterministically
|
||||
(list (string-append "XFAIL_TESTS=tests/misc/env-S.pl"
|
||||
" tests/misc/kill.sh"
|
||||
@ -433,7 +433,7 @@ used to apply commands with arbitrarily long arguments.")
|
||||
(("#!/bin/sh") (string-append "#!" (which "sh"))))))
|
||||
(add-after 'unpack 'remove-tests
|
||||
(lambda _
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'((substitute* "Makefile.in"
|
||||
;; this test hangs
|
||||
(("^ *tests/misc/timeout-group.sh.*") ""))
|
||||
@ -511,7 +511,7 @@ standard.")
|
||||
(inputs (list guile-3.0))
|
||||
(outputs '("out" "debug"))
|
||||
(arguments
|
||||
`(,@(if (hurd-target?)
|
||||
`(,@(if (target-hurd?)
|
||||
'(#:configure-flags '("CFLAGS=-D__alloca=alloca"
|
||||
"ac_cv_func_posix_spawn=no"))
|
||||
'())
|
||||
@ -798,7 +798,7 @@ the store.")
|
||||
;; libc provides <hurd.h>, which includes a bunch of Hurd and Mach headers,
|
||||
;; so both should be propagated.
|
||||
(propagated-inputs
|
||||
(if (hurd-target?)
|
||||
(if (target-hurd?)
|
||||
`(("hurd-core-headers" ,hurd-core-headers))
|
||||
`(("kernel-headers" ,linux-libre-headers))))
|
||||
|
||||
@ -864,7 +864,7 @@ the store.")
|
||||
|
||||
;; On GNU/Hurd we get discarded-qualifiers warnings for
|
||||
;; 'device_write_inband' among other things. Ignore them.
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
`("--disable-werror"
|
||||
,@%glibc/hurd-configure-flags)
|
||||
'()))
|
||||
@ -992,7 +992,7 @@ the store.")
|
||||
(map (cut string-append slib "/" <>)
|
||||
files))))))
|
||||
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'((add-after 'install 'augment-libc.so
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
@ -1012,7 +1012,7 @@ the store.")
|
||||
("gettext" ,gettext-minimal)
|
||||
("python" ,python-minimal)
|
||||
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
`(("mig" ,mig)
|
||||
("perl" ,perl))
|
||||
'())))
|
||||
@ -1066,12 +1066,13 @@ with the Linux kernel.")
|
||||
(base32
|
||||
"1zvp0qdfbdyqrzydz18d9zg3n5ygy8ps7cmny1bvsp8h1q05c99f"))
|
||||
(patches
|
||||
;; Remove a patch that's become irrelevant and that does not
|
||||
;; apply to this version.
|
||||
(remove (lambda (patch)
|
||||
(string=? (basename patch)
|
||||
"glibc-hurd-clock_gettime_monotonic.patch"))
|
||||
(origin-patches (package-source glibc))))))
|
||||
(cons (search-patch "glibc-2.33-riscv64-miscompilation.patch")
|
||||
;; Remove a patch that's become irrelevant and that does not
|
||||
;; apply to this version.
|
||||
(remove (lambda (patch)
|
||||
(string=? (basename patch)
|
||||
"glibc-hurd-clock_gettime_monotonic.patch"))
|
||||
(origin-patches (package-source glibc)))))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments glibc)
|
||||
((#:configure-flags flags ''())
|
||||
@ -1379,6 +1380,9 @@ test environments.")
|
||||
(make-glibc-utf8-locales glibc)))
|
||||
|
||||
;; Packages provided to ease use of binaries linked against the previous libc.
|
||||
(define-public glibc-locales-2.33
|
||||
(package (inherit (make-glibc-locales glibc-2.33))
|
||||
(name "glibc-locales-2.33")))
|
||||
(define-public glibc-locales-2.32
|
||||
(package (inherit (make-glibc-locales glibc-2.32))
|
||||
(name "glibc-locales-2.32")))
|
||||
|
@ -3312,6 +3312,77 @@ off-target reads for a capture method that targets CpG-rich region.")
|
||||
multiple sequence alignments.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-mofax
|
||||
;; This is a recent commit from the "dev" branch, which is much more recent
|
||||
;; than the latest commit from the "master" branch.
|
||||
(let ((commit "4d96f8f0a5d5251847353656f523684d66c3c47a")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "python-mofax")
|
||||
(version (git-version "0.4.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/bioFAM/mofax")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lwrw0qyvvnyiqz1l20dhcf7dxidb80cqgvk78czvdgba87yxzqx"))
|
||||
(modules '((guix build utils)))
|
||||
;; Prevent the pyproject-build-system from guessing that flit
|
||||
;; should be used as a builder.
|
||||
(snippet '(substitute* "pyproject.toml"
|
||||
(("^#.*") "")))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; This test is failing due to a bug. The bug has been reported to the
|
||||
;; developers. See https://github.com/bioFAM/mofax/issues/12 for more
|
||||
;; info.
|
||||
#:test-flags '(list "-k" "not test_get_methods")))
|
||||
(propagated-inputs (list python-h5py
|
||||
python-matplotlib
|
||||
python-pandas
|
||||
python-poetry-core
|
||||
python-scipy
|
||||
python-seaborn))
|
||||
(native-inputs (list python-numpy python-pytest))
|
||||
(home-page "https://github.com/bioFAM/mofax")
|
||||
(synopsis
|
||||
"Motif activity finder for transcription factor motif analysis")
|
||||
(description
|
||||
"MoFax is a Python package for transcription factor motif analysis.
|
||||
It provides convenience functions to load and visualize factor models trained
|
||||
with MOFA+ in Python.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public python-mudata
|
||||
(package
|
||||
(name "python-mudata")
|
||||
(version "0.2.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/scverse/mudata")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"02h0k1q57589r0hdv8nwg1vk7g2ljvn5g66c47fy5gdilbm3gjws"))))
|
||||
(build-system pyproject-build-system)
|
||||
(propagated-inputs
|
||||
(list python-anndata python-h5py python-pandas))
|
||||
(native-inputs
|
||||
(list python-flit-core python-numpy python-pytest python-zarr))
|
||||
(home-page "https://github.com/scverse/mudata")
|
||||
(synopsis "Python package for multi-omics data analysis")
|
||||
(description
|
||||
"Mudata is a Python package for multi-omics data analysis.
|
||||
It is designed to provide functionality to load, process, and store multimodal
|
||||
omics data.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-pyega3
|
||||
(package
|
||||
(name "python-pyega3")
|
||||
@ -10805,34 +10876,34 @@ generate FASTA, JSON, YAML, RDF, JSON-LD, HTML, CSV, tabular output etc.")
|
||||
(define-public bioruby
|
||||
(package
|
||||
(name "bioruby")
|
||||
(version "1.5.2")
|
||||
(version "2.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "bio" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1d56amdsjv1mag7m6gv2w0xij8hqx1v5xbdjsix8sp3yp36m7938"))))
|
||||
"08aknxk2ingwscwfqpw5vnax6jpk1sxfaialravladb63hcl8dx9"))))
|
||||
(build-system ruby-build-system)
|
||||
(propagated-inputs
|
||||
(list ruby-libxml))
|
||||
(native-inputs
|
||||
(list which)) ; required for test phase
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'patch-test-command
|
||||
(lambda _
|
||||
(substitute* '("test/functional/bio/test_command.rb")
|
||||
(("/bin/sh") (which "sh")))
|
||||
(substitute* '("test/functional/bio/test_command.rb")
|
||||
(("/bin/ls") (which "ls")))
|
||||
(substitute* '("test/functional/bio/test_command.rb")
|
||||
(("which") (which "which")))
|
||||
(substitute* '("test/functional/bio/test_command.rb",
|
||||
"test/data/command/echoarg2.sh")
|
||||
(("/bin/echo") (which "echo")))
|
||||
#t)))))
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'build 'patch-test-command
|
||||
(lambda _
|
||||
(substitute* '("test/functional/bio/test_command.rb")
|
||||
(("/bin/sh") (which "sh")))
|
||||
(substitute* '("test/functional/bio/test_command.rb")
|
||||
(("/bin/ls") (which "ls")))
|
||||
(substitute* '("test/functional/bio/test_command.rb")
|
||||
(("which") (which "which")))
|
||||
(substitute* '("test/functional/bio/test_command.rb"
|
||||
"test/data/command/echoarg2.sh")
|
||||
(("/bin/echo") (which "echo"))))))))
|
||||
(synopsis "Ruby library, shell and utilities for bioinformatics")
|
||||
(description "BioRuby comes with a comprehensive set of Ruby development
|
||||
tools and libraries for bioinformatics and molecular biology. BioRuby has
|
||||
@ -11661,13 +11732,7 @@ using high-throughput sc-RNAseq data.")
|
||||
(copy-file (string-append "bin/sambamba-" ,version)
|
||||
(string-append bin "/sambamba"))))))))
|
||||
(native-inputs
|
||||
`(("ld-gold-wrapper"
|
||||
;; Importing (gnu packages commencement) would introduce a cycle.
|
||||
,(module-ref (resolve-interface
|
||||
'(gnu packages commencement))
|
||||
'ld-gold-wrapper))
|
||||
("binutils-gold" ,binutils-gold)
|
||||
("python" ,python)))
|
||||
(list python))
|
||||
(inputs
|
||||
(list ldc lz4 zlib))
|
||||
(home-page "https://github.com/biod/sambamba")
|
||||
|
@ -293,6 +293,7 @@ files and generates build instructions for the Ninja build system.")
|
||||
(define-public meson
|
||||
(package
|
||||
(name "meson")
|
||||
(replacement meson/newer)
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
@ -329,6 +330,19 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that
|
||||
resembles Python.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public meson/newer
|
||||
(package
|
||||
(inherit meson)
|
||||
(version "1.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
"releases/download/" version "/meson-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"073vf8059nzs6p5aaqr5wva4pgl81540szdb5yw9yhyajwgm8jyh"))))))
|
||||
|
||||
(define-public meson-python
|
||||
(package
|
||||
(name "meson-python")
|
||||
@ -535,14 +549,14 @@ software.")
|
||||
(define-public tup
|
||||
(package
|
||||
(name "tup")
|
||||
(version "0.7.9")
|
||||
(version "0.7.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://gittup.org/tup/releases/tup-v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gnd2598xqgwihdkfkx7qn0q6p4n7npam1fy83mp7s04zwj99syc"))
|
||||
"1157qfnhjakm3h07y7h38lrjw5650gkif34k30bnrsypmwl5xyzb"))
|
||||
(patches (search-patches "tup-unbundle-dependencies.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
@ -591,7 +605,7 @@ software.")
|
||||
(display "au BufNewFile,BufRead Tupfile,*.tup setf tup")))
|
||||
#t))))))
|
||||
(inputs
|
||||
(list fuse pcre
|
||||
(list fuse-3 pcre
|
||||
`(,pcre "bin") ; pcre-config
|
||||
sqlite))
|
||||
(native-inputs
|
||||
|
@ -18,6 +18,7 @@
|
||||
;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||
;;; Copyright © 2022 ( <paren@disroot.org>
|
||||
;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
|
||||
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -241,6 +242,47 @@ standard.")
|
||||
;; (if ever) complete. See the RELICENSING file for more information.
|
||||
(license license:lgpl2.1+))))
|
||||
|
||||
(define-public tomlc99
|
||||
(let ((revision "0")
|
||||
(commit "52e9c039c5418a100605c2db1282590511fa891b"))
|
||||
(package
|
||||
(name "tomlc99")
|
||||
(version (git-version "1.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cktan/tomlc99")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zrn5mmd1ysxma96jzrq50xqypbs3rhk6dwlj1wcjpjz1a4h9wgg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags #~(list (string-append "CC="
|
||||
#$(cc-for-target))
|
||||
(string-append "prefix="
|
||||
#$output))
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? make-flags
|
||||
#:allow-other-keys)
|
||||
(when tests?
|
||||
(apply invoke
|
||||
`("make" "-C" "unittest"
|
||||
,@make-flags))
|
||||
(invoke "./unittest/t1")))))))
|
||||
(home-page "https://github.com/cktan/tomlc99")
|
||||
(synopsis "TOML library for C")
|
||||
(description
|
||||
"This library is a C99 implementation to read
|
||||
@acronym{TOML, Tom's Obvious Minimal Language} text documents.
|
||||
|
||||
This library is compatible with the @url{https://toml.io/en/v1.0.0,v1.0.0}
|
||||
specification of the language.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public pcc
|
||||
(package
|
||||
(name "pcc")
|
||||
|
@ -2,7 +2,7 @@
|
||||
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2016, 2017, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
|
||||
;;; Copyright © 2016, 2021 Stefan Reichoer <stefan@xsteve.at>
|
||||
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
@ -177,13 +177,13 @@ data units.")
|
||||
(define-public khal
|
||||
(package
|
||||
(name "khal")
|
||||
(version "0.11.1")
|
||||
(version "0.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "khal" version))
|
||||
(sha256
|
||||
(base32
|
||||
"07k0cfbfkx9fhfk4gf73vh34c05i1cb72gc15a1lmx9knxy4h503"))))
|
||||
"1flrz01nsmvphiv673b8ia279qcp3gj6a1rsjlsj4gp5f69xif4g"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; The test suite is unreliable. See <https://bugs.gnu.org/44197>
|
||||
@ -202,17 +202,18 @@ data units.")
|
||||
;; Required to build manpage
|
||||
python-sphinxcontrib-newsfeed python-sphinx))
|
||||
(inputs
|
||||
(list python-configobj
|
||||
python-dateutil
|
||||
python-icalendar
|
||||
python-tzlocal
|
||||
python-urwid
|
||||
python-pytz
|
||||
python-setproctitle
|
||||
python-atomicwrites
|
||||
(list python-atomicwrites
|
||||
python-click
|
||||
python-click-log
|
||||
python-pyxdg))
|
||||
python-configobj
|
||||
python-dateutil
|
||||
python-icalendar
|
||||
python-pytz
|
||||
python-pyxdg
|
||||
python-tzlocal
|
||||
python-urwid
|
||||
;; For the extras.
|
||||
python-setproctitle))
|
||||
(synopsis "Console calendar program")
|
||||
(description "Khal is a standards based console calendar program,
|
||||
able to synchronize with CalDAV servers through vdirsyncer. It includes
|
||||
|
@ -142,7 +142,7 @@
|
||||
(inputs
|
||||
(list guile-3.0-latest
|
||||
guile-avahi
|
||||
guile-fibers-1.1
|
||||
guile-fibers-1.3
|
||||
guile-gcrypt
|
||||
guile-json-4
|
||||
guile-simple-zmq
|
||||
|
@ -46,7 +46,6 @@
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages file)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages kde-frameworks)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages ncurses)
|
||||
@ -214,7 +213,7 @@ using the CMake build system.")
|
||||
(apply invoke "./configure" configure-flags))))))
|
||||
(inputs
|
||||
(append
|
||||
(if (hurd-target?)
|
||||
(if (target-hurd?)
|
||||
'()
|
||||
(list libuv)) ;not supported on the Hurd
|
||||
(list bzip2
|
||||
|
@ -5,7 +5,7 @@
|
||||
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2019-2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com>
|
||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
@ -2786,7 +2786,7 @@ memoized as a function of '%current-system'."
|
||||
"/lib/python"
|
||||
,(version-major+minor version)
|
||||
"/test"))))
|
||||
,@(if (hurd-system?)
|
||||
,@(if (system-hurd?)
|
||||
`((add-before 'build 'fix-regen
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((libc (assoc-ref inputs "libc")))
|
||||
@ -2841,7 +2841,7 @@ memoized as a function of '%current-system'."
|
||||
`(append (list ,(string-append "--host=" (boot-triplet))
|
||||
,(string-append "--build="
|
||||
(nix-system->gnu-triplet))
|
||||
,(if (hurd-system?) "--disable-werror"
|
||||
,(if (system-hurd?) "--disable-werror"
|
||||
""))
|
||||
,flags))
|
||||
((#:phases phases)
|
||||
@ -2853,7 +2853,7 @@ memoized as a function of '%current-system'."
|
||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
||||
|
||||
;; Tell 'libpthread' where to find 'libihash' on Hurd systems.
|
||||
,@(if (hurd-system?)
|
||||
,@(if (system-hurd?)
|
||||
'((substitute* '("sysdeps/mach/Makefile"
|
||||
"sysdeps/mach/hurd/Makefile")
|
||||
(("LDLIBS-pthread.so =.*")
|
||||
@ -2873,7 +2873,7 @@ memoized as a function of '%current-system'."
|
||||
,@(%boot1-inputs)
|
||||
|
||||
;; A native MiG is needed to build Glibc on Hurd.
|
||||
,@(if (hurd-system?)
|
||||
,@(if (system-hurd?)
|
||||
`(("mig" ,mig-boot0))
|
||||
'())
|
||||
|
||||
@ -3024,7 +3024,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
|
||||
(,(gexp-input gcc-boot0 "lib")
|
||||
,(kernel-headers-boot0)
|
||||
,static-bash-for-glibc
|
||||
,@(if (hurd-system?)
|
||||
,@(if (system-hurd?)
|
||||
`(,gnumach-headers-boot0
|
||||
,hurd-headers-boot0)
|
||||
'())
|
||||
|
@ -78,7 +78,7 @@
|
||||
go-github-com-google-goterm
|
||||
go-github-com-lucasb-eyer-go-colorful
|
||||
go-github-com-mattn-go-isatty
|
||||
go-github.com-mattn-go-runewidth
|
||||
go-github-com-mattn-go-runewidth
|
||||
go-github-com-olekukonko-tablewriter
|
||||
go-github-com-pelletier-go-toml
|
||||
go-github-com-pkg-diff
|
||||
|
@ -3,6 +3,7 @@
|
||||
;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2023 Zongyuan Li <zongyuan.li@c0x0o.me>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -396,3 +397,82 @@ configure network interfaces in Linux containers.")
|
||||
volumes mounted into those containers, and pods made from groups of
|
||||
containers.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public buildah
|
||||
(package
|
||||
(name "buildah")
|
||||
(version "1.29.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/containers/buildah")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mcqkz68fjccdla1bgxw57w268a586brm6x28fcm6x425ah0w07h"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:import-path "github.com/containers/buildah/cmd/buildah"
|
||||
#:unpack-path "github.com/containers/buildah"
|
||||
|
||||
;; Some dependencies require go-1.18 to build.
|
||||
#:go go-1.18
|
||||
|
||||
#:tests? #f
|
||||
#:install-source? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'prepare-install-docs
|
||||
(lambda* (#:key unpack-path #:allow-other-keys)
|
||||
(substitute* (string-append "src/"
|
||||
unpack-path
|
||||
"/docs/Makefile")
|
||||
(("../tests/tools/build/go-md2man")
|
||||
(which "go-md2man")))
|
||||
(substitute* (string-append "src/"
|
||||
unpack-path
|
||||
"/docs/Makefile")
|
||||
(("/usr/local") (string-append #$output)))))
|
||||
(add-after 'build 'build-docs
|
||||
(lambda* (#:key unpack-path #:allow-other-keys)
|
||||
(let ((doc (string-append "src/" unpack-path "/docs")))
|
||||
(invoke "make" "-C" doc))))
|
||||
(add-after 'install 'install-docs
|
||||
(lambda* (#:key unpack-path #:allow-other-keys)
|
||||
(let ((doc (string-append "src/" unpack-path "/docs")))
|
||||
(invoke "make" "-C" doc "install")))))))
|
||||
(inputs (list btrfs-progs
|
||||
cni-plugins
|
||||
conmon
|
||||
eudev
|
||||
glib
|
||||
gpgme
|
||||
libassuan
|
||||
libseccomp
|
||||
lvm2
|
||||
runc))
|
||||
(native-inputs
|
||||
(list go-github-com-go-md2man
|
||||
gnu-make
|
||||
pkg-config))
|
||||
(synopsis "Build @acronym{OCI, Open Container Initiative} images")
|
||||
(description
|
||||
"Buildah is a command-line tool to build @acronym{OCI, Open Container
|
||||
Initiative} container images. More generally, it can be used to:
|
||||
|
||||
@itemize
|
||||
@item
|
||||
create a working container, either from scratch or using an image as a
|
||||
starting point;
|
||||
@item
|
||||
create an image, either from a working container or via the instructions
|
||||
in a @file{Dockerfile};
|
||||
@item
|
||||
mount a working container's root filesystem for manipulation;
|
||||
@item
|
||||
use the updated contents of a container's root filesystem as a filesystem
|
||||
layer to create a new image.
|
||||
@end itemize")
|
||||
(home-page "https://buildah.io")
|
||||
(license license:asl2.0)))
|
||||
|
@ -30,7 +30,7 @@
|
||||
;;; Copyright © 2022 Attila Lendvai <attila@lendvai.name>
|
||||
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2022 David Elsing <david.elsing@posteo.net>
|
||||
;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Sughosha <Sughosha@proton.me>
|
||||
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
@ -1173,7 +1173,11 @@ parsers according to a Parsing Expression Grammar (PEG).")
|
||||
"/pSAscan-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cphk4gf202nzkxz6jdjzls4zy27055gwpm0r8cn99gr6c8548cy"))))
|
||||
"1cphk4gf202nzkxz6jdjzls4zy27055gwpm0r8cn99gr6c8548cy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin (substitute* '("src/Makefile"
|
||||
"tools/delete-bytes-255/Makefile")
|
||||
(("-march=native") ""))))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -1187,6 +1191,7 @@ parsers according to a Parsing Expression Grammar (PEG).")
|
||||
(install-file "psascan"
|
||||
(string-append #$output "/bin")))))))
|
||||
(inputs (list libdivsufsort))
|
||||
(properties '((tunable? . #t)))
|
||||
(home-page "https://www.cs.helsinki.fi/group/pads/pSAscan.html")
|
||||
(synopsis "Parallel external memory suffix array construction")
|
||||
(description "This package contains an implementation of the parallel
|
||||
|
@ -2262,16 +2262,37 @@ provides methods for automatically determining breaks and labels for axes and
|
||||
legends.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-swagger
|
||||
(package
|
||||
(name "r-swagger")
|
||||
(version "3.33.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "swagger" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ldgmy5vjzd11z5yl5a518wkw6y0l469b2zf0lp12hk19jq6k0sj"))))
|
||||
(properties `((upstream-name . "swagger")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/rstudio/swagger")
|
||||
(synopsis
|
||||
"Dynamically generate documentation from a Swagger-compliant API")
|
||||
(description
|
||||
"This package provides a collection of HTML, JavaScript, and CSS assets
|
||||
that dynamically generate beautiful documentation from a Swagger compliant
|
||||
API.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public r-pacman
|
||||
(package
|
||||
(name "r-pacman")
|
||||
(version "0.5.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "pacman" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z7gngd6h83cpjhq1vg75wvzhdjbgjh7gj5d4zvvi9gd2lmagjcy"))))
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "pacman" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0z7gngd6h83cpjhq1vg75wvzhdjbgjh7gj5d4zvvi9gd2lmagjcy"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
(list r-remotes))
|
||||
@ -2484,6 +2505,40 @@ does not use formula input or special syntax, but can be used in combination
|
||||
with default R plot functions.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public r-plumber
|
||||
(package
|
||||
(name "r-plumber")
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "plumber" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1k0y7ylc8bld16imn86g0i0dmxmr3kmh9ax4ys0yrxqzrvji7z3g"))))
|
||||
(properties `((upstream-name . "plumber")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-crayon
|
||||
r-ellipsis
|
||||
r-httpuv
|
||||
r-jsonlite
|
||||
r-lifecycle
|
||||
r-magrittr
|
||||
r-mime
|
||||
r-promises
|
||||
r-r6
|
||||
r-rlang
|
||||
r-sodium
|
||||
r-stringi
|
||||
r-swagger
|
||||
r-webutils))
|
||||
(home-page "https://www.rplumber.io")
|
||||
(synopsis "API generator for R")
|
||||
(description
|
||||
"This package gives you the ability to automatically generate and serve
|
||||
an HTTP API from R functions using the annotations in the R documentation
|
||||
around your functions.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-polychrome
|
||||
(package
|
||||
(name "r-polychrome")
|
||||
@ -10960,6 +11015,33 @@ It is a replacement for the @code{zip} function, that does not require any
|
||||
additional external tools on any platform.")
|
||||
(license license:cc0)))
|
||||
|
||||
(define-public r-openai
|
||||
(package
|
||||
(name "r-openai")
|
||||
(version "0.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "openai" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fi1nc9c7kfnig6b5ifpb1v9r3gxszk984rwyq7i1lb6s5jv0b9z"))))
|
||||
(properties `((upstream-name . "openai")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-assertthat
|
||||
r-glue
|
||||
r-httr
|
||||
r-jsonlite
|
||||
r-lifecycle
|
||||
r-magrittr))
|
||||
(home-page "https://github.com/irudnyts/openai")
|
||||
(synopsis "R Wrapper for OpenAI API")
|
||||
(description
|
||||
"This package provides an R wrapper of OpenAI API endpoints (see
|
||||
@url{https://platform.openai.com/docs/introduction} for details). This
|
||||
package covers Models, Completions, Chat, Edits, Images, Embeddings, Audio,
|
||||
Files, Fine-tunes, Moderations, and legacy Engines endpoints.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-openxlsx
|
||||
(package
|
||||
(name "r-openxlsx")
|
||||
@ -17188,6 +17270,29 @@ Kingsbury (1999, 2001) as implemented by Selesnick; and Hilbert wavelet
|
||||
pairs (Selesnick 2001, 2002).")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public r-word2vec
|
||||
(package
|
||||
(name "r-word2vec")
|
||||
(version "0.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "word2vec" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qj39vms6zgwb8lpmfkppayizdmhakic3pkacglary3ain61vnsk"))))
|
||||
(properties `((upstream-name . "word2vec")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-rcpp r-rcppprogress))
|
||||
(home-page "https://github.com/bnosac/word2vec")
|
||||
(synopsis "Distributed representations of words")
|
||||
(description
|
||||
"Learn vector representations of words by continuous bag of words and
|
||||
skip-gram implementations of the word2vec algorithm. The techniques are
|
||||
detailed in the paper \"Distributed Representations of Words and Phrases and
|
||||
their Compositionality\" by Mikolov et al. (2013), available at
|
||||
<arXiv:1310.4546>.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public r-wordcloud
|
||||
(package
|
||||
(name "r-wordcloud")
|
||||
@ -17287,6 +17392,38 @@ manipulate tree data.")
|
||||
R packages (on CRAN, Bioconductor or Github).")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public r-doc2vec
|
||||
(package
|
||||
(name "r-doc2vec")
|
||||
(version "0.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "doc2vec" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0249hm0103kxxsi4gks4h20wf6p00gbrk9jf8c148mbja1l56f6v"))))
|
||||
(properties `((upstream-name . "doc2vec")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs (list r-rcpp))
|
||||
(home-page "https://github.com/bnosac/doc2vec")
|
||||
(synopsis "Distributed representations of sentences, documents and topics")
|
||||
(description
|
||||
"Learn vector representations of sentences, paragraphs or documents by
|
||||
using the Paragraph Vector algorithms, namely the distributed bag of
|
||||
words (PV-DBOW) and the distributed memory (PV-DM) model. Top2vec finds
|
||||
clusters in text documents by combining techniques to embed documents and
|
||||
words and density-based clustering. It does this by embedding documents in
|
||||
the semantic space as defined by the doc2vec algorithm. Next it maps these
|
||||
document embeddings to a lower-dimensional space using the Uniform Manifold
|
||||
Approximation and Projection (UMAP) clustering algorithm and finds dense areas
|
||||
in that space using a Hierarchical Density-Based Clustering
|
||||
technique (HDBSCAN). These dense areas are the topic clusters which can be
|
||||
represented by the corresponding topic vector which is an aggregate of the
|
||||
document embeddings of the documents which are part of that topic cluster. In
|
||||
the same semantic space similar words can be found which are representative of
|
||||
the topic.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public r-docopt
|
||||
(package
|
||||
(name "r-docopt")
|
||||
|
@ -14304,6 +14304,40 @@ to the @code{is_x86_feature_detected!} macro.")
|
||||
(description "This package provides bindings to Google's cpu profiler.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public rust-uom-0.34
|
||||
(package
|
||||
(name "rust-uom")
|
||||
(version "0.34.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "uom" version))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"190n79b5ywa9w0j13ld0q6dphz7vzsjkwrpp8pjnwrczsvfhxxg8"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs (("rust-num-complex" ,rust-num-complex-0.4)
|
||||
("rust-num-rational" ,rust-num-rational-0.4)
|
||||
("rust-num-traits" ,rust-num-traits-0.2)
|
||||
("rust-typenum" ,rust-typenum-1)
|
||||
("rust-serde" ,rust-serde-1)
|
||||
("rust-num-bigint" ,rust-num-bigint-0.4))
|
||||
#:cargo-development-inputs (("rust-approx" ,rust-approx-0.5)
|
||||
("rust-quickcheck" ,rust-quickcheck-0.8)
|
||||
("rust-serde-json" ,rust-serde-json-1)
|
||||
("rust-static-assertions" ,rust-static-assertions-1))))
|
||||
(home-page "https://github.com/iliekturtles/uom")
|
||||
(synopsis "Units of measurement")
|
||||
(description
|
||||
"@code{uom} (Units of measurement) is a crate that does automatic type-safe
|
||||
zero-cost dimensional analysis. You can create your own systems or use the pre-built
|
||||
International System of Units (SI) which is based on the International System of
|
||||
Quantities (ISQ) and includes numerous quantities (length, mass, time, ...) with
|
||||
conversion factors for even more numerous measurement units (meter, kilometer, foot,
|
||||
mile, ...).")
|
||||
(license (list license:expat license:asl2.0))))
|
||||
|
||||
(define-public rust-crates-index-0.18
|
||||
(package
|
||||
(name "rust-crates-index")
|
||||
|
@ -1099,48 +1099,49 @@ trivial to build for local use. Portability is emphasized over performance.")
|
||||
(license license:unlicense)))
|
||||
|
||||
(define-public libsecp256k1
|
||||
(let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
|
||||
(package
|
||||
(name "libsecp256k1")
|
||||
(version (git-version "20200615" "1" commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/bitcoin-core/secp256k1")
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--enable-module-recovery"
|
||||
"--enable-experimental"
|
||||
"--enable-module-ecdh"
|
||||
"--enable-shared")))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool))
|
||||
;; WARNING: This package might need additional configure flags to run properly.
|
||||
;; See https://github.com/archlinux/svntogit-community/blob/packages/libsecp256k1/trunk/PKGBUILD.
|
||||
(synopsis "C library for EC operations on curve secp256k1")
|
||||
(description
|
||||
"Optimized C library for EC operations on curve secp256k1.
|
||||
|
||||
This library is a work in progress and is being used to research best
|
||||
practices. Use at your own risk.
|
||||
(package
|
||||
(name "libsecp256k1")
|
||||
(version "0.3.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/bitcoin-core/secp256k1")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"12wksk7bi3yfzmk1zwh5b6846zcaycqz1w4w4p23apjc8da4jwpn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--enable-module-recovery"
|
||||
"--enable-experimental"
|
||||
"--enable-module-ecdh"
|
||||
"--enable-module-schnorrsig"
|
||||
"--enable-shared"
|
||||
"--disable-static"
|
||||
"--disable-benchmark")))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool))
|
||||
(synopsis "C library for EC operations on curve secp256k1")
|
||||
(description
|
||||
"Optimized C library for EC operations on curve secp256k1.
|
||||
|
||||
Features:
|
||||
|
||||
@itemize
|
||||
@item secp256k1 ECDSA signing/verification and key generation.
|
||||
@item Adding/multiplying private/public keys.
|
||||
@item Additive and multiplicative tweaking of secret/public keys.
|
||||
@item Serialization/parsing of private keys, public keys, signatures.
|
||||
@item Constant time, constant memory access signing and pubkey generation.
|
||||
@item Derandomized DSA (via RFC6979 or with a caller provided function.)
|
||||
@item Constant time, constant memory access signing and public key generation.
|
||||
@item Derandomized ECDSA (via RFC6979 or with a caller provided function.)
|
||||
@item Very efficient implementation.
|
||||
@item Suitable for embedded systems.
|
||||
@item No runtime dependencies.
|
||||
@item Optional module for public key recovery.
|
||||
@item Optional module for ECDH key exchange.
|
||||
@item Optional module for Schnorr signatures according to BIP-340.
|
||||
@end itemize\n")
|
||||
(home-page "https://github.com/bitcoin-core/secp256k1")
|
||||
(license license:unlicense))))
|
||||
(home-page "https://github.com/bitcoin-core/secp256k1")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public libsecp256k1-bitcoin-cash
|
||||
(package
|
||||
|
@ -1556,20 +1556,17 @@ organized in a hash table or B+ tree.")
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
'(list "--disable-static"
|
||||
(string-append "--with-bash-headers="
|
||||
(dirname (search-input-directory
|
||||
%build-inputs
|
||||
"include/bash"))))))
|
||||
#~(list "--disable-static"
|
||||
(string-append "--with-bash-headers="
|
||||
(search-input-directory %build-inputs
|
||||
"include/bash")))))
|
||||
(native-inputs
|
||||
;; XXX Without labels, the default 'configure phase picks the wrong "bash".
|
||||
`(("bc" ,bc)
|
||||
("bash:include" ,bash "include")
|
||||
("check" ,check)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(list bc check-0.14 pkg-config))
|
||||
(inputs
|
||||
;; TODO: Add more optional inputs.
|
||||
(list curl
|
||||
(list bash ; /bin/bash for native compilation
|
||||
`(,bash "include")
|
||||
curl
|
||||
libgcrypt
|
||||
`(,util-linux "lib")))
|
||||
(synopsis "Manipulate plain text files as databases")
|
||||
@ -5075,7 +5072,7 @@ compatible with SQLite using a graphical user interface.")
|
||||
go-github-com-pkg-errors
|
||||
go-github-com-sourcegraph-jsonrpc2
|
||||
go-golang-org-x-crypto
|
||||
go-github.com-mattn-go-runewidth
|
||||
go-github-com-mattn-go-runewidth
|
||||
go-golang-org-x-xerrors
|
||||
go-gopkg-in-yaml-v2))
|
||||
(synopsis "SQL language server written in Go")
|
||||
|
@ -25,6 +25,7 @@
|
||||
;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com>
|
||||
;;; Copyright © 2023 Timotej Lazar <timotej.lazar@araneo.si>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -43,6 +44,7 @@
|
||||
|
||||
(define-module (gnu packages disk)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
@ -1159,7 +1161,7 @@ on your file system and offers to remove it. @command{rmlint} can find:
|
||||
"1piym8za0iw2s8yryh39y072f90mzisv89ffvn1jzb71f71mbfqa"))))
|
||||
(build-system go-build-system)
|
||||
(native-inputs
|
||||
(list go-github.com-mattn-go-runewidth go-golang-org-x-term
|
||||
(list go-github-com-mattn-go-runewidth go-golang-org-x-term
|
||||
go-gopkg-in-djherbis-times-v1 go-github-com-gdamore-tcell-v2-2.3))
|
||||
(arguments
|
||||
`(#:import-path "github.com/gokcehan/lf"))
|
||||
@ -1502,6 +1504,46 @@ gone and to help you to clean it up.")
|
||||
(home-page "https://github.com/shundhammer/qdirstat")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public nwipe
|
||||
(package
|
||||
(name "nwipe")
|
||||
(version "0.34")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/martijnvanbrummelen/nwipe")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1frwjgz4mpzwr9sigr693crmxsjl08wcikh6ik7dm0x40l1kqqpd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(wrap-program (search-input-file outputs "bin/nwipe")
|
||||
(list "PATH" ":" 'prefix
|
||||
(map (lambda (p) (dirname (search-input-file inputs p)))
|
||||
'("sbin/dmidecode"
|
||||
"sbin/hdparm"
|
||||
"sbin/smartctl")))))))))
|
||||
(inputs
|
||||
(list bash-minimal dmidecode hdparm ncurses parted smartmontools))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool pkg-config))
|
||||
(home-page "https://github.com/martijnvanbrummelen/nwipe")
|
||||
(synopsis "Secure disk wiping utility")
|
||||
(description
|
||||
"@command{nwipe} securely erases disks using a variety of methods to
|
||||
ensure the data cannot be recovered. It can wipe multiple drives in parallel
|
||||
and can be used noninteractively or with a text-based user interface.")
|
||||
(license
|
||||
(list license:gpl2
|
||||
license:bsd-3 ; mt19937ar-cok
|
||||
license:public-domain)))) ; {isaac_rand,PDFGen}
|
||||
|
||||
(define-public wipe
|
||||
(package
|
||||
(name "wipe")
|
||||
|
@ -2,7 +2,7 @@
|
||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
|
||||
@ -664,7 +664,7 @@ provisioning etc.")
|
||||
(define-public cqfd
|
||||
(package
|
||||
(name "cqfd")
|
||||
(version "5.3.0")
|
||||
(version "5.4.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -673,25 +673,18 @@ provisioning etc.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gy4kjy6v52acfk6ffbg5sp02k6176khhkms7zlwmywq8591bpww"))))
|
||||
"1kilrh4ahza19lka9218s2wkfcbk5r2cq9adczhlnlfggdrqnglg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; The test suite requires a docker daemon and connectivity.
|
||||
`(#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; Fix the directory of the bash completion.
|
||||
(substitute* "Makefile"
|
||||
(("completionsdir=.*$")
|
||||
(string-append "completionsdir=" out
|
||||
"/etc/bash_completion.d; \\\n")))
|
||||
(invoke "make" "install"
|
||||
(string-append "PREFIX=" out))))))))
|
||||
(list
|
||||
#:tests? #f
|
||||
#:make-flags #~(list (string-append "COMPLETIONSDIR="
|
||||
#$output "/etc/bash_completion.d")
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build))))
|
||||
(home-page "https://github.com/savoirfairelinux/cqfd")
|
||||
(synopsis "Convenience wrapper for Docker")
|
||||
(description "cqfd is a Bash script that provides a quick and convenient
|
||||
|
@ -370,7 +370,7 @@ the Net to search for documents which are not on the local system.")
|
||||
(license lgpl2.1+)))
|
||||
|
||||
(define-public zeal
|
||||
(let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c")
|
||||
(let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "zeal")
|
||||
@ -383,7 +383,7 @@ the Net to search for documents which are not on the local system.")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ky2qi2cmjckc51lm3i28815ixgqdm36j7smixxr16jxpmbqs6sl"))))
|
||||
(base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no tests
|
||||
|
@ -1102,16 +1102,16 @@ mentored learning for programming languages.")
|
||||
(define-public mazo
|
||||
(package
|
||||
(name "mazo")
|
||||
(version "1.0.0")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/luis-felipe/mazo.git")
|
||||
(url "https://codeberg.org/luis-felipe/mazo.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "06246380i5rxycniwg5syn0aldd2zy10cbqk1lgyc0qfqb2lyrwj"))))
|
||||
(base32 "14nk3qsj6lg7wp2ws8lxhb4hyjnczvw1cn9f3m466dkkfimp7ygf"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:use-setuptools? #f
|
||||
@ -1155,8 +1155,10 @@ mentored learning for programming languages.")
|
||||
python-pillow
|
||||
python-pycairo))
|
||||
(propagated-inputs
|
||||
(list gstreamer
|
||||
gtk+
|
||||
(list adwaita-icon-theme
|
||||
dbus
|
||||
gstreamer
|
||||
gtk
|
||||
python
|
||||
python-django
|
||||
python-django-cleanup
|
||||
|
@ -1118,6 +1118,31 @@ expression navigating and manipulating. It supports many major modes
|
||||
out of the box.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-pug-mode
|
||||
(package
|
||||
(name "emacs-pug-mode")
|
||||
(version "1.0.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hlissner/emacs-pug-mode")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp"))))
|
||||
(native-inputs (list emacs-ert-runner))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #t
|
||||
#:test-command #~(list "ert-runner")))
|
||||
(home-page "https://github.com/hlissner/emacs-pug-mode")
|
||||
(synopsis "Pug support for Emacs")
|
||||
(description "Pug mode offers Emacs support for Pug. Unlike Jade mode, it
|
||||
is based off of Slim mode.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-spaceline-all-the-icons
|
||||
(package
|
||||
(name "emacs-spaceline-all-the-icons")
|
||||
@ -1665,12 +1690,10 @@ Alternatively the menu can be bound globally, for example:
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-nano-modeline
|
||||
;; No tagged release upstream. The commit below matches latest version
|
||||
;; bump.
|
||||
(let ((commit "61f62aa4716eae4fa89961955323d146e9791fca"))
|
||||
(let ((commit "cba074e55c847f289085ec35c21fb2ad8df1b483")) ;version bump
|
||||
(package
|
||||
(name "emacs-nano-modeline")
|
||||
(version "0.7.2")
|
||||
(version "1.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -1679,7 +1702,7 @@ Alternatively the menu can be bound globally, for example:
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zwf3mp0z4vc36lg057vspk7dr8chcvhivm1l8q7p3m9b6xw8ask"))))
|
||||
"0fccasr5ydyfwpqj3kmsgxiazifkckybg2rnwm6sg034phavcyln"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/rougier/nano-modeline")
|
||||
(synopsis "Emacs minor mode controlling mode line")
|
||||
@ -2365,6 +2388,45 @@ different tools. It highlights errors and warnings inline in the buffer, and
|
||||
provides an optional IDE-like error list.")
|
||||
(license license:gpl3+))) ;+GFDLv1.3+ for the manual
|
||||
|
||||
(define-public emacs-fb2-reader
|
||||
(let ((commit "9836db284749e0cef4c43c2cb5358c82ae9b8589")) ; version bump
|
||||
(package
|
||||
(name "emacs-fb2-reader")
|
||||
(version "0.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jumper047/fb2-reader")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0vx4b9wnmx1bng8wak5r7yryyvgib4m46l6b877xzkdhsjr3rbsi"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #t
|
||||
#:test-command
|
||||
#~(list "emacs" "-Q" "--batch" "-L" "."
|
||||
"--eval" "(load-file \"tests/test-fb2-reader.el\")")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'qualify-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((unzip (search-input-file inputs "/bin/unzip")))
|
||||
(substitute* "fb2-reader.el"
|
||||
(("unzip") unzip))))))))
|
||||
(inputs (list unzip))
|
||||
(native-inputs
|
||||
(list emacs-async emacs-buttercup emacs-dash emacs-s))
|
||||
(propagated-inputs
|
||||
(list emacs-f emacs-visual-fill-column))
|
||||
(home-page "https://github.com/jumper047/fb2-reader")
|
||||
(synopsis "Emacs plugin to read FictionBook2 ebooks")
|
||||
(description "FB2 Reader provides a major mode for reading
|
||||
FictionBook2 (@file{.fb2} and @file{.fb2.zip} files) ebooks.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-flymake-collection
|
||||
(package
|
||||
(name "emacs-flymake-collection")
|
||||
@ -6080,7 +6142,7 @@ intended to be.")
|
||||
(define-public emacs-ef-themes
|
||||
(package
|
||||
(name "emacs-ef-themes")
|
||||
(version "1.0.0")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -6090,7 +6152,7 @@ intended to be.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rq1cy9hg603wk7pnfj0zfc84h1l87rg8blk4x4b61x7bkc3dd7q"))))
|
||||
"03xmc4657q9p4b5zbssjjpq125bb1vd4fbhmy1f6rk25vxx3pxg7"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://git.sr.ht/~protesilaos/ef-themes")
|
||||
(synopsis "Colorful and legible themes")
|
||||
@ -8275,7 +8337,7 @@ Tracker as well as bug identifiers prepared for @code{bug-reference-mode}.")
|
||||
(define-public emacs-piem
|
||||
(package
|
||||
(name "emacs-piem")
|
||||
(version "0.4.0")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -8284,7 +8346,7 @@ Tracker as well as bug identifiers prepared for @code{bug-reference-mode}.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32 "0wr6n6wvznngjdp4c0pmdr4xz05dark0kxi5svzhzxsg3rdaql3z"))))
|
||||
(base32 "0smdb1iph2q1xvxix5c93llckcxh7kmhg6pxgyrm88j736m4l16q"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
@ -8295,9 +8357,9 @@ Tracker as well as bug identifiers prepared for @code{bug-reference-mode}.")
|
||||
("piem-b4-b4-executable"
|
||||
(search-input-file inputs "/bin/b4"))))))))
|
||||
(inputs
|
||||
(list b4))
|
||||
(propagated-inputs
|
||||
(list emacs-elfeed
|
||||
(list b4
|
||||
emacs-debbugs
|
||||
emacs-elfeed
|
||||
emacs-notmuch))
|
||||
(home-page "https://docs.kyleam.com/piem")
|
||||
(synopsis "Glue for working with public-inbox archives")
|
||||
@ -12884,7 +12946,7 @@ mode with the package emacs-julia-mode.")
|
||||
(define-public emacs-julia-snail
|
||||
(package
|
||||
(name "emacs-julia-snail")
|
||||
(version "1.2.2")
|
||||
(version "1.2.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -12893,7 +12955,7 @@ mode with the package emacs-julia-mode.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vbg97h2jvmkpyhdsra51ilimzvrqnpy8rf1bhxnnb54p2cgkpsr"))))
|
||||
"07dj788hdfskn2k400q2fcfh18w7gflfrc5zqg8bqflhv755m30k"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -13070,7 +13132,7 @@ indentation and filling of comments and C preprocessor fontification.")
|
||||
(define-public emacs-tide
|
||||
(package
|
||||
(name "emacs-tide")
|
||||
(version "4.5.4")
|
||||
(version "5.1.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -13079,7 +13141,7 @@ indentation and filling of comments and C preprocessor fontification.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zrapfxdarakp3kwp73c2ymjx51fsnfk6azi2y1wb2kgsdxl2yim"))))
|
||||
"01chyr71b8893jxgf4wncpskfmg9iwfpcaxq0vfc6yaij46yfhky"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-dash emacs-flycheck emacs-s emacs-typescript-mode))
|
||||
@ -13905,16 +13967,16 @@ restrict the text width to 80 characters.")
|
||||
(define-public emacs-wucuo
|
||||
(package
|
||||
(name "emacs-wucuo")
|
||||
(version "0.2.9")
|
||||
(version "0.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/redguardtoo/wucuo")
|
||||
(commit "89b99166768afb811c48a7db7c93c02d51a32b09")))
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "03a6jlbv9axrd9yr0xscq3ni7fipm20ppc51kxy0sn241rplv0pg"))))
|
||||
(base32 "0za3mxssx48shdaqwn8akxrshkqn92dd0s06h6abqk9mfzdd67ng"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:tests? #t
|
||||
@ -15456,6 +15518,27 @@ can selectively commit files, view the diffs, and other things.")
|
||||
distribution, primarily targeting Clojure users")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-rail
|
||||
(package
|
||||
(name "emacs-rail")
|
||||
(version "0.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Sasanidas/Rail")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1i07zv0z6r46jpg22x99a1izyfp6536xf951ibyr9kis5bql5jz9"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/Sasanidas/Rail")
|
||||
(synopsis "Generic nREPL client for Emacs")
|
||||
(description
|
||||
"Rail is a nREPL client based on monroe with similar features, but aims
|
||||
to be a more complete implementation.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-orgalist
|
||||
(package
|
||||
(name "emacs-orgalist")
|
||||
@ -20865,7 +20948,7 @@ the pipeline, featuring the support for running @code{emacsclient}.")
|
||||
(define-public emacs-jupyter
|
||||
(package
|
||||
(name "emacs-jupyter")
|
||||
(version "0.8.2")
|
||||
(version "0.8.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -20874,7 +20957,7 @@ the pipeline, featuring the support for running @code{emacsclient}.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p"))))
|
||||
(base32 "0acn964xlpn265vry35lrkkpf9z5y4ml96xg8ifadkxwxymm1sh2"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-company ;optional
|
||||
@ -20885,9 +20968,9 @@ the pipeline, featuring the support for running @code{emacsclient}.")
|
||||
(home-page "https://github.com/nnicandro/emacs-jupyter")
|
||||
(synopsis "Emacs interface to communicate with Jupyter kernels")
|
||||
(description "This package provides an Emacs interface to communicate with
|
||||
Jupyter kernels. It provides REPL and @code{org-mode} source code block
|
||||
frontends to Jupyter kernels and kernel interactions integrated with Emacs'
|
||||
built-in features.")
|
||||
Jupyter kernels. It provides REPL and Org mode source code block frontends to
|
||||
Jupyter kernels and kernel interactions integrated with Emacs' built-in
|
||||
features.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-hcl-mode
|
||||
@ -21970,7 +22053,7 @@ according to a parsing expression grammar.")
|
||||
(define-public emacs-eldev
|
||||
(package
|
||||
(name "emacs-eldev")
|
||||
(version "1.4")
|
||||
(version "1.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -21979,7 +22062,7 @@ according to a parsing expression grammar.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cziz1a8mh24aj79jfnkjb0llh6a2raqnlcfyaswha80bwzwp4ph"))))
|
||||
(base32 "1vvqs8x2chm2bgwnlsrq7llgql5m9hjbxi1x3xbnzbx5l1yvldbp"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -23672,7 +23755,7 @@ powerful Org contents.")
|
||||
(define-public emacs-org-re-reveal
|
||||
(package
|
||||
(name "emacs-org-re-reveal")
|
||||
(version "3.18.2")
|
||||
(version "3.18.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -23681,7 +23764,7 @@ powerful Org contents.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0v9403zjxays4c66xq3zq2285h77pn2ha7afx70xffjyynmvnz6i"))))
|
||||
(base32 "124f59yj0w5linph4k38fil42jc6nvkzhx73312farkmn4p9r9zk"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-htmlize emacs-org))
|
||||
@ -26963,43 +27046,45 @@ can be queued at any time.")
|
||||
(license license:unlicense))))
|
||||
|
||||
(define-public emacs-ytdl
|
||||
(package
|
||||
(name "emacs-ytdl")
|
||||
(version "1.3.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/tuedachu/ytdl")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; .el is read-only in git.
|
||||
(make-file-writable "ytdl.el")
|
||||
;; Specify the absolute file names of the various programs so
|
||||
;; that everything works out-of-the-box.
|
||||
(emacs-substitute-variables "ytdl.el"
|
||||
("ytdl-command"
|
||||
(search-input-file inputs "/bin/youtube-dl"))))))))
|
||||
(inputs
|
||||
(list youtube-dl))
|
||||
(propagated-inputs
|
||||
(list emacs-async emacs-dash))
|
||||
(home-page "https://gitlab.com/tuedachu/ytdl")
|
||||
(synopsis "Emacs interface for youtube-dl")
|
||||
(description
|
||||
"This package manages a video download queue for @command{youtube-dl},
|
||||
(let ((commit "2ea3daf2f6aa9d18b71fe3e15f05c30a56fca228")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "emacs-ytdl")
|
||||
(version (git-version "1.3.6" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/tuedachu/ytdl")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0y62lkgsg19j05dpd6sp6zify8vq8xvpc8caqiy4rwi7p4ahacsf"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; .el is read-only in git.
|
||||
(make-file-writable "ytdl.el")
|
||||
;; Specify the absolute file names of the various programs so
|
||||
;; that everything works out-of-the-box.
|
||||
(emacs-substitute-variables "ytdl.el"
|
||||
("ytdl-command"
|
||||
(search-input-file inputs "/bin/youtube-dl"))))))))
|
||||
(inputs
|
||||
(list youtube-dl))
|
||||
(propagated-inputs
|
||||
(list emacs-async emacs-dash))
|
||||
(home-page "https://gitlab.com/tuedachu/ytdl")
|
||||
(synopsis "Emacs interface for youtube-dl")
|
||||
(description
|
||||
"This package manages a video download queue for @command{youtube-dl},
|
||||
which serves as the back end. New videos can be queued at any time. All
|
||||
youtube-dl backends are supported. It is possible to create download profiles
|
||||
depending on the downloaded URL.")
|
||||
(license license:gpl3+)))
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-ytel
|
||||
;; No tagged releases. Using version from main file.
|
||||
@ -29493,7 +29578,7 @@ as Emacs Lisp.")
|
||||
(define-public emacs-transient
|
||||
(package
|
||||
(name "emacs-transient")
|
||||
(version "0.4.0")
|
||||
(version "0.4.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -29502,7 +29587,7 @@ as Emacs Lisp.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0c9bfn5jwwng98h7i9lx0q3vg00wd8w25cg8d3vyy2vqfbg80qhy"))))
|
||||
"1aq4bb83pdkbkbqh6ba0r7sadaq45qqg2q5jlqyvsn8akcsq65iq"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;no test suite
|
||||
@ -30870,14 +30955,14 @@ well as an option for visually flashing evaluated s-expressions.")
|
||||
(define-public emacs-tramp
|
||||
(package
|
||||
(name "emacs-tramp")
|
||||
(version "2.6.0.4")
|
||||
(version "2.6.0.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"tramp-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "0s50zgxxhlc2k80mnxyyqcfd1iij9dz95fryb2a65chy1ccibd0m"))))
|
||||
(base32 "0hbrrlcyhxkmjym4wnwipi47lzqpnlxc833p0hmghc6n0s8sx7hf"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -31295,20 +31380,18 @@ programming in Emacs Lisp easy and fun.")
|
||||
(define-public emacs-excorporate
|
||||
(package
|
||||
(name "emacs-excorporate")
|
||||
(version "1.1.0")
|
||||
(version "1.1.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/"
|
||||
"excorporate-" version ".tar"))
|
||||
(sha256
|
||||
(base32 "1il51gfgvkxjj7vdi5kdmzi87hl9853ck8s45p0cxrddlaiqbmwy"))))
|
||||
(base32 "06ilfkrlx6ca0qfqq3w1w07kdwak556i1wgf1875py2d5xkg4r90"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-fsm
|
||||
emacs-soap-client
|
||||
emacs-url-http-oauth
|
||||
emacs-url-http-ntlm))
|
||||
(list emacs-fsm emacs-soap-client emacs-url-http-ntlm
|
||||
emacs-url-http-oauth))
|
||||
(home-page "https://elpa.gnu.org/packages/excorporate.html")
|
||||
(synopsis "Exchange integration")
|
||||
(description "This package provides Exchange integration for Emacs.")
|
||||
@ -31758,22 +31841,22 @@ format.")
|
||||
(define-public emacs-ox-pandoc
|
||||
(package
|
||||
(name "emacs-ox-pandoc")
|
||||
(version "20180510")
|
||||
(version "2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/kawabata/ox-pandoc")
|
||||
(commit "aa37dc7e94213d4ebedb85c384c1ba35007da18e")))
|
||||
(url "https://github.com/emacsorphanage/ox-pandoc")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iibxplgdp34bpq1yll2gmqjd8d8lnqn4mqjvx6cdf0y438yr4jz"))))
|
||||
"0sh8l18lc2hngbmb1vv99xb8cp4sfy90j9cbf7b09l82jmnlqmk1"))))
|
||||
(build-system emacs-build-system)
|
||||
(inputs
|
||||
(list pandoc))
|
||||
(propagated-inputs
|
||||
(list emacs-dash emacs-ht))
|
||||
(home-page "https://github.com/kawabata/ox-pandoc")
|
||||
(home-page "https://github.com/emacsorphanage/ox-pandoc")
|
||||
(synopsis "Org exporter for Pandoc")
|
||||
(description "@code{ox-pandoc} is an exporter for converting Org-mode
|
||||
files to numerous other formats via Pandoc.")
|
||||
@ -32331,7 +32414,7 @@ Emacs that integrate with major modes like Org-mode.")
|
||||
(define-public emacs-modus-themes
|
||||
(package
|
||||
(name "emacs-modus-themes")
|
||||
(version "4.1.0")
|
||||
(version "4.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -32340,7 +32423,7 @@ Emacs that integrate with major modes like Org-mode.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1rfnn7c6qv3qmzpksdzy7623qijbldnmr7hl9ka2kwnhdarsigkk"))))
|
||||
(base32 "1r6m2jsfn6066155pnlkdgs6dz2fdsampdhdz796z2jy53k7srsg"))))
|
||||
(native-inputs (list texinfo))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
@ -33604,29 +33687,27 @@ data format @code{edn}. See @url{https://github.com/edn-format/edn}.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-ednc
|
||||
(let ((commit "940a4adbbeb3b6b1a72270a814d52770dd89a997")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-ednc")
|
||||
(version (git-version "0.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sinic/ednc")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1gsx2qgv5xm9r0i0axd4hf31g2rq2m4a1hvnif48g4xb0llss73c"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/sinic/ednc")
|
||||
(synopsis "Emacs Desktop Notification Center")
|
||||
(description
|
||||
"The Emacs Desktop Notification Center (EDNC) is an Emacs package written
|
||||
(package
|
||||
(name "emacs-ednc")
|
||||
(version "0.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/sinic/ednc")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1jdlwngxipq5pzs3kgmzwc99aqk6mi3cf1wv228hhmb8nsm1dqgd"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "https://github.com/sinic/ednc")
|
||||
(synopsis "Emacs Desktop Notification Center")
|
||||
(description
|
||||
"The Emacs Desktop Notification Center (EDNC) is an Emacs package written
|
||||
in pure Lisp that implements a Desktop Notifications service according to the
|
||||
freedesktop.org specification. EDNC aspires to be a small, but flexible
|
||||
drop-in replacement of standalone daemons like Dunst.")
|
||||
(license license:gpl3+))))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-helm-clojuredocs
|
||||
(let ((commit "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea"))
|
||||
@ -34268,6 +34349,33 @@ generate random passwords and insert them into the current buffer. It also
|
||||
supports generation of phonetic and numeric passwords.")
|
||||
(license license:artistic2.0)))
|
||||
|
||||
(define-public emacs-qrencode
|
||||
(package
|
||||
(name "emacs-qrencode")
|
||||
(version "1.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ruediger/qrencode-el")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yrshahci319lnjdpsksdy11a69k1n91qk9r2zfyhqmng09s6i0y"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list #:tests? #t
|
||||
#:test-command #~(list "emacs" "-Q" "--batch"
|
||||
"-l" "qrencode.el"
|
||||
"-l" "qrencode-tests.el"
|
||||
"-f" "ert-run-tests-batch-and-exit")))
|
||||
(home-page "https://github.com/ruediger/qrencode-el")
|
||||
(synopsis "QRCode encoder for Emacs in pure elisp")
|
||||
(description
|
||||
"This package provides two user facing interactive functions, that will encode
|
||||
text into a QR Code and show it in a separate buffer.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-csv
|
||||
(package
|
||||
(name "emacs-csv")
|
||||
@ -35091,7 +35199,7 @@ displayed for sharing.")
|
||||
(define-public emacs-orglink
|
||||
(package
|
||||
(name "emacs-orglink")
|
||||
(version "1.2.1")
|
||||
(version "1.2.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -35100,7 +35208,7 @@ displayed for sharing.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "05x8alv4a8c1g9l8v8p319vcr0y7w1i2r6ipj0v3dy4n2gh7v822"))))
|
||||
(base32 "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
(list emacs-compat))
|
||||
|
@ -12,6 +12,7 @@
|
||||
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -559,7 +560,12 @@ SEGGER J-Link and compatible devices.")
|
||||
(lambda _
|
||||
;; XXX All but 1 SSL tests fail (tries connecting to Google
|
||||
;; servers).
|
||||
(delete-file "tests/ssl.test"))))))
|
||||
(delete-file "tests/ssl.test")))
|
||||
#$@(if (not (target-64bit?))
|
||||
#~((add-after 'unpack 'delete-failing-tests/32bit
|
||||
(lambda _
|
||||
(delete-file "tests/file.test"))))
|
||||
#~()))))
|
||||
(inputs (list openssl))
|
||||
(native-inputs
|
||||
;; For tests.
|
||||
|
@ -725,7 +725,7 @@ The following systems are supported:
|
||||
(define-public mgba
|
||||
(package
|
||||
(name "mgba")
|
||||
(version "0.10.1")
|
||||
(version "0.10.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -734,7 +734,8 @@ The following systems are supported:
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0pqfjsr9q61a3mgmvqxxkalxb838k46q9ilz31frpcvvndif0sm1"))
|
||||
(base32
|
||||
"1wwpjcblp2c1svab4z1if5xb7707wsy6zw590lwdz9za35i0h37q"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Make sure we don't use the bundled software.
|
||||
@ -750,8 +751,7 @@ The following systems are supported:
|
||||
#:configure-flags
|
||||
(list "-DUSE_LZMA=OFF" ;do not use bundled LZMA
|
||||
"-DUSE_LIBZIP=OFF"))) ;use "zlib" instead
|
||||
(native-inputs
|
||||
(list pkg-config qttools-5))
|
||||
(native-inputs (list pkg-config qttools-5))
|
||||
(inputs
|
||||
(list ffmpeg
|
||||
libedit
|
||||
|
@ -45,7 +45,7 @@
|
||||
(define-public erlang
|
||||
(package
|
||||
(name "erlang")
|
||||
(version "25.3")
|
||||
(version "25.3.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
;; The tarball from http://erlang.org/download contains many
|
||||
@ -57,7 +57,7 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0jw230fy0z358aj1xi80hg14qyqyj5p4wp0pfifkr0n694j3h2d1"))
|
||||
"092lym5a181gz89nscw7kqhw1wa6qvgcpkj80q4i9p79mxmsr1nj"))
|
||||
(patches (search-patches "erlang-man-path.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
@ -477,7 +477,7 @@ significantly increases the risk of irreversible data loss!")
|
||||
(define-public gocryptfs
|
||||
(package
|
||||
(name "gocryptfs")
|
||||
(version "2.3.1")
|
||||
(version "2.4.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -486,7 +486,7 @@ significantly increases the risk of irreversible data loss!")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1m0xk5imkx81i1l4wv1j1xh9ckp0gqssq4v46pkkcq2xlv2dvxlr"))))
|
||||
"08pdfx6bs1dc2k7xv54x7i1qbych4a7dlf31qwcm9wlz7lr5lawm"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -1364,7 +1364,7 @@ with the included @command{xfstests-check} helper.")
|
||||
(define-public zfs
|
||||
(package
|
||||
(name "zfs")
|
||||
(version "2.1.11")
|
||||
(version "2.1.12")
|
||||
(outputs '("out" "module" "src"))
|
||||
(source
|
||||
(origin
|
||||
@ -1373,7 +1373,7 @@ with the included @command{xfstests-check} helper.")
|
||||
"/download/zfs-" version
|
||||
"/zfs-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1cnfv3adk7prl6b8r3nw62y6dbjy2q7ai68p9xc0g8nhaklf8kx5"))))
|
||||
(base32 "0vbf9kfryprb2mbb65jllf6xpsy44xskshglyqqwj4iyxmma5nk4"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -547,7 +547,7 @@ do so.")
|
||||
(define-public electrum
|
||||
(package
|
||||
(name "electrum")
|
||||
(version "4.3.2")
|
||||
(version "4.4.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -555,13 +555,12 @@ do so.")
|
||||
version "/Electrum-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1kbyinm9fnxpx9chkyd11yr9rxvcxvw3ml7kzvxcfa8v7jnl0dmx"))
|
||||
(base32 "05xzafv8ry5k5mzn3i4l71d42q42kjl81q154i97qmqiy3s2fhkb"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete the bundled dependencies.
|
||||
(delete-file-recursively "packages")
|
||||
#t))))
|
||||
(delete-file-recursively "packages")))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
(list libsecp256k1
|
||||
@ -585,31 +584,13 @@ do so.")
|
||||
`(#:tests? #f ; no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-prefix
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; setup.py installs to ~/.local/share if sys.prefix/share isn't
|
||||
;; writable. sys.prefix points to Python's, not our, --prefix.
|
||||
(mkdir-p (string-append out "/share"))
|
||||
(substitute* "setup.py"
|
||||
(("sys\\.prefix")
|
||||
(format #f "\"~a\"" out)))
|
||||
#t)))
|
||||
(add-after 'unpack 'relax-dnspython-version-requirement
|
||||
;; The version requirement for dnspython>=2.0,<2.1 makes the
|
||||
;; sanity-check phase fail, but the application seems to be working
|
||||
;; fine with dnspython 2.1 (the version we have currently).
|
||||
(lambda _
|
||||
(substitute* "contrib/requirements/requirements.txt"
|
||||
(("dnspython>=.*")
|
||||
"dnspython"))))
|
||||
(add-after 'unpack 'use-libsecp256k1-input
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "electrum/ecc_fast.py"
|
||||
(("library_paths = .* 'libsecp256k1.so.0'.")
|
||||
(string-append "library_paths = ('"
|
||||
(("library_paths = \\[\\]")
|
||||
(string-append "library_paths = ['"
|
||||
(assoc-ref inputs "libsecp256k1")
|
||||
"/lib/libsecp256k1.so.0'"))))))))
|
||||
"/lib/libsecp256k1.so']"))))))))
|
||||
(home-page "https://electrum.org/")
|
||||
(synopsis "Bitcoin wallet")
|
||||
(description
|
||||
@ -622,7 +603,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
|
||||
(define-public electron-cash
|
||||
(package
|
||||
(name "electron-cash")
|
||||
(version "4.2.14")
|
||||
(version "4.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -631,7 +612,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "086rqqxxh1dmw1qiwmry6sraai3xg44sb85wdw8zkj30si9780kk"))))
|
||||
(base32 "0slx7hmlw2gpcqg951vwvnyl7j52pfzqyaldphghhfxbfzjs7v64"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -2256,7 +2237,7 @@ mining.")
|
||||
(define-public p2pool
|
||||
(package
|
||||
(name "p2pool")
|
||||
(version "3.2")
|
||||
(version "3.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -2265,7 +2246,7 @@ mining.")
|
||||
(commit (string-append "v" version))
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32 "0jwddazvp9rv88dd2b67rn2y23grycnl539abl5ax6b8a89wm7i8"))
|
||||
(sha256 (base32 "190dyyscmb71jnz0yb4l2ahsmz9wp7mcnn81yajv01bajgwnbl16"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
#~(for-each delete-file-recursively
|
||||
@ -2290,6 +2271,8 @@ mining.")
|
||||
(chdir "tests")
|
||||
(invoke "cmake" "../../source/tests")
|
||||
(invoke "make" "-j" (number->string (parallel-job-count)))
|
||||
(invoke "gzip" "-d" "sidechain_dump.dat.gz")
|
||||
(invoke "gzip" "-d" "sidechain_dump_mini.dat.gz")
|
||||
(invoke "./p2pool_tests")
|
||||
(chdir ".."))))
|
||||
(replace 'install
|
||||
|
@ -336,7 +336,7 @@ by the b43-open driver of Linux-libre.")
|
||||
(define-public eg25-manager
|
||||
(package
|
||||
(name "eg25-manager")
|
||||
(version "0.4.2")
|
||||
(version "0.4.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -345,11 +345,19 @@ by the b43-open driver of Linux-libre.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1czq2yi852aqkdnrxdifzcq669bdvlm7j40xivxq77jq04fggpmf"))))
|
||||
"1a591dhr43mhwh09n2vlfpw6aajl6d1vkwniikjvwfjrmp01v6yq"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "udev/80-modem-eg25.rules"
|
||||
(("/bin/grep") (search-input-file inputs "/bin/grep"))))))))
|
||||
(native-inputs (list curl
|
||||
`(,glib "bin") pkg-config))
|
||||
(inputs (list libgpiod libgudev libusb))
|
||||
(inputs (list grep libgpiod libgudev libusb))
|
||||
(synopsis "Manager daemon for the Quectel EG25 mobile broadband modem")
|
||||
(description
|
||||
"This package provides a manager daemon for the Quectel EG25 mobile
|
||||
|
@ -29,20 +29,25 @@
|
||||
(define-module (gnu packages flashing-tools)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages embedded)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages gnupg)
|
||||
@ -58,7 +63,7 @@
|
||||
(define-public flashrom
|
||||
(package
|
||||
(name "flashrom")
|
||||
(version "1.2")
|
||||
(version "1.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -66,35 +71,22 @@
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71"))
|
||||
(patches
|
||||
(search-patches "flashrom-fix-building-on-aarch64.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list dmidecode pciutils libusb libftdi))
|
||||
(native-inputs (list pkg-config))
|
||||
"08wn2j5vxzzvigflrjypgxxzjp32c76bshrlkzki5l6cad226lx0"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs (list bash-minimal dmidecode pciutils libusb libftdi libjaylink))
|
||||
(native-inputs (list cmocka pkg-config))
|
||||
(arguments
|
||||
'(#:make-flags
|
||||
(list "CC=gcc"
|
||||
(string-append "PREFIX=" %output)
|
||||
"CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no")
|
||||
#:tests? #f ; no 'check' target
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(add-before 'build 'patch-exec-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "dmi.c"
|
||||
(("\"dmidecode\"")
|
||||
(format #f "~S"
|
||||
(search-input-file inputs "/sbin/dmidecode"))))))
|
||||
(add-before 'build 'patch-type-error
|
||||
(lambda _
|
||||
;; See https://github.com/flashrom/flashrom/pull/133
|
||||
(substitute* "libflashrom.c"
|
||||
(("supported_boards\\[i\\].working = binfo\\[i\\].working")
|
||||
"supported_boards[i].working = (enum flashrom_test_state)binfo[i].working")
|
||||
(("supported_chipsets\\[i\\].status = chipset\\[i\\].status")
|
||||
"supported_chipsets[i].status = (enum flashrom_test_state)chipset[i].status")))))))
|
||||
(list #:configure-flags
|
||||
#~'("-Dprogrammer=all")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((flashrom (string-append #$output "/sbin/flashrom")))
|
||||
(wrap-program flashrom
|
||||
`("PATH" ":" prefix
|
||||
(,(dirname (search-input-file
|
||||
inputs "/sbin/dmidecode")))))))))))
|
||||
(home-page "https://flashrom.org/")
|
||||
(synopsis "Identify, read, write, erase, and verify ROM/flash chips")
|
||||
(description
|
||||
|
@ -15,6 +15,7 @@
|
||||
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
|
||||
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -1934,3 +1935,29 @@ PostScript Type 1, Type 1 Multiple Master, OpenType, and TrueType fonts.
|
||||
These tools are cfftot1, mmafm, mmpfb, otfinfo, otftotfm, t1dotlessj, t1lint,
|
||||
t1rawfm, t1reencode, t1testpage and ttftotype42.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public bdf2sfd
|
||||
(package
|
||||
(name "bdf2sfd")
|
||||
(version "1.1.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/fcambus/bdf2sfd")
|
||||
(commit "1.1.8")))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pa92gjiijp9xqnw9dcvz24s6qk11a4lp5q6s5psd6mpkhpd88zq"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://github.com/fcambus/bdf2sfd")
|
||||
(synopsis "BDF to SFD converter, allowing to vectorize bitmap fonts")
|
||||
(description
|
||||
"bdf2sfd is a
|
||||
@uref{https://en.wikipedia.org/wiki/Glyph_Bitmap_Distribution_Format,
|
||||
BDF} to @uref{https://fontforge.org/docs/techref/sfdformat.html, SFD}
|
||||
converter, allowing to vectorize bitmap fonts. It works by converting
|
||||
each pixel of a glyph to a polygon, which produces large and
|
||||
unoptimized SFD files that should be post-processed using
|
||||
@uref{https://fontforge.org, FontForge}.")
|
||||
(license license:bsd-2)))
|
||||
|
@ -28,14 +28,14 @@
|
||||
(define-public freeipmi
|
||||
(package
|
||||
(name "freeipmi")
|
||||
(version "1.6.10")
|
||||
(version "1.6.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/freeipmi/freeipmi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zbszq9nn60vqm2gmwy6hmcz9yqb3lk064ib7l89q65n07ja3r7w"))))
|
||||
"15x861i8r1gk44924d2pszlb8mapgkr18m3991vla4601y8xdyv5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static"
|
||||
|
@ -36,7 +36,7 @@
|
||||
(define-public fvwm
|
||||
(package
|
||||
(name "fvwm")
|
||||
(version "2.6.9")
|
||||
(version "2.7.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -44,7 +44,7 @@
|
||||
version "/fvwm-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv"))))
|
||||
"12s1wgkvrvl8m62gpb2918izfx9ysj7hgn9p00blfi3p1gb6v0k6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -2809,29 +2809,26 @@ much more.")
|
||||
(license license:zlib))))
|
||||
|
||||
(define-public recastnavigation
|
||||
;; We follow master since there hasn't been a release since 1.5.1 in 2016.
|
||||
(let ((commit "6d1f9711b3b71f28c2c1c0742d76e0ef8766cf91")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "recastnavigation")
|
||||
(version (git-version "1.5.1" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/recastnavigation/recastnavigation")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cqp0sbm0ixqnxqz6gf2gybh5l4az91mdsd8b5bgxs1wpl2jmnga"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
|
||||
"-DRECASTNAVIGATION_DEMO=OFF"
|
||||
"-DRECASTNAVIGATION_TESTS=ON"
|
||||
"-DRECASTNAVIGATION_EXAMPLES=OFF")))
|
||||
(synopsis "Navigation system for games")
|
||||
(description "Recast is state of the art navigation mesh
|
||||
(package
|
||||
(name "recastnavigation")
|
||||
(version "1.6.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/recastnavigation/recastnavigation")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0rdz3qmp4b961zjah2ax82h471j14w2rcf576gcyx7vldrg8dmj8"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
|
||||
"-DRECASTNAVIGATION_DEMO=OFF"
|
||||
"-DRECASTNAVIGATION_TESTS=ON"
|
||||
"-DRECASTNAVIGATION_EXAMPLES=OFF")))
|
||||
(synopsis "Navigation system for games")
|
||||
(description "Recast is state of the art navigation mesh
|
||||
construction toolset for games.
|
||||
|
||||
@itemize
|
||||
@ -2854,8 +2851,8 @@ simple cases, as well as tiled navigation mesh which allows you to plug
|
||||
in and out pieces of the mesh. The tiled mesh allows you to create
|
||||
systems where you stream new navigation data in and out as the player
|
||||
progresses the level, or you may regenerate tiles as the world changes.")
|
||||
(home-page "https://github.com/recastnavigation/recastnavigation")
|
||||
(license license:zlib))))
|
||||
(home-page "https://github.com/recastnavigation/recastnavigation")
|
||||
(license license:zlib)))
|
||||
|
||||
(define-public raylib
|
||||
(package
|
||||
|
@ -78,6 +78,7 @@
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
|
||||
;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
|
||||
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -415,6 +416,40 @@ Plenty of classic platforming in four nice colors guaranteed!
|
||||
The game includes a built-in editor so you can design and share your own maps.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public anarch
|
||||
(let ((commit "2d78d0c69a3aac14dbd8f8aca62d0cbd9d27c860")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "anarch")
|
||||
(version (git-version "1.1d" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~drummyfish/Anarch")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1lg9r6q1davn5yj181ccygmvaigvm8fr9q2s1bc77a1vkz68vzdk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;no tests
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure) ;no configure script
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke "./make.sh" "sdl")))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(let ((bin (string-append #$output "/bin")))
|
||||
(install-file "anarch" bin)))))))
|
||||
(inputs (list alsa-lib libxcursor libxrandr sdl2))
|
||||
(home-page "https://drummyfish.gitlab.io/anarch/")
|
||||
(synopsis "Public domain 90s-style shooter game")
|
||||
(description "Anarch is a small, completely public domain, 90s-style
|
||||
Doom clone shooter game.")
|
||||
(license license:cc0))))
|
||||
|
||||
(define-public armagetronad
|
||||
(package
|
||||
(name "armagetronad")
|
||||
@ -877,6 +912,31 @@ Quizzes: arithmetic and quiz.")
|
||||
;; phantasia (all but phantasia/pathnames.h.in, which is bsd-3)
|
||||
(license:fsf-free "file:///phantasia/COPYRIGHT")))))
|
||||
|
||||
(define-public rogue
|
||||
(package
|
||||
(name "rogue")
|
||||
(version "5.4.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Davidslv/rogue")
|
||||
(commit "cf9bd26d564a72fac4cf56b55c96c2435270d29a")))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0mk03l120scas4dcn6xccnhslnwmcx2blshbf925z06yk7rkzias"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:make-flags (list "CFLAGS=-DNCURSES_INTERNALS")))
|
||||
(inputs (list ncurses))
|
||||
(synopsis "Original rogue game")
|
||||
(description
|
||||
"This package provides ``Rogue: Exploring the Dungeons of Doom'', the
|
||||
original rogue game found on 4.2BSD.")
|
||||
(home-page "https://github.com/Davidslv/rogue")
|
||||
(license license:bsd-3)))
|
||||
|
||||
|
||||
(define-public bzflag
|
||||
(package
|
||||
@ -2018,33 +2078,59 @@ scriptable with Guile.")
|
||||
(package
|
||||
(name "gnushogi")
|
||||
(version "1.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnushogi/gnushogi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"))))
|
||||
(arguments `(#:tests? #f)) ;; No check target.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnushogi/gnushogi-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a9bsl2nbnb138lq0h14jfc5xvz7hpb2bcsj4mjn6g1hcsl4ik0y"))
|
||||
(modules '((guix build utils)))
|
||||
;; Fix "warning: ISO C90 does not support ‘__func__’ predefined
|
||||
;; identifier [-Wpedantic]"
|
||||
(snippet '(begin
|
||||
(substitute* "gnushogi/dspwrappers.c"
|
||||
(("__FUNCTION__")
|
||||
"__extension__ __FUNCTION__"))))))
|
||||
(arguments
|
||||
`(#:configure-flags (list (string-append
|
||||
"CFLAGS="
|
||||
(string-join '("-Wno-format"
|
||||
"-Wno-unused-but-set-variable"
|
||||
"-Wno-bool-compare")
|
||||
" ")))
|
||||
#:make-flags '("LDFLAGS=-z muldefs")
|
||||
#:phases (modify-phases %standard-phases
|
||||
;; Skip --enable-fast-install flag
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs configure-flags #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "CONFIG_SHELL"
|
||||
(which "sh"))
|
||||
(setenv "SHELL"
|
||||
(which "sh"))
|
||||
(apply invoke "./configure"
|
||||
(string-append "--prefix=" out) configure-flags)))))
|
||||
#:test-target "sizetest"))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.gnu.org/software/gnushogi/")
|
||||
(synopsis "The game of Shogi (Japanese chess)")
|
||||
(description "GNU Shogi is a program that plays the game Shogi (Japanese
|
||||
Chess). It is similar to standard chess but this variant is far more complicated.")
|
||||
(synopsis "Game of Shogi (Japanese chess)")
|
||||
(description
|
||||
"GNU Shogi is a program that plays the game Shogi (Japanese Chess).
|
||||
It is similar to standard chess but this variant is far more complicated.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public ltris
|
||||
(package
|
||||
(name "ltris")
|
||||
(version "1.2.4")
|
||||
(version "1.2.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lgames/ltris/"
|
||||
"ltris-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "10wg6v12w3jms8ka2x9a87p06l9gzpr94ai9v428c9r320q7psyn"))))
|
||||
(base32 "1xj65kn815x2hq1ynzjyc90dj178xwa2xvx7jx99qf60ahaf4g62"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
@ -10543,14 +10629,14 @@ ChessX.")
|
||||
(define-public barrage
|
||||
(package
|
||||
(name "barrage")
|
||||
(version "1.0.6")
|
||||
(version "1.0.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/lgames/barrage/"
|
||||
"barrage-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1bhx708s7viv01m6bmpjsdgr33wk5kqw4wf7bvgw73a07v6j8ncw"))))
|
||||
(base32 "0j7j6n5h97xpw0h8zi5a8ziw1vjsbr5gk4dcsiwzh59qn0djnrkh"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list hicolor-icon-theme sdl sdl-mixer))
|
||||
|
@ -114,14 +114,14 @@
|
||||
("libxml2" ,libxml2)
|
||||
|
||||
;; The Hurd needs -lshouldbeinlibc.
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
`(("hurd" ,hurd))
|
||||
'())))
|
||||
(native-inputs
|
||||
`(("texinfo" ,texinfo)
|
||||
("dejagnu" ,dejagnu)
|
||||
("pkg-config" ,pkg-config)
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
;; When cross-compiling from x86_64-linux, make sure to use a
|
||||
;; 32-bit MiG because we assume target i586-pc-gnu.
|
||||
`(("mig" ,(if (%current-target-system)
|
||||
|
@ -2786,17 +2786,20 @@ growing set of geoscientific methods.")
|
||||
sqlite
|
||||
(list zstd "lib")))
|
||||
(native-inputs
|
||||
(list bison
|
||||
flex
|
||||
perl
|
||||
perl-yaml-tiny
|
||||
pkg-config
|
||||
python-mock
|
||||
python-nose2
|
||||
python-pyqt-builder
|
||||
qttools-5
|
||||
shellcheck
|
||||
xorg-server-for-tests))
|
||||
(append
|
||||
(list bison
|
||||
flex
|
||||
perl
|
||||
perl-yaml-tiny
|
||||
pkg-config
|
||||
python-mock
|
||||
python-nose2
|
||||
python-pyqt-builder
|
||||
qttools-5)
|
||||
(if (supported-package? shellcheck)
|
||||
(list shellcheck)
|
||||
'())
|
||||
(list xorg-server-for-tests)))
|
||||
(home-page "https://qgis.org")
|
||||
(synopsis "Geographical information system")
|
||||
(description "QGIS is an easy to use Geographical Information
|
||||
|
@ -9,7 +9,7 @@
|
||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 EuAndreh <eu@euandre.org>
|
||||
;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com>
|
||||
@ -42,7 +42,6 @@
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages libunistring)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages perl)
|
||||
@ -124,7 +123,7 @@
|
||||
"coreutils-gnulib-tests.patch")))))
|
||||
'())
|
||||
|
||||
#$@(if (hurd-target?)
|
||||
#$@(if (target-hurd?)
|
||||
#~((substitute*
|
||||
"gettext-tools/gnulib-tests/Makefile.in"
|
||||
;; See 'coreutils' for the rationale.
|
||||
@ -135,7 +134,7 @@
|
||||
|
||||
;; When tests fail, we want to know the details.
|
||||
#:make-flags #~'("VERBOSE=yes"
|
||||
#$@(if (hurd-target?)
|
||||
#$@(if (target-hurd?)
|
||||
'("XFAIL_TESTS=test-perror2")
|
||||
'()))))
|
||||
(home-page "https://www.gnu.org/software/gettext/")
|
||||
|
@ -296,18 +296,17 @@ shadows, highlights, and gradients for some depth.")
|
||||
(define-public flat-remix-gnome-theme
|
||||
(package
|
||||
(name "flat-remix-gnome-theme")
|
||||
(version "20221107-1")
|
||||
(version "20230508")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/daniruiz/flat-remix-gnome")
|
||||
;; This commit adds GtkSourceView 5 theme, for GNOME Text Editor.
|
||||
(commit "b5616efc515e9f1417436e67d94718db7529a2ba")))
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "10fgdz8hz8rd7aj4vb3bvl8khzb2fvaia7n00gi0x19yvnnh36pr"))))
|
||||
(base32 "1b31ayb4qvcr5m3dqcidl9ilpp3w4mr56wq6vrp73g4cj558pi9h"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
`(#:install-plan
|
||||
|
@ -4294,7 +4294,7 @@ Hints specification (EWMH).")
|
||||
gtk+
|
||||
goffice
|
||||
libgsf
|
||||
librsvg
|
||||
(librsvg-for-system)
|
||||
libxml2
|
||||
libxslt
|
||||
python
|
||||
|
@ -409,14 +409,14 @@ services.")
|
||||
"faketime -m -f '1970-01-01 00:00:00' $(TEXMACS_CONVERT)")))))))
|
||||
(inputs (list guile-3.0)) ;for pkg-config
|
||||
(propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds
|
||||
guile-fibers-1.1))
|
||||
guile-fibers-1.3))
|
||||
(native-inputs (list guile-3.0 ;as a compiler
|
||||
;; for cross-compilation, the guile inputs need to be
|
||||
;; native-inputs as well.
|
||||
guile-bytestructures
|
||||
guile-gcrypt
|
||||
guile-pfds
|
||||
guile-fibers-1.1
|
||||
guile-fibers-1.3
|
||||
libfaketime
|
||||
automake
|
||||
autoconf
|
||||
|
@ -1138,8 +1138,8 @@ standards of the IceCat project.")
|
||||
"ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl"
|
||||
"tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
|
||||
|
||||
(define %icedove-build-id "20230527000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icedove-version "102.11.2")
|
||||
(define %icedove-build-id "20230607000000") ;must be of the form YYYYMMDDhhmmss
|
||||
(define %icedove-version "102.12.0")
|
||||
|
||||
;; Provides the "comm" folder which is inserted into the icecat source.
|
||||
;; Avoids the duplication of Icecat's source tarball.
|
||||
@ -1148,11 +1148,11 @@ standards of the IceCat project.")
|
||||
(method hg-fetch)
|
||||
(uri (hg-reference
|
||||
(url "https://hg.mozilla.org/releases/comm-esr102")
|
||||
(changeset "c406f857789ca8a8943b895f4cadfc61921860ab")))
|
||||
(changeset "9d42734e12597ccdb59fee178bf369d8c328dcad")))
|
||||
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1id7wlj16zbgxyxx672vls7h3sq1153grrfqgw71y2ps6zwzxg67"))))
|
||||
"159jdxcg62fq24hgpp5pd8yb0xmqzjhcmd706yzs8lnydm9kjpcg"))))
|
||||
|
||||
(define (comm-source->locales+changeset source)
|
||||
"Given SOURCE, a checkout of the Thunderbird 'comm' component, return the
|
||||
|
@ -2755,7 +2755,7 @@ jar struct to manage the cookies added to the cookie jar.")
|
||||
'(#:unpack-path "github.com/gizak/termui"
|
||||
#:import-path "github.com/gizak/termui/v3"))
|
||||
(propagated-inputs
|
||||
(list go-github.com-mattn-go-runewidth
|
||||
(list go-github-com-mattn-go-runewidth
|
||||
go-github-com-mitchellh-go-wordwrap go-github.com-nsf-termbox-go))
|
||||
(home-page "https://github.com/gizak/termui")
|
||||
(synopsis "Terminal dashboard widget Go library")
|
||||
@ -7105,7 +7105,7 @@ encoding in Go.")
|
||||
(arguments
|
||||
`(#:import-path "github.com/gdamore/tcell"))
|
||||
(inputs
|
||||
(list go-github.com-mattn-go-runewidth
|
||||
(list go-github-com-mattn-go-runewidth
|
||||
go-github-com-lucasb-eyer-go-colorful
|
||||
go-golang-org-x-text
|
||||
go-github-com-gdamore-encoding))
|
||||
@ -7121,7 +7121,7 @@ systems.")
|
||||
(package
|
||||
(inherit go-github-com-gdamore-tcell)
|
||||
(name "go-github-com-gdamore-tcell")
|
||||
(version "2.5.3")
|
||||
(version "2.6.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -7130,7 +7130,7 @@ systems.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0pvs0gigqxpifc7y7cx82cg95pgqmy8qzxynja3zidplrx2075j3"))))
|
||||
"0126hi8glnfqdx4l9zlh6dhd5f5c8bws7arv9pp4n2kqcnhdc6g2"))))
|
||||
(arguments
|
||||
(list #:import-path "github.com/gdamore/tcell/v2"
|
||||
#:phases
|
||||
@ -9128,7 +9128,7 @@ transforms one JSON document into another through a JMESPath expression.")
|
||||
`(#:import-path "github.com/muesli/reflow/wordwrap"
|
||||
#:unpack-path "github.com/muesli/reflow"))
|
||||
(native-inputs
|
||||
(list go-github.com-mattn-go-runewidth))
|
||||
(list go-github-com-mattn-go-runewidth))
|
||||
(home-page "https://github.com/muesli/reflow/")
|
||||
(synopsis "Collection of methods helping to transform blocks of text")
|
||||
(description "This package provides a collection of ANSI-aware methods and
|
||||
@ -9187,7 +9187,7 @@ io.Writers helping you to transform blocks of text.")
|
||||
(list go-github-com-google-goterm
|
||||
go-github-com-lucasb-eyer-go-colorful
|
||||
go-github-com-mattn-go-isatty
|
||||
go-github.com-mattn-go-runewidth))
|
||||
go-github-com-mattn-go-runewidth))
|
||||
(home-page "https://github.com/muesli/termenv/")
|
||||
(synopsis "Advanced styling options on the terminal")
|
||||
(description "termenv lets you safely use advanced styling options on the
|
||||
@ -9241,7 +9241,7 @@ which produce colorized output using github.com/fatih/color.")
|
||||
(arguments
|
||||
`(#:import-path "github.com/olekukonko/tablewriter"))
|
||||
(propagated-inputs
|
||||
(list go-github.com-mattn-go-runewidth))
|
||||
(list go-github-com-mattn-go-runewidth))
|
||||
(home-page "https://github.com/olekukonko/tablewriter/")
|
||||
(synopsis "Generate ASCII table")
|
||||
(description "This package generates ASCII tables. Features:
|
||||
@ -9338,7 +9338,7 @@ size of the terminal.")
|
||||
go-github-com-muesli-reflow-wordwrap
|
||||
go-github-com-muesli-reflow-indent
|
||||
go-github-com-muesli-reflow-padding
|
||||
go-github.com-mattn-go-runewidth
|
||||
go-github-com-mattn-go-runewidth
|
||||
go-github-com-muesli-termenv
|
||||
go-github-com-google-goterm
|
||||
go-github-com-lucasb-eyer-go-colorful
|
||||
@ -11521,7 +11521,7 @@ averages.")
|
||||
(define-public go-github-com-mattn-go-runewidth
|
||||
(package
|
||||
(name "go-github-com-mattn-go-runewidth")
|
||||
(version "0.0.13")
|
||||
(version "0.0.14")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -11530,7 +11530,7 @@ averages.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1yir0f3wc5z5hnkwhvx5qb6nmpfb05zp2gvfjvna63s8kmla1rrn"))))
|
||||
(base32 "1iaqw5pd7f4f2xz37540kp0828p2820g4vxx3hz089hwl331sx1v"))))
|
||||
(build-system go-build-system)
|
||||
(arguments '(#:import-path "github.com/mattn/go-runewidth"))
|
||||
(propagated-inputs
|
||||
@ -11563,7 +11563,7 @@ string.")
|
||||
(propagated-inputs
|
||||
`(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
|
||||
("github.com/muesli/termenv" ,go-github-com-muesli-termenv)
|
||||
("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth)
|
||||
("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth)
|
||||
("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent)
|
||||
("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi)
|
||||
("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful)
|
||||
|
@ -189,13 +189,29 @@ framebuffer graphics, audio output and input event.")
|
||||
(lambda _
|
||||
(substitute* "src/core/core.c"
|
||||
(("..BUILDTIME..") ""))))
|
||||
;; TODO: Move patch to source.
|
||||
,@(if (target-arm32?)
|
||||
`((add-after 'unpack 'patch-source
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(invoke "patch" "--force" "-p1" "-i"
|
||||
(assoc-ref inputs "patch-file")))))
|
||||
'())
|
||||
(add-after 'unpack 'disable-configure-during-bootstrap
|
||||
(lambda _
|
||||
(substitute* "autogen.sh"
|
||||
(("^.*\\$srcdir/configure.*") ""))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
(list autoconf automake libtool perl pkg-config))
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
,@(if (target-arm32?)
|
||||
`(("patch" ,patch)
|
||||
("patch-file"
|
||||
,(search-patch "directfb-davinci-glibc-228-compat.patch")))
|
||||
'())))
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
ffmpeg
|
||||
@ -1448,11 +1464,11 @@ in Julia).")
|
||||
(define-public openmw-openscenegraph
|
||||
;; OpenMW prefers its own fork of openscenegraph:
|
||||
;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
|
||||
(let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
|
||||
(let ((commit "69cfecebfb6dc703b42e8de39eed750a84a87489"))
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit openscenegraph)
|
||||
(version (git-version "3.6" "1" commit))
|
||||
(version (git-version "3.6" "2" commit))
|
||||
(outputs (list "out"))
|
||||
(source
|
||||
(origin
|
||||
@ -1463,7 +1479,7 @@ in Julia).")
|
||||
(file-name (git-file-name (package-name openscenegraph) version))
|
||||
(sha256
|
||||
(base32
|
||||
"05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
|
||||
"1qayk2gklm8zvss90dcjfxv6717rvcmwmgmgyy1qzkli67a0zbw2"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openscenegraph)
|
||||
((#:configure-flags flags)
|
||||
@ -1471,14 +1487,14 @@ in Julia).")
|
||||
#~(append
|
||||
'("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
|
||||
"-DBUILD_OSG_PLUGIN_OSG=1"
|
||||
"-DBUILD_OSG_PLUGIN_DAE=1"
|
||||
"-DBUILD_OSG_PLUGIN_DDS=1"
|
||||
"-DBUILD_OSG_PLUGIN_TGA=1"
|
||||
"-DBUILD_OSG_PLUGIN_BMP=1"
|
||||
"-DBUILD_OSG_PLUGIN_JPEG=1"
|
||||
"-DBUILD_OSG_PLUGIN_PNG=1"
|
||||
"-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
|
||||
;; The jpeg plugin requires conversion between integers and booleans
|
||||
"-DCMAKE_CXX_FLAGS=-fpermissive")
|
||||
"-DBUILD_OSG_PLUGIN_FREETYPE=1"
|
||||
"-DBUILD_OSG_DEPRECATED_SERIALIZERS=0")
|
||||
#$flags))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
@ -2596,4 +2612,3 @@ environment. It supports drawing freehand as well as basic shapes and text.
|
||||
It features cut-and-paste for irregular regions or polygons.")
|
||||
(home-page "https://www.gnu.org/software/gpaint/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
@ -799,6 +799,14 @@ model to base your own plug-in on, here it is.")
|
||||
|
||||
;; This test is flaky on at least some architectures.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
|
||||
#$@(if (target-riscv64?)
|
||||
`((("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],")
|
||||
(("'elements/viewfinderbin\\.c'\\].*],")
|
||||
"'elements/viewfinderbin.c'], true, ],"))
|
||||
'())
|
||||
|
||||
;; This substitution is no longer effective and can be removed.
|
||||
#$@(if (member (%current-system)
|
||||
'("i686-linux" "aarch64-linux" "riscv64-linux"))
|
||||
`((("'elements/camerabin\\.c'\\]\\],")
|
||||
|
@ -9,7 +9,7 @@
|
||||
;;; Copyright © 2016, 2017, 2021 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
|
||||
;;; Copyright © 2016, 2021 Amirouche <amirouche@hypermove.net>
|
||||
;;; Copyright © 2016, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2019, 2021, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
|
||||
;;; Copyright © 2017 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
@ -89,9 +89,9 @@
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages haskell-xyz) ;pandoc
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages libunistring)
|
||||
#:use-module (gnu packages linux)
|
||||
@ -311,11 +311,11 @@ currently does not do much, but it might in the future.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile-openai
|
||||
(let ((commit "9265b641dea0246609b7bd5031f3f6780ef6a167")
|
||||
(revision "2"))
|
||||
(let ((commit "751cd5db5f8bb7c00e60042a7ec86100930b0f02")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "guile-openai")
|
||||
(version (git-version "0.1" revision commit))
|
||||
(version (git-version "0.2" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -324,21 +324,16 @@ currently does not do much, but it might in the future.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0sydjsgdr6xxk1w5f8pf14wgimfy4fb1hpi8yml0nv83p7bfr1w3"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:scheme-file-regexp
|
||||
#~(lambda (file info)
|
||||
(let ((name (basename file)))
|
||||
(and (string-suffix? ".scm" name)
|
||||
(not (string=? (basename file) "guix.scm")))))))
|
||||
(inputs (list guile-3.0-latest))
|
||||
"1rl15wkm682xwzj2fjn4czp1haxnxlcjsk3g69j2a9qlwc4w0g4a"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments (list #:strip-binaries? #f))
|
||||
(inputs (list guile-3.0-latest imagemagick))
|
||||
(propagated-inputs
|
||||
(list guile-colorized
|
||||
guile-gnutls
|
||||
guile-json-4
|
||||
guile-picture-language))
|
||||
(native-inputs (list autoconf automake pkg-config))
|
||||
(home-page "https://gitlab.com/flatwhatson/guile-openai")
|
||||
(synopsis "Guile implementation of the OpenAI API")
|
||||
(description
|
||||
@ -788,10 +783,10 @@ Unix-style DSV format and RFC 4180 format.")
|
||||
(inputs (list guile-2.2))
|
||||
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
|
||||
|
||||
(define-public guile-fibers-1.1
|
||||
(define-public guile-fibers-1.3
|
||||
(package
|
||||
(name "guile-fibers")
|
||||
(version "1.1.1")
|
||||
(version "1.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -800,11 +795,9 @@ Unix-style DSV format and RFC 4180 format.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc"))
|
||||
"0wvdi4l58f9a5c9wi3cdc9l1bniscsixb6w2zj86mch7j7j814lc"))
|
||||
(patches
|
||||
(search-patches "guile-fibers-wait-for-io-readiness.patch"
|
||||
"guile-fibers-epoll-instance-is-dead.patch"
|
||||
"guile-fibers-fd-finalizer-leak.patch"))))
|
||||
(search-patches "guile-fibers-libevent-32-bit.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags
|
||||
@ -822,17 +815,15 @@ Unix-style DSV format and RFC 4180 format.")
|
||||
(substitute* "Makefile"
|
||||
(("tests/speedup.scm") ""))))))))
|
||||
(native-inputs
|
||||
(list texinfo pkg-config autoconf automake libtool
|
||||
(list texinfo pkg-config autoconf-2.71 automake libtool
|
||||
guile-3.0 ;for 'guild compile
|
||||
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'
|
||||
gettext-minimal))
|
||||
(inputs
|
||||
(list guile-3.0)) ;for libguile-3.0.so
|
||||
(supported-systems
|
||||
;; This version requires 'epoll' and is thus limited to Linux-based
|
||||
;; systems, but this may change soon:
|
||||
;; <https://github.com/wingo/fibers/pull/53>.
|
||||
(filter (cut string-suffix? "-linux" <>) %supported-systems))
|
||||
(append (list guile-3.0) ;for libguile-3.0.so
|
||||
(if (target-hurd?)
|
||||
(list libevent)
|
||||
'())))
|
||||
(synopsis "Lightweight concurrency facility for Guile")
|
||||
(description
|
||||
"Fibers is a Guile library that implements a a lightweight concurrency
|
||||
@ -849,22 +840,35 @@ is not available for Guile 2.0.")
|
||||
(properties '((upstream-name . "fibers")))
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public guile-fibers-next
|
||||
(let ((commit "99fc3e38048f732de67c43fde52e949fa294aa7d")
|
||||
(revision "1"))
|
||||
(package
|
||||
(inherit guile-fibers-1.1)
|
||||
(name "guile-fibers-next")
|
||||
(version (git-version "1.3.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wingo/fibers")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name "guile-fibers" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1950nf0qa52m1hhc33z0snci5azbdcv4m6hklk5rpqchc90x9h4p")))))))
|
||||
(define-public guile-fibers-1.1
|
||||
(package
|
||||
(inherit guile-fibers-1.3)
|
||||
(version "1.1.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wingo/fibers")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name "guile-fibers" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc"))
|
||||
(patches
|
||||
(search-patches "guile-fibers-wait-for-io-readiness.patch"
|
||||
"guile-fibers-epoll-instance-is-dead.patch"
|
||||
"guile-fibers-fd-finalizer-leak.patch"))))
|
||||
(native-inputs
|
||||
(list texinfo pkg-config autoconf automake libtool
|
||||
guile-3.0 ;for 'guild compile
|
||||
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'
|
||||
gettext-minimal))
|
||||
(inputs
|
||||
(list guile-3.0)) ;for libguile-3.0.so
|
||||
(supported-systems
|
||||
;; This version requires 'epoll' and is thus limited to Linux-based
|
||||
;; systems, which is fixed in 1.2.0:
|
||||
;; <https://github.com/wingo/fibers/pull/53>.
|
||||
(filter (cut string-suffix? "-linux" <>) %supported-systems))))
|
||||
|
||||
(define-public guile-fibers
|
||||
(package
|
||||
@ -3843,7 +3847,7 @@ debugging code.")
|
||||
(define-public guile-png
|
||||
(package
|
||||
(name "guile-png")
|
||||
(version "0.5.0")
|
||||
(version "0.6.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -3852,7 +3856,7 @@ debugging code.")
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dnahq05mwxzbsqb0qjkyysylc54qr8l5839zyc4sanl2syzhvwk"))))
|
||||
"0i0q2h4kfp1mj5m3wnz2hk6z895001j38s5vkbhkdxf05cjvwkky"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
|
||||
@ -4058,6 +4062,50 @@ enriched with pure Guile Scheme algorithms, all accessible through a nice,
|
||||
clean and easy to use high level API.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile-ffi-cblas
|
||||
(let ((commit "4458d50f84786d7ace0181c6588345eed7474996")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "guile-ffi-cblas")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(home-page "https://github.com/lloda/guile-ffi-cblas")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page)
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"050s0lq64v286hkxqczkfkx3fp1vr3jm5w236hxx67br9najb1cp"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list #:source-directory "mod"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-blas-file-name
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "mod/ffi/cblas.scm"
|
||||
(("\"libcblas\"")
|
||||
(string-append "\""
|
||||
(search-input-file
|
||||
inputs "/lib/libopenblas.so")
|
||||
"\"")))))
|
||||
(add-after 'build 'check
|
||||
(lambda _
|
||||
(invoke "guile" "-C" "mod" "-L" "mod"
|
||||
"test/test-ffi-cblas.scm"))))))
|
||||
(native-inputs (list guile-3.0))
|
||||
(inputs (list openblas))
|
||||
(synopsis "Guile bindings for CBLAS, the linear algebra library")
|
||||
(description
|
||||
"This package provides Guile FFI bindings for CBLAS, the library of
|
||||
linear algebra subprograms.
|
||||
|
||||
To use the bindings, import @code{(ffi cblas)}. CBLAS will be loaded from the
|
||||
default dynamic library path. There are up to three bindings for each
|
||||
function: raw, typed, and functional.")
|
||||
(license license:lgpl3+))))
|
||||
|
||||
(define-public guile-ffi-fftw
|
||||
(let ((commit "294ad9e7491dcb40026d2fec9be2af05263be1c0")
|
||||
(revision "2"))
|
||||
@ -5205,7 +5253,7 @@ locations.")
|
||||
(define-public guile-netlink
|
||||
(package
|
||||
(name "guile-netlink")
|
||||
(version "1.1.2")
|
||||
(version "1.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -5215,7 +5263,7 @@ locations.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1s06xbyj0yd49aivfpc9l73c8c12r3zjmskkyislrfwkbpd74hjr"))))
|
||||
"06ls830nrshzi2j532di5vdf03fp8cy1275ll4ms93x1hv2g8dk0"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list guile-3.0))
|
||||
|
@ -4,7 +4,7 @@
|
||||
;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015, 2017 Christine Lemmer-Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
|
||||
@ -47,7 +47,6 @@
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages libunistring)
|
||||
#:use-module (gnu packages linux)
|
||||
@ -202,7 +201,7 @@ without requiring the source code to be rewritten.")
|
||||
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
,@(if (hurd-system?)
|
||||
,@(if (system-hurd?)
|
||||
'((add-after 'unpack 'disable-tests
|
||||
(lambda _
|
||||
;; Hangs at: "Running 00-repl-server.test"
|
||||
@ -345,7 +344,7 @@ without requiring the source code to be rewritten.")
|
||||
(not (%current-target-system)))
|
||||
((#:configure-flags flags #~'())
|
||||
;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd.
|
||||
#~(cons* #$@(if (hurd-target?)
|
||||
#~(cons* #$@(if (target-hurd?)
|
||||
#~("--disable-jit")
|
||||
#~())
|
||||
;; -fexcess-precision=standard is required when compiling for
|
||||
@ -433,9 +432,9 @@ without requiring the source code to be rewritten.")
|
||||
; when heavily loaded)
|
||||
|
||||
(define-public guile-next
|
||||
(let ((version "3.0.8")
|
||||
(let ((version "3.0.9")
|
||||
(revision "0")
|
||||
(commit "a1a85581f17dade76a598b48eac7d3d308e3a0a5"))
|
||||
(commit "aa2cfe7cf69327285a17de97682d696f2f6c43ef"))
|
||||
(package
|
||||
(inherit guile-3.0)
|
||||
(name "guile-next")
|
||||
@ -449,7 +448,7 @@ without requiring the source code to be rewritten.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1l5zkg0wpchyizq8s4615hkj0n0i029l72k3pq2hha89r3bcn8al"))))
|
||||
"03xwy3ni85qy0lrvz0lk0488394nfsfc1004l84lgyzql2qwkynl"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments guile-3.0)
|
||||
((#:phases phases '%standard-phases)
|
||||
|
@ -46,20 +46,7 @@
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages onc-rpc)
|
||||
#:use-module (gnu packages xorg) ; libpciaccess
|
||||
#:use-module (guix git-download)
|
||||
#:export (hurd-system?
|
||||
hurd-target?))
|
||||
|
||||
(define (hurd-target?)
|
||||
"Return true if the cross-compilation target or the current system is
|
||||
GNU/Hurd."
|
||||
(or (and=> (%current-target-system) target-hurd?)
|
||||
(and (not (%current-target-system))
|
||||
(and=> (%current-system) target-hurd?))))
|
||||
|
||||
(define (hurd-system?)
|
||||
"Return true if the current system is the Hurd."
|
||||
(and=> (%current-system) target-hurd?))
|
||||
#:use-module (guix git-download))
|
||||
|
||||
(define (hurd-source-url version)
|
||||
(string-append "mirror://gnu/hurd/hurd-"
|
||||
|
@ -59,10 +59,12 @@
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages iso-codes)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages logging)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-check)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages serialization)
|
||||
@ -348,18 +350,44 @@ Chinese pinyin input methods.")
|
||||
version "/ibus-anthy-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8"))))
|
||||
"16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8"))
|
||||
(patches (search-patches "ibus-anthy-fix-tests.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; The test suite hangs (see:
|
||||
;; https://github.com/ibus/ibus-anthy/issues/28).
|
||||
#:tests? #f
|
||||
#:configure-flags
|
||||
;; Use absolute exec path in the anthy.xml.
|
||||
#~(list (string-append "--libexecdir=" #$output "/libexec"))
|
||||
;; The test suite fails (see:
|
||||
;; https://github.com/ibus/ibus-anthy/issues/28).
|
||||
#:tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-check
|
||||
(lambda _
|
||||
(substitute* "data/Makefile.in"
|
||||
;; Use a year current at the time the release was made, to
|
||||
;; avoid the "This year 2023 is not included in era.y"
|
||||
;; error.
|
||||
(("`date '\\+%Y'`")
|
||||
"2021"))))
|
||||
(add-after 'unpack 'do-not-override-GI_TYPELIB_PATH
|
||||
;; Do not override the GI_TYPELIB_PATH to avoid the pygobject
|
||||
;; error: "ValueError: Namespace Gdk not available".
|
||||
(lambda _
|
||||
(substitute* "tests/test-build.sh"
|
||||
(("GI_TYPELIB_PATH=\\$BUILDDIR/../gir" all)
|
||||
(string-append all ":$GI_TYPELIB_PATH")))))
|
||||
(add-before 'check 'prepare-for-tests
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; IBus requires write access to the HOME directory.
|
||||
(setenv "HOME" "/tmp")
|
||||
;; The single test is skipped if no actual display is found.
|
||||
(system "Xvfb :1 &")
|
||||
(setenv "DISPLAY" ":1"))))
|
||||
(add-after 'install 'wrap-programs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(for-each
|
||||
@ -376,7 +404,11 @@ Chinese pinyin input methods.")
|
||||
`(,glib "bin")
|
||||
intltool
|
||||
pkg-config
|
||||
python))
|
||||
procps ;for ps
|
||||
python
|
||||
python-pycotap
|
||||
util-linux ;for getopt
|
||||
xorg-server-for-tests))
|
||||
(inputs
|
||||
(list anthy
|
||||
gtk+
|
||||
|
@ -7,7 +7,7 @@
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;; Copyright © 2018 Lprndn <guix@lprndn.info>
|
||||
;;; Copyright © 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
@ -385,7 +385,10 @@ many popular formats.")
|
||||
"-DVTK_SMP_ENABLE_OPENNMP=ON"
|
||||
"-DVTK_SMP_ENABLE_TBB=ON"
|
||||
"-DVTK_USE_MPI=ON"
|
||||
)
|
||||
#$@(if (target-riscv64?)
|
||||
'("-DCMAKE_SHARED_LINKER_FLAGS=-latomic"
|
||||
"-DCMAKE_EXE_LINKER_FLAGS=-latomic")
|
||||
'()))
|
||||
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
@ -604,7 +607,31 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
|
||||
;; opencv-extra/alldata.
|
||||
(substitute* "modules/dnn/test/test_layers.cpp"
|
||||
(("\\b(Accum|DataAugmentation|Resample|Correlation|Interp)\\b" all)
|
||||
(string-append "DISABLED_" all)))))
|
||||
(string-append "DISABLED_" all)))
|
||||
|
||||
,@(if (target-aarch64?)
|
||||
`(;; This test fails on aarch64, loosen the bounds.
|
||||
;; Expected: (max) < (0.131), actual: 0.207148 vs 0.131
|
||||
(substitute* "modules/photo/test/test_hdr.cpp"
|
||||
(("0\\.131") "0.222"))
|
||||
;; These tests hang forever on aarch64.
|
||||
(delete-file-recursively "modules/videoio/test/"))
|
||||
'())
|
||||
|
||||
,@(if (target-riscv64?)
|
||||
`(;; This test fails on riscv64, loosen the bounds.
|
||||
;; Expected: (max) < (0.1), actual: 0.220829 vs 0.1
|
||||
(substitute* "modules/photo/test/test_hdr.cpp"
|
||||
(("0\\.1") "0.240"))
|
||||
;; Expected equality of these values:
|
||||
;; ellipses.size()
|
||||
;; Which is: 668
|
||||
;; ellipses_size
|
||||
;; Which is: 2449
|
||||
(substitute* "../opencv-contrib/modules/ximgproc/test/test_fld.cpp"
|
||||
(("\\bManySmallCircles\\b" all)
|
||||
(string-append "DISABLED_" all))))
|
||||
'())))
|
||||
(add-after 'unpack 'unpack-submodule-sources
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(mkdir "../opencv-extra")
|
||||
|
@ -2,7 +2,7 @@
|
||||
;;; Copyright © 2013, 2017-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
||||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
@ -799,7 +799,7 @@ displayed in a terminal.")
|
||||
libjpeg-turbo
|
||||
libinih
|
||||
libnsgif
|
||||
librsvg
|
||||
(librsvg-for-system)
|
||||
libtiff
|
||||
libxkbcommon
|
||||
pango
|
||||
|
@ -28,7 +28,7 @@
|
||||
;;; Copyright © 2020, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
|
||||
;;; Copyright © 2021 Alexandr Vityazev <avityazev@posteo.org>
|
||||
@ -37,6 +37,7 @@
|
||||
;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -322,6 +323,62 @@ APNG patch provides APNG support to libpng.")
|
||||
images. It can further losslessly compress them by as much as 40%.")
|
||||
(license license:zlib)))
|
||||
|
||||
(define-public pngcheck
|
||||
(package
|
||||
(name "pngcheck")
|
||||
(version "3.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.libpng.org/pub/png/src/pngcheck-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rny14v57d2zvnqcqbh3m87mkya22qr2394fg7vm3xsacf8l8sn3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ;no check target
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(invoke "make" "-f" "Makefile.unx")))
|
||||
(add-after 'build 'compress-man-pages
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(invoke "gzip" "pngcheck.1")
|
||||
(invoke "gzip" "gpl/pngsplit.1")
|
||||
(invoke "gzip" "gpl/png-fix-IDAT-windowsize.1")))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin/"))
|
||||
(man (string-append out "/share/man/man1/")))
|
||||
(install-file "pngcheck" bin)
|
||||
(install-file "pngcheck.1.gz" man)
|
||||
(install-file "pngsplit" bin)
|
||||
(install-file "gpl/pngsplit.1.gz" man)
|
||||
(install-file "png-fix-IDAT-windowsize" bin)
|
||||
(install-file "gpl/png-fix-IDAT-windowsize.1.gz" man)))))))
|
||||
(inputs (list zlib))
|
||||
(home-page "http://www.libpng.org/pub/png/apps/pngcheck.html")
|
||||
(synopsis "Print info and check PNG, JNG and MNG files")
|
||||
(description
|
||||
"@code{pngcheck} verifies the integrity of PNG, JNG and MNG files (by
|
||||
checking the internal 32-bit CRCs, a.k.a. checksums, and decompressing the image
|
||||
data); it can optionally dump almost all of the chunk-level information in the image
|
||||
in human-readable form. For example, it can be used to print the basic statistics
|
||||
about an image (dimensions, bit depth, etc.); to list the color and transparency info
|
||||
in its palette (assuming it has one); or to extract the embedded text annotations.
|
||||
This is a command-line program with batch capabilities (e.g. @code{pngcheck
|
||||
*.png}.)
|
||||
|
||||
Also includes @code{pngsplit} which can split a PNG, MNG or JNG file into individual,
|
||||
numbered chunks, and @code{png-fix-IDAT-windowsize} that allow to reset first IDAT's
|
||||
zlib window-size bytes and fix up CRC to match.")
|
||||
;; "pngsplit" and "png-fix-IDAT-windowsize" are licensed under the terms of
|
||||
;; GNU GPL2+. See "gpl/COPYING" in the repository."
|
||||
(license (list license:x11 license:gpl2+))))
|
||||
|
||||
(define-public pnglite
|
||||
(let ((commit "11695c56f7d7db806920bd9229b69f230e6ffb38")
|
||||
(revision "1"))
|
||||
@ -2373,7 +2430,7 @@ Format) file format decoder and encoder.")
|
||||
(define-public libjxl
|
||||
(package
|
||||
(name "libjxl")
|
||||
(version "0.7.0")
|
||||
(version "0.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -2383,23 +2440,24 @@ Format) file format decoder and encoder.")
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ysh7kd30wwnq0gc1l8c0j9b6wzd15k0kkvfaacjvjqcz11lnc7l"))
|
||||
(base32 "1alhnnxkwy5bdwahfsdh87xk9rg1s2fm3r9y2w11ka8p3n1ccwr3"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Delete the bundles that will not be used. libjxl bundles LCMS,
|
||||
;; which is in Guix, but a newer version is required.
|
||||
;; Delete the bundles that will not be used.
|
||||
'(begin
|
||||
(for-each (lambda (directory)
|
||||
(delete-file-recursively
|
||||
(string-append "third_party/" directory)))
|
||||
'("brotli" "googletest" "highway"))))))
|
||||
'("brotli" "googletest" "highway" "lcms" "libpng"
|
||||
"zlib"))))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "-DJPEGXL_FORCE_SYSTEM_GTEST=true"
|
||||
"-DJPEGXL_FORCE_SYSTEM_BROTLI=true"
|
||||
;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; requires lcms@2.13
|
||||
"-DJPEGXL_FORCE_SYSTEM_HWY=true")))
|
||||
"-DJPEGXL_FORCE_SYSTEM_LCMS2=true"
|
||||
"-DJPEGXL_FORCE_SYSTEM_HWY=true"
|
||||
"-DJPEGXL_BUNDLE_LIBPNG=false")))
|
||||
(native-inputs
|
||||
(list asciidoc doxygen googletest pkg-config python))
|
||||
(inputs
|
||||
@ -2407,12 +2465,13 @@ Format) file format decoder and encoder.")
|
||||
gflags
|
||||
giflib
|
||||
imath
|
||||
;; lcms ; requires lcms@2.13
|
||||
lcms
|
||||
libavif
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libwebp
|
||||
openexr))
|
||||
openexr
|
||||
zlib))
|
||||
;; These are in Requires.private of libjxl.pc.
|
||||
(propagated-inputs
|
||||
(list brotli google-highway))
|
||||
|
@ -1,5 +1,6 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021, 2022 Olivier Dion <olivier.dion@polymtl.ca>
|
||||
;;; Copyright © 2023 Andy Tai <atai@atai.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -24,6 +25,7 @@
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages commencement)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cpio)
|
||||
#:use-module (gnu packages datastructures)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages elf)
|
||||
@ -314,14 +316,14 @@ coverage.")
|
||||
(define-public lttng-modules
|
||||
(package
|
||||
(name "lttng-modules")
|
||||
(version "2.13.5")
|
||||
(version "2.13.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://lttng.org/files/lttng-modules/"
|
||||
"lttng-modules-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0277yfp57psnvn5g40mk09zryp0r4saynns213qak18fv0l39szc"))))
|
||||
"19xh8nm19vx6c2i1adqpa8q2xsvxn59qxa6z186iywbhr0dgpaqk"))))
|
||||
(build-system linux-module-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
@ -498,6 +500,40 @@ analysis and instrumentation based on Linux perf_events (aka perf) and
|
||||
ftrace.")
|
||||
(license (list license:gpl2))))
|
||||
|
||||
(define-public systemtap
|
||||
(package
|
||||
(name "systemtap")
|
||||
(version "4.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://sourceware.org/ftp/systemtap/releases/" name "-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"161smpv4ajqfncmgylvs89bbix1id60nf0g7clmga2lxxax3646h"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list cpio python))
|
||||
(inputs (list elfutils))
|
||||
|
||||
(home-page "https://sourceware.org/systemtap/")
|
||||
(synopsis "GNU/Linux trace/probe tool")
|
||||
(description
|
||||
"SystemTap provides infrastructure to simplify the
|
||||
gathering of information about the running Linux system. This assists
|
||||
diagnosis of a performance or functional problem. SystemTap eliminates the
|
||||
need for the developer to go through the tedious and disruptive
|
||||
instrument, recompile, install, and reboot sequence that may be otherwise
|
||||
required to collect data.
|
||||
|
||||
SystemTap provides a simple command line interface and scripting language for
|
||||
writing instrumentation for a live running kernel plus user-space applications.
|
||||
We are publishing samples, as well as enlarging the internal \"tapset\" script
|
||||
library to aid reuse and abstraction. SystemTap is a tool for complex
|
||||
tasks that may require live analysis, programmable on-line response, and
|
||||
whole-system symbolic access, and can also handle simple tracing jobs.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public uftrace
|
||||
(package
|
||||
(name "uftrace")
|
||||
|
@ -1493,7 +1493,8 @@ blacklisted.certs.pem"
|
||||
"0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"
|
||||
(source (origin
|
||||
(inherit (package-source base))
|
||||
(patches (search-patches "openjdk-10-setsignalhandler.patch"))))))
|
||||
(patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"
|
||||
"openjdk-10-setsignalhandler.patch"))))))
|
||||
|
||||
(define-public openjdk17
|
||||
(make-openjdk
|
||||
@ -1501,7 +1502,7 @@ blacklisted.certs.pem"
|
||||
"1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs"
|
||||
(source (origin
|
||||
(inherit (package-source base))
|
||||
(patches '())))
|
||||
(patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments openjdk16)
|
||||
((#:phases phases)
|
||||
@ -11240,7 +11241,7 @@ outputting XML data from Java code.")
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"18q3i6jgm6rkw8aysfgihgywrdc5nvijrwnslmi3ww497jvri6ja"))))
|
||||
"0zjqmsad4xk0iar23hdyvx19nxczybd2bh0i35xrafli5cmh720k"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:jar-name "geronimo-xbean-reflect.jar"
|
||||
@ -11291,7 +11292,7 @@ and graphs of objects for dependency injection frameworks")
|
||||
(file-name (string-append name "-" version "-source"))
|
||||
(sha256
|
||||
(base32
|
||||
"119yn795jvnjf52si84q192s8wag1k013iabg78b7wnadssnnh31"))))
|
||||
"1mky4zyl2xsqlgrkairaj5971byvhwk2z9bq8snsgvlr11ydc0zf"))))
|
||||
(build-system ant-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -13,6 +13,7 @@
|
||||
;;; Copyright © 2018, 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
|
||||
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -913,6 +914,11 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:imported-modules `((guix build python-build-system)
|
||||
,@%glib-or-gtk-build-system-modules)
|
||||
#:modules `(((guix build python-build-system) #:select (python-version))
|
||||
(ice-9 textual-ports)
|
||||
,@%glib-or-gtk-build-system-modules)
|
||||
#:tests? #f ; Building the tests already fails.
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
@ -976,7 +982,12 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
||||
;; Create 'soffice' and 'libreoffice' symlinks to the executable
|
||||
;; script.
|
||||
(lambda _
|
||||
(let ((out #$output))
|
||||
(let* ((out #$output)
|
||||
(python-libdir
|
||||
(string-append out "/lib/python"
|
||||
(python-version
|
||||
#$(this-package-input "python"))
|
||||
"/site-packages/")))
|
||||
(define (symlink-output src dst)
|
||||
(mkdir-p (dirname (string-append out dst)))
|
||||
(symlink (string-append out src) (string-append out dst)))
|
||||
@ -1002,6 +1013,24 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
||||
"sysui/desktop/appstream-appdata/"
|
||||
"libreoffice-" app ".appdata.xml")
|
||||
(string-append out "/share/appdata")))
|
||||
(define (install-python-script name)
|
||||
(with-input-from-file
|
||||
(string-append out "/lib/libreoffice/program/" name ".py")
|
||||
(lambda _
|
||||
(let ((file (get-string-all (current-input-port))))
|
||||
(with-output-to-file
|
||||
(string-append python-libdir name ".py")
|
||||
(lambda _
|
||||
(format (current-output-port) "~a"
|
||||
(string-append
|
||||
"import sys, os\n"
|
||||
"sys.path.append('"
|
||||
out "/lib/libreoffice/program" "')\n"
|
||||
"os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:"
|
||||
out "/lib/libreoffice/program/fundamentalrc')\n\n"
|
||||
file)))))))
|
||||
(delete-file
|
||||
(string-append out "/lib/libreoffice/program/" name ".py")))
|
||||
(symlink-output "/lib/libreoffice/program/soffice"
|
||||
"/bin/soffice")
|
||||
(symlink-output "/lib/libreoffice/program/soffice"
|
||||
@ -1016,7 +1045,12 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
||||
'("base" "calc" "draw" "impress" "writer"))
|
||||
(mkdir-p (string-append out "/share/icons/hicolor"))
|
||||
(copy-recursively "sysui/desktop/icons/hicolor"
|
||||
(string-append out "/share/icons/hicolor"))))))
|
||||
(string-append out "/share/icons/hicolor"))
|
||||
(mkdir-p python-libdir)
|
||||
(for-each install-python-script
|
||||
'("access2base" "mailmerge" "msgbox" "officehelper"
|
||||
"pythonloader" "pythonscript" "scriptforge"
|
||||
"unohelper" "uno"))))))
|
||||
#:configure-flags
|
||||
#~(list
|
||||
"--enable-release-build"
|
||||
|
@ -73,6 +73,7 @@
|
||||
;;; Copyright © 2022, 2023 Demis Balbach <db@minikn.xyz>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -485,17 +486,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
;; The current "stable" kernels. That is, the most recently released major
|
||||
;; versions that are still supported upstream.
|
||||
|
||||
(define-public linux-libre-6.3-version "6.3.6")
|
||||
(define-public linux-libre-6.3-version "6.3.8")
|
||||
(define-public linux-libre-6.3-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.3
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.3-version
|
||||
linux-libre-6.3-gnu-revision
|
||||
(base32 "01ivgzq18fwas87q84jx9jipcw58kwdnch7ylwg06d98ncga27px")
|
||||
(base32 "0la20slh52jm4cg4v2liphhqqx4808gm6pfqcxiawj13a4ps9ygk")))
|
||||
(base32 "1i6vyakvqgmr3lcmr0aj8n7lbcksrp4d0rm1sz7cz64hwbsr67pq")))
|
||||
(define-public linux-libre-6.3-pristine-source
|
||||
(let ((version linux-libre-6.3-version)
|
||||
(hash (base32 "1vr418rf0zd16fq4vaxda1w2ccng2n9l0ysakmgz9xqbz86iysks")))
|
||||
(hash (base32 "0m89safyzi0rklsqvii5vkg92rdmvnl4lvyk6m648bhf4lhx88s3")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.3)))
|
||||
@ -503,67 +504,67 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
;; The "longterm" kernels — the older releases with long-term upstream support.
|
||||
;; Here are the support timelines:
|
||||
;; <https://www.kernel.org/category/releases.html>
|
||||
(define-public linux-libre-6.1-version "6.1.32")
|
||||
(define-public linux-libre-6.1-version "6.1.34")
|
||||
(define-public linux-libre-6.1-gnu-revision "gnu")
|
||||
(define deblob-scripts-6.1
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-6.1-version
|
||||
linux-libre-6.1-gnu-revision
|
||||
(base32 "1b96867b46m36l88qnq2d4i9y43ghw97z9jajrh11cvb6kq4xi67")
|
||||
(base32 "1yv15mb278wlrn8gb2yjm0mczirzixy668h221vcpbz416ibxx1m")))
|
||||
(base32 "1qq3nsznblz5fkwahxwq26csmrmjbxh8xknm2z4zw6b6k9svzb1b")))
|
||||
(define-public linux-libre-6.1-pristine-source
|
||||
(let ((version linux-libre-6.1-version)
|
||||
(hash (base32 "0v0saai735jzaj3dbpgp6sbdi95n3lmv78pbg1xy9fd2kfhbg23w")))
|
||||
(hash (base32 "00yniq1smlckp18k3bf6bzys8d7wfbrkdwhikz2fycc0pyy7qvxj")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-6.1)))
|
||||
|
||||
(define-public linux-libre-5.15-version "5.15.115")
|
||||
(define-public linux-libre-5.15-version "5.15.117")
|
||||
(define-public linux-libre-5.15-gnu-revision "gnu")
|
||||
(define deblob-scripts-5.15
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.15-version
|
||||
linux-libre-5.15-gnu-revision
|
||||
(base32 "0w5wyw8zp124nwydjvpnih7q3lp7gadlgsw60syw45nqq0afvlz3")
|
||||
(base32 "00n8c7ghfs36bvz0yjw6w9daf5zcgj94kxxn27bfyfm274rkddmz")))
|
||||
(base32 "1zljgvzr8irs3acq436i2iyana9vgx4k1pm3id4rz0fbaqfma602")))
|
||||
(define-public linux-libre-5.15-pristine-source
|
||||
(let ((version linux-libre-5.15-version)
|
||||
(hash (base32 "050j9z0wg5glgxwbmzfq4l8lv8y7g3nc2rz8342yjdcjfxh6h1qv")))
|
||||
(hash (base32 "17r3yyy4yzxyi4n1ri3sb42m9y1vnn4dcc0zli04n00f7hgk7a59")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.15)))
|
||||
|
||||
(define-public linux-libre-5.10-version "5.10.182")
|
||||
(define-public linux-libre-5.10-version "5.10.184")
|
||||
(define-public linux-libre-5.10-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.10
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.10-version
|
||||
linux-libre-5.10-gnu-revision
|
||||
(base32 "0mw7qn77y9c6wrnw4rjvf75cpm1w6n1aqqhf8cnghcb97p2yxxrf")
|
||||
(base32 "12jhak2bw1jy2jk70vrm66kjvh0cd6c8f2qiy2bk40rq7bf62mr6")))
|
||||
(base32 "1739xvyzi3i7d12mvsvnqa7208pvwfss43kzin71l9svw0405vp5")))
|
||||
(define-public linux-libre-5.10-pristine-source
|
||||
(let ((version linux-libre-5.10-version)
|
||||
(hash (base32 "1xp9bxk2vyw29bq3z854ly4cj94z8i52yl5hq4a3l3j6564wb3ny")))
|
||||
(hash (base32 "0219qv9rxg4fi7w2s0s9y7ggral40wm2riis58hmg80z3nybxabp")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.10)))
|
||||
|
||||
(define-public linux-libre-5.4-version "5.4.245")
|
||||
(define-public linux-libre-5.4-version "5.4.247")
|
||||
(define-public linux-libre-5.4-gnu-revision "gnu1")
|
||||
(define deblob-scripts-5.4
|
||||
(linux-libre-deblob-scripts
|
||||
linux-libre-5.4-version
|
||||
linux-libre-5.4-gnu-revision
|
||||
(base32 "1nlgk8ajb5wl3aa96h9a0pb9j5a5wmrbpk63varn557x1d00r7wj")
|
||||
(base32 "070j069sj6spy2wkzfzm1d5jd7pffm0s1m917wblc8d3x8pbgvf8")))
|
||||
(base32 "0ll19zlgx5sbr7gvi93lgavrnzlgv6dpj2yp2x63fj6vdba5iwgc")))
|
||||
(define-public linux-libre-5.4-pristine-source
|
||||
(let ((version linux-libre-5.4-version)
|
||||
(hash (base32 "195ixy9l18mhwvzj7v63fkyifb9mysq950afxh6ixlpvg0c8h1wn")))
|
||||
(hash (base32 "1mzyzxfsqp085qx17wp9xz7z4w79kks0jpdba7mx8k9i097hs09k")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-5.4)))
|
||||
|
||||
(define-public linux-libre-4.19-version "4.19.284")
|
||||
(define-public linux-libre-4.19-version "4.19.286")
|
||||
(define-public linux-libre-4.19-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.19
|
||||
(linux-libre-deblob-scripts
|
||||
@ -573,12 +574,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "05yqb59gj7mq5ha9xg045bz517sdg6janfa2yjq70qa6ahpc5fac")))
|
||||
(define-public linux-libre-4.19-pristine-source
|
||||
(let ((version linux-libre-4.19-version)
|
||||
(hash (base32 "0gnhgxcpx9s96wa3dqgxmdjb7x12i94yh0gmv7k9nbz5qwhfxfbz")))
|
||||
(hash (base32 "1788a68fbga03nkgbvai2bi89v826915829727j4zcilyc21b127")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.19)))
|
||||
|
||||
(define-public linux-libre-4.14-version "4.14.316")
|
||||
(define-public linux-libre-4.14-version "4.14.318")
|
||||
(define-public linux-libre-4.14-gnu-revision "gnu1")
|
||||
(define deblob-scripts-4.14
|
||||
(linux-libre-deblob-scripts
|
||||
@ -588,7 +589,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
||||
(base32 "1ccggm19nl7pdcxmsm08fkqy8phz8rqfmww5ypizibdmnrmpn2v9")))
|
||||
(define-public linux-libre-4.14-pristine-source
|
||||
(let ((version linux-libre-4.14-version)
|
||||
(hash (base32 "0xlg93va7dbz2w428kiw7vr2sds3542fqq57rwyf51ykq7qii0xc")))
|
||||
(hash (base32 "1g0i68q7xjcjqigwza60i8rqhxsd1l86czqnjv5312lvg5z34fn6")))
|
||||
(make-linux-libre-source version
|
||||
(%upstream-linux-source version hash)
|
||||
deblob-scripts-4.14)))
|
||||
@ -9175,7 +9176,7 @@ types and interfaces and translates so that the X server can use them.")
|
||||
(define-public pipewire
|
||||
(package
|
||||
(name "pipewire")
|
||||
(version "0.3.63")
|
||||
(version "0.3.70")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -9184,18 +9185,20 @@ types and interfaces and translates so that the X server can use them.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pkngynvhxc6iyv75gsyqjy18ky4si9dhvpavb9xwq5xj71nj0hr"))))
|
||||
"1n74rrbwymm89ri4daa4v092f4b81wrak4vg685xfz2wl89p64n6"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags
|
||||
#~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d")
|
||||
"-Dsystemd=disabled"
|
||||
"-Dman=enabled"
|
||||
"-Drlimits-install=false"
|
||||
"-Dsession-managers=[]"
|
||||
"-Dsysconfdir=/etc"
|
||||
"-Dman=enabled")))
|
||||
"-Dsystemd=disabled")))
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
(list `(,glib "bin")
|
||||
pkg-config
|
||||
python-docutils))
|
||||
(inputs (list alsa-lib
|
||||
avahi
|
||||
@ -9235,7 +9238,7 @@ of Linux application development.")
|
||||
(define-public wireplumber
|
||||
(package
|
||||
(name "wireplumber")
|
||||
(version "0.4.13")
|
||||
(version "0.4.14")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -9245,7 +9248,7 @@ of Linux application development.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "07psjb7rxsigwnwnzmw2y767vhyyha7cn8i8dgq80rzhwgl0sgv7"))))
|
||||
(base32 "0jmnd6000j4wx68lxgz5b4g4hxkf243ivi9swaaf8rnx99cbx91w"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dsystemd=disabled"
|
||||
@ -9734,6 +9737,41 @@ These trace events are logged in @file{/sys/kernel/debug/tracing} and reported
|
||||
through standard log mechanisms like syslog.")
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public renameat2
|
||||
;; This is a Gist, with no release or tags.
|
||||
(let ((revision "0")
|
||||
(commit "5c5193f20142511a5fc7069a539f4e5aba0ea470"))
|
||||
(package
|
||||
(name "renameat2")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://gist.githubusercontent.com/"
|
||||
"eatnumber1/f97ac7dad7b1f5a9721f/raw/"
|
||||
commit "/renameat2.c"))
|
||||
(sha256
|
||||
(base32
|
||||
"07b4hsxqjm610sdkm4nxhp0gnl2s7gzlh4zdnja5ay40v4x24bb9"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;no test suite
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(invoke #$(cc-for-target) "renameat2.c"
|
||||
"-o" "renameat2")))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(install-file "renameat2"
|
||||
(string-append #$output "/bin")))))))
|
||||
(home-page "https://gist.github.com/eatnumber1/f97ac7dad7b1f5a9721f")
|
||||
(synopsis "Command to call the renameat2 Linux system call")
|
||||
(description "This package provides a @command{renameat2} command that
|
||||
calls the Linux-specific @code{renameat2} system call.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public libgpiod
|
||||
(package
|
||||
(name "libgpiod")
|
||||
@ -9820,6 +9858,7 @@ formats.")
|
||||
(url "https://github.com/haampie/libtree")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "libtree-fix-check-non-x86.patch"))
|
||||
(sha256
|
||||
(base32 "1jbc60cslzcfxk9jwva51ncr1zl1nz0fkgfjdckgv81is11nswmb"))))
|
||||
(arguments
|
||||
|
@ -11717,20 +11717,20 @@ be used with @code{cl-yacc}.")
|
||||
(sbcl-package->ecl-package sbcl-cl-lex))
|
||||
|
||||
(define-public sbcl-cl-colors2
|
||||
(let ((commit "d620e7fb504bbec3ed48cc7cd03f60ce2bb3735d")
|
||||
(revision "2"))
|
||||
(let ((commit "cc03badf5f69be65ae7e13c2f9a7c16838ab8241")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "sbcl-cl-colors2")
|
||||
(version (git-version "0.5.0" revision commit))
|
||||
(version (git-version "0.5.4" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://notabug.org/cage/cl-colors2.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(file-name (git-file-name "cl-colors2" version))
|
||||
(sha256
|
||||
(base32 "14wx006lv4bhf86z68484kphm5jsh86ns60pb4i1bi8kl8lp03r0"))))
|
||||
(base32 "1l7sl7nnvq13xmss9wwkhcq123bsylskxjrijwfkqp6sm02gbd15"))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(native-inputs
|
||||
(list sbcl-clunit2))
|
||||
@ -11741,11 +11741,10 @@ be used with @code{cl-yacc}.")
|
||||
"This is a very simple color library for Common Lisp, providing:
|
||||
|
||||
@itemize
|
||||
@item Types for representing colors in HSV and RGB spaces.
|
||||
@item Simple conversion functions between the above types (and also
|
||||
hexadecimal representation for RGB).
|
||||
@item Some predefined colors (currently X11 color names -- of course
|
||||
the library does not depend on X11).
|
||||
@item Types for representing colors in HSV, HSL, and RGB spaces.
|
||||
@item Simple conversion functions between the above types.
|
||||
@item Function printing colors to HEX, RGB, RGBA, and HSL.
|
||||
@item Predefined colors from X11, SVG, and GDK.
|
||||
@end itemize\n")
|
||||
(home-page "https://notabug.org/cage/cl-colors2")
|
||||
(license license:boost1.0))))
|
||||
@ -25684,7 +25683,7 @@ desktop files to the right directories.
|
||||
(define-public sbcl-nclasses
|
||||
(package
|
||||
(name "sbcl-nclasses")
|
||||
(version "0.5.0")
|
||||
(version "0.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -25694,7 +25693,7 @@ desktop files to the right directories.
|
||||
(file-name (git-file-name "cl-nclasses" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0aym0m12s5px139ragna0pr8jan8bx3akhjgamj6h0y28xksziji"))
|
||||
"0kp5wim5frr4l52rgchaz1cj74daqngagrz3r0lgasii6bwlzsi6"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
`(begin
|
||||
|
@ -993,7 +993,7 @@ the HTML documentation of TXR.")
|
||||
(define-public txr
|
||||
(package
|
||||
(name "txr")
|
||||
(version "287")
|
||||
(version "288")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -1002,7 +1002,7 @@ the HTML documentation of TXR.")
|
||||
(commit (string-append "txr-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0bwa40l5c0dnpcpfbysqbv8ch58sycbb31dnskmhr387jlv938dl"))))
|
||||
(base32 "0an26zffdaw9m673i077r2bw061mhzv4lz4z127sgda5gvg999mf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
@ -1433,7 +1433,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
||||
(define-public eisl
|
||||
(package
|
||||
(name "eisl")
|
||||
(version "2.72")
|
||||
(version "3.00")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -1442,7 +1442,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "12dc6b70dcfalyq3h5i7lmz39xh310k5p83x5q6j18knd6ql9ik9"))))
|
||||
(base32 "0nppbzfdx4cjy72b4n0yk177i7063a0nhsrs9b1y45y4avbrbl00"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list bash-minimal freeglut gdbm libiconv ncurses tcl tk))
|
||||
|
@ -1,6 +1,6 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
@ -239,7 +239,7 @@ classification.")
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qbq1rqp94l530f043qzp8aw5lj7dng9wq0miffd7spd1ff638wq"))))
|
||||
"07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:imported-modules (,@%gnu-build-system-modules
|
||||
@ -708,6 +708,51 @@ SentencePiece allows us to make a purely end-to-end system that does not
|
||||
depend on language-specific pre- or post-processing.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-sacrebleu
|
||||
(package
|
||||
(name "python-sacrebleu")
|
||||
(version "2.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mjpost/sacrebleu")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1al4qf9wsq5l453qqb6clims62ns0s07wb9rfbf4hbpr1f2iv7zv"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
;; These all need internet access.
|
||||
'(list "-k" "not test_api_get_source \
|
||||
and not test_api_get_reference \
|
||||
and not test_maybe_download \
|
||||
and not test_process_to_text \
|
||||
and not test_get_files_and_fieldnames \
|
||||
and not test_source_and_references \
|
||||
and not test_wmt22_references")
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
;; Needed for tests.
|
||||
(add-before 'check 'set-HOME
|
||||
(lambda _ (setenv "HOME" "/tmp"))))))
|
||||
(propagated-inputs (list python-colorama
|
||||
python-lxml
|
||||
python-numpy
|
||||
python-portalocker
|
||||
python-regex
|
||||
python-tabulate))
|
||||
(native-inputs (list python-pytest))
|
||||
(home-page "https://github.com/mjpost/sacrebleu")
|
||||
(synopsis
|
||||
"Compute shareable, comparable, and reproducible BLEU, chrF, and TER scores")
|
||||
(description
|
||||
"This is a package for hassle-free computation of shareable, comparable,
|
||||
and reproducible BLEU, chrF, and TER scores for natural language processing.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-sentencepiece
|
||||
(package
|
||||
(name "python-sentencepiece")
|
||||
@ -2349,7 +2394,7 @@ Python.")
|
||||
;; "ZIP does not support timestamps before 1980". Luckily,
|
||||
;; SOURCE_DATE_EPOCH is respected, which we set to some time in
|
||||
;; 1980.
|
||||
(lambda _ (setenv "SOURCE_DATE_EPOCH" "315532800") #t))
|
||||
(lambda _ (setenv "SOURCE_DATE_EPOCH" "315532800")))
|
||||
(add-after 'unpack 'python3.10-compatibility
|
||||
(lambda _
|
||||
;; See https://github.com/tensorflow/tensorflow/issues/20517#issuecomment-406373913
|
||||
@ -2390,6 +2435,8 @@ Python.")
|
||||
(substitute* "tensorflow/python/keras/callbacks.py"
|
||||
(("from collections import Iterable")
|
||||
"from collections.abc import Iterable"))
|
||||
(substitute* "tensorflow/python/ops/variable_scope.py"
|
||||
(("collections_lib.Sequence") "collections_lib.abc.Sequence"))
|
||||
|
||||
;; XXX: it is not clear if this is a good idea, but the build
|
||||
;; system tries to overwrite the __or__ and __ror__ methods of
|
||||
@ -2405,7 +2452,20 @@ Python.")
|
||||
(("void BinaryUFunc\\(char\\*\\* args, npy_intp\\* dimensions, npy_intp\\* steps,")
|
||||
"void BinaryUFunc(char** args, npy_intp const* dimensions, npy_intp const* steps,")
|
||||
(("void CompareUFunc\\(char\\*\\* args, npy_intp\\* dimensions, npy_intp\\* steps,")
|
||||
"void CompareUFunc(char** args, npy_intp const* dimensions, npy_intp const* steps,"))))
|
||||
"void CompareUFunc(char** args, npy_intp const* dimensions, npy_intp const* steps,"))
|
||||
|
||||
;; ...and for numpy >= 1.23
|
||||
(substitute* "tensorflow/python/framework/tensor_util.py"
|
||||
(("np.asscalar\\(x\\[0\\]\\)") "x[0].item()")
|
||||
(("np.asscalar\\(x\\)") "x.item()")
|
||||
(("np.asscalar\\(v\\)") "np.ndarray.item(v)")
|
||||
(("return np.asscalar") "return np.ndarray.item"))
|
||||
(substitute* "tensorflow/python/kernel_tests/cwise_ops_test.py"
|
||||
(("np.asscalar\\(np.random.rand\\(1\\) \\* 100.\\)")
|
||||
"(np.random.rand(1) * 100.).item()"))
|
||||
(substitute* '("tensorflow/python/framework/fast_tensor_util.pyx"
|
||||
"tensorflow/python/estimator/canned/linear_testing_utils.py")
|
||||
(("np.asscalar") "np.ndarray.item"))))
|
||||
(add-after 'python3.10-compatibility 'chdir
|
||||
(lambda _ (chdir "tensorflow/contrib/cmake")))
|
||||
(add-after 'chdir 'disable-downloads
|
||||
@ -2749,15 +2809,15 @@ DESTINATION include/tensorflow/c FILES_MATCHING PATTERN \"*.h\")\n" m)))))
|
||||
("swig" ,swig)
|
||||
("unzip" ,unzip)))
|
||||
(propagated-inputs
|
||||
`(("python-absl-py" ,python-absl-py)
|
||||
("python-astor" ,python-astor)
|
||||
("python-gast" ,python-gast)
|
||||
("python-grpcio" ,python-grpcio)
|
||||
("python-numpy" ,python-numpy)
|
||||
("python-protobuf" ,python-protobuf-3.6)
|
||||
("python-six" ,python-six)
|
||||
("python-termcolo" ,python-termcolor)
|
||||
("python-wheel" ,python-wheel)))
|
||||
(list python-absl-py
|
||||
python-astor
|
||||
python-gast
|
||||
python-grpcio
|
||||
python-numpy
|
||||
python-protobuf-3.6
|
||||
python-six
|
||||
python-termcolor
|
||||
python-wheel))
|
||||
(inputs
|
||||
`(("c-ares" ,c-ares)
|
||||
("eigen" ,eigen-for-tensorflow)
|
||||
@ -3161,46 +3221,115 @@ with image data, text data, and sequence data.")
|
||||
(define-public python-keras
|
||||
(package
|
||||
(name "python-keras")
|
||||
(version "2.2.4")
|
||||
(version "2.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Keras" version))
|
||||
(patches (search-patches "python-keras-integration-test.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j8bsqzh49vjdxy6l1k4iwax5vpjzniynyd041xjavdzvfii1dlh"))))
|
||||
"1k68xd8n2y9ldijggjc8nn4d6d1axw0p98gfb0fmm8h641vl679j"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(substitute* '("keras/callbacks/callbacks.py"
|
||||
"keras/engine/training_utils.py"
|
||||
"keras/engine/training.py"
|
||||
"keras/engine/training_generator.py"
|
||||
"keras/utils/generic_utils.py")
|
||||
(("from collections import Iterable")
|
||||
"from collections.abc import Iterable")
|
||||
(("collections.Container")
|
||||
"collections.abc.Container")
|
||||
(("collections.Mapping")
|
||||
"collections.abc.Mapping")
|
||||
(("collections.Sequence")
|
||||
"collections.abc.Sequence")))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'remove-tests-for-unavailable-features
|
||||
(add-after 'unpack 'tf-compatibility
|
||||
(lambda _
|
||||
(substitute* "keras/backend/tensorflow_backend.py"
|
||||
(("^get_graph = .*")
|
||||
"get_graph = tf.get_default_graph")
|
||||
(("tf.compat.v1.nn.fused_batch_norm")
|
||||
"tf.nn.fused_batch_norm")
|
||||
;; categorical_crossentropy does not support axis
|
||||
(("from_logits=from_logits, axis=axis")
|
||||
"from_logits=from_logits")
|
||||
;; dropout accepts a level number, not a named rate argument.
|
||||
(("dropout\\(x, rate=level,")
|
||||
"dropout(x, level,")
|
||||
(("return x.shape.rank")
|
||||
"return len(x.shape)"))))
|
||||
(add-after 'unpack 'hdf5-compatibility
|
||||
(lambda _
|
||||
;; The truth value of an array with more than one element is ambiguous.
|
||||
(substitute* "tests/keras/utils/io_utils_test.py"
|
||||
((" *assert .* == \\[b'(asd|efg).*") ""))
|
||||
(substitute* "tests/test_model_saving.py"
|
||||
(("h5py.File\\('does not matter',")
|
||||
"h5py.File('does not matter', 'w',"))
|
||||
(substitute* "keras/utils/io_utils.py"
|
||||
(("h5py.File\\('in-memory-h5py', driver='core', backing_store=False\\)")
|
||||
"h5py.File('in-memory-h5py', 'w', driver='core', backing_store=False)")
|
||||
(("h5file.fid.get_file_image")
|
||||
"h5file.id.get_file_image"))
|
||||
(substitute* "keras/engine/saving.py"
|
||||
(("\\.decode\\('utf-?8'\\)") ""))))
|
||||
(add-after 'unpack 'delete-unavailable-backends
|
||||
(lambda _
|
||||
(delete-file "keras/backend/theano_backend.py")
|
||||
(delete-file "keras/backend/cntk_backend.py")
|
||||
(delete-file "tests/keras/backend/backend_test.py")
|
||||
;; FIXME: This doesn't work because Tensorflow is missing the
|
||||
;; coder ops library.
|
||||
(delete-file "tests/keras/test_callbacks.py")))
|
||||
(delete-file "keras/backend/cntk_backend.py")))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
;; These tests attempt to download data files from the internet.
|
||||
(delete-file "tests/integration_tests/test_datasets.py")
|
||||
(delete-file "tests/integration_tests/imagenet_utils_test.py")
|
||||
;; Backport https://github.com/keras-team/keras/pull/12479.
|
||||
(substitute* "tests/keras/engine/test_topology.py"
|
||||
(("np.ones\\(\\(3, 2\\)\\)")
|
||||
"1."))
|
||||
(invoke "python" "-m" "pytest" "tests"
|
||||
"-p" "no:pep8"
|
||||
;; FIXME: python-build-system lacks PARALLEL-TESTS?
|
||||
"-n" (number->string (parallel-job-count))
|
||||
;; This one uses the theano backend that we don't have.
|
||||
"--ignore=tests/test_api.py"
|
||||
"--ignore=tests/keras/backend/backend_test.py"
|
||||
;; Our Tensorflow version does not have the coder ops library.
|
||||
"--ignore=tests/keras/callbacks/callbacks_test.py"
|
||||
;; ...nor do we have tensorboard
|
||||
"--ignore=tests/keras/callbacks/tensorboard_test.py"
|
||||
"-k"
|
||||
(string-append
|
||||
;; See https://github.com/keras-team/keras/pull/7033
|
||||
"not test_TimeDistributed_learning_phase "
|
||||
;; XXX fails because no closure is provided
|
||||
"and not test_func_dump_and_load_backwards_compat "
|
||||
;; XXX real bug? These are all tests that fail due to
|
||||
;; shape mismatch, e.g. "got logits shape [12,3] and
|
||||
;; labels shape [9]"
|
||||
"and not test_model_with_crossentropy_losses_channels_first "
|
||||
"and not test_masking_correctness_output_size_not_equal_to_first_state_size "
|
||||
"and not test_convolutional_recurrent "
|
||||
"and not test_axis "
|
||||
|
||||
;; XXX fails because of 3/15 values have unexpected differences.
|
||||
"and not test_masking_correctness_output_not_equal_to_first_state "
|
||||
;; XXX fails because of a difference of about 0.1
|
||||
"and not test_sample_weighted "
|
||||
;; XXX fails because of a difference of about 0.3
|
||||
"and not test_scalar_weighted "
|
||||
;; XXX fails because of a difference of about 0.2
|
||||
"and not test_unweighted "
|
||||
|
||||
;; XXX I cannot reproduce this in an interactive
|
||||
;; Python session, because l2_norm works just fine.
|
||||
"and not test_weighted " ;TestCosineSimilarity
|
||||
"and not test_config " ;TestCosineSimilarity
|
||||
|
||||
;; The following test fails only in the build
|
||||
;; container; skip it.
|
||||
"not test_selu "
|
||||
"and not test_selu "
|
||||
;; The following test was found flaky and removed in
|
||||
;; recent versions.
|
||||
"and not test_stateful_metrics"))))))))
|
||||
@ -3216,12 +3345,15 @@ with image data, text data, and sequence data.")
|
||||
tensorflow
|
||||
graphviz))
|
||||
(native-inputs
|
||||
(list python-pandas
|
||||
(list python-flaky
|
||||
python-markdown
|
||||
python-pandas
|
||||
python-pytest
|
||||
python-pytest-cov
|
||||
python-pytest-pep8
|
||||
python-pytest-timeout
|
||||
python-pytest-xdist
|
||||
python-pyux
|
||||
python-sphinx
|
||||
python-requests))
|
||||
(home-page "https://github.com/keras-team/keras")
|
||||
|
@ -275,14 +275,14 @@ example, modify the message headers or body, or encrypt or sign the message.")
|
||||
(define-public mailutils
|
||||
(package
|
||||
(name "mailutils")
|
||||
(version "3.15")
|
||||
(version "3.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/mailutils/mailutils-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nrd9wsidxami3wa86l9z8hnnwv6rhbxdkvqg7dcgz2jqf3c5l5p"))
|
||||
"1h02l0zilxsak1sxpm15vhfaahd8rwvcksc88cc7c0wc626ia784"))
|
||||
(patches
|
||||
(search-patches "mailutils-variable-lookup.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
@ -1208,7 +1208,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
||||
(define-public mu
|
||||
(package
|
||||
(name "mu")
|
||||
(version "1.10.2")
|
||||
(version "1.10.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -1216,7 +1216,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
|
||||
version "/mu-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mj43lnxr11wg354q8svcqjc403b36igb7ia406yavw6xfk46w9f"))))
|
||||
"0pr4w2afhansi151lx3145rsaf3gxfjx21y26p8jfg0nnvy70ff8"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config
|
||||
@ -3175,14 +3175,14 @@ from the Cyrus IMAP project.")
|
||||
(define-public opensmtpd
|
||||
(package
|
||||
(name "opensmtpd")
|
||||
(version "6.8.0p2")
|
||||
(version "7.3.0p0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.opensmtpd.org/archives/"
|
||||
"opensmtpd-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi"))))
|
||||
(base32 "1rnaa022pkdc15vkvlisv42dvcxchib40h0m97myfyqjralabmrd"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list bdb
|
||||
@ -3205,13 +3205,6 @@ from the Cyrus IMAP project.")
|
||||
"--with-table-db")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; See: https://github.com/OpenSMTPD/OpenSMTPD/issues/1069.
|
||||
(add-after 'unpack 'fix-smtpctl-encrypt-bug
|
||||
(lambda _
|
||||
(substitute* "usr.sbin/smtpd/smtpctl.c"
|
||||
(("\"encrypt\", \"--\",")
|
||||
"\"encrypt\","))
|
||||
#t))
|
||||
;; Fix some incorrectly hard-coded external tool file names.
|
||||
(add-after 'unpack 'patch-FHS-file-names
|
||||
(lambda _
|
||||
@ -3219,8 +3212,7 @@ from the Cyrus IMAP project.")
|
||||
;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't.
|
||||
(("/bin/cat") (which "cat")))
|
||||
(substitute* "usr.sbin/smtpd/mda_unpriv.c"
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))
|
||||
(("/bin/sh") (which "sh")))))
|
||||
;; OpenSMTPD provides a single smtpctl utility to control both the
|
||||
;; daemon and the local submission subsystem. To accomodate systems
|
||||
;; that require historical interfaces such as sendmail, newaliases or
|
||||
@ -3233,8 +3225,7 @@ from the Cyrus IMAP project.")
|
||||
(for-each (lambda (command)
|
||||
(symlink "smtpctl" (string-append sbin command)))
|
||||
(list "mailq" "makemap" "newaliases"
|
||||
"send-mail" "sendmail")))
|
||||
#t)))))
|
||||
"send-mail" "sendmail"))))))))
|
||||
(synopsis "Lightweight SMTP daemon")
|
||||
(description
|
||||
"OpenSMTPD is an implementation of server-side @acronym{SMTP, Simple Mail
|
||||
|
@ -3,7 +3,7 @@
|
||||
;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2018, 2019, 2021, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
@ -626,7 +626,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||
#~("AR=gcc-ar" "RANLIB=gcc-ranlib")
|
||||
#~())
|
||||
|
||||
#$@(if (hurd-target?)
|
||||
#$@(if (target-hurd?)
|
||||
#~("--disable-jit")
|
||||
#~())))
|
||||
((#:phases phases '%standard-phases)
|
||||
|
@ -32,12 +32,14 @@
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python-check)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages time))
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages xml))
|
||||
|
||||
(define-public toot
|
||||
(package
|
||||
@ -81,6 +83,52 @@ Features include:
|
||||
@end itemize")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public tuba
|
||||
(package
|
||||
(name "tuba")
|
||||
(version "0.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/GeopJr/Tuba")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1xhyz6wi17g4m76lr6qc75q4xnnw7c3dh3d04dg8m5gzk6j0y89x"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
#:configure-flags (list "-Ddistro=true")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'glib-or-gtk-wrap 'symlink-package
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(with-directory-excursion
|
||||
(string-append (assoc-ref outputs "out") "/bin")
|
||||
(symlink "dev.geopjr.Tuba" "tuba")))))))
|
||||
(native-inputs
|
||||
(list gettext-minimal
|
||||
`(,glib "bin") ; for glib-compile-resources
|
||||
pkg-config))
|
||||
(inputs
|
||||
(list gtk
|
||||
gtksourceview
|
||||
json-glib
|
||||
libadwaita
|
||||
libgee
|
||||
libsoup-minimal
|
||||
libsecret
|
||||
libwebp
|
||||
libxml2
|
||||
vala))
|
||||
(home-page "https://tuba.geopjr.dev/")
|
||||
(synopsis "GTK client for Mastodon")
|
||||
(description "Tuba is a GTK client for Mastodon. It provides a clean,
|
||||
native interface that allows you to integrate Mastodon's social experience
|
||||
seamlessly with your desktop environment.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public tootle
|
||||
(package
|
||||
(name "tootle")
|
||||
|
@ -1029,6 +1029,7 @@ large scale eigenvalue problems.")
|
||||
(arguments
|
||||
`(#:configure-flags (list
|
||||
"-DBUILD_SHARED_LIBS:BOOL=YES"
|
||||
"-DCBLAS=ON"
|
||||
"-DLAPACKE=ON"
|
||||
;; Build the 'LAPACKE_clatms' functions.
|
||||
"-DLAPACKE_WITH_TMG=ON"
|
||||
@ -2785,7 +2786,7 @@ can solve two kinds of problems:
|
||||
(define-public octave-cli
|
||||
(package
|
||||
(name "octave-cli")
|
||||
(version "8.1.0")
|
||||
(version "8.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@ -2793,7 +2794,7 @@ can solve two kinds of problems:
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00lis18dsb13v9nvz0z4cs7v4y634jc0vb04lxfw9pshwriikglv"))))
|
||||
"1pkh4vmq4hcrmyl2gybd54i3qamyvmcjmpgy1i2kkw2g03jxdfdp"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
|
@ -2424,6 +2424,10 @@ reporting or the build process.")))
|
||||
(substitute-keyword-arguments (package-arguments maven-model-builder)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'add-components-shebang
|
||||
(lambda _
|
||||
(substitute* "components.sh"
|
||||
(("^## T") "#!/bin/sh\n## T"))))
|
||||
(add-before 'build 'generate-components.xml
|
||||
(lambda _
|
||||
(mkdir-p "build/classes/META-INF/plexus")
|
||||
|
@ -436,7 +436,8 @@ TCP sessions from existing clients.")
|
||||
python-pygments
|
||||
python-pyinotify
|
||||
python-qrcode
|
||||
python-slixmpp))
|
||||
python-slixmpp
|
||||
python-typing-extensions))
|
||||
(synopsis "Console Jabber/XMPP Client")
|
||||
(description "Poezio is a free console XMPP client (the protocol on which
|
||||
the Jabber IM network is built).
|
||||
|
@ -791,7 +791,7 @@ provides a simple Python client for the StatsD daemon.")
|
||||
(define-public batsignal
|
||||
(package
|
||||
(name "batsignal")
|
||||
(version "1.6.0")
|
||||
(version "1.6.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -800,7 +800,7 @@ provides a simple Python client for the StatsD daemon.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0b1j6mljnqgxwr3id3r9shzhsjk5r0qdh9cxkvy1dm4kzbyc4dxq"))))
|
||||
"0f8jabql70nxkslgxd8pcfllqy4bnbf1c19rcri0dp054aszk637"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:make-flags
|
||||
|
@ -159,6 +159,7 @@
|
||||
#:use-module (gnu packages mpd)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages netpbm)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages pdf)
|
||||
#:use-module (gnu packages perl)
|
||||
@ -7095,7 +7096,7 @@ choice.")
|
||||
(define-public musikcube
|
||||
(package
|
||||
(name "musikcube")
|
||||
(version "0.96.10")
|
||||
(version "3.0.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -7104,13 +7105,12 @@ choice.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"06myr83x8jvzlzchg3jsw1163n2lcsbmb176zgnx7xxa26jpdbh1"))))
|
||||
"09q15xlssgg67zg5m0q574k3al2pdjdnm1580mlf0wzr6a021fnd"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; No test suite
|
||||
#:configure-flags
|
||||
'("-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DENABLE_BUNDLED_TAGLIB=false"
|
||||
;; Use the "wide" ncurses headers but don't look for them in an
|
||||
;; ncursesw directory. For more info:
|
||||
;; https://github.com/clangen/musikcube/wiki/building#compiler-cannot-find-ncurseswcursesh
|
||||
@ -7118,7 +7118,7 @@ choice.")
|
||||
;; We will strip the binaries ourselves in the 'strip' phase.
|
||||
"-DDISABLE_STRIP=true")))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(list asio pkg-config))
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
boost
|
||||
@ -7126,10 +7126,14 @@ choice.")
|
||||
ffmpeg-4
|
||||
lame
|
||||
libev
|
||||
libgme
|
||||
libmicrohttpd
|
||||
libogg
|
||||
libopenmpt
|
||||
ncurses
|
||||
libvorbis
|
||||
ncurses/tinfo
|
||||
openssl
|
||||
pipewire
|
||||
pulseaudio
|
||||
taglib
|
||||
zlib))
|
||||
@ -7150,6 +7154,8 @@ streaming audio server.")
|
||||
(url "https://github.com/quodlibet/quodlibet")
|
||||
(commit (string-append "release-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches "quodlibet-fix-invalid-glob.patch"
|
||||
"quodlibet-fix-mtime-tests.patch"))
|
||||
(sha256
|
||||
(base32 "1i5k93k3bfp7hpcwkbr865mbj9jam3jv2a5k1bazcyp4f5vdrb0v"))))
|
||||
(build-system python-build-system)
|
||||
@ -7173,9 +7179,7 @@ streaming audio server.")
|
||||
"--ignore=tests/test_browsers_iradio.py"
|
||||
;; broken upstream
|
||||
"--disable-warnings"
|
||||
"--ignore=tests/quality"
|
||||
;; missing legacy icons in adwaita-icon-theme
|
||||
"--ignore=tests/plugin/test_trayicon.py")
|
||||
"--ignore=tests/quality/test_flake8.py")
|
||||
(format #t "test suite not run~%"))))
|
||||
(add-after 'install 'glib-or-gtk-wrap ; ensure icons loaded
|
||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
|
||||
|
@ -4505,7 +4505,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send
|
||||
(define-public phantomsocks
|
||||
(package
|
||||
(name "phantomsocks")
|
||||
(version "0.0.0-20230223180716-34d21f24a9eb")
|
||||
(version "0.0.0-20230405135900-a54ae9f3611e")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -4514,7 +4514,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zfkqiimqwg89njqm9qbwki3fgy0rqx8wr95hq813zk0rf3bj1ka"))))
|
||||
"1qgv8dcrsyzjzppvdk0n5kkyaypcjm1hcn9lb29ahvbhm70cpm6a"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:install-source? #f
|
||||
|
@ -12,7 +12,7 @@
|
||||
;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
|
||||
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
||||
@ -171,8 +171,8 @@
|
||||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||
;; start precisely like this.
|
||||
(let ((version "1.4.0")
|
||||
(commit "dc5430c9dc20ee53441995d9a89a90b0a86aeed3")
|
||||
(revision 6))
|
||||
(commit "44bbfc24e4bcc48d0e3343cd3d83452721af8c36")
|
||||
(revision 7))
|
||||
(package
|
||||
(name "guix")
|
||||
|
||||
@ -188,7 +188,7 @@
|
||||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"192jxca7gdf8451kac58fq1f2rxn3624krmhz04bh7ln2sp5q0yd"))
|
||||
"08gq04pphapr3i0gzdilp8l87rpxlh2p768qrn1fw92fmw727xf7"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
@ -216,7 +216,7 @@
|
||||
;; choose a fixed-width and short directory name
|
||||
;; for tests.
|
||||
"ac_cv_guix_test_root=/tmp/guix-tests"
|
||||
,@(if (hurd-target?) '("--with-courage") '()))
|
||||
,@(if (target-hurd?) '("--with-courage") '()))
|
||||
#:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
|
||||
|
||||
#:modules ((guix build gnu-build-system)
|
||||
@ -416,7 +416,7 @@ $(prefix)/etc/openrc\n")))
|
||||
;; cross-compilation.
|
||||
("guile" ,guile-3.0-latest) ;for faster builds
|
||||
("guile-gnutls" ,guile-gnutls)
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'()
|
||||
`(("guile-avahi" ,guile-avahi)))
|
||||
("guile-gcrypt" ,guile-gcrypt)
|
||||
@ -476,7 +476,7 @@ $(prefix)/etc/openrc\n")))
|
||||
(propagated-inputs
|
||||
`(("guile-gnutls" ,guile-gnutls)
|
||||
;; Avahi requires "glib" which doesn't cross-compile yet.
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'()
|
||||
`(("guile-avahi" ,guile-avahi)))
|
||||
("guile-gcrypt" ,guile-gcrypt)
|
||||
@ -1442,9 +1442,9 @@ environments.")
|
||||
"guile-zlib"
|
||||
"guile-sqlite3"
|
||||
"guile-gnutls"
|
||||
,@(if (hurd-target?)
|
||||
,@(if (target-hurd?)
|
||||
'()
|
||||
'("guile-fibers-next")))))
|
||||
'("guile-fibers")))))
|
||||
(wrap-program file
|
||||
`("PATH" ":" prefix
|
||||
(,bin
|
||||
@ -1485,7 +1485,7 @@ environments.")
|
||||
guile-gcrypt
|
||||
guix
|
||||
guile-prometheus
|
||||
guile-fibers-next
|
||||
guile-fibers-1.3
|
||||
guile-lib
|
||||
(first (assoc-ref (package-native-inputs guix) "guile"))))
|
||||
(inputs
|
||||
@ -1503,7 +1503,7 @@ environments.")
|
||||
guile-sqlite3
|
||||
guix
|
||||
guile-gnutls
|
||||
guile-fibers-next))
|
||||
guile-fibers-1.3))
|
||||
(home-page "https://git.cbaines.net/guix/build-coordinator/")
|
||||
(synopsis "Tool to help build derivations")
|
||||
(description
|
||||
@ -1686,7 +1686,7 @@ in an isolated environment, in separate namespaces.")
|
||||
"guile-prometheus"
|
||||
"guile-sqlite3"
|
||||
"guile-gnutls"
|
||||
"guile-fibers-next")))
|
||||
"guile-fibers")))
|
||||
(wrap-program file
|
||||
`("GUILE_LOAD_PATH" ":" prefix
|
||||
(,scm ,(string-join
|
||||
@ -1719,7 +1719,7 @@ in an isolated environment, in separate namespaces.")
|
||||
guile-json-4
|
||||
guile-gcrypt
|
||||
guix
|
||||
guile-fibers-next
|
||||
guile-fibers-1.3
|
||||
guile-prometheus
|
||||
guile-lib
|
||||
guile-lzlib
|
||||
@ -1732,7 +1732,7 @@ in an isolated environment, in separate namespaces.")
|
||||
(list guile-json-4
|
||||
guile-gcrypt
|
||||
guix
|
||||
guile-fibers-next
|
||||
guile-fibers-1.3
|
||||
guile-prometheus
|
||||
guile-lib
|
||||
guile-lzlib
|
||||
|
@ -75,6 +75,7 @@
|
||||
#:use-module (gnu packages authentication)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages crypto)
|
||||
@ -102,6 +103,7 @@
|
||||
#:use-module (gnu packages opencl)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
@ -114,6 +116,7 @@
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages wxwidgets)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xorg)
|
||||
@ -304,6 +307,58 @@ platforms.")
|
||||
Counterpane's Passwordsafe.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public otpclient
|
||||
(package
|
||||
(name "otpclient")
|
||||
(version "3.1.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/paolostivanin/OTPClient")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0cwn4spddhg099hcqcvzgbws3xpmnd29g1vayk36118x94wmajaf"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules `(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
|
||||
(guix build cmake-build-system)
|
||||
(guix build utils))
|
||||
#:imported-modules `((guix build glib-or-gtk-build-system)
|
||||
,@%cmake-build-system-modules)
|
||||
#:tests? #f ; No tests
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
|
||||
(assoc-ref glib-or-gtk:%standard-phases
|
||||
'generate-gdk-pixbuf-loaders-cache-file))
|
||||
(add-after 'wrap 'glib-or-gtk-compile-schemas
|
||||
(assoc-ref glib-or-gtk:%standard-phases
|
||||
'glib-or-gtk-compile-schemas))
|
||||
(add-after 'wrap 'glib-or-gtk-wrap
|
||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
|
||||
(inputs (list adwaita-icon-theme
|
||||
libcotp
|
||||
libgcrypt
|
||||
libsecret
|
||||
libzip
|
||||
hicolor-icon-theme
|
||||
gtk+
|
||||
jansson
|
||||
protobuf
|
||||
protobuf-c
|
||||
qrencode
|
||||
zbar))
|
||||
(native-inputs (list pkg-config protobuf))
|
||||
(home-page "https://github.com/paolostivanin/OTPClient")
|
||||
(synopsis "Two-factor authentication client")
|
||||
(description "OTPClient is a GTK+-based @acronym{OTP, One Time Password}
|
||||
client, supporting @acronym{TOTP, Time-based one time passwords} and
|
||||
@acronym{HOTP,HMAC-based one time passwords}.")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public shroud
|
||||
(package
|
||||
(name "shroud")
|
||||
@ -898,7 +953,7 @@ from password-store and gopass files.")
|
||||
(define-public browserpass-native
|
||||
(package
|
||||
(name "browserpass-native")
|
||||
(version "3.0.7")
|
||||
(version "3.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -907,54 +962,44 @@ from password-store and gopass files.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jkjslbbac49xjyjkc2b07phdm3i64z40kh6h55cl22dxjmpp1nb"))))
|
||||
(base32 "1if72k526sqqxnw250qwxvzwvh1w0k8ag4p4xq3442b22hywx72i"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/browserpass/browserpass-native"
|
||||
#:install-source? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'patch-makefile
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; This doesn't go in #:make-flags because the Makefile itself
|
||||
;; gets installed.
|
||||
(substitute*
|
||||
"src/github.com/browserpass/browserpass-native/Makefile"
|
||||
(("PREFIX \\?= /usr")
|
||||
(string-append "PREFIX ?= " out)))
|
||||
#t)))
|
||||
(add-before 'build 'configure
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
"src/github.com/browserpass/browserpass-native"
|
||||
(invoke "make" "configure"))
|
||||
#t))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
"src/github.com/browserpass/browserpass-native"
|
||||
(invoke "make"))
|
||||
#t))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
"src/github.com/browserpass/browserpass-native"
|
||||
(invoke "make" "install"))
|
||||
#t))
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gnupg (assoc-ref inputs "gnupg")))
|
||||
(wrap-program (string-append out "/bin/browserpass")
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append gnupg "/bin"))))
|
||||
#t))))))
|
||||
(list #:import-path "github.com/browserpass/browserpass-native"
|
||||
#:install-source? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'build 'patch-makefile
|
||||
(lambda _
|
||||
;; This doesn't go in #:make-flags because the Makefile
|
||||
;; itself gets installed.
|
||||
(substitute* "src/github.com/browserpass/browserpass-native/Makefile"
|
||||
(("PREFIX \\?= /usr")
|
||||
(string-append "PREFIX ?= " #$output)))))
|
||||
(add-before 'build 'configure
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
"src/github.com/browserpass/browserpass-native"
|
||||
(invoke "make" "configure"))))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
"src/github.com/browserpass/browserpass-native"
|
||||
(invoke "make"))))
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(with-directory-excursion
|
||||
"src/github.com/browserpass/browserpass-native"
|
||||
(invoke "make" "install"))))
|
||||
(add-after 'install 'wrap-executable
|
||||
(lambda _
|
||||
(wrap-program (string-append #$output "/bin/browserpass")
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append #$(this-package-input "gnupg") "/bin")))))))))
|
||||
(native-inputs
|
||||
(list which))
|
||||
(inputs
|
||||
(list gnupg go-github-com-mattn-go-zglob
|
||||
(list bash-minimal gnupg go-github-com-mattn-go-zglob
|
||||
go-github-com-rifflock-lfshook go-github-com-sirupsen-logrus
|
||||
go-golang-org-x-sys))
|
||||
(home-page "https://github.com/browserpass/browserpass-native")
|
||||
|
41
gnu/packages/patches/directfb-davinci-glibc-228-compat.patch
Normal file
41
gnu/packages/patches/directfb-davinci-glibc-228-compat.patch
Normal file
@ -0,0 +1,41 @@
|
||||
This patch is from upstream
|
||||
|
||||
From 3a236241bbec3f15b012b6f0dbe94353d8094557 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Childs <lorne@cons.org.nz>
|
||||
Date: Sat, 2 May 2020 12:36:46 +0900
|
||||
Subject: [PATCH] davinci: fix build with glibc >= 2.28
|
||||
|
||||
From glibc 2.28 release notes:
|
||||
|
||||
* The macros 'major', 'minor', and 'makedev' are now only available from
|
||||
the header <sys/sysmacros.h>; not from <sys/types.h> or various other
|
||||
headers that happen to include <sys/types.h>. These macros are rarely
|
||||
used, not part of POSIX nor XSI, and their names frequently collide with
|
||||
user code; see https://sourceware.org/bugzilla/show_bug.cgi?id=19239 for
|
||||
further explanation.
|
||||
|
||||
<sys/sysmacros.h> is a GNU extension. Portable programs that require
|
||||
these macros should first include <sys/types.h>, and then include
|
||||
<sys/sysmacros.h> if __GNU_LIBRARY__ is defined.
|
||||
|
||||
https://lists.gnu.org/archive/html/info-gnu/2018-08/msg00000.html
|
||||
---
|
||||
gfxdrivers/davinci/davinci_c64x.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/gfxdrivers/davinci/davinci_c64x.c b/gfxdrivers/davinci/davinci_c64x.c
|
||||
index 431ffdd99..351250a03 100644
|
||||
--- a/gfxdrivers/davinci/davinci_c64x.c
|
||||
+++ b/gfxdrivers/davinci/davinci_c64x.c
|
||||
@@ -39,6 +39,11 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+// Required for `makedev` in glibc >= 2.28
|
||||
+#if defined(__GNU_LIBRARY__)
|
||||
+#include <sys/sysmacros.h>
|
||||
+#endif
|
||||
+
|
||||
#include <directfb_util.h>
|
||||
|
||||
#include <direct/clock.h>
|
@ -1,89 +0,0 @@
|
||||
commit da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d
|
||||
Author: Pyry Kontio <pyry.kontio@drasa.eu>
|
||||
Date: Mon Jul 6 12:57:35 2020 +0900
|
||||
|
||||
Makefile: Fix building on AArch64 NixOS
|
||||
|
||||
The parsing of the output of archtest.c produced an unexpected
|
||||
value on AArch64 NixOS. For example, the make variable ARCH was set to:
|
||||
|
||||
```
|
||||
bit outside of fd_set selected
|
||||
arm
|
||||
```
|
||||
|
||||
This made the arch and OS checks fail.
|
||||
|
||||
This commit simplifies the parsing, making it more robust.
|
||||
|
||||
The C files archtest.c, endiantest.c and os.h used to set the
|
||||
TARGET_OS, ARCH and ENDIAN variables, respectively, output
|
||||
the result of the test as the final line, so just extracting
|
||||
the final line and removing double quoting is enough.
|
||||
|
||||
This commit also fixes a bug with debug_shell lacking escaping
|
||||
single quotes, which prevented using the single quote in the
|
||||
debug_shell calls. It used to work by accident before this fix;
|
||||
the line in the call happened to contain a balanced pair of double
|
||||
quotes and lacked other characters that needed escaping, which
|
||||
didn't break the debug_shell, but this was accidental and very
|
||||
brittle.
|
||||
|
||||
Signed-off-by: Pyry Kontio <pyry.kontio@drasa.eu>
|
||||
Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510
|
||||
Reviewed-on: https://review.coreboot.org/c/flashrom/+/43140
|
||||
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
|
||||
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f3f7717e..e475cbdb 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -83,7 +83,8 @@ dummy_for_make_3_80:=$(shell printf "Build started on %s\n\n" "$$(date)" >$(BUIL
|
||||
|
||||
# Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr
|
||||
# in the build details file together with the original stdout output.
|
||||
-debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE))
|
||||
+debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \
|
||||
+ { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE))
|
||||
|
||||
###############################################################################
|
||||
# General OS-specific settings.
|
||||
@@ -106,7 +107,8 @@ endif
|
||||
# IMPORTANT: The following line must be placed before TARGET_OS is ever used
|
||||
# (of course), but should come after any lines setting CC because the line
|
||||
# below uses CC itself.
|
||||
-override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"'))
|
||||
+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \
|
||||
+ | tail -1 | cut -f 2 -d'"'))
|
||||
|
||||
ifeq ($(TARGET_OS), Darwin)
|
||||
override CPPFLAGS += -I/opt/local/include -I/usr/local/include
|
||||
@@ -490,8 +492,10 @@ endif
|
||||
# IMPORTANT: The following line must be placed before ARCH is ever used
|
||||
# (of course), but should come after any lines setting CC because the line
|
||||
# below uses CC itself.
|
||||
-override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"'))
|
||||
-override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#'))
|
||||
+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \
|
||||
+ | tail -1 | cut -f 2 -d'"'))
|
||||
+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \
|
||||
+ | tail -1))
|
||||
|
||||
# Disable the internal programmer on unsupported architectures (everything but x86 and mipsel)
|
||||
ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN))
|
||||
@@ -1299,12 +1303,12 @@ compiler: featuresavailable
|
||||
@printf "Target arch is "
|
||||
@# FreeBSD wc will output extraneous whitespace.
|
||||
@echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \
|
||||
- ( echo "unknown. Aborting."; exit 1)
|
||||
+ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1)
|
||||
@printf "%s\n" '$(ARCH)'
|
||||
@printf "Target OS is "
|
||||
@# FreeBSD wc will output extraneous whitespace.
|
||||
@echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \
|
||||
- ( echo "unknown. Aborting."; exit 1)
|
||||
+ ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1)
|
||||
@printf "%s\n" '$(TARGET_OS)'
|
||||
ifeq ($(TARGET_OS), libpayload)
|
||||
@$(CC) --version 2>&1 | grep -q coreboot || \
|
57
gnu/packages/patches/glibc-2.33-riscv64-miscompilation.patch
Normal file
57
gnu/packages/patches/glibc-2.33-riscv64-miscompilation.patch
Normal file
@ -0,0 +1,57 @@
|
||||
This patch is from upstream glibc after 2.33 and is needed in Guix to
|
||||
fix glibc-2.33 compilation for riscv64-linux.
|
||||
|
||||
From 044e603b698093cf48f6e6229e0b66acf05227e4 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Fri, 19 Feb 2021 13:29:00 +0100
|
||||
Subject: [PATCH] string: Work around GCC PR 98512 in rawmemchr
|
||||
|
||||
---
|
||||
string/rawmemchr.c | 26 +++++++++++++++-----------
|
||||
1 file changed, 15 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/string/rawmemchr.c b/string/rawmemchr.c
|
||||
index 59bbeeaa42..b8523118e5 100644
|
||||
--- a/string/rawmemchr.c
|
||||
+++ b/string/rawmemchr.c
|
||||
@@ -22,24 +22,28 @@
|
||||
# define RAWMEMCHR __rawmemchr
|
||||
#endif
|
||||
|
||||
+/* The pragmata should be nested inside RAWMEMCHR below, but that
|
||||
+ triggers GCC PR 98512. */
|
||||
+DIAG_PUSH_NEEDS_COMMENT;
|
||||
+#if __GNUC_PREREQ (7, 0)
|
||||
+/* GCC 8 warns about the size passed to memchr being larger than
|
||||
+ PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */
|
||||
+DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow=");
|
||||
+#endif
|
||||
+#if __GNUC_PREREQ (11, 0)
|
||||
+/* Likewise GCC 11, with a different warning option. */
|
||||
+DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
|
||||
+#endif
|
||||
+
|
||||
/* Find the first occurrence of C in S. */
|
||||
void *
|
||||
RAWMEMCHR (const void *s, int c)
|
||||
{
|
||||
- DIAG_PUSH_NEEDS_COMMENT;
|
||||
-#if __GNUC_PREREQ (7, 0)
|
||||
- /* GCC 8 warns about the size passed to memchr being larger than
|
||||
- PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */
|
||||
- DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow=");
|
||||
-#endif
|
||||
-#if __GNUC_PREREQ (11, 0)
|
||||
- /* Likewise GCC 11, with a different warning option. */
|
||||
- DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
|
||||
-#endif
|
||||
if (c != '\0')
|
||||
return memchr (s, c, (size_t)-1);
|
||||
- DIAG_POP_NEEDS_COMMENT;
|
||||
return (char *)s + strlen (s);
|
||||
}
|
||||
libc_hidden_def (__rawmemchr)
|
||||
weak_alias (__rawmemchr, rawmemchr)
|
||||
+
|
||||
+DIAG_POP_NEEDS_COMMENT;
|
||||
--
|
18
gnu/packages/patches/guile-fibers-libevent-32-bit.patch
Normal file
18
gnu/packages/patches/guile-fibers-libevent-32-bit.patch
Normal file
@ -0,0 +1,18 @@
|
||||
This fixes a bug with the libevent backend on 32-bit platforms:
|
||||
|
||||
https://github.com/wingo/fibers/issues/86
|
||||
|
||||
diff --git a/extensions/libevent.c b/extensions/libevent.c
|
||||
index 4f44de9..52c9d73 100644
|
||||
--- a/extensions/libevent.c
|
||||
+++ b/extensions/libevent.c
|
||||
@@ -215,7 +215,8 @@ run_event_loop (void *p)
|
||||
microsec = -1;
|
||||
else if (data->timeout >= 0)
|
||||
{
|
||||
- microsec = data->timeout / time_units_per_microsec;
|
||||
+ microsec = (time_units_per_microsec == 0)
|
||||
+ ? 0 : data->timeout / time_units_per_microsec;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = microsec;
|
||||
}
|
40
gnu/packages/patches/hubbub-maybe-uninitialized.patch
Normal file
40
gnu/packages/patches/hubbub-maybe-uninitialized.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 69d81a8a4d4c223aad67cde0fdf64d64351b9802 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Tai <atai@atai.org>
|
||||
Date: Sat, 27 May 2023 00:01:34 -0700
|
||||
Subject: [PATCH] prevent -Werror=maybe-uninitialized build failure with gcc 11
|
||||
when building tests tokeniser2 and tokeniser3
|
||||
|
||||
---
|
||||
test/tokeniser2.c | 2 +-
|
||||
test/tokeniser3.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/tokeniser2.c b/test/tokeniser2.c
|
||||
index c8ab9c0..4caae38 100644
|
||||
--- a/test/tokeniser2.c
|
||||
+++ b/test/tokeniser2.c
|
||||
@@ -438,7 +438,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
|
||||
/* Expected token only contained part of the data
|
||||
* Calculate how much is left, then try again with
|
||||
* the next expected token */
|
||||
- hubbub_token t;
|
||||
+ hubbub_token t = { 0 };
|
||||
|
||||
t.type = HUBBUB_TOKEN_CHARACTER;
|
||||
t.data.character.ptr += len;
|
||||
diff --git a/test/tokeniser3.c b/test/tokeniser3.c
|
||||
index e33d018..b3be901 100644
|
||||
--- a/test/tokeniser3.c
|
||||
+++ b/test/tokeniser3.c
|
||||
@@ -447,7 +447,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
|
||||
/* Expected token only contained part of the data
|
||||
* Calculate how much is left, then try again with
|
||||
* the next expected token */
|
||||
- hubbub_token t;
|
||||
+ hubbub_token t = { 0 };
|
||||
|
||||
t.type = HUBBUB_TOKEN_CHARACTER;
|
||||
t.data.character.ptr += len;
|
||||
--
|
||||
2.40.1
|
||||
|
49
gnu/packages/patches/ibus-anthy-fix-tests.patch
Normal file
49
gnu/packages/patches/ibus-anthy-fix-tests.patch
Normal file
@ -0,0 +1,49 @@
|
||||
Submitted upstream: https://github.com/ibus/ibus-anthy/pull/35
|
||||
|
||||
diff --git a/tests/test-build.sh b/tests/test-build.sh
|
||||
index e83b78f..a0efe32 100755
|
||||
--- a/tests/test-build.sh
|
||||
+++ b/tests/test-build.sh
|
||||
@@ -63,26 +63,27 @@ parse_args()
|
||||
done;
|
||||
}
|
||||
|
||||
+maybe_install_pycotap() {
|
||||
+ # Check if pycotap is already available.
|
||||
+ python3 -m pycotap >/dev/null && return 0
|
||||
+
|
||||
+ # Red Hat specific hint.
|
||||
+ if test -f /etc/redhat-release ; then
|
||||
+ if ! rpm -q --quiet python3-pycotap; then
|
||||
+ echo "Please install python3-pycotap"
|
||||
+ exit -1
|
||||
+ fi
|
||||
+ fi;
|
||||
+}
|
||||
+
|
||||
init_environment()
|
||||
{
|
||||
if test x$FORCE_TEST != x ; then
|
||||
RUN_ARGS="$RUN_ARGS --force";
|
||||
fi;
|
||||
- HAS_TAP=0;
|
||||
- if test -f /etc/redhat-release ; then
|
||||
- rpm -q --quiet python3-pycotap
|
||||
- if test $? -ne 0 ; then
|
||||
- echo "Not found python3-pycotap";
|
||||
- exit -1;
|
||||
- fi;
|
||||
- HAS_TAP=1;
|
||||
- fi;
|
||||
- TAP_DIR=`python -m site --user-site`/pycotap;
|
||||
- if test $HAS_TAP -ne 1 && \
|
||||
- test x"$TAP_DIR" != x && test ! -d "$TAP_DIR" ; then
|
||||
- echo "pip install pycotap --user";
|
||||
- pip install pycotap --user;
|
||||
- fi;
|
||||
+
|
||||
+ maybe_install_pycotap
|
||||
+
|
||||
if test ! -f $BUILDDIR/../data/$ANTHY_SCHEMA_FILE ; then
|
||||
echo "Not found $BUILDDIR/../data/$ANTHY_SCHEMA_FILE";
|
||||
exit -1;
|
50
gnu/packages/patches/libtree-fix-check-non-x86.patch
Normal file
50
gnu/packages/patches/libtree-fix-check-non-x86.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 061d3ec62707a526a83482e57d202a66f9d776cd Mon Sep 17 00:00:00 2001
|
||||
From: Ismael Luceno <ismael@iodev.co.uk>
|
||||
Date: Tue, 23 Aug 2022 19:34:39 +0200
|
||||
Subject: [PATCH] Test the -m32 and -m64 compiler flags before use
|
||||
|
||||
Fixes: https://github.com/haampie/libtree/issues/78
|
||||
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
|
||||
---
|
||||
tests/05_32_bits/Makefile | 20 +++++++++++++++-----
|
||||
1 file changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tests/05_32_bits/Makefile b/tests/05_32_bits/Makefile
|
||||
index 2c0bece..5628f42 100644
|
||||
--- a/tests/05_32_bits/Makefile
|
||||
+++ b/tests/05_32_bits/Makefile
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
LD_LIBRARY_PATH=
|
||||
|
||||
-.PHONY: clean
|
||||
+.PHONY: clean check
|
||||
|
||||
all: check
|
||||
|
||||
@@ -21,11 +21,21 @@ exe64: lib64/libx.so
|
||||
exe32: lib32/libx.so
|
||||
echo 'extern int a(); int _start(){return a();}' | $(CC) -m32 "-Wl,-rpath,$(CURDIR)/lib64" "-Wl,-rpath,$(CURDIR)/lib32" -o $@ -nostdlib -x c - -Llib32 -lx
|
||||
|
||||
-check: exe32 exe64
|
||||
- ../../libtree exe32
|
||||
- ../../libtree exe64
|
||||
-
|
||||
clean:
|
||||
rm -rf lib32 lib64 exe*
|
||||
|
||||
CURDIR ?= $(.CURDIR)
|
||||
+
|
||||
+test-flag = 2>/dev/null ${CC} -E /dev/null
|
||||
+test-end = && echo y || echo n
|
||||
+support-m32 != ${test-flag} -m32 ${test-end}
|
||||
+support-m64 != ${test-flag} -m64 ${test-end}
|
||||
+
|
||||
+check${support-m32:y=}:: exe32
|
||||
+ ../../libtree exe32
|
||||
+
|
||||
+check${support-m64:y=}:: exe64
|
||||
+ ../../libtree exe64
|
||||
+
|
||||
+check${support-m32:n=} check${support-m64:n=}::
|
||||
+ @echo WARNING: test skipped at ${CURDIR}
|
@ -1,19 +0,0 @@
|
||||
Fix a test failure with recent versions of ... Pytest? Python?
|
||||
|
||||
Taken from upstream:
|
||||
https://github.com/keras-team/keras/commit/fe35050a8f18dc52304aa8da4e463eececa25240
|
||||
|
||||
diff --git a/tests/integration_tests/applications_test.py b/tests/integration_tests/applications_test.py
|
||||
index 979f2f2abd6..6e3b57fa8e2 100644
|
||||
--- a/tests/integration_tests/applications_test.py
|
||||
+++ b/tests/integration_tests/applications_test.py
|
||||
@@ -58,7 +58,8 @@ def _test_application_basic(app, last_dim=1000):
|
||||
def _test_application_notop(app, last_dim):
|
||||
output_shape = _get_output_shape(
|
||||
lambda: app(weights=None, include_top=False))
|
||||
- assert output_shape == (None, None, None, last_dim)
|
||||
+ assert len(output_shape) == 4
|
||||
+ assert output_shape[-1] == last_dim
|
||||
|
||||
|
||||
def test_mobilenet_v2_legacy_import():
|
89
gnu/packages/patches/quodlibet-fix-invalid-glob.patch
Normal file
89
gnu/packages/patches/quodlibet-fix-invalid-glob.patch
Normal file
@ -0,0 +1,89 @@
|
||||
From 5f55431a28509fd4f4f7b40dc246f3d34fa8549e Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Reiter <reiter.christoph@gmail.com>
|
||||
Date: Sun, 26 Jun 2022 23:14:28 +0200
|
||||
Subject: [PATCH] builtin cover: fix handling of invalid glob ranges with
|
||||
Python 3.10.5+ (#4027)
|
||||
|
||||
Previously Python would raise if an invalid range was given
|
||||
to glob, but with 3.10.5 they fixed it to not match anything.
|
||||
https://github.com/python/cpython/issues/89973
|
||||
|
||||
Our tests depended on the previous logic and treating the glob pattern
|
||||
as a literal file name in that case.
|
||||
|
||||
One could argue that this is wrong since a range that doesn't contain anything
|
||||
should also not match anything, so wrap glob() to make it not match for all
|
||||
Python versions in that case and adjust the tests accordingly.
|
||||
|
||||
This should fix the Windows CI, which is currently the only job using 3.10.5
|
||||
---
|
||||
quodlibet/util/cover/built_in.py | 22 +++++++++++-----------
|
||||
tests/test_util_cover.py | 12 +++---------
|
||||
2 files changed, 14 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/quodlibet/util/cover/built_in.py b/quodlibet/util/cover/built_in.py
|
||||
index f2a8791a2..01474c9b6 100644
|
||||
--- a/quodlibet/util/cover/built_in.py
|
||||
+++ b/quodlibet/util/cover/built_in.py
|
||||
@@ -100,6 +100,15 @@ class FilesystemCover(CoverSourcePlugin):
|
||||
base = self.song('~dirname')
|
||||
images = []
|
||||
|
||||
+ def safe_glob(*args, **kwargs):
|
||||
+ try:
|
||||
+ return glob.glob(*args, **kwargs)
|
||||
+ except sre_constants.error:
|
||||
+ # https://github.com/python/cpython/issues/89973
|
||||
+ # old glob would fail with invalid ranges, newer one
|
||||
+ # handles it correctly.
|
||||
+ return []
|
||||
+
|
||||
if config.getboolean("albumart", "force_filename"):
|
||||
score = 100
|
||||
for filename in config.get("albumart", "filename").split(","):
|
||||
@@ -107,17 +116,8 @@ class FilesystemCover(CoverSourcePlugin):
|
||||
filename = filename.strip()
|
||||
|
||||
escaped_path = os.path.join(glob.escape(base), filename)
|
||||
- try:
|
||||
- for path in glob.glob(escaped_path):
|
||||
- images.append((score, path))
|
||||
- except sre_constants.error:
|
||||
- # Use literal filename if globbing causes errors
|
||||
- path = os.path.join(base, filename)
|
||||
-
|
||||
- # We check this here, so we can search for alternative
|
||||
- # files in case no preferred file was found.
|
||||
- if os.path.isfile(path):
|
||||
- images.append((score, path))
|
||||
+ for path in safe_glob(escaped_path):
|
||||
+ images.append((score, path))
|
||||
|
||||
# So names and patterns at the start are preferred
|
||||
score -= 1
|
||||
diff --git a/tests/test_util_cover.py b/tests/test_util_cover.py
|
||||
index db81e4d1f..71a48ad9a 100644
|
||||
--- a/tests/test_util_cover.py
|
||||
+++ b/tests/test_util_cover.py
|
||||
@@ -105,15 +105,9 @@ class TCoverManager(TestCase):
|
||||
config.set("albumart", "force_filename", str(True))
|
||||
config.set("albumart", "filename", "[a-2].jpg")
|
||||
|
||||
- # Should match
|
||||
- f = self.add_file("[a-2].jpg")
|
||||
- assert path_equal(
|
||||
- os.path.abspath(self._find_cover(self.song).name), f)
|
||||
-
|
||||
- # Should not crash
|
||||
- f = self.add_file("test.jpg")
|
||||
- assert not path_equal(
|
||||
- os.path.abspath(self._find_cover(self.song).name), f)
|
||||
+ # Invalid glob range, should not match anything
|
||||
+ self.add_file("a.jpg")
|
||||
+ assert self._find_cover(self.song) is None
|
||||
|
||||
def test_invalid_glob_path(self):
|
||||
config.set("albumart", "force_filename", str(True))
|
||||
--
|
||||
2.39.2
|
||||
|
39
gnu/packages/patches/quodlibet-fix-mtime-tests.patch
Normal file
39
gnu/packages/patches/quodlibet-fix-mtime-tests.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 06a32b319f065550efe0d2a9ff10ca6bdc32b893 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Reiter <reiter.christoph@gmail.com>
|
||||
Date: Sat, 23 Jul 2022 20:15:18 +0200
|
||||
Subject: [PATCH] operon: hopefully better fix for flaky mtime tests
|
||||
|
||||
copy the mtime after we write everything, so there is no chance of
|
||||
it changing before we note the initial value.
|
||||
---
|
||||
quodlibet/operon/commands.py | 8 ++++----
|
||||
1 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/quodlibet/operon/commands.py b/quodlibet/operon/commands.py
|
||||
index e0a5ef33a..af2dcfa8b 100644
|
||||
--- a/quodlibet/operon/commands.py
|
||||
+++ b/quodlibet/operon/commands.py
|
||||
@@ -227,16 +227,16 @@ class EditCommand(Command):
|
||||
# write to tmp file
|
||||
fd, path = tempfile.mkstemp(suffix=".txt")
|
||||
|
||||
- # XXX: copy mtime here so we can test for changes in tests by
|
||||
- # setting a out of date mtime on the source song file
|
||||
- copy_mtime(args[0], path)
|
||||
-
|
||||
try:
|
||||
try:
|
||||
os.write(fd, dump)
|
||||
finally:
|
||||
os.close(fd)
|
||||
|
||||
+ # XXX: copy mtime here so we can test for changes in tests by
|
||||
+ # setting a out of date mtime on the source song file
|
||||
+ copy_mtime(args[0], path)
|
||||
+
|
||||
# only parse the result if the editor returns 0 and the mtime has
|
||||
# changed
|
||||
old_mtime = mtime(path)
|
||||
--
|
||||
2.39.2
|
||||
|
@ -3,7 +3,7 @@
|
||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
|
||||
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
@ -33,7 +33,6 @@
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages hurd)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages base))
|
||||
|
||||
@ -162,7 +161,7 @@ Each database is contained in a specific package output, such as the
|
||||
(native-inputs
|
||||
(list `(,hwdata "pci") pkg-config which))
|
||||
(inputs
|
||||
`(,@(if (not (hurd-target?))
|
||||
`(,@(if (not (target-hurd?))
|
||||
`(("kmod" ,kmod))
|
||||
'())
|
||||
("zlib" ,zlib)))
|
||||
|
@ -68,6 +68,7 @@
|
||||
#:use-module (gnu packages fonts)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages game-development)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages gl)
|
||||
@ -113,21 +114,23 @@
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public a4pdf
|
||||
(define-public capypdf
|
||||
(package
|
||||
(name "a4pdf")
|
||||
(version "0.1.0")
|
||||
(name "capypdf")
|
||||
(version "0.3.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jpakkane/a4pdf")
|
||||
(url "https://github.com/jpakkane/capypdf")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "18062cm1qsbaymmjar0whbd7kaggy4x7wzp7xw94kcd1pwx2jp1p"))))
|
||||
(base32 "193izn2jw55w2dxy6l0vz5zrlar9lm7a6z443nw0vs4mlj4jnasi"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
(list #:meson meson/newer
|
||||
#:test-options '(list "plainc")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'add-missing-header
|
||||
(lambda _
|
||||
@ -139,14 +142,7 @@
|
||||
;; XXX: remove when bumping glib
|
||||
(substitute* "src/pdfviewer.cpp"
|
||||
(("G_APPLICATION_DEFAULT_FLAGS")
|
||||
"G_APPLICATION_FLAGS_NONE"))))
|
||||
(add-after 'unpack 'fix-broken-tests
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
(substitute* "test/a4pdftests.py"
|
||||
(("'Ghostscript not found, test suite can not be run.'")
|
||||
;; Sucks, but there's no point in repairing a certain test
|
||||
;; at the moment.
|
||||
"0")))))))
|
||||
"G_APPLICATION_FLAGS_NONE")))))))
|
||||
(inputs (list fmt
|
||||
freetype
|
||||
gtk
|
||||
@ -155,7 +151,8 @@
|
||||
libpng
|
||||
zlib))
|
||||
(native-inputs (list font-google-noto
|
||||
;; ghostscript
|
||||
gcc-12
|
||||
ghostscript
|
||||
pkg-config
|
||||
python
|
||||
python-pillow))
|
||||
@ -167,6 +164,9 @@ directly. It uses LittleCMS for color management but otherwise does not
|
||||
convert data in any way.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public a4pdf
|
||||
(deprecated-package "a4pdf" capypdf))
|
||||
|
||||
(define-public diffpdf
|
||||
(let ((commit "ba68231d3d05e0cb3a2d4a4fca8b70d4044f4303")
|
||||
(revision "1"))
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user