grub copy bug

1 files changed, 35 insertions, 15 deletions

diff --git a/sigils/packages/solana.scm b/sigils/packages/solana.scm
index 2a9782d..7f7e9fa 100644
--- a/sigils/packages/solana.scm
+++ b/sigils/packages/solana.scm
@@ -1,6 +1,7 @@
 (define-module (sigils packages solana)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix gexp)
   #:use-module ((guix licenses)
                 #:prefix license:)
@@ -1013,25 +1014,44 @@
     (description "Helpers for confirming Solana transactions")
     (license license:expat)))
 
-(define-public node-solana-web3-js-2.0.0
+(define %solana-web3-js-version "2.0.0")
+(define %solana-web3-js-source
+  (origin
+    (method git-fetch)
+    (uri (git-reference
+          (url "https://github.com/solana-labs/solana-web3.js")
+          (commit (string-append "v" %solana-web3-js-version))))
+    (file-name (git-file-name "node-solana-web3-js" %solana-web3-js-version))
+    (sha256
+     (base32 "1i5j9yvlps6br8g809bz8wqqfl44fgm9rg1rbsqqa9h4pylc393y"))))
+
+(define (node-solana-web3-js-package pkg)
   (package
-    (name "node-solana-web3-js")
+    (name (format #f "node-solana-~a" pkg))
     (version "2.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri "https://registry.npmjs.org/@solana/web3.js/-/web3.js-2.0.0.tgz")
-       (sha256
-        (base32 "1afy3507pc8aj3lspl58m6jrjjvx6k7c9mc20yiy40q1235yjy9j"))))
+    (source %solana-web3-js-source)
     (build-system node-build-system)
     (arguments
-     (list
-      #:tests? #f
-      #:phases #~(modify-phases %standard-phases
-                   (delete 'build)
-                   (add-after 'patch-dependencies 'delete-dev-dependencies
-                     (lambda _
-                       (delete-dependencies '("typescript")))))))
+     (list #:tests? #f
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'chdir-package
+                          (lambda _
+                            (chdir (format #f "packages/~a" #$pkg)))))))
+    (home-page "https://github.com/solana-labs/solana-web3.js#readme")
+    (synopsis "Solana Javascript API")
+    (description "Solana Javascript API")
+    (license license:expat)))
+
+(define-public node-solana-build-scripts
+  (node-solana-web3-js-package "build-scripts"))
+
+(define-public node-solana-web3-js
+  (package
+    (name "node-solana-web3-js")
+    (version %solana-web3-js-version)
+    (source %solana-web3-js-source)
+    (build-system node-build-system)
+    (arguments '(#:tests? #f))
     (inputs (list node-solana-transaction-confirmation-2.0.0
                   node-solana-transaction-messages-2.0.0
                   node-solana-rpc-subscriptions-2.0.0