01/03: import: snix: Use the right 'package-name->name+version'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 322bb53c7aca0855833d07a7ea55ae243235f285
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 6 21:50:40 2016 +0100

    import: snix: Use the right 'package-name->name+version'.
    
    Fixes a regression introduced in
    1b846da8c372bee78851439fd9e72b2499115e5a.
    
    * guix/import/snix.scm: Use 'package-name->name+version' from (guix
    build utils).
---
 guix/import/snix.scm |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/guix/import/snix.scm b/guix/import/snix.scm
index 033b716..bc75cbf 100644
--- a/guix/import/snix.scm
+++ b/guix/import/snix.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016 Ludovic Courtès 
<address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,7 +31,13 @@
   #:use-module (srfi srfi-37)
   #:use-module (system foreign)
   #:use-module (rnrs bytevectors)
-  #:use-module (guix utils)
+
+  ;; Use the 'package-name->name+version' procedure that works with
+  ;; hyphen-separate name/version, not the one that works with '@'-separated
+  ;; name/version.  Subtle!
+  #:use-module ((guix utils) #:hide (package-name->name+version))
+  #:use-module ((guix build utils) #:select (package-name->name+version))
+
   #:use-module (guix import utils)
   #:use-module (guix base32)
   #:use-module (guix config)