Fixup guix packaging

guix.scm

@@ -1,20 +1,29 @@
-(use-modules (gnu packages guile)
-	     (gnu packages pkg-config)
-	     (guix)
+(use-modules (guix packages)
+	     (guix gexp)
+	     (guix build-system guile)
+	     (gnu packages)
+	     (gnu packages guile)
+	     (gnu packages tls)
 	     (guix git-download)
-	     (guix build-system guile))
+	     (guix utils))
 
-(package
+
+(define-public guile-equinix-metal
+  (let ((vcs-file? (or (git-predicate (current-source-directory))
+		       (const #t))))
+  (package
    (name "guile-equinix-metal")
- (version "0.0.1")
+   (version "0.0.5")
    (source (local-file "." "guile-equinix-metal"
-		     #:select? (git-predicate
-				(dirname (assoc-ref (current-source-location) 'filename)))
-		     #:recursive? #t))
+		       #:recursive? #t
+		       #:select? vcs-file?))
    (build-system guile-build-system)
- (native-inputs (list pkg-config guile-3.0))
- (inputs (list guile-3.0 guile-json-4))
+   (arguments
+    (list #:source-directory "src"))
+   (inputs (list guile-3.0 guile-json-4 guile-gnutls))
    (synopsis "Equinix Metal SDK")
    (home-page "https://git.fixergrid.net/adam/equinix-scm")
    (description "Equinix-scm supports token exchange and talking to Metal API")
- (license #f))
+   (license #f))))
+
+guile-equinix-metal

src/metalapi/vlan.scm

@@ -1,6 +1,7 @@
 (define-module (metalapi vlan)
   #:use-module (metalapi requests)
   #:use-module (metalapi project)
+  #:use-module (json)
   #:export (build-vlan
 	    vlan->project
 	    vlan->metro-code