mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge remote-tracking branch 'origin/master' into core-updates
This commit is contained in:
commit
d7ec2805fb
19 changed files with 1286 additions and 261 deletions
|
@ -14236,8 +14236,8 @@ $ ./pre-inst-env guix refresh -s non-core -u
|
||||||
|
|
||||||
@item --select=[@var{subset}]
|
@item --select=[@var{subset}]
|
||||||
@itemx -s @var{subset}
|
@itemx -s @var{subset}
|
||||||
Select all the packages in @var{subset}, one of @code{core} or
|
Select all the packages in @var{subset}, one of @code{core}, @code{non-core}
|
||||||
@code{non-core}.
|
or @code{module:@var{name}}.
|
||||||
|
|
||||||
The @code{core} subset refers to all the packages at the core of the
|
The @code{core} subset refers to all the packages at the core of the
|
||||||
distribution---i.e., packages that are used to build ``everything
|
distribution---i.e., packages that are used to build ``everything
|
||||||
|
@ -14250,6 +14250,11 @@ The @code{non-core} subset refers to the remaining packages. It is
|
||||||
typically useful in cases where an update of the core packages would be
|
typically useful in cases where an update of the core packages would be
|
||||||
inconvenient.
|
inconvenient.
|
||||||
|
|
||||||
|
The @code{module:@var{name}} subset refers to all the packages in a
|
||||||
|
specified guile module. The module can be specified as
|
||||||
|
@code{module:guile} or @code{module:(gnu packages guile)}, the former is
|
||||||
|
a shorthand for the later.
|
||||||
|
|
||||||
@item --manifest=@var{file}
|
@item --manifest=@var{file}
|
||||||
@itemx -m @var{file}
|
@itemx -m @var{file}
|
||||||
Select all the packages from the manifest in @var{file}. This is useful to
|
Select all the packages from the manifest in @var{file}. This is useful to
|
||||||
|
|
|
@ -2025,7 +2025,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
|
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
|
||||||
%D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \
|
%D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \
|
||||||
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
|
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
|
||||||
%D%/packages/patches/webkitgtk-libelogind.patch \
|
|
||||||
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \
|
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \
|
||||||
%D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
|
%D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
|
||||||
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
|
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;; Copyright © 2022 Feng Shu <tumashu@163.com>
|
;;; Copyright © 2022 Feng Shu <tumashu@163.com>
|
||||||
|
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -1019,6 +1020,53 @@ precious backup space.
|
||||||
@end itemize")
|
@end itemize")
|
||||||
(license license:bsd-2)))
|
(license license:bsd-2)))
|
||||||
|
|
||||||
|
(define-public restic-rest-server
|
||||||
|
(package
|
||||||
|
(name "restic-rest-server")
|
||||||
|
(version "0.11.0")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/restic/rest-server")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1nvmxc9x0mlks6yfn66fmwn50k5q83ip4g9vvb0kndzd7hwcyacy"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:import-path "github.com/restic/rest-server/cmd/rest-server"
|
||||||
|
#:unpack-path "github.com/restic/rest-server"
|
||||||
|
#:install-source? #f ;all we need is the binary
|
||||||
|
#:phases (modify-phases %standard-phases
|
||||||
|
(replace 'check
|
||||||
|
(lambda* (#:key tests? #:allow-other-keys . args)
|
||||||
|
(when tests?
|
||||||
|
;; Unit tests seems to break with Guix' non-standard TMPDIR.
|
||||||
|
(setenv "TMPDIR" "/tmp")
|
||||||
|
(apply (assoc-ref %standard-phases
|
||||||
|
'check) args))))
|
||||||
|
(add-after 'install 'rename-binary
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(with-directory-excursion (assoc-ref outputs "out")
|
||||||
|
;; "rest-server" is a bit too generic.
|
||||||
|
(rename-file "bin/rest-server"
|
||||||
|
"bin/restic-rest-server")))))))
|
||||||
|
(propagated-inputs (list go-golang-org-x-crypto
|
||||||
|
go-github-com-spf13-cobra
|
||||||
|
go-github-com-prometheus-client-golang
|
||||||
|
go-github-com-miolini-datacounter
|
||||||
|
go-github-com-minio-sha256-simd
|
||||||
|
go-github-com-gorilla-handlers
|
||||||
|
go-github-com-coreos-go-systemd-activation))
|
||||||
|
(home-page "https://github.com/restic/rest-server")
|
||||||
|
(synopsis "Restic REST server")
|
||||||
|
(description
|
||||||
|
"The Restic REST server is a high performance HTTP server that implements
|
||||||
|
restic's REST backend API. It provides a secure and efficient way to backup
|
||||||
|
data remotely, using the restic backup client and a @code{rest:} URL.")
|
||||||
|
(license license:bsd-2)))
|
||||||
|
|
||||||
(define-public zbackup
|
(define-public zbackup
|
||||||
(package
|
(package
|
||||||
(name "zbackup")
|
(name "zbackup")
|
||||||
|
|
|
@ -177,13 +177,13 @@ data units.")
|
||||||
(define-public khal
|
(define-public khal
|
||||||
(package
|
(package
|
||||||
(name "khal")
|
(name "khal")
|
||||||
(version "0.10.5")
|
(version "0.11.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (pypi-uri "khal" version))
|
(uri (pypi-uri "khal" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0xhcrx7lcjk126i2xgqmgb199vd4hxsq34mkdmhdh9ia62nbgvsf"))))
|
"07k0cfbfkx9fhfk4gf73vh34c05i1cb72gc15a1lmx9knxy4h503"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; The test suite is unreliable. See <https://bugs.gnu.org/44197>
|
`(#:tests? #f ; The test suite is unreliable. See <https://bugs.gnu.org/44197>
|
||||||
|
@ -202,8 +202,7 @@ data units.")
|
||||||
;; Required to build manpage
|
;; Required to build manpage
|
||||||
python-sphinxcontrib-newsfeed python-sphinx))
|
python-sphinxcontrib-newsfeed python-sphinx))
|
||||||
(inputs
|
(inputs
|
||||||
(list sqlite
|
(list python-configobj
|
||||||
python-configobj
|
|
||||||
python-dateutil
|
python-dateutil
|
||||||
python-icalendar
|
python-icalendar
|
||||||
python-tzlocal
|
python-tzlocal
|
||||||
|
@ -216,7 +215,9 @@ data units.")
|
||||||
python-pyxdg))
|
python-pyxdg))
|
||||||
(synopsis "Console calendar program")
|
(synopsis "Console calendar program")
|
||||||
(description "Khal is a standards based console calendar program,
|
(description "Khal is a standards based console calendar program,
|
||||||
able to synchronize with CalDAV servers through vdirsyncer.")
|
able to synchronize with CalDAV servers through vdirsyncer. It includes
|
||||||
|
both a @acronym{CLI, command-line interface} and a @acronym{TUI, textual user
|
||||||
|
interface} named 'ikhal'.")
|
||||||
(home-page "https://lostpackets.de/khal/")
|
(home-page "https://lostpackets.de/khal/")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
|
|
@ -369,8 +369,10 @@ asynchronously via cURL in C++.")
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:import-path "github.com/rs/curlie"))
|
`(#:import-path "github.com/rs/curlie"))
|
||||||
(inputs
|
(inputs (list curl
|
||||||
(list curl go-golang-org-x-crypto go-golang-org-x-sys))
|
go-golang-org-x-crypto
|
||||||
|
go-golang-org-x-sys
|
||||||
|
go-golang-org-x-term))
|
||||||
(home-page "https://curlie.io")
|
(home-page "https://curlie.io")
|
||||||
(synopsis "The power of curl, the ease of use of httpie")
|
(synopsis "The power of curl, the ease of use of httpie")
|
||||||
(description "If you like the interface of HTTPie but miss the features of
|
(description "If you like the interface of HTTPie but miss the features of
|
||||||
|
|
|
@ -427,3 +427,61 @@ from ALSA, ESD, and COMEDI sources. This package currently does not include
|
||||||
support for ESD sources.")
|
support for ESD sources.")
|
||||||
(home-page "https://xoscope.sourceforge.net/")
|
(home-page "https://xoscope.sourceforge.net/")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public minipro
|
||||||
|
;; Information needed to fix Makefile
|
||||||
|
(let* ((commit "c181c2cf1619d00a520627d475e3fadb1eea5dac")
|
||||||
|
(commit-short (substring commit 0 8))
|
||||||
|
(date "2022-09-10 21:44:06 -0700"))
|
||||||
|
(package
|
||||||
|
(name "minipro")
|
||||||
|
(version "0.6")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://gitlab.com/DavidGriffith/minipro.git")
|
||||||
|
(commit version)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"03xgmvvsxmqrz7blg7cqk0pb9ynhlq6v6jfl532zmjdzp5p3h10d"))))
|
||||||
|
(native-inputs (list pkg-config which))
|
||||||
|
(inputs (list libusb))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ; no test suite
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(delete 'configure) ; No ./configure script
|
||||||
|
(add-before 'build 'fix-makefile
|
||||||
|
(lambda _
|
||||||
|
;; Fix some git related variables that minipro expects
|
||||||
|
(substitute* "Makefile"
|
||||||
|
(("GIT_BRANCH = .*")
|
||||||
|
(string-append "GIT_BRANCH = \"master\"\n"))
|
||||||
|
(("GIT_HASH = .*")
|
||||||
|
(string-append "GIT_HASH = \"" #$commit "\"\n"))
|
||||||
|
(("GIT_HASH_SHORT = .*")
|
||||||
|
(string-append "GIT_HASH_SHORT = \"" #$commit-short "\"\n"))
|
||||||
|
(("GIT_DATE = .*")
|
||||||
|
(string-append "GIT_DATE = \"" #$date "\"\n"))))))
|
||||||
|
#:make-flags
|
||||||
|
#~(list (string-append "VERSION=" #$version)
|
||||||
|
(string-append "PREFIX=" #$output)
|
||||||
|
(string-append "UDEV_DIR=" #$output "/lib/udev")
|
||||||
|
(string-append "COMPLETIONS_DIR=" #$output
|
||||||
|
"/share/bash-completion/completions"))))
|
||||||
|
(synopsis "Controls the TL866xx series of chip programmers")
|
||||||
|
(description
|
||||||
|
"minipro is designed to program or read the contents of
|
||||||
|
chips supported by the TL866xx series of programmers. This includes many
|
||||||
|
microcontrollers, ROMs, EEPROMs and PLDs.
|
||||||
|
|
||||||
|
To use this program without root privileges you must install the necessary udev
|
||||||
|
rules. This can be done by extending @code{udev-service-type} in your
|
||||||
|
@code{operating-system} configuration with this package. E.g.:
|
||||||
|
@code{(udev-rules-service 'minipro minipro #:groups '(\"plugdev\")}.
|
||||||
|
Additionally your user must be member of the @code{plugdev} group.")
|
||||||
|
(home-page "https://gitlab.com/DavidGriffith/minipro")
|
||||||
|
(license license:gpl3+))))
|
||||||
|
|
|
@ -126,6 +126,7 @@
|
||||||
;;; Copyright © 2020, 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
|
;;; Copyright © 2020, 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
|
||||||
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
|
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
|
||||||
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
|
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
|
||||||
|
;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -1768,7 +1769,7 @@ Apprentice and Sourcerer.")
|
||||||
(define-public emacs-suneater-theme
|
(define-public emacs-suneater-theme
|
||||||
(package
|
(package
|
||||||
(name "emacs-suneater-theme")
|
(name "emacs-suneater-theme")
|
||||||
(version "2.2.1")
|
(version "2.3.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -1777,7 +1778,7 @@ Apprentice and Sourcerer.")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1pnfiwnh2hr2hp4rxivx61j3hrmvwingjpfslnn535a3z9md0c4f"))
|
"19432hb4lkfvip72wrc9nqq5bc10nv0g4547x2sif5iqak43dw72"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system emacs-build-system)
|
(build-system emacs-build-system)
|
||||||
(home-page "https://git.sr.ht/~plattfot/suneater-theme")
|
(home-page "https://git.sr.ht/~plattfot/suneater-theme")
|
||||||
|
@ -31372,6 +31373,28 @@ name (with autocompletion), a simple bookmark management system and
|
||||||
connections using TLS encryption.")
|
connections using TLS encryption.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public emacs-gemini
|
||||||
|
(package
|
||||||
|
(name "emacs-gemini")
|
||||||
|
(version "1.2.0")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://git.carcosa.net/jmcbray/gemini.el")
|
||||||
|
(commit "a7dd7c6ea4e036d0d5ecc4a5d284874c400f10ba")))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1pvlk56mhh4xh4gwzqldfk79jsjbcpivv5scd9811pv3afc30gsx"))))
|
||||||
|
(build-system emacs-build-system)
|
||||||
|
(home-page "https://git.carcosa.net/jmcbray/gemini.el")
|
||||||
|
(synopsis "Syntax highlighting for text/gemini")
|
||||||
|
(description
|
||||||
|
"This is a very simple syntax-highlighting mode for text/gemini documents.
|
||||||
|
Currently, support is not complete, but it should be enough to help with basic
|
||||||
|
documents.")
|
||||||
|
(license license:agpl3+)))
|
||||||
|
|
||||||
(define-public emacs-zerodark-theme
|
(define-public emacs-zerodark-theme
|
||||||
(package
|
(package
|
||||||
(name "emacs-zerodark-theme")
|
(name "emacs-zerodark-theme")
|
||||||
|
|
|
@ -64,14 +64,14 @@
|
||||||
;; directory.
|
;; directory.
|
||||||
(package
|
(package
|
||||||
(name "gnucash")
|
(name "gnucash")
|
||||||
(version "4.11")
|
(version "5.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
|
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
|
||||||
version "/gnucash-" version ".tar.bz2"))
|
version "/gnucash-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "069b216dkpjs9hp32s4bhi6f76lbc81qvbmjmz0dxq3v1piys57q"))))
|
(base32 "09482f1w4yawrdw5c2wi0jb8hwlp1x9mdvq552bf9n5f66mkphfg"))))
|
||||||
(outputs '("out" "doc" "debug" "python"))
|
(outputs '("out" "doc" "debug" "python"))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -87,6 +87,13 @@
|
||||||
(guix build utils))
|
(guix build utils))
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'disable-unsupported-test
|
||||||
|
;; test test-gnc-quotes neeeds perl JSON::Parse
|
||||||
|
;; not packaged in Guix yet
|
||||||
|
(lambda _
|
||||||
|
(substitute* "libgnucash/app-utils/test/CMakeLists.txt"
|
||||||
|
(("gnc_add_test\\(test-gnc-quotes")
|
||||||
|
"#gnc_add_test\\(test-gnc-quotes"))))
|
||||||
(add-after 'unpack 'set-env-vars
|
(add-after 'unpack 'set-env-vars
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; At least one test is time-related and requires this
|
;; At least one test is time-related and requires this
|
||||||
|
@ -95,12 +102,6 @@
|
||||||
(substitute* "CMakeLists.txt"
|
(substitute* "CMakeLists.txt"
|
||||||
(("set\\(SHELL /bin/bash\\)")
|
(("set\\(SHELL /bin/bash\\)")
|
||||||
(string-append "set(SHELL " (which "bash") ")")))))
|
(string-append "set(SHELL " (which "bash") ")")))))
|
||||||
;; After wrapping gnc-fq-check and gnc-fq-helper we can no longer
|
|
||||||
;; execute them with perl, so execute them directly instead.
|
|
||||||
(add-after 'unpack 'fix-finance-quote-check
|
|
||||||
(lambda _
|
|
||||||
(substitute* "gnucash/price-quotes.scm"
|
|
||||||
(("\"perl\" \"-w\" ") ""))))
|
|
||||||
;; The qof test requires the en_US, en_GB, and fr_FR locales.
|
;; The qof test requires the en_US, en_GB, and fr_FR locales.
|
||||||
(add-before 'check 'install-locales
|
(add-before 'check 'install-locales
|
||||||
(lambda _
|
(lambda _
|
||||||
|
@ -155,9 +156,7 @@
|
||||||
(assoc l (package-inputs this-package)))
|
(assoc l (package-inputs this-package)))
|
||||||
'("perl-finance-quote")))))))))
|
'("perl-finance-quote")))))))))
|
||||||
'("gnucash"
|
'("gnucash"
|
||||||
"gnc-fq-check"
|
"gnc-fq-update"))))
|
||||||
"gnc-fq-helper"
|
|
||||||
"gnc-fq-dump"))))
|
|
||||||
(add-after 'install 'glib-or-gtk-compile-schemas
|
(add-after 'install 'glib-or-gtk-compile-schemas
|
||||||
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
|
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
|
||||||
(add-after 'install 'glib-or-gtk-wrap
|
(add-after 'install 'glib-or-gtk-wrap
|
||||||
|
@ -217,7 +216,7 @@ installed as well as Yelp, the Gnome help browser.")
|
||||||
"mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
|
"mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
|
||||||
version "/gnucash-docs-" version revision ".tar.gz"))
|
version "/gnucash-docs-" version revision ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "162qq8p76grczdnsd4qbpxn1d8ap6l2n1a00a601v5hij7rqwfx8"))))
|
(base32 "1cgdb5qrwrx6yf6dsc8zlhi67lbyjs1g82i0n53sw6n6v38dd882"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
;; These are native-inputs because they are only required for building the
|
;; These are native-inputs because they are only required for building the
|
||||||
;; documentation.
|
;; documentation.
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -44,6 +44,7 @@
|
||||||
#:use-module (gnu packages cdrom)
|
#:use-module (gnu packages cdrom)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
|
#:use-module (gnu packages cmake)
|
||||||
#:use-module (gnu packages cpp)
|
#:use-module (gnu packages cpp)
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
#:use-module (gnu packages cups)
|
#:use-module (gnu packages cups)
|
||||||
|
@ -63,12 +64,14 @@
|
||||||
#:use-module (gnu packages high-availability)
|
#:use-module (gnu packages high-availability)
|
||||||
#:use-module (gnu packages libusb)
|
#:use-module (gnu packages libusb)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
|
#:use-module (gnu packages lua)
|
||||||
#:use-module (gnu packages lxqt)
|
#:use-module (gnu packages lxqt)
|
||||||
#:use-module (gnu packages mtools)
|
#:use-module (gnu packages mtools)
|
||||||
#:use-module (gnu packages package-management)
|
#:use-module (gnu packages package-management)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages networking)
|
#:use-module (gnu packages networking)
|
||||||
#:use-module (gnu packages openldap)
|
#:use-module (gnu packages openldap)
|
||||||
|
#:use-module (gnu packages onc-rpc)
|
||||||
#:use-module (gnu packages pciutils)
|
#:use-module (gnu packages pciutils)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
|
@ -81,6 +84,7 @@
|
||||||
#:use-module (gnu packages qt)
|
#:use-module (gnu packages qt)
|
||||||
#:use-module (gnu packages scanner)
|
#:use-module (gnu packages scanner)
|
||||||
#:use-module (gnu packages security-token)
|
#:use-module (gnu packages security-token)
|
||||||
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages video)
|
#:use-module (gnu packages video)
|
||||||
#:use-module (gnu packages virtualization)
|
#:use-module (gnu packages virtualization)
|
||||||
|
@ -1359,3 +1363,78 @@ and libtss2-tcti-mssim.")
|
||||||
string, code name and other information from x86 CPU. This library is not to be
|
string, code name and other information from x86 CPU. This library is not to be
|
||||||
confused with the @code{cpuid} command line utility from package @code{cpuid}.")
|
confused with the @code{cpuid} command line utility from package @code{cpuid}.")
|
||||||
(license license:bsd-2))))
|
(license license:bsd-2))))
|
||||||
|
|
||||||
|
(define-public liblxi
|
||||||
|
(package
|
||||||
|
(name "liblxi")
|
||||||
|
(version "1.18")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/lxi-tools/liblxi")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0cbnnd5qmchlr586349j5y4qv5w3bw9nmpbd3k6sq9vwvqh5dmns"))))
|
||||||
|
(build-system meson-build-system)
|
||||||
|
(native-inputs
|
||||||
|
(list cmake pkg-config))
|
||||||
|
(inputs
|
||||||
|
(list avahi libtirpc libxml2))
|
||||||
|
(home-page "https://lxi-tools.github.io/")
|
||||||
|
(synopsis "LAN eXtensions for Instrumentation library")
|
||||||
|
(description
|
||||||
|
"This package provides library for LAN eXtensions for Instrumentation
|
||||||
|
based on the LXI Consortium standard which defines the communication protocols
|
||||||
|
for modern instrumentation and data acquision systems using Ethernet.")
|
||||||
|
(license license:bsd-3)))
|
||||||
|
|
||||||
|
(define-public lxi-tools
|
||||||
|
(package
|
||||||
|
(name "lxi-tools")
|
||||||
|
(version "2.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/lxi-tools/lxi-tools")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1xc99xhca386az73rpsrf3z0j7y0hrv0xcwj1dr2ahr7lhnjznqp"))))
|
||||||
|
(build-system meson-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:glib-or-gtk? #true
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'skip-gtk-update-icon-cache
|
||||||
|
(lambda _
|
||||||
|
(substitute* "build-aux/meson/postinstall.py"
|
||||||
|
(("gtk-update-icon-cache") (which "true"))
|
||||||
|
(("update-desktop-database") (which "true"))))))))
|
||||||
|
(native-inputs
|
||||||
|
(list bash-completion
|
||||||
|
cmake
|
||||||
|
(list glib "bin")
|
||||||
|
pkg-config
|
||||||
|
python
|
||||||
|
readline))
|
||||||
|
(inputs
|
||||||
|
(list glib
|
||||||
|
gtk
|
||||||
|
gtksourceview
|
||||||
|
json-glib
|
||||||
|
libadwaita
|
||||||
|
liblxi
|
||||||
|
lua))
|
||||||
|
(home-page "https://lxi-tools.github.io/")
|
||||||
|
(synopsis "LAN eXtensions for Instrumentation tools")
|
||||||
|
(description
|
||||||
|
"This package provides tools for LAN eXtensions for Instrumentation based
|
||||||
|
on the LXI Consortium standard which defines the communication protocols for
|
||||||
|
modern instrumentation and data acquision systems using Ethernet.")
|
||||||
|
(license license:bsd-3)))
|
||||||
|
|
|
@ -524,7 +524,8 @@ It supports JPEG, PNG and GIF formats.")
|
||||||
(inputs (list go-github-com-disintegration-imaging
|
(inputs (list go-github-com-disintegration-imaging
|
||||||
go-github-com-lucasb-eyer-go-colorful
|
go-github-com-lucasb-eyer-go-colorful
|
||||||
go-golang-org-x-crypto
|
go-golang-org-x-crypto
|
||||||
go-golang-org-x-image))
|
go-golang-org-x-image
|
||||||
|
go-golang-org-x-term))
|
||||||
(home-page "https://github.com/eliukblau/pixterm")
|
(home-page "https://github.com/eliukblau/pixterm")
|
||||||
(synopsis "Draw images in your ANSI terminal with true color")
|
(synopsis "Draw images in your ANSI terminal with true color")
|
||||||
(description "PIXterm shows images directly in your terminal, recreating
|
(description "PIXterm shows images directly in your terminal, recreating
|
||||||
|
|
|
@ -246,7 +246,7 @@ player daemon.")
|
||||||
(define-public ncmpc
|
(define-public ncmpc
|
||||||
(package
|
(package
|
||||||
(name "ncmpc")
|
(name "ncmpc")
|
||||||
(version "0.47")
|
(version "0.48")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
@ -255,7 +255,7 @@ player daemon.")
|
||||||
"/ncmpc-" version ".tar.xz"))
|
"/ncmpc-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1714saz8m6y2chby0c1qh3vgqc3srlr1jq98vhzmjykcpjqj7nk1"))))
|
"035rd64a70qiv334bgs9z2hqnvzldkwdvxay2hmdx5l0a5zd5cml"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(inputs (list boost pcre libmpdclient ncurses))
|
(inputs (list boost pcre libmpdclient ncurses))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
|
|
@ -64,14 +64,14 @@
|
||||||
(define-public parallel
|
(define-public parallel
|
||||||
(package
|
(package
|
||||||
(name "parallel")
|
(name "parallel")
|
||||||
(version "20230322")
|
(version "20230422")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/parallel/parallel-"
|
(uri (string-append "mirror://gnu/parallel/parallel-"
|
||||||
version ".tar.bz2"))
|
version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1jkv5c0ddnwbmx7ay3zxn14sxibhi4ff58waqm6rvg0cdnxb3iz5"))
|
(base32 "1hp3pbf3fsfi2hwaa13isaqzrn09lf847cdpjkhf0kfw14ymj1li"))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
From 8d46803c09edc2b6d4e35c778a3d2f90e5baad0b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
||||||
Date: Sat, 25 Mar 2023 22:55:16 -0400
|
|
||||||
Subject: [PATCH] Fallback to elogind when systemd is unavailable at build time
|
|
||||||
https://bugs.webkit.org/show_bug.cgi?id=254475
|
|
||||||
|
|
||||||
Reviewed by NOBODY (OOPS!).
|
|
||||||
|
|
||||||
The build system supports elogind, but it only considers the
|
|
||||||
'libsystemd' library name for the pkg-config lookup and not
|
|
||||||
'libelogind'. This change makes the build system fallback to search
|
|
||||||
for libelogind when libsystemd was not found.
|
|
||||||
|
|
||||||
* Source/cmake/FindJournald.cmake [!PC_SYSTEMD_FOUND]: Search for libelogind.
|
|
||||||
---
|
|
||||||
Source/cmake/FindJournald.cmake | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/Source/cmake/FindJournald.cmake b/Source/cmake/FindJournald.cmake
|
|
||||||
index 18dd6b50908c..e0dc9ce1d397 100644
|
|
||||||
--- a/Source/cmake/FindJournald.cmake
|
|
||||||
+++ b/Source/cmake/FindJournald.cmake
|
|
||||||
@@ -55,6 +55,10 @@ find_package(PkgConfig QUIET)
|
|
||||||
|
|
||||||
# libelogind provides compatible pc and header files
|
|
||||||
pkg_check_modules(PC_SYSTEMD QUIET libsystemd)
|
|
||||||
+if (NOT PC_SYSTEMD_FOUND)
|
|
||||||
+ pkg_check_modules(PC_SYSTEMD QUIET libelogind)
|
|
||||||
+endif ()
|
|
||||||
+
|
|
||||||
set(Journald_COMPILE_OPTIONS ${PC_SYSTEMD_CFLAGS_OTHER})
|
|
||||||
set(Journald_VERSION ${PC_SYSTEMD_VERSION})
|
|
||||||
|
|
||||||
|
|
||||||
base-commit: 43ea8744bc6065aad7ae5988e32d31d253905e5f
|
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
|
@ -877,96 +877,6 @@ message streaming.")
|
||||||
(home-page "https://github.com/matttproud/golang_protobuf_extensions")
|
(home-page "https://github.com/matttproud/golang_protobuf_extensions")
|
||||||
(license asl2.0))))
|
(license asl2.0))))
|
||||||
|
|
||||||
(define-public go-github-com-prometheus-common
|
|
||||||
(package
|
|
||||||
(name "go-github-com-prometheus-common")
|
|
||||||
(version "0.4.1")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/prometheus/common")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
'(#:import-path "github.com/prometheus/common"
|
|
||||||
#:tests? #f
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
;; Source-only package
|
|
||||||
(delete 'build))))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-github-com-golang-protobuf-proto
|
|
||||||
go-github-com-matttproud-golang-protobuf-extensions-pbutil
|
|
||||||
go-github-com-prometheus-client-model))
|
|
||||||
(synopsis "Prometheus metrics")
|
|
||||||
(description "This package provides tools for reading and writing
|
|
||||||
Prometheus metrics.")
|
|
||||||
(home-page "https://github.com/prometheus/common")
|
|
||||||
(license asl2.0)))
|
|
||||||
|
|
||||||
(define-public go-github-com-prometheus-procfs
|
|
||||||
(package
|
|
||||||
(name "go-github-com-prometheus-procfs")
|
|
||||||
(version "0.0.4")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/prometheus/procfs")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
'(#:import-path "github.com/prometheus/procfs"
|
|
||||||
;; The tests require Go modules, which are not yet supported in Guix's
|
|
||||||
;; Go build system.
|
|
||||||
#:tests? #f))
|
|
||||||
(synopsis "Go library for reading @file{/proc}")
|
|
||||||
(description "The @code{procfs} Go package provides functions to retrieve
|
|
||||||
system, kernel, and process metrics from the @file{/proc} pseudo file system.")
|
|
||||||
(home-page "https://github.com/prometheus/procfs")
|
|
||||||
(license asl2.0)))
|
|
||||||
|
|
||||||
(define-public go-github-com-prometheus-client-golang
|
|
||||||
(package
|
|
||||||
(name "go-github-com-prometheus-client-golang")
|
|
||||||
(version "1.2.1")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/prometheus/client_golang")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0zs49psk23n9z8wrl02d5vib5wclpym8kaxcy6n5pk696i419065"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
'(#:tests? #f
|
|
||||||
#:import-path "github.com/prometheus/client_golang"
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
;; Source-only package
|
|
||||||
(delete 'build))))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-github-com-beorn7-perks-quantile
|
|
||||||
go-github-com-golang-protobuf-proto
|
|
||||||
go-github-com-prometheus-client-model
|
|
||||||
go-github-com-prometheus-common
|
|
||||||
go-github-com-prometheus-procfs
|
|
||||||
go-github-com-cespare-xxhash))
|
|
||||||
(synopsis "HTTP server and client tools for Prometheus")
|
|
||||||
(description "This package @code{promhttp} provides HTTP client and
|
|
||||||
server tools for Prometheus metrics.")
|
|
||||||
(home-page "https://github.com/prometheus/client_golang")
|
|
||||||
(license asl2.0)))
|
|
||||||
|
|
||||||
(define-public go-github-com-go-asn1-ber-asn1-ber
|
(define-public go-github-com-go-asn1-ber-asn1-ber
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-go-asn1-ber-asn1-ber")
|
(name "go-github-com-go-asn1-ber-asn1-ber")
|
||||||
|
|
|
@ -1043,33 +1043,6 @@ usable with any list--including files, command history, processes and more.")
|
||||||
("findutils" ,findutils)
|
("findutils" ,findutils)
|
||||||
("ncurses" ,ncurses)))))
|
("ncurses" ,ncurses)))))
|
||||||
|
|
||||||
(define-public go-github.com-howeyc-gopass
|
|
||||||
(let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8")
|
|
||||||
(revision "0"))
|
|
||||||
(package
|
|
||||||
(name "go-github.com-howeyc-gopass")
|
|
||||||
(version (git-version "0.0.0" revision commit))
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/howeyc/gopass")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
'(#:import-path "github.com/howeyc/gopass"))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-golang-org-x-crypto))
|
|
||||||
(synopsis "Retrieve password from a terminal or piped input in Go")
|
|
||||||
(description
|
|
||||||
"@code{gopass} is a Go package for retrieving a password from user
|
|
||||||
terminal or piped input.")
|
|
||||||
(home-page "https://github.com/howeyc/gopass")
|
|
||||||
(license license:isc))))
|
|
||||||
|
|
||||||
(define-public python-pyte
|
(define-public python-pyte
|
||||||
(package
|
(package
|
||||||
(name "python-pyte")
|
(name "python-pyte")
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
|
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
|
||||||
;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
|
;;; Copyright © 2022 Dhruvin Gandhi <contact@dhruvin.dev>
|
||||||
;;; Copyright © 2015, 2022 David Thompson <davet@gnu.org>
|
;;; Copyright © 2015, 2022 David Thompson <davet@gnu.org>
|
||||||
|
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -125,6 +126,7 @@
|
||||||
#:use-module (gnu packages python-xyz)
|
#:use-module (gnu packages python-xyz)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages rsync)
|
#:use-module (gnu packages rsync)
|
||||||
|
#:use-module (gnu packages ruby)
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
#:use-module (gnu packages texinfo)
|
#:use-module (gnu packages texinfo)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
|
@ -2938,10 +2940,90 @@ the smallest possible conflicts and to allow a merge to be saved, tested,
|
||||||
interrupted, published, and collaborated on while in progress.")
|
interrupted, published, and collaborated on while in progress.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public go-github-com-git-lfs-pktline
|
||||||
|
(let ((commit "06e9096e28253ba5c7825cbba43f469e4efd10f0")
|
||||||
|
(revision "0"))
|
||||||
|
(package
|
||||||
|
(name "go-github-com-git-lfs-pktline")
|
||||||
|
(version (git-version "0.0.0" revision commit))
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri
|
||||||
|
(git-reference
|
||||||
|
(url "https://github.com/git-lfs/pktline")
|
||||||
|
(commit commit)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "02sn3v8vrl7qjnagbnrbrjnyjvzq8cwkxmc922zyc9b2hg187kpz"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments `(#:import-path "github.com/git-lfs/pktline"))
|
||||||
|
(propagated-inputs (list go-github-com-stretchr-testify
|
||||||
|
go-github-com-pmezard-go-difflib
|
||||||
|
go-github-com-davecgh-go-spew))
|
||||||
|
(home-page "https://github.com/git-lfs/pktline")
|
||||||
|
(synopsis "Git pkt-line Go toolkit")
|
||||||
|
(description "This package is a Go language toolkit for reading and
|
||||||
|
writing files using the Git pkt-line format used in various Git operations.")
|
||||||
|
(license license:expat))))
|
||||||
|
|
||||||
|
(define-public go-github-com-git-lfs-wildmatch-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-git-lfs-wildmatch-v2")
|
||||||
|
(version "2.0.1")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/git-lfs/wildmatch")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0yg6d77d5l6v7cd8vr00y68z9aqb8qs4lidv0hkqh4fvz0ggvpln"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:import-path "github.com/git-lfs/wildmatch/v2"))
|
||||||
|
(home-page "https://github.com/git-lfs/wildmatch")
|
||||||
|
(synopsis "Go implementation of Git's wildmatch")
|
||||||
|
(description
|
||||||
|
"This package is an implementation of Git's wildmatch.c-style pattern
|
||||||
|
matching.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public go-github-com-git-lfs-gitobj-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-git-lfs-gitobj-v2")
|
||||||
|
(version "2.1.1")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/git-lfs/gitobj")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1sd7y4xbx00js1g2az4nq8g5lvsm4d7nqr3v4kxy8fxrfzdm63j9"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
'(#:import-path "github.com/git-lfs/gitobj/v2"))
|
||||||
|
(propagated-inputs (list go-github-com-stretchr-testify
|
||||||
|
go-github-com-pmezard-go-difflib
|
||||||
|
go-github-com-davecgh-go-spew))
|
||||||
|
(home-page "https://github.com/git-lfs/gitobj")
|
||||||
|
(synopsis "Read and write git objects")
|
||||||
|
(description
|
||||||
|
"This package reads and writes loose and packed (objects found in git
|
||||||
|
packfiles) Git objects. It uses the pack package to search pack index files
|
||||||
|
and locate the corresponding delta-base chain in the appropriate pack file.
|
||||||
|
If gitobj can't find a loose object with the appropriate SHA-1, it will search
|
||||||
|
the repository's packfile(s) instead. If it finds an object in a packfile, it
|
||||||
|
will reconstruct the object along its delta-base chain and return it.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public git-lfs
|
(define-public git-lfs
|
||||||
(package
|
(package
|
||||||
(name "git-lfs")
|
(name "git-lfs")
|
||||||
(version "2.13.3")
|
(version "3.3.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -2950,13 +3032,21 @@ interrupted, published, and collaborated on while in progress.")
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0r7dmqhkhz91d3n7qfpny483x8f1n88yya22j2fvx75rgg33z2sg"))))
|
"1g268pplld04b9myhlrwc4fd8r1hvfyya5ja8wr558rar3pgsp5g"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:import-path "github.com/git-lfs/git-lfs"
|
(list
|
||||||
|
#:import-path "github.com/git-lfs/git-lfs"
|
||||||
#:install-source? #f
|
#:install-source? #f
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'fix-embed-x-net
|
||||||
|
(lambda _
|
||||||
|
(delete-file-recursively "src/golang.org/x/net/publicsuffix/data")
|
||||||
|
(copy-recursively
|
||||||
|
#$(file-append (this-package-input "go-golang-org-x-net")
|
||||||
|
"/src/golang.org/x/net/publicsuffix/data")
|
||||||
|
"src/golang.org/x/net/publicsuffix/data")))
|
||||||
(add-before 'build 'man-gen
|
(add-before 'build 'man-gen
|
||||||
;; Without this, the binary generated in 'build
|
;; Without this, the binary generated in 'build
|
||||||
;; phase won't have any embedded usage-text.
|
;; phase won't have any embedded usage-text.
|
||||||
|
@ -2966,19 +3056,36 @@ interrupted, published, and collaborated on while in progress.")
|
||||||
(add-after 'build 'build-man-pages
|
(add-after 'build 'build-man-pages
|
||||||
(lambda _
|
(lambda _
|
||||||
(with-directory-excursion "src/github.com/git-lfs/git-lfs"
|
(with-directory-excursion "src/github.com/git-lfs/git-lfs"
|
||||||
(invoke "make" "man"))
|
(invoke "make" "man"))))
|
||||||
#t))
|
|
||||||
(add-after 'install 'install-man-pages
|
(add-after 'install 'install-man-pages
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(with-directory-excursion "src/github.com/git-lfs/git-lfs/man"
|
(with-directory-excursion "src/github.com/git-lfs/git-lfs/man"
|
||||||
(let ((out (assoc-ref outputs "out")))
|
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (manpage)
|
(lambda (manpage)
|
||||||
(install-file manpage (string-append out "/share/man/man1")))
|
(install-file manpage
|
||||||
(find-files "." "^git-lfs.*\\.1$"))))
|
(string-append #$output "/share/man/man1")))
|
||||||
#t)))))
|
(find-files "." "^git-lfs.*\\.1$"))))))))
|
||||||
;; make `ronn` available during build for man page generation
|
;; make `ronn` available during build for man page generation
|
||||||
(native-inputs (list ronn-ng))
|
(native-inputs (list ronn-ng git-minimal ruby-asciidoctor))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-xeipuuv-gojsonschema
|
||||||
|
go-github-com-xeipuuv-gojsonreference
|
||||||
|
go-github-com-xeipuuv-gojsonpointer
|
||||||
|
go-golang-org-x-net
|
||||||
|
go-golang.org-x-sync-semaphore
|
||||||
|
go-github-com-ssgelm-cookiejarparser
|
||||||
|
go-github-com-rubyist-tracerx
|
||||||
|
go-github-com-olekukonko-ts
|
||||||
|
go-github-com-leonelquinteros-gotext
|
||||||
|
go-github-com-git-lfs-wildmatch-v2
|
||||||
|
go-github-com-git-lfs-pktline
|
||||||
|
go-github-com-git-lfs-go-netrc
|
||||||
|
go-github-com-git-lfs-gitobj-v2
|
||||||
|
go-github-com-dpotapov-go-spnego
|
||||||
|
go-github-com-avast-retry-go
|
||||||
|
go-github-com-mattn-go-isatty
|
||||||
|
go-github-com-pkg-errors
|
||||||
|
go-github-com-spf13-cobra))
|
||||||
(home-page "https://git-lfs.github.com/")
|
(home-page "https://git-lfs.github.com/")
|
||||||
(synopsis "Git extension for versioning large files")
|
(synopsis "Git extension for versioning large files")
|
||||||
(description
|
(description
|
||||||
|
@ -2987,6 +3094,38 @@ videos, datasets, and graphics with text pointers inside Git, while storing the
|
||||||
file contents on a remote server.")
|
file contents on a remote server.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public lfs-s3
|
||||||
|
(package
|
||||||
|
(name "lfs-s3")
|
||||||
|
(version "0.1")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://git.sr.ht/~ngraves/lfs-s3")
|
||||||
|
(commit version)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0nkxivb356f1zjlj34px601zy86w4398db9s2ivd178jp4v69raw"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "git.sr.ht/~ngraves/lfs-s3"))
|
||||||
|
(inputs (list git-lfs))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-aws-aws-sdk-go-v2
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-config
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-feature-s3-manager
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-service-s3
|
||||||
|
go-github-com-spf13-cobra))
|
||||||
|
(home-page "https://git.sr.ht/~ngraves/lfs-s3/")
|
||||||
|
(synopsis "Git extension for versioning large files in S3")
|
||||||
|
(description
|
||||||
|
"This package provides a custom transfer agent for Git LFS, allowing
|
||||||
|
plain S3 bucket usage as remote storage for media files. This package uses a
|
||||||
|
standalone agent instead of a server.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public git-open
|
(define-public git-open
|
||||||
(package
|
(package
|
||||||
(name "git-open")
|
(name "git-open")
|
||||||
|
|
|
@ -127,16 +127,15 @@ engine that uses Wayland for graphics output.")
|
||||||
(define-public webkitgtk
|
(define-public webkitgtk
|
||||||
(package
|
(package
|
||||||
(name "webkitgtk") ; webkit2gtk4
|
(name "webkitgtk") ; webkit2gtk4
|
||||||
(version "2.40.0")
|
(version "2.40.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.webkitgtk.org/releases/"
|
(uri (string-append "https://www.webkitgtk.org/releases/"
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "14xkgamqlshxqw6fcslvw0yzj4y5mvx66b6bn64rwrl9pyhpwq54"))
|
(base32 "1xky3cy4l5k0nj366pk17lrzy0n0k6plks9sy0g1dllc9yc2drb4"))
|
||||||
(patches (search-patches
|
(patches (search-patches
|
||||||
"webkitgtk-adjust-bubblewrap-paths.patch"
|
"webkitgtk-adjust-bubblewrap-paths.patch"))))
|
||||||
"webkitgtk-libelogind.patch"))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(outputs '("out" "doc" "debug"))
|
(outputs '("out" "doc" "debug"))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#:use-module ((guix scripts build) #:select (%standard-build-options))
|
#:use-module ((guix scripts build) #:select (%standard-build-options))
|
||||||
#:use-module (guix store)
|
#:use-module (guix store)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
|
#:use-module (guix discovery)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix profiles)
|
#:use-module (guix profiles)
|
||||||
#:use-module (guix upstream)
|
#:use-module (guix upstream)
|
||||||
|
@ -44,6 +45,7 @@
|
||||||
#:use-module ((gnu packages commencement) #:select (%final-inputs))
|
#:use-module ((gnu packages commencement) #:select (%final-inputs))
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
#:use-module (ice-9 format)
|
#:use-module (ice-9 format)
|
||||||
|
#:use-module (ice-9 regex)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (srfi srfi-9)
|
#:use-module (srfi srfi-9)
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
|
@ -71,8 +73,23 @@
|
||||||
((or "core" "non-core")
|
((or "core" "non-core")
|
||||||
(alist-cons 'select (string->symbol arg)
|
(alist-cons 'select (string->symbol arg)
|
||||||
result))
|
result))
|
||||||
|
((? (cut string-prefix? "module:" <>))
|
||||||
|
(let ((mod (cond
|
||||||
|
;; Shorthand name: "module:guile".
|
||||||
|
((string-match "module:([^\( ]+)$" arg) =>
|
||||||
|
(lambda (m)
|
||||||
|
`(gnu packages ,(string->symbol
|
||||||
|
(match:substring m 1)))))
|
||||||
|
;; Full name : "module:(gnu packages guile)".
|
||||||
|
((string-match "module:\\(([^)]+)\\)$" arg) =>
|
||||||
|
(lambda (m)
|
||||||
|
(map string->symbol
|
||||||
|
(string-split
|
||||||
|
(match:substring m 1) #\space))))
|
||||||
|
(else (leave (G_ "invalid module: ~a~%") arg)))))
|
||||||
|
(alist-cons 'select (cons 'module mod) result)))
|
||||||
(x
|
(x
|
||||||
(leave (G_ "~a: invalid selection; expected `core' or `non-core'~%")
|
(leave (G_ "~a: invalid selection; expected `core', `non-core' or `module:NAME'~%")
|
||||||
arg)))))
|
arg)))))
|
||||||
(option '(#\t "type") #t #f
|
(option '(#\t "type") #t #f
|
||||||
(lambda (opt name arg result)
|
(lambda (opt name arg result)
|
||||||
|
@ -141,8 +158,10 @@ specified with `--select'.\n"))
|
||||||
(display (G_ "
|
(display (G_ "
|
||||||
-u, --update update source files in place"))
|
-u, --update update source files in place"))
|
||||||
(display (G_ "
|
(display (G_ "
|
||||||
-s, --select=SUBSET select all the packages in SUBSET, one of
|
-s, --select=SUBSET select all the packages in SUBSET, one of `core`,
|
||||||
`core' or `non-core'"))
|
`non-core' or `module:NAME' (eg: module:guile)
|
||||||
|
the module can also be fully specified as
|
||||||
|
'module:(gnu packages guile)'"))
|
||||||
(display (G_ "
|
(display (G_ "
|
||||||
-m, --manifest=FILE select all the packages from the manifest in FILE"))
|
-m, --manifest=FILE select all the packages from the manifest in FILE"))
|
||||||
(display (G_ "
|
(display (G_ "
|
||||||
|
@ -257,13 +276,20 @@ update would trigger a complete rebuild."
|
||||||
(let ((select? (match (assoc-ref opts 'select)
|
(let ((select? (match (assoc-ref opts 'select)
|
||||||
('core core-package?)
|
('core core-package?)
|
||||||
('non-core (negate core-package?))
|
('non-core (negate core-package?))
|
||||||
(_ (const #t)))))
|
(_ (const #t))))
|
||||||
|
(modules (match (assoc-ref opts 'select)
|
||||||
|
(('module . mod)
|
||||||
|
(list (resolve-interface mod)))
|
||||||
|
(_ (all-modules (%package-module-path)
|
||||||
|
#:warn
|
||||||
|
warn-about-load-error)))))
|
||||||
(map update-spec
|
(map update-spec
|
||||||
(fold-packages (lambda (package result)
|
(fold-packages (lambda (package result)
|
||||||
(if (select? package)
|
(if (select? package)
|
||||||
(keep-newest package result)
|
(keep-newest package result)
|
||||||
result))
|
result))
|
||||||
'()))))
|
'()
|
||||||
|
modules))))
|
||||||
(some ;user-specified packages
|
(some ;user-specified packages
|
||||||
some)))
|
some)))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue