[PATCH] distro: Rename 'gettext' to 'guix:gettext'.

[PATCH] distro: Rename 'gettext' to 'guix:gettext'.

[Nikita Karetnikov]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-distro-Rename-gettext-to-guix-gettext.patch --]
[-- Type: text/x-diff, Size: 2181 bytes --]

From 3026baf2a7c37721217567cade9f15d1336d6d9d Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Tue, 27 Nov 2012 20:06:18 +0000
Subject: [PATCH] distro: Rename 'gettext' to 'guix:gettext'.

* distro/packages/nano.scm (symbol-prefix-proc),
  distro/packages/wget.scm (symbol-prefix-proc): New functions.
* distro/packages/nano.scm (inputs),
  distro/packages/wget.scm (inputs): Rename 'gettext' to 'guix:gettext'.
---
 distro/packages/nano.scm |    5 +++--
 distro/packages/wget.scm |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/distro/packages/nano.scm b/distro/packages/nano.scm
index e4a39a8..e87c679 100644
--- a/distro/packages/nano.scm
+++ b/distro/packages/nano.scm
@@ -17,7 +17,8 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages nano)
-  #:use-module (distro packages gettext)
+  #:use-module ((distro packages gettext)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages ncurses)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -37,7 +38,7 @@
         "0yp6pid67k8h7394spzw0067fl2r7rxm2b6kfccg87g8nlry2s5y"))))
     (build-system gnu-build-system)
     (inputs
-     `(("gettext" ,gettext)
+     `(("gettext" ,guix:gettext)
        ("ncurses" ,ncurses)))
     (home-page "http://www.nano-editor.org/")
     (synopsis
diff --git a/distro/packages/wget.scm b/distro/packages/wget.scm
index db81042..9d877ec 100644
--- a/distro/packages/wget.scm
+++ b/distro/packages/wget.scm
@@ -17,7 +17,8 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages wget)
-  #:use-module (distro packages gettext)
+  #:use-module ((distro packages gettext)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages gnutls)
   #:use-module (distro packages perl)
   #:use-module (guix packages)
@@ -40,7 +41,7 @@
     (inputs
      `(("gnutls" ,gnutls)
        ("perl" ,perl)
-       ("gettext" ,gettext)))
+       ("gettext" ,guix:gettext)))
     (arguments
      '(#:phases
        (alist-cons-before 'build 'patch-/usr/bin/env
-- 
1.7.5.4

Re: [PATCH] distro: Rename 'gettext' to 'guix:gettext'.

[Ludovic Courtès]

Nikita Karetnikov <nikita.karetnikov@gmail.com> skribis:

> From 3026baf2a7c37721217567cade9f15d1336d6d9d Mon Sep 17 00:00:00 2001
> From: Nikita Karetnikov <nikita@karetnikov.org>
> Date: Tue, 27 Nov 2012 20:06:18 +0000
> Subject: [PATCH] distro: Rename 'gettext' to 'guix:gettext'.
>
> * distro/packages/nano.scm (symbol-prefix-proc),
>   distro/packages/wget.scm (symbol-prefix-proc): New functions.
> * distro/packages/nano.scm (inputs),
>   distro/packages/wget.scm (inputs): Rename 'gettext' to 'guix:gettext'.
> ---
>  distro/packages/nano.scm |    5 +++--
>  distro/packages/wget.scm |    5 +++--
>  2 files changed, 6 insertions(+), 4 deletions(-)

Applied with a slightly different commit log.  Thanks!

Ludo’.