From 6780a1876409d15231f6a05e7030899f3d45bcfc Mon Sep 17 00:00:00 2001
From: Tissevert <tissevert+devel@marvid.fr>
Date: Fri, 4 Aug 2023 16:33:06 +0200
Subject: [PATCH] Fix devel package for hablo, clean package for ghc-template
 and add unitJS as a runtime dependency

---
 ghc-template.scm | 12 ++++--------
 guix.scm         |  5 +++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ghc-template.scm b/ghc-template.scm
index f766e41..e7d49ab 100644
--- a/ghc-template.scm
+++ b/ghc-template.scm
@@ -1,11 +1,7 @@
-(use-modules (gnu packages haskell-xyz)
-             (gnu packages haskell-web)
-             (guix build-system haskell)
-             (guix download)
-             (guix gexp)
-             (guix git-download)
-             (guix licenses)
-             (guix packages))
+(use-modules ((guix build-system haskell) #:select (hackage-uri haskell-build-system))
+             ((guix download) #:select (url-fetch))
+             ((guix licenses) #:select (bsd-3))
+             ((guix packages) #:select (base32 origin package)))
 
 (package
   (name "ghc-template")
diff --git a/guix.scm b/guix.scm
index 8bcdc91..f594d8d 100644
--- a/guix.scm
+++ b/guix.scm
@@ -19,6 +19,7 @@
           #:recursive? #t
           #:select? (git-predicate %source-dir)))
     (build-system haskell-build-system)
+    (propagated-inputs (list sjw-unitjs))
     (inputs
       (list ghc-aeson
             ghc-attoparsec
@@ -32,8 +33,8 @@
     (arguments
       `(#:phases
         (modify-phases %standard-phases
-          (insert-after 'install 'copy-static-resources
-            (lambda* #:key outputs #:allow-other-keys
+          (add-after 'install 'copy-static-resources
+            (lambda* (#:key outputs #:allow-other-keys)
               (let ((out (assoc-ref outputs "out")))
                 (copy-recursively "share" (string-append out "/share/hablo"))))))))
     (native-search-paths