tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

gnu: inxi: Update to 3.3.40-1.

Browse Source 
* gnu/packages/admin.scm (inxi-minimal): Update to 3.3.40-1.
[source]: Use new upstream URI.
[arguments]: Adjust substitution of perl shebang in script.  Fix
locations of some binaries in the wrap-program section.
(inxi)[inputs]: Add eudev, wayland-utils.

Change-Id: Iccf953ac41cfbfdd07e04758757cdf8a451097bb
This commit is contained in:
Efraim Flashner
2026-03-31 16:08:54 +03:00
parent 7a68ab3a73
commit 712bb1e29f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/admin.scm
View File

@@ -4988,16 +4988,16 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.3.31-2") (version "3.3.40-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/smxi/inxi") (url "https://codeberg.org/smxi/inxi")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "1fca5minalpmizbxh5kmjiv8xrl7k6g91zn8d84fxmbhsk8vn3kk")))) (base32 "0ivj0dcx7d2hmmkhyql156sb08385rzw640z9kyq4cv1n8ndz58s"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
(list bash-minimal (list bash-minimal
@@ -5023,8 +5023,8 @@ Python loading in HPC environments.")
(copy-recursively (assoc-ref %build-inputs "source") (copy-recursively (assoc-ref %build-inputs "source")
,(string-append real-name "-" version)) ,(string-append real-name "-" version))
(with-directory-excursion ,(string-append real-name "-" version) (with-directory-excursion ,(string-append real-name "-" version)
(with-fluids ((%default-port-encoding #f)) (patch-shebang "inxi" (list (dirname (search-input-file
(substitute* "inxi" (("/usr/bin/env perl") (which "perl")))) %build-inputs "bin/perl"))))
(let ((bin (string-append %output "/bin"))) (let ((bin (string-append %output "/bin")))
(install-file "inxi" bin) (install-file "inxi" bin)
(wrap-program (string-append bin "/inxi") (wrap-program (string-append bin "/inxi")
@@ -5039,7 +5039,8 @@ Python loading in HPC environments.")
((member name '("util-linux")) ((member name '("util-linux"))
(string-append (store-append "/bin") ":" (string-append (store-append "/bin") ":"
(store-append "/sbin"))) (store-append "/sbin")))
((member name '("dmidecode" "iproute2")) ((member name '("dmidecode" "iproute2" "lvm2"
"mdadm"))
(store-append "/sbin")) (store-append "/sbin"))
(else (store-append "/bin"))))))) (else (store-append "/bin")))))))
%build-inputs))) %build-inputs)))
@@ -5067,6 +5068,7 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
(name "inxi") (name "inxi")
(inputs (inputs
`(("dmidecode" ,dmidecode) `(("dmidecode" ,dmidecode)
("eudev" ,eudev)
("file" ,file) ("file" ,file)
("bind:utils" ,isc-bind "utils") ; dig ("bind:utils" ,isc-bind "utils") ; dig
("gzip" ,gzip) ("gzip" ,gzip)
@@ -5092,11 +5094,14 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
("perl-time-hires" ,perl-time-hires) ("perl-time-hires" ,perl-time-hires)
("lvm2" ,lvm2) ; lvs ("lvm2" ,lvm2) ; lvs
("mdadm" ,mdadm) ("mdadm" ,mdadm)
("wayland-utils" ,wayland-utils)
;; TODO: Add more inputs: ;; TODO: Add more inputs:
;; ipmi-sensors ;; ipmi-sensors
;; hddtemp ;; hddtemp
;; perl-xml-dumper ;; perl-xml-dumper
;; ipmitool ;; ipmitool
;; wlr-randr
;; vulkan-tools
,@(package-inputs inxi-minimal))))) ,@(package-inputs inxi-minimal)))))
(define-public pscircle (define-public pscircle