diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
| commit | 53c85e97dcc264da5ff5cd4e3be4d47028f4d726 (patch) | |
| tree | 8984fefeb61e0c165bf960fdfa3cd11355d02ba3 /gnu/packages/version-control.scm | |
| parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
| parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
| download | patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz | |
Merge branch 'core-updates'
Conflicts:
gnu/packages/gnunet.scm
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 38e586b853..3d88ff8a4a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -26,8 +26,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build utils) - #:use-module ((gnu packages gettext) - #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages gettext) #:use-module (gnu packages apr) #:use-module (gnu packages curl) #:use-module (gnu packages ed) @@ -59,7 +58,7 @@ (inputs ;; Note: 'tools/packaging/lp-upload-release' and 'tools/weavemerge.sh' ;; require Zsh. - `(("gettext" ,guix:gettext))) + `(("gettext" ,gnu-gettext))) (arguments `(#:tests? #f ; no test target #:python ,python-2)) ; Python 3 apparently not yet supported, see @@ -88,7 +87,7 @@ from a command line or use a GUI application.") (inputs `(("curl" ,curl) ("expat" ,expat) - ("gettext" ,guix:gettext) + ("gettext" ,gnu-gettext) ("openssl" ,openssl) ("perl" ,perl) ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to INSTALL |