code updates

2 files changed, 28 insertions, 39 deletions

diff --git a/gn/packages/golang.scm b/gn/packages/golang.scm
index 7131cfe..ca9ee13 100644
--- a/gn/packages/golang.scm
+++ b/gn/packages/golang.scm
@@ -20,15 +20,16 @@
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-          (base32
-            "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw"))))
+         (base32
+          "0f98qk83l2fhpclvrgyxsa9b8m4pipf11fah85bnjl01wy4lvybw"))))
     (build-system go-build-system)
     (arguments
-      '(#:import-path "github.com/OneOfOne/xxhash"))
+     '(#:import-path "github.com/OneOfOne/xxhash"))
     (home-page "https://github.com/OneOfOne/xxhash")
-    (synopsis "xxhash")
-    (description
-      "This is a native Go implementation of the excellent @url{https://github.com/Cyan4973/xxHash,xxhash}* algorithm, an extremely fast non-cryptographic Hash algorithm, working at speeds close to RAM limits.")
+    (synopsis "Go implementation of xxhash")
+    (description "This is a native Go implementation of the
+@url{https://github.com/Cyan4973/xxHash, xxhash} algorithm, an extremely fast
+non-cryptographic Hash algorithm, working at speeds close to RAM limits.")
     (license license:asl2.0)))
 
 (define-public go-github-com-aswinkarthik-csvdiff
@@ -43,33 +44,23 @@
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-          (base32
-            "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b"))))
+         (base32
+          "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b"))))
     (build-system go-build-system)
     (arguments
-      '(#:import-path "github.com/aswinkarthik/csvdiff"))
+     '(#:import-path "github.com/aswinkarthik/csvdiff"))
     (propagated-inputs
-      `(("go-golang-org-x-sys" ,go-golang-org-x-sys)
-        ("go-github-com-stretchr-testify"
-         ,go-github-com-stretchr-testify)
-        ("go-github-com-spf13-cobra"
-         ,go-github-com-spf13-cobra)
-        ("go-github-com-spf13-afero"
-         ,go-github-com-spf13-afero)
-        ("go-github-com-spaolacci-murmur3"
-         ,go-github-com-spaolacci-murmur3)
-        ("go-github-com-mattn-go-colorable"
-         ,go-github-com-mattn-go-colorable)
-        ("go-github-com-fatih-color"
-         ,go-github-com-fatih-color)
-        ("go-github-com-cespare-xxhash"
-         ,go-github-com-cespare-xxhash)
-        ("go-github-com-oneofone-xxhash"
-         ,go-github-com-oneofone-xxhash)))
-    (home-page
-      "https://github.com/aswinkarthik/csvdiff")
+     `(("go-golang-org-x-sys" ,go-golang-org-x-sys)
+       ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify)
+       ("go-github-com-spf13-cobra" ,go-github-com-spf13-cobra)
+       ("go-github-com-spf13-afero" ,go-github-com-spf13-afero)
+       ("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
+       ("go-github-com-mattn-go-colorable" ,go-github-com-mattn-go-colorable)
+       ("go-github-com-fatih-color" ,go-github-com-fatih-color)
+       ("go-github-com-cespare-xxhash" ,go-github-com-cespare-xxhash)
+       ("go-github-com-oneofone-xxhash" ,go-github-com-oneofone-xxhash)))
+    (home-page "https://github.com/aswinkarthik/csvdiff")
     (synopsis "csvdiff")
     (description
-      "This package provides a fast diff tool for comparing csv files.")
-    (license
-      license:expat)))
+     "This package provides a fast diff tool for comparing csv files.")
+    (license license:expat)))
diff --git a/gn/packages/node.scm b/gn/packages/node.scm
index 18512bf..7559e0b 100644
--- a/gn/packages/node.scm
+++ b/gn/packages/node.scm
@@ -4,8 +4,8 @@
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix build-system node)
-  #:use-module (gnu packages lisp-xyz)
-  #:use-module (gnu packages node-xyz))
+  #:use-module (gnu packages node-xyz)
+  #:use-module (gnu packages uglifyjs))
 
 (define-public node-asap
   (package
@@ -209,8 +209,6 @@
        (modify-phases %standard-phases
          (replace 'build
            (lambda _
-             (substitute* "Makefile"
-               (("uglifyjs") (which "uglify-js")))
              (invoke "make" "clean")
              (invoke "make" "build"))))))
     (native-inputs
@@ -235,9 +233,9 @@
        ;("node-nyc" ,node-nyc)
        ;("node-rsvp" ,node-rsvp)
        ;("node-semver" ,node-semver)
+       ("node-uglify-js" ,node-uglify-js)
        ;("node-xyz" ,node-xyz)
        ;("node-yargs" ,node-yargs)
-       ("uglify-js" ,uglify-js)
        ))))
 
 (define-public node-closure-library
@@ -706,7 +704,7 @@ functionality to JupyterHub deployments.")
        ;("node-pre-commit" ,node-pre-commit)
        ;("node-sauce-browsers" ,node-sauce-browsers)
        ;("node-sauce-test" ,node-sauce-test)
-       ;("uglify-js" ,uglify-js)
+       ("node-uglify-js" ,node-uglify-js)
        ))
     (home-page "https://github.com/primus/eventemitter3")
     (synopsis "EventEmitter3 focuses on performance while maintaining a Node.js AND browser compatible interface")
@@ -1066,7 +1064,7 @@ such as reverse proxies and load balancers.")
        ;("node-request" ,node-request)
        ;("node-requirejs" ,node-requirejs)
        ;("node-sauce-tunnel" ,node-sauce-tunnel)
-       ;("node-uglify-js" ,node-uglify-js)
+       ("node-uglify-js" ,node-uglify-js)
        ;("node-webpack" ,node-webpack)
        ))
     (home-page "https://lodash.com/")
@@ -1245,7 +1243,7 @@ such as reverse proxies and load balancers.")
      `(("node-asap" ,node-asap)))
     (native-inputs
      `(
-       ;("node-acorn" ,node-acorn)
+       ("node-acorn" ,node-acorn)
        ;("node-better-assert" ,node-better-assert)
        ;("node-istanbul" ,node-istanbul)
        ;("node-mocha" ,node-mocha)