simplify some scripts, tr7 2.0.7

1 files changed, 73 insertions, 69 deletions

diff --git a/mcgoron/guix/scheme-packages.scm b/mcgoron/guix/scheme-packages.scm
index cba418d..a6b73b7 100644
--- a/mcgoron/guix/scheme-packages.scm
+++ b/mcgoron/guix/scheme-packages.scm
@@ -158,7 +158,6 @@
   (format #f "${~a:+${~a}:}" name name))
 
 (define (package/path imported-package
-                      package-name
                       synopsis
                       description
                       binary-name
@@ -168,10 +167,10 @@
                       libdir
                       generator-script)
 (package
-  (name (string-append package-name "-with-path"))
+  (name (string-append (package-name imported-package) "-with-path"))
   (synopsis synopsis)
   (description description)
-  (version "1.0.0")
+  (version (package-version imported-package))
   (source #f)
   (license gpl3+)
   (build-system trivial-build-system)
@@ -268,7 +267,6 @@
 
 (define-public foment-with-path
   (package/path foment
-                "foment"
                 "Foment with Guix paths"
                 "Wrapper for Foment Scheme that adds Guix-managed paths to Foment search path"
                 "/bin/foment"
@@ -278,13 +276,13 @@
                 foment-lib-dir
                 `(lambda (sh impl)
                    (format #t
-                    "#!~a
+                           "#!~a
 
                      ~a
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "FOMENT_LIBPATH" "GUIX_FOMENT_PATH" "R7RS_LIBRARY_PATH")
-                    impl))))
+                           sh
+                           ,(append-to "FOMENT_LIBPATH" "GUIX_FOMENT_PATH" "R7RS_LIBRARY_PATH")
+                           impl))))
 
 ;;;;;;;;;;;;;;;;;;;
 ;;;; Chibi
@@ -301,7 +299,6 @@
 (define-public chibi-scheme-with-path
   (package/path
    chibi-scheme
-   "chibi-scheme"
    "Chibi Scheme with Guix paths"
    "Wrapper for Chibi Scheme that adds Guix-managed paths to search path"
    "/bin/chibi-scheme"
@@ -311,7 +308,7 @@
    chibi-lib-dir
    `(lambda (sh impl)
       (format #t
-       "#!~a
+              "#!~a
 
         ~a
         if [ -z \"$CHIBI_MODULE_PATH\" ]; then
@@ -319,9 +316,9 @@
         fi
 
         exec -a $0 \"~a\" \"$@\""
-       sh 
-       ,(append-to "CHIBI_MODULE_PATH" "GUIX_CHIBI_PATH" "R7RS_LIBRARY_PATH")
-       impl))))
+              sh
+              ,(append-to "CHIBI_MODULE_PATH" "GUIX_CHIBI_PATH" "R7RS_LIBRARY_PATH")
+              impl))))
 
 ;;;;;;;;;;;;;;;;
 ;;;; Sagittarius
@@ -355,7 +352,6 @@
 
 (define-public sagittarius-scheme-with-path
   (package/path sagittarius-scheme
-                "sagittarius-scheme"
                 "Sagittarius Scheme with Guix paths"
                 "Wrapper for Sagittarius Scheme that adds Guix-managed paths"
                 "/bin/sagittarius"
@@ -365,13 +361,13 @@
                 foment-lib-dir
                 `(lambda (sh impl)
                    (format #t
-                    "#!~a
+                           "#!~a
 
                      ~a
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "SAGITTARIUS_LOADPATH" "GUIX_SAGITTARIUS_PATH" "R6RS_LIBRARY_PATH" "R7RS_LIBRARY_PATH")
-                    impl))))
+                           sh
+                           ,(append-to "SAGITTARIUS_LOADPATH" "GUIX_SAGITTARIUS_PATH" "R6RS_LIBRARY_PATH" "R7RS_LIBRARY_PATH")
+                           impl))))
 
 ;;;;;;;;;;;;;;;;;;
 ;;;; Gauche
@@ -403,28 +399,27 @@
 (define-public gauche-with-path
   (let-values (((abi-ver libpath dynlibpath) (generate-gauche-library-information gauche)))
    (package/path gauche
-                "gauche"
-                "Gauche with Guix paths"
-                "Wrapper for Gauche that adds Guix-managed paths"
-                "/bin/gosh"
-                "/bin/gosh"
-                "GUIX_GAUCHE_PATH"
-                (list (search-path-specification
-                        (variable "GUIX_GAUCHE_DYN_PATH")
-                        (files (list dynlibpath)))
-                      r7rs-search-path-specification)
-                libpath
-                `(lambda (sh impl)
-                   (format #t
-                    "#!~a
+                 "Gauche with Guix paths"
+                 "Wrapper for Gauche that adds Guix-managed paths"
+                 "/bin/gosh"
+                 "/bin/gosh"
+                 "GUIX_GAUCHE_PATH"
+                 (list (search-path-specification
+                       (variable "GUIX_GAUCHE_DYN_PATH")
+                       (files (list dynlibpath)))
+                       r7rs-search-path-specification)
+                 libpath
+                 `(lambda (sh impl)
+                    (format #t
+                            "#!~a
 
                      ~a
                      ~a
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "GAUCHE_LOAD_PATH" "GUIX_GAUCHE_PATH" "R7RS_LIBRARY_PATH")
-                    ,(append-to "GAUCHE_DYNLOAD_PATH" "GUIX_GAUCHE_DYN_PATH")
-                    impl)))))
+                            sh
+                            ,(append-to "GAUCHE_LOAD_PATH" "GUIX_GAUCHE_PATH" "R7RS_LIBRARY_PATH")
+                            ,(append-to "GAUCHE_DYNLOAD_PATH" "GUIX_GAUCHE_DYN_PATH")
+                            impl)))))
 
 ;;;;;;;;;;
 ;;;; Loko
@@ -439,7 +434,6 @@
 
 (define-public loko-scheme-with-path
   (package/path loko-scheme
-                "loko-scheme"
                 "Loko Scheme with Guix paths"
                 "Wrapper for Loko that adds Guix-managed paths"
                 "/bin/loko"
@@ -449,13 +443,13 @@
                 loko-scheme-lib-dir
                 `(lambda (sh impl)
                    (format #t
-                    "#!~a
+                           "#!~a
 
                      ~a
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "LOKO_LIBRARY_PATH" "GUIX_LOKO_PATH" "R6RS_LIBRARY_PATH" "R7RS_LIBRARY_PATH")
-                    impl))))
+                           sh
+                           ,(append-to "LOKO_LIBRARY_PATH" "GUIX_LOKO_PATH" "R6RS_LIBRARY_PATH" "R7RS_LIBRARY_PATH")
+                           impl))))
 
 ;;;;;;;;;;;;;;;;;;;
 ;;;; STKlos
@@ -471,7 +465,6 @@
 (define-public stklos-with-path
   (package/path
    stklos
-   "stklos"
    "STKlos with Guix paths"
    "Wrapper for STKlos that adds Guix-managed paths to search path"
    "/bin/stklos"
@@ -481,24 +474,39 @@
    stklos-lib-dir
    `(lambda (sh impl)
       (format #t
-       "#!~a
+              "#!~a
 
         ~a
 
         exec -a $0 \"~a\" \"$@\""
-       sh 
-       ,(append-to "STKLOS_LOAD_PATH" "GUIX_STKLOS_PATH" "R7RS_LIBRARY_PATH")
-       impl))))
+              sh
+              ,(append-to "STKLOS_LOAD_PATH" "GUIX_STKLOS_PATH" "R7RS_LIBRARY_PATH")
+              impl))))
 
 ;;;;;;;;;;;
 ;;;; TR7
 ;;;;;;;;;;;
 
+(define-public tr7-2.0.6
+  (package
+   (inherit tr7)
+   (name "tr7")
+   (version "2.0.6")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+           (url "https://gitlab.com/jobol/tr7")
+           (commit (string-append "v" version))))
+     (sha256
+      (base32 "0z9zjk71294afr5aynnr8q9iih6q6lfsx747swbaz14r5vpjhg3n"))
+     (file-name (git-file-name name version))))))
+
 (define-public tr7
   ;; Current guix TR7 is a major version out of date
   (package
     (name "tr7")
-    (version "2.0.6")
+    (version "2.0.7")
     (source
      (origin
        (method git-fetch)
@@ -506,7 +514,7 @@
              (url "https://gitlab.com/jobol/tr7")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "0z9zjk71294afr5aynnr8q9iih6q6lfsx747swbaz14r5vpjhg3n"))
+        (base32 "0xg0bq2q6g1095m7x72y35p8n3dg1sv4fqbxyqjbyzx2s4ac5h3g"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
@@ -563,7 +571,6 @@ developers freedom in balancing features and footprint.")
 (define-public tr7-with-path
   (package/path
    tr7
-   "tr7"
    "TR7 interpreter with Guix paths"
    "Wrapper for TR7 interpreter that adds Guix-managed paths to search path"
    "/bin/tr7i"
@@ -573,14 +580,14 @@ developers freedom in balancing features and footprint.")
    tr7-lib-dir
    `(lambda (sh impl)
       (format #t
-       "#!~a
+              "#!~a
 
         ~a
 
         exec -a $0 \"~a\" \"$@\""
-       sh 
-       ,(append-to "TR7_LIB_PATH" "GUIX_TR7_PATH" "R7RS_LIBRARY_PATH")
-       impl))))
+              sh
+              ,(append-to "TR7_LIB_PATH" "GUIX_TR7_PATH" "R7RS_LIBRARY_PATH")
+              impl))))
 
 ;;;;;;;;;;;;;;;;
 ;;;; Mosh
@@ -614,7 +621,6 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
 
 (define-public mosh-scheme-with-path
   (package/path mosh-scheme
-                "mosh-scheme"
                 "Mosh with Guix paths"
                 "Wrapper for Mosh that adds Guix-managed paths"
                 "/bin/mosh"
@@ -624,13 +630,13 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
                 mosh-lib-dir
                 `(lambda (sh impl)
                    (format #t
-                    "#!~a
+                           "#!~a
 
                      ~a
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "MOSH_LOADPATH" "GUIX_MOSH_PATH" "R6RS_LIBRARY_PATH")
-                    impl))))
+                           sh
+                           ,(append-to "MOSH_LOADPATH" "GUIX_MOSH_PATH" "R6RS_LIBRARY_PATH")
+                           impl))))
 
 ;;;;;;;;;;;;;;;
 ;;;; SKint
@@ -700,7 +706,6 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
 
 (define-public skint-with-path
   (package/path skint
-                "skint"
                 "SKINT with Guix paths"
                 "Wrapper for SKINT that adds Guix-managed paths"
                 "/bin/skint"
@@ -710,7 +715,7 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
                 skint-lib-dir
                 `(lambda (sh impl)
                    (format #t
-                    "#!~a
+                           "#!~a
 
                      ~a
                      if [ -z \"$SKINT_LIBDIRS\" ]; then
@@ -718,9 +723,9 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
                      fi
 
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "SKINT_LIBDIRS" "GUIX_SKINT_PATH" "R7RS_LIBRARY_PATH")
-                    impl))))
+                           sh
+                           ,(append-to "SKINT_LIBDIRS" "GUIX_SKINT_PATH" "R7RS_LIBRARY_PATH")
+                           impl))))
 
 
 ;;;; Ypsilon: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ypsilon/ypsilon-0.9.6.update3.tar.gz
@@ -738,7 +743,6 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
 
 (define-public chez-scheme-with-path
   (package/path chez-scheme
-                "chez-scheme"
                 "Chez with Guix paths"
                 "Wrapper for Chez that adds Guix-managed paths"
                 "/bin/chez-scheme"
@@ -748,13 +752,13 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
                 chez-lib-dir
                 `(lambda (sh impl)
                    (format #t
-                    "#!~a
+                           "#!~a
 
                      ~a
                      exec -a $0 \"~a\" \"$@\""
-                    sh
-                    ,(append-to "CHEZSCHEMELIBDIRS" "GUIX_CHEZ_PATH" "R6RS_LIBRARY_PATH")
-                    impl))))
+                           sh
+                           ,(append-to "CHEZSCHEMELIBDIRS" "GUIX_CHEZ_PATH" "R6RS_LIBRARY_PATH")
+                           impl))))
 
 #|
 ;;;;;;;;;;;;
@@ -792,7 +796,7 @@ The current release of Mosh supports all of the features R7RS small and R6RS."))
 
 (define-public vicare-with-path
   (package/path vicare
-                "vicare"
+   
                 "Vicare with Guix paths"
                 "Wrapper for Vicare that adds Guix-managed paths"
                 "/bin/vicare"