TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: lsscsi: Move to (gnu packages scsi).

Browse source 
* gnu/packages/linux.scm (lsscsi): Move to...
* gnu/packages/scsi.scm (lsscsi): ... here.
(sg3-utils)[license]: Use license: prefix.
(libiscsi)[license]: Likewise.

Signed-off-by: Hilton Chain <hako@ultrarare.space>
This commit is contained in:
Felix Lechner 2023-05-15 11:19:05 -07:00 committed by Hilton Chain
parent 63b2d9a8f1
commit 160f78a4d9
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/linux.scm
View file

@ -3122,27 +3122,6 @@ (define-public jitterentropy-rngd
(license (list license:bsd-3 ; or
license:gpl2+))))
(define-public lsscsi
(package
(name "lsscsi")
(version "0.32")
(source (origin
(method url-fetch)
(uri (string-append
"http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz"))
(sha256
(base32
"0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4"))))
(build-system gnu-build-system)
(synopsis "Lists information about SCSI or NVMe devices in Linux")
(home-page "https://sg.danny.cz/scsi/lsscsi.html")
(description
"@command{lsscsi} lists SCSI logical units or SCSI targets. It can
also list NVMe namespaces or controllers and show the relationship between a
device's primary node name, its SCSI generic (sg) node name and its kernel
name.")
(license license:gpl2)))
(define-public ebtables
(package
(name "ebtables")

30
gnu/packages/scsi.scm
View file

@ -19,8 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages scsi)
#:use-module ((guix licenses)
#:select (gpl2+ bsd-2 bsd-3 lgpl2.1+))
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@ -70,7 +69,7 @@ (define-public sg3-utils
;; "3 clause" to the newer "2 clause" version on 20180119. To save space
;; various source code files refer to a file called "BSD_LICENSE" [...]."
;; Some files (like sg_compare_and_write.c) retain their 3-clause headers!
(license (list gpl2+ bsd-2 bsd-3))))
(license (list license:gpl2+ license:bsd-2 license:bsd-3))))
(define-public libiscsi
(package
@ -97,6 +96,27 @@ (define-public libiscsi
(license (list
;; For the src, examples and test-tool directories, except
;; src/ld_iscsi.c.
gpl2+
license:gpl2+
;; For the lib and include directories.
lgpl2.1+))))
license:lgpl2.1+))))
(define-public lsscsi
(package
(name "lsscsi")
(version "0.32")
(source (origin
(method url-fetch)
(uri (string-append
"http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz"))
(sha256
(base32
"0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4"))))
(build-system gnu-build-system)
(synopsis "Lists information about SCSI or NVMe devices in Linux")
(home-page "https://sg.danny.cz/scsi/lsscsi.html")
(description
"@command{lsscsi} lists SCSI logical units or SCSI targets. It can
also list NVMe namespaces or controllers and show the relationship between a
device's primary node name, its SCSI generic (sg) node name and its kernel
name.")
(license license:gpl2)))