Ludovic Courtès writes:
> Manolis Ragkousis <manolis...@gmail.com> skribis:
>
>> On 04/29/2016 06:12 PM, Jan Nieuwenhuizen wrote:
>>> + #:use-module (guix build-system trivial)
>>> + #:export (glibc
>>> + libiconv-if-needed))
>>
>> The #:export (glibc...) part only exists in wip-hurd so we need to
>> remove this in order for your patch to apply on master.
>
> Yes.
(already) done.
>> Maybe we should break this patch into two different ones, one for the
>> libiconv package description and one for the libiconv-if-needed. The
>> first will go to master and the second to core-updates. WDYT?
>
> Seconded: the patch that adds libiconv (and only that) can go directly
> in master; the patch that adds ‘libiconv-if-needed’ must be separate
> since it depends on the MinGW stuff.
Split up-now into 6a/10 and 6b/10.
Ah, Sorry!! libiconv-if-needed depends on mingw-target? which sits in
guix/utils.scm. I had that in patch 0004, and so I assumed that would
go in first and be OK. IIUC, 0004 may go into core-updates...
Greetings,
Jan
>From e3d01e6075ece0269131fb35cd560c05d37a586e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <jann...@gnu.org>
Date: Tue, 3 May 2016 18:48:40 +0200
Subject: [PATCH 6a/10] gnu: Add libiconv.
* gnu/packages/base.scm (libiconv): New variable.
---
gnu/packages/base.scm | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1c4ebbf..3819ecc 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2014 Alex Kost <alez...@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis...@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efr...@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <jann...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,7 +25,7 @@
(define-module (gnu packages base)
#:use-module ((guix licenses)
- #:select (gpl3+ lgpl2.0+ public-domain))
+ #:select (gpl3+ lgpl2.0+ lgpl3+ public-domain))
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages bash)
@@ -43,7 +44,8 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system trivial))
+ #:use-module (guix build-system trivial)
+ #:export (libiconv-if-needed))
;;; Commentary:
;;;
@@ -936,6 +938,27 @@ reflect changes made by political bodies to time zone boundaries, UTC offsets,
and daylight-saving rules.")
(license public-domain)))
+(define-public libiconv
+ (package
+ (name "libiconv")
+ (version "1.14")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://gnu/libiconv/libiconv-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"))))
+ (build-system gnu-build-system)
+ (synopsis "Character set conversion library")
+ (description
+ "libiconv provides an implementation of the iconv function for systems
+that lack it. iconv is used to convert between character encodings in a
+program. It supports a wide variety of different encodings.")
+ (home-page "http://www.gnu.org/software/libiconv/";)
+ (license lgpl3+)))
+
(define-public (canonical-package package)
;; Avoid circular dependency by lazily resolving 'commencement'.
(let* ((iface (resolve-interface '(gnu packages commencement)))
--
2.7.3
--
Jan Nieuwenhuizen <jann...@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
