mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: Avoid #:prefix when importing a (gnu packages …) module.
* gnu/packages/admin.scm, gnu/packages/emacs.scm, gnu/packages/gnutls.scm, gnu/packages/gsasl.scm, gnu/packages/linux.scm: Remove uses of #:prefix for package modules.
This commit is contained in:
Ludovic Courtès
parent
6d0b9d03ce
commit
f61e0e7900
5 changed files with 59 additions and 60 deletions
|
|
@ -21,7 +21,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages admin)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix download)
|
||||
|
|
@ -38,7 +38,7 @@ (define-module (gnu packages admin)
|
|||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module ((gnu packages compression) #:prefix c:)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module ((gnu packages openssl) #:prefix o:)
|
||||
#:use-module (gnu packages gnutls)
|
||||
#:use-module (gnu packages gnupg)
|
||||
|
|
@ -78,7 +78,7 @@ (define-public dmd
|
|||
execution of system services, replacing similar functionality found in
|
||||
typical init systems. It provides dependency-handling through a convenient
|
||||
interface and is based on GNU Guile.")
|
||||
(license gpl3+)
|
||||
(license license:gpl3+)
|
||||
(home-page "http://www.gnu.org/software/dmd/")))
|
||||
|
||||
(define-public dfc
|
||||
|
|
@ -102,7 +102,7 @@ (define-public dfc
|
|||
(description
|
||||
"dfc (df color) is a modern version of df. It uses colors, draws pretty
|
||||
graphs and can export its output to different formats.")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public htop
|
||||
(package
|
||||
|
|
@ -123,7 +123,7 @@ (define-public htop
|
|||
(description
|
||||
"This is htop, an interactive process viewer. It is a text-mode
|
||||
application (for console or X terminals) and requires ncurses.")
|
||||
(license gpl2)))
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public pies
|
||||
(package
|
||||
|
|
@ -145,7 +145,7 @@ (define-public pies
|
|||
other programs. It reads the list of programs to be started from its
|
||||
configuration file, executes them, and then monitors their status,
|
||||
re-executing them as necessary.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public inetutils
|
||||
(package
|
||||
|
|
@ -169,7 +169,7 @@ (define-public inetutils
|
|||
(description
|
||||
"Inetutils is a collection of common network programs, such as an ftp
|
||||
client and server, a telnet client and server, and an rsh client and server.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public shadow
|
||||
(package
|
||||
|
|
@ -224,7 +224,7 @@ (define-public shadow
|
|||
|
||||
;; The `vipw' program is GPLv2+.
|
||||
;; libmisc/salt.c is public domain.
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public mingetty
|
||||
(package
|
||||
|
|
@ -274,7 +274,7 @@ (define-public mingetty
|
|||
"Small console getty that is started on the Linux text console,
|
||||
asks for a login name and then transfers over to 'login'. It is extended to
|
||||
allow automatic login and starting any app.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public net-base
|
||||
(package
|
||||
|
|
@ -311,14 +311,14 @@ (define-public net-base
|
|||
'("services" "protocols" "rpc")))
|
||||
#t))))
|
||||
(native-inputs `(("tar" ,tar)
|
||||
("xz" ,c:xz)))
|
||||
("xz" ,xz)))
|
||||
(synopsis "IANA protocol, port, and RPC number assignments")
|
||||
(description
|
||||
"This package provides the /etc/services, /etc/protocols, and /etc/rpc
|
||||
files, which contain information about the IANA-assigned port, protocol, and
|
||||
ONC RPC numbers")
|
||||
(home-page "http://packages.debian.org/sid/netbase")
|
||||
(license gpl2)))
|
||||
(license license:gpl2)))
|
||||
|
||||
(define-public netcat
|
||||
(package
|
||||
|
|
@ -348,7 +348,7 @@ (define-public netcat
|
|||
programs and scripts. At the same time, it is a feature-rich network debugging
|
||||
and exploration tool, since it can create almost any kind of connection you
|
||||
would need and has several interesting built-in capabilities.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public alive
|
||||
(package
|
||||
|
|
@ -370,7 +370,7 @@ (define-public alive
|
|||
(description
|
||||
"GNU Alive sends periodic pings to a server, generally to keep a
|
||||
connection alive.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public isc-dhcp
|
||||
(package
|
||||
|
|
@ -460,7 +460,7 @@ (define-public isc-dhcp
|
|||
"ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a
|
||||
reference implementation of all aspects of DHCP, through a suite of DHCP
|
||||
tools: server, client, and relay agent.")
|
||||
(license isc)))
|
||||
(license license:isc)))
|
||||
|
||||
(define-public libpcap
|
||||
(package
|
||||
|
|
@ -484,7 +484,7 @@ (define-public libpcap
|
|||
network statistics collection, security monitoring, network debugging, etc.")
|
||||
|
||||
;; fad-*.c and a couple other files are BSD-4, but the rest is BSD-3.
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public tcpdump
|
||||
(package
|
||||
|
|
@ -506,7 +506,7 @@ (define-public tcpdump
|
|||
(description
|
||||
"Tcpdump is a command-line tool to analyze network traffic passing
|
||||
through the network interface controller.")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public jnettop
|
||||
(package
|
||||
|
|
@ -532,7 +532,7 @@ (define-public jnettop
|
|||
"Jnettop is a traffic visualiser, which captures traffic going
|
||||
through the host it is running from and displays streams sorted
|
||||
by bandwidth they use.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public clusterssh
|
||||
(package
|
||||
|
|
@ -578,7 +578,7 @@ (define-public clusterssh
|
|||
"ClusterSSH controls a number of xterm windows via a single graphical
|
||||
console window to allow commands to be interactively run on multiple servers
|
||||
over ssh connections.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public rottlog
|
||||
(package
|
||||
|
|
@ -621,7 +621,7 @@ (define-public rottlog
|
|||
according to a given schedule. It can also be used to automatically compress
|
||||
and archive such logs. Rot[t]log will mail reports of its activity to the
|
||||
system administrator.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public sudo
|
||||
(package
|
||||
|
|
@ -681,7 +681,7 @@ (define-public sudo
|
|||
commands and their arguments.")
|
||||
|
||||
;; See <http://www.sudo.ws/sudo/license.html>.
|
||||
(license x11)))
|
||||
(license license:x11)))
|
||||
|
||||
(define-public wpa-supplicant-light
|
||||
(package
|
||||
|
|
@ -762,7 +762,7 @@ (define (copy-man-page target)
|
|||
This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
|
||||
|
||||
;; In practice, this is linked against Readline, which makes it GPLv3+.
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public wpa-supplicant
|
||||
(package (inherit wpa-supplicant-light)
|
||||
|
|
@ -820,7 +820,7 @@ (define-public wakelan
|
|||
(description
|
||||
"WakeLan broadcasts a properly formatted UDP packet across the local area
|
||||
network, which causes enabled computers to power on.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public dmidecode
|
||||
(package
|
||||
|
|
@ -850,7 +850,7 @@ (define-public dmidecode
|
|||
reliability depending on the manufacturer. This will often include usage
|
||||
status for the CPU sockets, expansion slots (e.g. AGP, PCI, ISA) and memory
|
||||
module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public acpica
|
||||
(package
|
||||
|
|
@ -883,7 +883,7 @@ (define-public acpica
|
|||
subsystem, and a small set of tools to assist in developing and debugging ACPI
|
||||
tables. This package contains only the user-space tools needed for ACPI table
|
||||
development, not the kernel implementation of ACPI.")
|
||||
(license gpl2))) ; Dual GPLv2/ACPICA Licence
|
||||
(license license:gpl2))) ; Dual GPLv2/ACPICA Licence
|
||||
|
||||
(define-public stress
|
||||
(package
|
||||
|
|
@ -909,7 +909,7 @@ (define-public stress
|
|||
perceived performance characteristics, and by systems programmers to expose
|
||||
the classes of bugs which only or more frequently manifest themselves when the
|
||||
system is under heavy load.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public detox
|
||||
(package
|
||||
|
|
@ -939,7 +939,7 @@ (define-public detox
|
|||
under Unix and related operating systems. Spaces and various other unsafe
|
||||
characters (such as \"$\") get replaced with \"_\". ISO 8859-1 (Latin-1)
|
||||
characters can be replaced as well, as can UTF-8 characters.")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public testdisk
|
||||
(package
|
||||
|
|
@ -957,7 +957,7 @@ (define-public testdisk
|
|||
`(;; ("ntfs" ,ntfs)
|
||||
("util-linux" ,util-linux)
|
||||
("openssl" ,o:openssl)
|
||||
("zlib" ,c:zlib)
|
||||
("zlib" ,zlib)
|
||||
("e2fsprogs" ,e2fsprogs)
|
||||
("libjpeg" ,libjpeg)
|
||||
("ncurses" ,ncurses)))
|
||||
|
|
@ -966,7 +966,7 @@ (define-public testdisk
|
|||
(description
|
||||
"TestDisk is a program for data recovery, primarily designed to help
|
||||
recover lost partitions and/or make non-booting disks bootable again.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public direvent
|
||||
(package
|
||||
|
|
@ -1004,7 +1004,7 @@ (define-public direvent
|
|||
within the file system where it occurred. Thus, \"direvent\" provides an
|
||||
easy way to react immediately if given files undergo changes, for example, to
|
||||
track changes in important system configuration files.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public libcap-ng
|
||||
(package
|
||||
|
|
@ -1030,7 +1030,7 @@ (define-public libcap-ng
|
|||
included utilities are designed to let admins and developers spot apps from
|
||||
various ways that may be running with too much privilege.")
|
||||
;; The library is lgpl2.1+, but also ships some utils which are gpl2+.
|
||||
(license (list lgpl2.1+ gpl2+))))
|
||||
(license (list license:lgpl2.1+ license:gpl2+))))
|
||||
|
||||
(define-public smartmontools
|
||||
(package
|
||||
|
|
@ -1054,4 +1054,4 @@ (define-public smartmontools
|
|||
Technology System (S.M.A.R.T.) built into most modern ATA and SCSI harddisks.
|
||||
In many cases, these utilities will provide advanced warning of disk
|
||||
degradation and failure.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages emacs)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
|
|
@ -42,7 +42,7 @@ (define-module (gnu packages emacs)
|
|||
#:use-module (gnu packages w3m)
|
||||
#:use-module (gnu packages wget)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module ((gnu packages compression) #:prefix compression:)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages acl)
|
||||
|
|
@ -90,7 +90,7 @@ (define-public emacs
|
|||
;; When looking for libpng `configure' links with `-lpng -lz', so we
|
||||
;; must also provide zlib as an input.
|
||||
("libpng" ,libpng)
|
||||
("zlib" ,compression:zlib)
|
||||
("zlib" ,zlib)
|
||||
|
||||
("libXpm" ,libxpm)
|
||||
("libxml2" ,libxml2)
|
||||
|
|
@ -112,7 +112,7 @@ (define-public emacs
|
|||
documentation on all aspects of the system, from basic editing to writing
|
||||
large Lisp programs. It has full Unicode support for nearly all human
|
||||
languages.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-no-x-toolkit
|
||||
(package (inherit emacs)
|
||||
|
|
@ -170,7 +170,7 @@ (define-public geiser
|
|||
of the stage in Geiser. A bundle of Elisp shims orchestrates the dialog
|
||||
between the Scheme interpreter, Emacs and, ultimately, the schemer,
|
||||
giving her access to live metadata.")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public paredit
|
||||
(package
|
||||
|
|
@ -215,7 +215,7 @@ (define-public paredit
|
|||
S-expressions and moving around in S-expressions. Its behavior can be jarring
|
||||
for those who may want transient periods of unbalanced parentheses, such as
|
||||
when typing parentheses directly or commenting out code line by line.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public magit
|
||||
(package
|
||||
|
|
@ -272,7 +272,7 @@ (define-public magit
|
|||
example, and you can browse the history of past changes. There is support for
|
||||
cherry picking, reverting, merging, rebasing, and other common Git
|
||||
operations.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -347,7 +347,7 @@ (define-public emacs-w3m
|
|||
(synopsis "Simple Web browser for Emacs based on w3m")
|
||||
(description
|
||||
"Emacs-w3m is an emacs interface for the w3m web browser.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public emacs-wget
|
||||
(package
|
||||
|
|
@ -394,7 +394,7 @@ (define-public emacs-wget
|
|||
(synopsis "Simple file downloader for Emacs based on wget")
|
||||
(description
|
||||
"Emacs-wget is an emacs interface for the wget file downloader.")
|
||||
(license gpl2+)))
|
||||
(license license:gpl2+)))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -517,7 +517,7 @@ (define-public emms
|
|||
supports tagging and playlist management, all behind a clean and
|
||||
light user interface.")
|
||||
(home-page "http://www.gnu.org/software/emms/")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
@ -560,4 +560,4 @@ (define-public bbdb
|
|||
an address book for email and snail mail addresses, phone numbers and the
|
||||
like. It can be linked with various Emacs mail clients (Message and Mail
|
||||
mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.")
|
||||
(license gpl3+)))
|
||||
(license license:gpl3+)))
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages gnutls)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:select (lgpl2.0+ lgpl2.1+ bsd-3))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module ((gnu packages compression) #:prefix guix:)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages libffi)
|
||||
|
|
@ -141,7 +141,7 @@ (define-public gnutls
|
|||
;; These are all in the 'Requires.private' field of gnutls.pc.
|
||||
`(("libtasn1" ,libtasn1)
|
||||
("nettle" ,nettle)
|
||||
("zlib" ,guix:zlib)))
|
||||
("zlib" ,zlib)))
|
||||
(home-page "http://www.gnu.org/software/gnutls/")
|
||||
(synopsis "Transport layer security library")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
(define-module (gnu packages gsasl)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module ((gnu packages compression) #:prefix guix:)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gnutls)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages nettle)
|
||||
#:use-module (gnu packages shishi)
|
||||
#:use-module (guix licenses)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu))
|
||||
|
|
@ -42,7 +42,7 @@ (define-public libntlm
|
|||
(synopsis "Library that implements NTLM authentication")
|
||||
(description
|
||||
"Libntlm is a library that implements NTLM authentication")
|
||||
(license lgpl2.1+)
|
||||
(license license:lgpl2.1+)
|
||||
(home-page "http://www.nongnu.org/libntlm/")))
|
||||
|
||||
(define-public gss
|
||||
|
|
@ -58,8 +58,7 @@ (define-public gss
|
|||
(build-system gnu-build-system)
|
||||
(inputs `(("nettle" ,nettle)
|
||||
("shishi" ,shishi)
|
||||
("zlib" ,guix:zlib)
|
||||
))
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Generic Security Service library")
|
||||
(description
|
||||
"The GNU Generic Security Service provides a free implementation of the
|
||||
|
|
@ -68,7 +67,7 @@ (define-public gss
|
|||
a generic, GSS interface, with which the calling application interacts via
|
||||
this library, freeing the application developer from needing to know about
|
||||
the underlying security implementation.")
|
||||
(license gpl3+)
|
||||
(license license:gpl3+)
|
||||
(home-page "http://www.gnu.org/software/gss/")))
|
||||
|
||||
(define-public gsasl
|
||||
|
|
@ -85,7 +84,7 @@ (define-public gsasl
|
|||
(inputs `(("libidn" ,libidn)
|
||||
("libntlm" ,libntlm)
|
||||
("gss" ,gss)
|
||||
("zlib" ,guix:zlib)))
|
||||
("zlib" ,zlib)))
|
||||
(propagated-inputs
|
||||
;; Propagate GnuTLS because libgnutls.la reads `-lnettle', and Nettle is a
|
||||
;; propagated input of GnuTLS.
|
||||
|
|
@ -96,5 +95,5 @@ (define-public gsasl
|
|||
Security Layer framework. On network servers such as IMAP or SMTP servers,
|
||||
SASL is used to handle client/server authentication. This package contains
|
||||
both a library and a command-line tool to access the library.")
|
||||
(license gpl3+)
|
||||
(license license:gpl3+)
|
||||
(home-page "http://www.gnu.org/software/gsasl/")))
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ (define-module (gnu packages linux)
|
|||
#:use-module ((guix licenses)
|
||||
#:hide (zlib))
|
||||
#:use-module (gnu packages)
|
||||
#:use-module ((gnu packages compression) #:prefix guix:)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages bison)
|
||||
|
|
@ -415,7 +415,7 @@ (define-public util-linux
|
|||
(string-append net "/etc/services")))
|
||||
#t))
|
||||
%standard-phases)))
|
||||
(inputs `(("zlib" ,guix:zlib)
|
||||
(inputs `(("zlib" ,zlib)
|
||||
("ncurses" ,ncurses)))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
|
|
@ -1092,7 +1092,7 @@ (define-public powertop
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
;; TODO: Add pciutils.
|
||||
`(("zlib" ,guix:zlib)
|
||||
`(("zlib" ,zlib)
|
||||
;; ("pciutils" ,pciutils)
|
||||
("ncurses" ,ncurses)
|
||||
("libnl" ,libnl)))
|
||||
|
|
@ -1408,8 +1408,8 @@ (define-public kbd
|
|||
'("unicode_start" "unicode_stop"))))
|
||||
%standard-phases))))
|
||||
(inputs `(("check" ,check)
|
||||
("gzip" ,guix:gzip)
|
||||
("bzip2" ,guix:bzip2)
|
||||
("gzip" ,gzip)
|
||||
("bzip2" ,bzip2)
|
||||
("pam" ,linux-pam)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(home-page "ftp://ftp.kernel.org/pub/linux/utils/kbd/")
|
||||
|
|
@ -1457,8 +1457,8 @@ (define-public kmod
|
|||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("xz" ,guix:xz)
|
||||
("zlib" ,guix:zlib)))
|
||||
`(("xz" ,xz)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME: Investigate test failures
|
||||
#:configure-flags '("--with-xz" "--with-zlib")
|
||||
|
|
|
|||
Loading…
Reference in a new issue