[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: gnu: Add glibc-utf8-locales to the implicit inputs.
From: |
Ludovic Courtès |
Subject: |
06/08: gnu: Add glibc-utf8-locales to the implicit inputs. |
Date: |
Thu, 26 Feb 2015 23:09:52 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit b0fd2bd3c5c1b04c3452473cdf104a8258bb7649
Author: Ludovic Courtès <address@hidden>
Date: Thu Feb 26 23:39:47 2015 +0100
gnu: Add glibc-utf8-locales to the implicit inputs.
Suggested by Mark H Weaver and Andreas Enge
at <http://lists.gnu.org/archive/html/guix-devel/2015-02/msg00356.html>.
* gnu/packages/commencement.scm (gzip-final, glibc-utf8-locales-final):
New variables.
(%final-inputs): Use them.
---
gnu/packages/commencement.scm | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8fa90fe..aa0aac6 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Andreas Enge <address@hidden>
;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
;;; Copyright © 2014 Mark H Weaver <address@hidden>
@@ -662,6 +662,16 @@ store.")
("grep" ,grep-final)
,@%boot4-inputs))
+(define gzip-final
+ (package-with-explicit-inputs gzip %boot5-inputs
+ (current-source-location)))
+
+(define glibc-utf8-locales-final
+ (package
+ (inherit glibc-utf8-locales)
+ (inputs `(("glibc" ,glibc-final)
+ ("gzip" ,gzip-final)))))
+
(define-public %final-inputs
;; Final derivations used as implicit inputs by 'gnu-build-system'. We
;; still use 'package-with-bootstrap-guile' so that the bootstrap tools are
@@ -674,7 +684,6 @@ store.")
((name package)
(list name (finalize package))))
`(("tar" ,tar)
- ("gzip" ,gzip)
("bzip2" ,bzip2)
("xz" ,xz)
("file" ,file)
@@ -683,6 +692,7 @@ store.")
("sed" ,sed)
("findutils" ,findutils)
("gawk" ,gawk)))
+ ("gzip" ,gzip-final)
("grep" ,grep-final)
("coreutils" ,coreutils-final)
("make" ,gnu-make-final)
@@ -690,7 +700,8 @@ store.")
("ld-wrapper" ,ld-wrapper)
("binutils" ,binutils-final)
("gcc" ,gcc-final)
- ("libc" ,glibc-final))))
+ ("libc" ,glibc-final)
+ ("locales" ,glibc-utf8-locales-final))))
(define-public canonical-package
(let ((name->package (fold (lambda (input result)
- branch core-updates updated (a068dba -> f307947), Ludovic Courtès, 2015/02/26
- 01/08: Merge branch 'master' into core-updates, Ludovic Courtès, 2015/02/26
- 05/08: build-system/gnu: Add 'install-locale' phase., Ludovic Courtès, 2015/02/26
- 06/08: gnu: Add glibc-utf8-locales to the implicit inputs.,
Ludovic Courtès <=
- 08/08: ld-wrapper: Add '-rpath' for arguments such as 'libfoo.so.5.3'., Ludovic Courtès, 2015/02/26
- 02/08: build-system/gnu: Add support for zip archives., Ludovic Courtès, 2015/02/26
- 03/08: utils: Add 'modify-phases'., Ludovic Courtès, 2015/02/26
- 07/08: packages: When possible, use a UTF-8 locale in patch-and-repack., Ludovic Courtès, 2015/02/26
- 04/08: build-system: Use 'modify-phases'., Ludovic Courtès, 2015/02/26