[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/07: gnu: move miscfiles into gnu-doc.scm
From: |
Ludovic Courtès |
Subject: |
06/07: gnu: move miscfiles into gnu-doc.scm |
Date: |
Thu, 31 Mar 2016 22:05:50 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 2cdeecbe4da32b4ec8c23c338f11cd16d6eededa
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Mar 26 13:56:14 2016 +0100
gnu: move miscfiles into gnu-doc.scm
* gnu/packages/miscfiles.scm: Remove file.
* gnu-sytem.am: Remove it.
* gnu/packages/gnu-doc.scm (miscfiles): Move here.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu-system.am | 1 -
gnu/packages/gnu-doc.scm | 27 +++++++++++++++++++++++++
gnu/packages/miscfiles.scm | 47 --------------------------------------------
3 files changed, 27 insertions(+), 48 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 8161632..3e81f73 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -223,7 +223,6 @@ GNU_SYSTEM_MODULES = \
gnu/packages/mcrypt.scm \
gnu/packages/messaging.scm \
gnu/packages/mg.scm \
- gnu/packages/miscfiles.scm \
gnu/packages/mit-krb5.scm \
gnu/packages/moe.scm \
gnu/packages/moreutils.scm \
diff --git a/gnu/packages/gnu-doc.scm b/gnu/packages/gnu-doc.scm
index 572647d..3daa54f 100644
--- a/gnu/packages/gnu-doc.scm
+++ b/gnu/packages/gnu-doc.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -21,11 +22,37 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages texinfo)
+ #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix cvs-download)
+ #:use-module (guix download)
#:use-module (guix licenses)
#:use-module (guix packages))
+(define-public miscfiles
+ (package
+ (name "miscfiles")
+ (version "1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/" name "/" name "-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"))))
+ (build-system gnu-build-system)
+ (home-page "https://www.gnu.org/software/miscfiles/")
+ (synopsis
+ "Data files for airport codes, zip codes, a dictionary, and more")
+ (description
+ "GNU Miscfiles is a collection of common data files. They include, for
+example, country abbreviations, names and capital cities; currency
+abbreviations and names; a Best Current Practices index; a map of the ASCII
+character set; a list of three-letter airport codes; and an English word
+list.")
+ (license gpl2+)))
+
(define-public gnu-standards
(package
(name "gnu-standards")
diff --git a/gnu/packages/miscfiles.scm b/gnu/packages/miscfiles.scm
deleted file mode 100644
index fd0fc7b..0000000
--- a/gnu/packages/miscfiles.scm
+++ /dev/null
@@ -1,47 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright 2014 John Darrington <address@hidden>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages miscfiles)
- #:use-module (guix licenses)
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix build-system gnu))
-
-(define-public miscfiles
- (package
- (name "miscfiles")
- (version "1.5")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/" name "/" name "-"
- version ".tar.gz"))
- (sha256
- (base32
- "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"))))
- (build-system gnu-build-system)
- (home-page "https://www.gnu.org/software/miscfiles/")
- (synopsis
- "Data files for airport codes, zip codes, a dictionary, and more")
- (description
- "GNU Miscfiles is a collection of common data files. They include, for
-example, country abbreviations, names and capital cities; currency
-abbreviations and names; a Best Current Practices index; a map of the ASCII
-character set; a list of three-letter airport codes; and an English word
-list.")
- (license gpl2+)))
- branch master updated (b5afe6f -> 52af45a), Ludovic Courtès, 2016/03/31
- 04/07: cvs: Disable compression., Ludovic Courtès, 2016/03/31
- 05/07: gnu: Add gnu-standards., Ludovic Courtès, 2016/03/31
- 03/07: cvs: Allow checkouts when /tmp is a different device., Ludovic Courtès, 2016/03/31
- 01/07: profiles: Use the right 'package-name->name+version'., Ludovic Courtès, 2016/03/31
- 02/07: gnu: font-gnu-freefont-ttf: Update to 20120503 and build from source., Ludovic Courtès, 2016/03/31
- 06/07: gnu: move miscfiles into gnu-doc.scm,
Ludovic Courtès <=
- 07/07: gnu: fontforge: Build fonts bit-reproducibly., Ludovic Courtès, 2016/03/31