summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-03-06 21:50:40 +0100
committerLudovic Courtès <ludo@gnu.org>2016-03-06 23:16:35 +0100
commit322bb53c7aca0855833d07a7ea55ae243235f285 (patch)
tree3ae9b1af7c9872216177314b55ff2f2f82bc159a
parentafadb05e586dab503cf0f61e3ae3dd42be806e3a (diff)
downloadguix-322bb53c7aca0855833d07a7ea55ae243235f285.tar.gz
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).
-rw-r--r--guix/import/snix.scm10
1 files changed, 8 insertions, 2 deletions
diff --git a/guix/import/snix.scm b/guix/import/snix.scm
index 033b7165d3..bc75cbfda5 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 <ludo@gnu.org>
+;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; 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)