gnu: Use #:prefix when importing (guix licenses).

This works around a problem with #:hide, whereby Guile would report
'zlib', 'openssl', and/or 'expat as colliding bindings at run time
despite the #:hide.

* gnu/packages/linux.scm: Use #:prefix license for (guix licenses).
* gnu/packages/haskell.scm: Likewise.
This commit is contained in:
Ludovic Courtès 2015-12-19 00:30:33 +01:00
parent 793bcc1933
commit 3ac732715d
2 changed files with 282 additions and 286 deletions

File diff suppressed because it is too large Load diff

View file

@ -23,8 +23,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages linux) (define-module (gnu packages linux)
#:use-module ((guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:hide (zlib openssl))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
@ -150,7 +149,7 @@ (define-public linux-libre-headers
#:tests? #f)) #:tests? #f))
(synopsis "GNU Linux-Libre kernel headers") (synopsis "GNU Linux-Libre kernel headers")
(description "Headers of the Linux-Libre kernel.") (description "Headers of the Linux-Libre kernel.")
(license gpl2) (license license:gpl2)
(home-page "http://www.gnu.org/software/linux-libre/")))) (home-page "http://www.gnu.org/software/linux-libre/"))))
(define-public module-init-tools (define-public module-init-tools
@ -184,7 +183,7 @@ (define-public module-init-tools
(description (description
"Tools for loading and managing Linux kernel modules, such as `modprobe', "Tools for loading and managing Linux kernel modules, such as `modprobe',
`insmod', `lsmod', and more.") `insmod', `lsmod', and more.")
(license gpl2+))) (license license:gpl2+)))
(define %boot-logo-patch (define %boot-logo-patch
;; Linux-Libre boot logo featuring Freedo and a gnu. ;; Linux-Libre boot logo featuring Freedo and a gnu.
@ -315,7 +314,7 @@ (define-public linux-libre
(description (description
"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel. "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.
It has been modified to remove all non-free binary blobs.") It has been modified to remove all non-free binary blobs.")
(license gpl2) (license license:gpl2)
(home-page "http://www.gnu.org/software/linux-libre/")))) (home-page "http://www.gnu.org/software/linux-libre/"))))
@ -362,7 +361,7 @@ (define-public linux-pam
Pluggable authentication modules are small shared object files that can Pluggable authentication modules are small shared object files that can
be used through the PAM API to perform tasks, like authenticating a user be used through the PAM API to perform tasks, like authenticating a user
at login. Local and dynamic reconfiguration are its key features.") at login. Local and dynamic reconfiguration are its key features.")
(license bsd-3))) (license license:bsd-3)))
;;; ;;;
@ -390,7 +389,7 @@ (define-public psmisc
"This PSmisc package is a set of some small useful utilities that "This PSmisc package is a set of some small useful utilities that
use the proc filesystem. We're not about changing the world, but use the proc filesystem. We're not about changing the world, but
providing the system administrator with some help in common tasks.") providing the system administrator with some help in common tasks.")
(license gpl2+))) (license license:gpl2+)))
(define-public util-linux (define-public util-linux
(package (package
@ -457,8 +456,8 @@ (define-public util-linux
;; Note that util-linux doesn't use the same license for all the ;; Note that util-linux doesn't use the same license for all the
;; code. GPLv2+ is the default license for a code without an ;; code. GPLv2+ is the default license for a code without an
;; explicitly defined license. ;; explicitly defined license.
(license (list gpl3+ gpl2+ gpl2 lgpl2.0+ (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+
bsd-4 public-domain)))) license:bsd-4 license:public-domain))))
(define-public procps (define-public procps
(package (package
@ -525,7 +524,7 @@ (define-public procps
that give information about processes using the Linux /proc file system. that give information about processes using the Linux /proc file system.
The package includes the programs ps, top, vmstat, w, kill, free, The package includes the programs ps, top, vmstat, w, kill, free,
slabtop, and skill.") slabtop, and skill.")
(license gpl2))) (license license:gpl2)))
(define-public usbutils (define-public usbutils
(package (package
@ -549,7 +548,7 @@ (define-public usbutils
"Tools for working with USB devices, such as lsusb") "Tools for working with USB devices, such as lsusb")
(description (description
"Tools for working with USB devices, such as lsusb.") "Tools for working with USB devices, such as lsusb.")
(license gpl2+))) (license license:gpl2+)))
(define-public e2fsprogs (define-public e2fsprogs
(package (package
@ -625,9 +624,9 @@ (define-public e2fsprogs
(synopsis "Creating and checking ext2/ext3/ext4 file systems") (synopsis "Creating and checking ext2/ext3/ext4 file systems")
(description (description
"This package provides tools for manipulating ext2/ext3/ext4 file systems.") "This package provides tools for manipulating ext2/ext3/ext4 file systems.")
(license (list gpl2 ; programs (license (list license:gpl2 ;programs
lgpl2.0 ; libext2fs license:lgpl2.0 ;libext2fs
x11)))) ; libuuid license:x11)))) ;libuuid
(define e2fsprogs/static (define e2fsprogs/static
(static-package (static-package
@ -691,7 +690,7 @@ (define-public extundelete
(description (description
"Extundelete is a set of tools that can recover deleted files from an "Extundelete is a set of tools that can recover deleted files from an
ext3 or ext4 partition.") ext3 or ext4 partition.")
(license gpl2))) (license license:gpl2)))
(define-public zerofree (define-public zerofree
(package (package
@ -726,7 +725,7 @@ (define-public zerofree
"The zerofree command scans the free blocks in an ext2 file system and "The zerofree command scans the free blocks in an ext2 file system and
fills any non-zero blocks with zeroes. This is a useful way to make disk fills any non-zero blocks with zeroes. This is a useful way to make disk
images more compressible.") images more compressible.")
(license gpl2))) (license license:gpl2)))
(define-public strace (define-public strace
(package (package
@ -746,7 +745,7 @@ (define-public strace
(description (description
"strace is a system call tracer, i.e. a debugging tool which prints out a "strace is a system call tracer, i.e. a debugging tool which prints out a
trace of all the system calls made by a another process/program.") trace of all the system calls made by a another process/program.")
(license bsd-3))) (license license:bsd-3)))
(define-public ltrace (define-public ltrace
(package (package
@ -770,7 +769,7 @@ (define-public ltrace
"ltrace intercepts and records dynamic library calls which are called by "ltrace intercepts and records dynamic library calls which are called by
an executed process and the signals received by that process. It can also an executed process and the signals received by that process. It can also
intercept and print the system calls executed by the program.") intercept and print the system calls executed by the program.")
(license gpl2+))) (license license:gpl2+)))
(define-public alsa-lib (define-public alsa-lib
(package (package
@ -791,7 +790,7 @@ (define-public alsa-lib
(description (description
"The Advanced Linux Sound Architecture (ALSA) provides audio and "The Advanced Linux Sound Architecture (ALSA) provides audio and
MIDI functionality to the Linux-based operating system.") MIDI functionality to the Linux-based operating system.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public alsa-utils (define-public alsa-utils
(package (package
@ -836,7 +835,7 @@ (define-public alsa-utils
;; This is mostly GPLv2+ but a few files such as 'alsactl.c' are ;; This is mostly GPLv2+ but a few files such as 'alsactl.c' are
;; GPLv2-only. ;; GPLv2-only.
(license gpl2))) (license license:gpl2)))
(define-public iptables (define-public iptables
(package (package
@ -864,7 +863,7 @@ (define-public iptables
from the packet filter ruleset, iptables is used for this, too. The iptables from the packet filter ruleset, iptables is used for this, too. The iptables
package also includes ip6tables. ip6tables is used for configuring the IPv6 package also includes ip6tables. ip6tables is used for configuring the IPv6
packet filter.") packet filter.")
(license gpl2+))) (license license:gpl2+)))
(define-public iproute (define-public iproute
(package (package
@ -925,7 +924,7 @@ (define-public iproute
controls IPv4 and IPv6 configuration and tc stands for traffic control. Both controls IPv4 and IPv6 configuration and tc stands for traffic control. Both
tools print detailed usage messages and are accompanied by a set of tools print detailed usage messages and are accompanied by a set of
manpages.") manpages.")
(license gpl2+))) (license license:gpl2+)))
(define-public net-tools (define-public net-tools
;; XXX: This package is basically unmaintained, but it provides a few ;; XXX: This package is basically unmaintained, but it provides a few
@ -1023,7 +1022,7 @@ (define (apply-patch file)
netstat, rarp and route. Additionally, this package contains utilities netstat, rarp and route. Additionally, this package contains utilities
relating to particular network hardware types (plipconfig, slattach) and relating to particular network hardware types (plipconfig, slattach) and
advanced aspects of IP configuration (iptunnel, ipmaddr).") advanced aspects of IP configuration (iptunnel, ipmaddr).")
(license gpl2+))) (license license:gpl2+)))
(define-public libcap (define-public libcap
(package (package
@ -1061,7 +1060,7 @@ (define-public libcap
Linux-based operating systems.") Linux-based operating systems.")
;; License is BSD-3 or GPLv2, at the user's choice. ;; License is BSD-3 or GPLv2, at the user's choice.
(license gpl2))) (license license:gpl2)))
(define-public bridge-utils (define-public bridge-utils
(package (package
@ -1107,7 +1106,7 @@ (define-public bridge-utils
Packets are forwarded based on Ethernet address, rather than IP address (like Packets are forwarded based on Ethernet address, rather than IP address (like
a router). Since forwarding is done at Layer 2, all protocols can go a router). Since forwarding is done at Layer 2, all protocols can go
transparently through a bridge.") transparently through a bridge.")
(license gpl2+))) (license license:gpl2+)))
(define-public libnl (define-public libnl
(package (package
@ -1134,7 +1133,7 @@ (define-public libnl
;; Most files are LGPLv2.1-only, but some are GPLv2-only (like ;; Most files are LGPLv2.1-only, but some are GPLv2-only (like
;; 'nl-addr-add.c'), so the result is GPLv2-only. ;; 'nl-addr-add.c'), so the result is GPLv2-only.
(license gpl2))) (license license:gpl2)))
(define-public iw (define-public iw
(package (package
@ -1160,7 +1159,7 @@ (define-public iw
(description (description
"iw is a new nl80211 based CLI configuration utility for wireless "iw is a new nl80211 based CLI configuration utility for wireless
devices. It replaces 'iwconfig', which is deprecated.") devices. It replaces 'iwconfig', which is deprecated.")
(license isc))) (license license:isc)))
(define-public powertop (define-public powertop
(package (package
@ -1191,7 +1190,7 @@ (define-public powertop
an interactive mode where the user can experiment various power management an interactive mode where the user can experiment various power management
settings for cases where the operating system has not enabled these settings for cases where the operating system has not enabled these
settings.") settings.")
(license gpl2))) (license license:gpl2)))
(define-public aumix (define-public aumix
(package (package
@ -1212,7 +1211,7 @@ (define-public aumix
(description (description
"Aumix adjusts an audio mixer from X, the console, a terminal, "Aumix adjusts an audio mixer from X, the console, a terminal,
the command line or a script.") the command line or a script.")
(license gpl2+))) (license license:gpl2+)))
(define-public iotop (define-public iotop
(package (package
@ -1238,7 +1237,7 @@ (define-public iotop
(description (description
"Iotop is a Python program with a top like user interface to show the "Iotop is a Python program with a top like user interface to show the
processes currently causing I/O.") processes currently causing I/O.")
(license gpl2+))) (license license:gpl2+)))
(define-public fuse (define-public fuse
(package (package
@ -1296,8 +1295,8 @@ (define-public fuse
user space\", is a kernel module and user-space library that tries to address user space\", is a kernel module and user-space library that tries to address
part of this problem by allowing users to run file system implementations as part of this problem by allowing users to run file system implementations as
user-space processes.") user-space processes.")
(license (list lgpl2.1 ; library (license (list license:lgpl2.1 ;library
gpl2+)))) ; command-line utilities license:gpl2+)))) ;command-line utilities
(define-public unionfs-fuse (define-public unionfs-fuse
(package (package
@ -1321,7 +1320,7 @@ (define-public unionfs-fuse
space, using the FUSE library. Mounting a union file system allows you to space, using the FUSE library. Mounting a union file system allows you to
\"aggregate\" the contents of several directories into a single mount point. \"aggregate\" the contents of several directories into a single mount point.
UnionFS-FUSE additionally supports copy-on-write.") UnionFS-FUSE additionally supports copy-on-write.")
(license bsd-3))) (license license:bsd-3)))
(define fuse-static (define fuse-static
(package (inherit fuse) (package (inherit fuse)
@ -1390,7 +1389,7 @@ (define-public sshfs-fuse
Since most SSH servers already support this protocol it is very easy to set Since most SSH servers already support this protocol it is very easy to set
up: on the server side there's nothing to do; on the client side mounting the up: on the server side there's nothing to do; on the client side mounting the
file system is as easy as logging into the server with an SSH client.") file system is as easy as logging into the server with an SSH client.")
(license gpl2+))) (license license:gpl2+)))
(define-public numactl (define-public numactl
(package (package
@ -1423,8 +1422,8 @@ (define-public numactl
The package contains other commands, such as numademo, numastat and memhog. The package contains other commands, such as numademo, numastat and memhog.
The numademo command provides a quick overview of NUMA performance on your The numademo command provides a quick overview of NUMA performance on your
system.") system.")
(license (list gpl2 ; programs (license (list license:gpl2 ;programs
lgpl2.1)))) ; library license:lgpl2.1)))) ;library
(define-public kbd (define-public kbd
(package (package
@ -1482,7 +1481,7 @@ (define-public kbd
"This package contains keytable files and keyboard utilities compatible "This package contains keytable files and keyboard utilities compatible
for systems using the Linux kernel. This includes commands such as for systems using the Linux kernel. This includes commands such as
'loadkeys', 'setfont', 'kbdinfo', and 'chvt'.") 'loadkeys', 'setfont', 'kbdinfo', and 'chvt'.")
(license gpl2+))) (license license:gpl2+)))
(define-public inotify-tools (define-public inotify-tools
(package (package
@ -1502,7 +1501,7 @@ (define-public inotify-tools
(description (description
"The inotify-tools packages provides a C library and command-line tools "The inotify-tools packages provides a C library and command-line tools
to use Linux' inotify mechanism, which allows file accesses to be monitored.") to use Linux' inotify mechanism, which allows file accesses to be monitored.")
(license gpl2+))) (license license:gpl2+)))
(define-public kmod (define-public kmod
(package (package
@ -1546,7 +1545,7 @@ (define-public kmod
These tools are designed on top of libkmod, a library that is shipped with These tools are designed on top of libkmod, a library that is shipped with
kmod. The aim is to be compatible with tools, configurations and indices kmod. The aim is to be compatible with tools, configurations and indices
from the module-init-tools project.") from the module-init-tools project.")
(license gpl2+))) ; library under lgpl2.1+ (license license:gpl2+))) ; library under lgpl2.1+
(define-public eudev (define-public eudev
;; The post-systemd fork, maintained by Gentoo. ;; The post-systemd fork, maintained by Gentoo.
@ -1574,7 +1573,7 @@ (define-public eudev
(description "Udev is a daemon which dynamically creates and removes (description "Udev is a daemon which dynamically creates and removes
device nodes from /dev/, handles hotplug events and loads drivers at boot device nodes from /dev/, handles hotplug events and loads drivers at boot
time.") time.")
(license gpl2+))) (license license:gpl2+)))
(define-public lvm2 (define-public lvm2
(package (package
@ -1639,7 +1638,7 @@ (define-public lvm2
;; Libraries (liblvm2, libdevmapper) are LGPLv2.1. ;; Libraries (liblvm2, libdevmapper) are LGPLv2.1.
;; Command-line tools are GPLv2. ;; Command-line tools are GPLv2.
(license (list gpl2 lgpl2.1)))) (license (list license:gpl2 license:lgpl2.1))))
(define-public wireless-tools (define-public wireless-tools
(package (package
@ -1678,7 +1677,7 @@ (define-public wireless-tools
(home-page "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html") (home-page "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html")
;; wireless.21.h and wireless.22.h are distributed under lgpl2.1+, the ;; wireless.21.h and wireless.22.h are distributed under lgpl2.1+, the
;; other files are distributed under gpl2. ;; other files are distributed under gpl2.
(license (list gpl2 lgpl2.1+)))) (license (list license:gpl2 license:lgpl2.1+))))
(define-public crda (define-public crda
(package (package
@ -1747,7 +1746,7 @@ (define-public crda
"The Central Regulatory Domain Agent (CRDA) acts as the udev helper for "The Central Regulatory Domain Agent (CRDA) acts as the udev helper for
communication between the kernel Linux and user space for regulatory communication between the kernel Linux and user space for regulatory
compliance.") compliance.")
(license copyleft-next))) (license license:copyleft-next)))
(define-public wireless-regdb (define-public wireless-regdb
(package (package
@ -1795,7 +1794,7 @@ (define-public wireless-regdb
"This package contains the wireless regulatory database Central "This package contains the wireless regulatory database Central
Regulatory Database Agent (CRDA) daemon. The database contains information on Regulatory Database Agent (CRDA) daemon. The database contains information on
country-specific regulations for the wireless spectrum.") country-specific regulations for the wireless spectrum.")
(license isc))) (license license:isc)))
(define-public lm-sensors (define-public lm-sensors
(package (package
@ -1868,7 +1867,7 @@ (define-public lm-sensors
"Lm-sensors is a hardware health monitoring package for Linux. It allows "Lm-sensors is a hardware health monitoring package for Linux. It allows
you to access information from temperature, voltage, and fan speed sensors. you to access information from temperature, voltage, and fan speed sensors.
It works with most newer systems.") It works with most newer systems.")
(license gpl2+))) (license license:gpl2+)))
(define-public i2c-tools (define-public i2c-tools
(package (package
@ -1898,7 +1897,7 @@ (define-public i2c-tools
Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers, Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers,
EEPROM decoding scripts, EEPROM programming tools, and a python module for EEPROM decoding scripts, EEPROM programming tools, and a python module for
SMBus access.") SMBus access.")
(license gpl2+))) (license license:gpl2+)))
(define-public xsensors (define-public xsensors
(package (package
@ -1935,7 +1934,7 @@ (define-public xsensors
"Xsensors reads data from the libsensors library regarding hardware "Xsensors reads data from the libsensors library regarding hardware
health such as temperature, voltage and fan speed and displays the information health such as temperature, voltage and fan speed and displays the information
in a digital read-out.") in a digital read-out.")
(license gpl2+))) (license license:gpl2+)))
(define-public perf (define-public perf
(package (package
@ -2011,7 +2010,7 @@ (define-public pflask
an isolated container, created with the help of Linux namespaces. It is an isolated container, created with the help of Linux namespaces. It is
similar in functionality to chroot, although pflask provides better isolation similar in functionality to chroot, although pflask provides better isolation
thanks to the use of namespaces.") thanks to the use of namespaces.")
(license bsd-2))) (license license:bsd-2)))
(define-public hdparm (define-public hdparm
(package (package
@ -2037,7 +2036,7 @@ (define-public hdparm
(description (description
"Get/set device parameters for Linux SATA/IDE drives. It's primary use "Get/set device parameters for Linux SATA/IDE drives. It's primary use
is for enabling irq-unmasking and IDE multiple-mode.") is for enabling irq-unmasking and IDE multiple-mode.")
(license (non-copyleft "file://LICENSE.TXT")))) (license (license:non-copyleft "file://LICENSE.TXT"))))
(define-public rfkill (define-public rfkill
(package (package
@ -2063,8 +2062,8 @@ (define-public rfkill
"rfkill is a simple tool for accessing the rfkill device interface, "rfkill is a simple tool for accessing the rfkill device interface,
which is used to enable and disable wireless networking devices, typically which is used to enable and disable wireless networking devices, typically
WLAN, Bluetooth and mobile broadband.") WLAN, Bluetooth and mobile broadband.")
(license (non-copyleft "file://COPYING" (license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution.")))) "See COPYING in the distribution."))))
(define-public acpid (define-public acpid
(package (package
@ -2086,7 +2085,7 @@ (define-public acpid
during the system boot, and will run as a background process. When an ACPI during the system boot, and will run as a background process. When an ACPI
event is received from the kernel, acpid will examine the list of rules event is received from the kernel, acpid will examine the list of rules
specified in /etc/acpi/events and execute the rules that match the event.") specified in /etc/acpi/events and execute the rules that match the event.")
(license gpl2+))) (license license:gpl2+)))
(define-public sysfsutils (define-public sysfsutils
(package (package
@ -2110,7 +2109,7 @@ (define-public sysfsutils
also contains the libsysfs library.") also contains the libsysfs library.")
;; The library is under lgpl2.1+ (all files say "or any later version"). ;; The library is under lgpl2.1+ (all files say "or any later version").
;; The rest is mostly gpl2, with a few files indicating gpl2+. ;; The rest is mostly gpl2, with a few files indicating gpl2+.
(license (list gpl2 gpl2+ lgpl2.1+)))) (license (list license:gpl2 license:gpl2+ license:lgpl2.1+))))
(define-public sysfsutils-1 (define-public sysfsutils-1
(package (package
@ -2162,7 +2161,7 @@ (define-public cpufrequtils
"The cpufrequtils suite contains utilities to retrieve CPU frequency "The cpufrequtils suite contains utilities to retrieve CPU frequency
information, and set the CPU frequency if supported, using the cpufreq information, and set the CPU frequency if supported, using the cpufreq
capabilities of the Linux kernel.") capabilities of the Linux kernel.")
(license gpl2))) (license license:gpl2)))
(define-public libraw1394 (define-public libraw1394
(package (package
@ -2185,7 +2184,7 @@ (define-public libraw1394
1394 buses to user space. Through libraw1394/raw1394, applications can directly 1394 buses to user space. Through libraw1394/raw1394, applications can directly
send to and receive from other nodes without requiring a kernel driver for the send to and receive from other nodes without requiring a kernel driver for the
protocol in question.") protocol in question.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public libavc1394 (define-public libavc1394
(package (package
@ -2208,7 +2207,7 @@ (define-public libavc1394
(description (description
"Libavc1394 is a programming interface to the AV/C specification from "Libavc1394 is a programming interface to the AV/C specification from
the 1394 Trade Association. AV/C stands for Audio/Video Control.") the 1394 Trade Association. AV/C stands for Audio/Video Control.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public libiec61883 (define-public libiec61883
(package (package
@ -2232,7 +2231,7 @@ (define-public libiec61883
(description (description
"The libiec61883 library provides a higher level API for streaming DV, "The libiec61883 library provides a higher level API for streaming DV,
MPEG-2 and audio over Linux IEEE 1394.") MPEG-2 and audio over Linux IEEE 1394.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public mdadm (define-public mdadm
(package (package
@ -2275,7 +2274,7 @@ (define-public mdadm
"mdadm is a tool for managing Linux Software RAID arrays. It can create, "mdadm is a tool for managing Linux Software RAID arrays. It can create,
assemble, report on, and monitor arrays. It can also move spares between raid assemble, report on, and monitor arrays. It can also move spares between raid
arrays when needed.") arrays when needed.")
(license gpl2+))) (license license:gpl2+)))
(define-public libaio (define-public libaio
(package (package
@ -2304,7 +2303,7 @@ (define-public libaio
"This library enables userspace to use Linux kernel asynchronous I/O "This library enables userspace to use Linux kernel asynchronous I/O
system calls, important for the performance of databases and other advanced system calls, important for the performance of databases and other advanced
applications.") applications.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public bluez (define-public bluez
(package (package
@ -2341,7 +2340,7 @@ (define-public bluez
(description (description
"BlueZ provides support for the core Bluetooth layers and protocols. It "BlueZ provides support for the core Bluetooth layers and protocols. It
is flexible, efficient and uses a modular implementation.") is flexible, efficient and uses a modular implementation.")
(license gpl2+))) (license license:gpl2+)))
(define-public fuse-exfat (define-public fuse-exfat
(package (package
@ -2399,7 +2398,7 @@ (define-public fuse-exfat
(description (description
"This package provides a FUSE-based file system that provides read and "This package provides a FUSE-based file system that provides read and
write access to exFAT devices.") write access to exFAT devices.")
(license gpl2+))) (license license:gpl2+)))
(define-public gpm (define-public gpm
(package (package
@ -2442,4 +2441,4 @@ (define-public gpm
"The GPM (general-purpose mouse) daemon is a mouse server for "The GPM (general-purpose mouse) daemon is a mouse server for
applications running on the Linux console. It allows users to select items applications running on the Linux console. It allows users to select items
and copy/paste text in the console and in xterm.") and copy/paste text in the console and in xterm.")
(license gpl2+))) (license license:gpl2+)))