diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /distro/packages/system.scm | |
parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
download | guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar guix-patches-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
distro/packages/multiprecision.scm
Diffstat (limited to 'distro/packages/system.scm')
-rw-r--r-- | distro/packages/system.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/distro/packages/system.scm b/distro/packages/system.scm index bd3de558c0..608b233a94 100644 --- a/distro/packages/system.scm +++ b/distro/packages/system.scm @@ -17,6 +17,7 @@ ;;; along with Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (distro packages system) + #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -57,7 +58,7 @@ controlling terminal, such as, e.g., minicom. It can launch and control components of some complex system, such as Jabberd or MeTA1 (and it offers much more control over them than the native utilities). Finally, it can replace the inetd utility!") - (license "GPLv3+"))) + (license gpl3+))) (define-public inetutils (package @@ -87,4 +88,4 @@ it can replace the inetd utility!") ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d), traceroute, uucpd, and whois.") - (license "GPLv3+"))) + (license gpl3+))) |