gnu: gerbil: Update to 0.18.1.
* gnu/packages/scheme.scm (gerbil): Update to 0.18.1. [arguments]: Remove ‘chdir’ and ‘configure’ phases. Add ‘set-cc’ phase. Adjust ‘fix-gxi-shebangs’ phase. [native-inputs]: Remove ‘coreutils’ and ‘gcc’. Change-Id: I4248ae3d6df3beaf57b6036f5329374da79e26f1 Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Skylar Hill
Ludovic Courtès
parent
6b138626e4
commit
4b23fd7adb
1 changed files with 65 additions and 87 deletions
|
|
@ -23,6 +23,7 @@
|
||||||
;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
|
;;; Copyright © 2023 Andrew Whatson <whatson@tailcall.au>
|
||||||
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
|
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
|
||||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
|
;;; Copyright © 2024 Skylar Hill <stellarskylark@posteo.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
|
@ -1117,33 +1118,22 @@ a Common Lisp environment.")
|
||||||
(define-public gerbil
|
(define-public gerbil
|
||||||
(package
|
(package
|
||||||
(name "gerbil")
|
(name "gerbil")
|
||||||
(version "0.17.0")
|
(version "0.18.1")
|
||||||
(source (origin
|
(source
|
||||||
(method git-fetch)
|
(origin
|
||||||
(uri (git-reference
|
(method url-fetch)
|
||||||
(url "https://github.com/vyzo/gerbil")
|
(uri (string-append
|
||||||
(commit (string-append "v" version))))
|
"https://github.com/mighty-gerbils/gerbil/releases/download/v"
|
||||||
(file-name (git-file-name name version))
|
version "/gerbil-v" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32 "1dff14bzqkq6scyyhnwhc3ky96j6lr84mnghk4da0x6vifw7p0p1"))))
|
||||||
"0c0nspm659ybgmqlppdv7sxzll4hwkvcp9qmcsip6d0kz0p8r9c3"))))
|
|
||||||
(arguments
|
(arguments
|
||||||
(list #:phases
|
(list
|
||||||
#~(modify-phases %standard-phases
|
#:phases #~(modify-phases %standard-phases
|
||||||
(delete 'bootstrap)
|
(delete 'bootstrap)
|
||||||
(add-before 'configure 'chdir
|
(add-after 'set-paths 'set-cc
|
||||||
(lambda _
|
(lambda _
|
||||||
(chdir "src")))
|
(setenv "CC" #$(cc-for-target))))
|
||||||
(replace 'configure
|
|
||||||
(lambda _
|
|
||||||
(invoke "chmod" "755" "-R" ".")
|
|
||||||
;; Otherwise fails when editing an r--r--r-- file.
|
|
||||||
(invoke "gsi-script"
|
|
||||||
"configure"
|
|
||||||
"--prefix"
|
|
||||||
#$output
|
|
||||||
"--with-gambit"
|
|
||||||
#$gambit-c)))
|
|
||||||
(add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs
|
(add-before 'patch-generated-file-shebangs 'fix-gxi-shebangs
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Some .ss files refer to gxi using /usr/bin/env gxi
|
;; Some .ss files refer to gxi using /usr/bin/env gxi
|
||||||
|
|
@ -1158,33 +1148,29 @@ a Common Lisp environment.")
|
||||||
(("#!/usr/bin/env gxi")
|
(("#!/usr/bin/env gxi")
|
||||||
(string-append "#!" abs-srcdir
|
(string-append "#!" abs-srcdir
|
||||||
"/../bin/gxi"))))
|
"/../bin/gxi"))))
|
||||||
'("./gerbil/gxc" "./lang/build.ss"
|
'("./src/std/web/rack-test.ss"
|
||||||
"./misc/http-perf/build.ss"
|
"./src/std/web/fastcgi-test.ss"
|
||||||
"./misc/rpc-perf/build.ss"
|
"./src/std/build.ss"
|
||||||
"./misc/scripts/docsnarf.ss"
|
"./src/build/build-libgerbil.ss"
|
||||||
"./misc/scripts/docstub.ss"
|
"./src/gerbil/test/test-build-static-exe.ss"
|
||||||
"./misc/scripts/docsyms.ss"
|
"./src/gerbil/test/test-build-optimized-static-exe.ss"
|
||||||
"./r7rs-large/build.ss"
|
"./src/gerbil/test/test-build-optimized-exe.ss"
|
||||||
"./release.ss"
|
"./src/gerbil/test/test-build-exe.ss"
|
||||||
"./std/build.ss"
|
"./src/srfi/build.ss"
|
||||||
"./std/run-tests.ss"
|
"./src/r7rs-large/build.ss"
|
||||||
"./std/web/fastcgi-test.ss"
|
"./src/misc/rpc-perf/build.ss"
|
||||||
"./std/web/rack-test.ss"
|
"./src/misc/http-perf/build.ss"
|
||||||
"./tools/build.ss"
|
"./src/misc/scripts/docsnarf.ss"
|
||||||
"./tutorial/httpd/build.ss"
|
"./src/misc/scripts/docstub.ss"
|
||||||
"./tutorial/kvstore/build.ss"
|
"./src/misc/scripts/docsyms.ss"
|
||||||
"./tutorial/lang/build.ss"
|
"./src/tools/gxpkg.ss"
|
||||||
"./tutorial/proxy/build-static.ss"
|
"./src/tools/build.ss"
|
||||||
"./tutorial/proxy/build.ss")))))
|
"./src/lang/build.ss"
|
||||||
(add-after 'configure 'create-gx-version.scm
|
"./src/tutorial/kvstore/build.ss"
|
||||||
(lambda _
|
"./src/tutorial/httpd/build.ss"
|
||||||
(with-output-to-file (string-append (getcwd)
|
"./src/tutorial/proxy/build.ss"
|
||||||
"/gerbil/runtime/gx-version.scm")
|
"./src/tutorial/ensemble/build.ss"
|
||||||
(lambda _
|
"./src/tutorial/lang/build.ss")))))
|
||||||
(write `(define (gerbil-version-string)
|
|
||||||
,(string-append "v"
|
|
||||||
#$(version-major+minor
|
|
||||||
version))))))))
|
|
||||||
(replace 'build
|
(replace 'build
|
||||||
(lambda _
|
(lambda _
|
||||||
(setenv "HOME"
|
(setenv "HOME"
|
||||||
|
|
@ -1195,17 +1181,9 @@ a Common Lisp environment.")
|
||||||
;; Calling in script prevents that.
|
;; Calling in script prevents that.
|
||||||
"script"
|
"script"
|
||||||
"-qefc"
|
"-qefc"
|
||||||
"./build.sh")))
|
"./build.sh"))))
|
||||||
(replace 'install
|
|
||||||
(lambda _
|
|
||||||
(let* ((bin (string-append #$output "/bin"))
|
|
||||||
(lib (string-append #$output "/lib")))
|
|
||||||
(mkdir-p bin)
|
|
||||||
(mkdir-p lib)
|
|
||||||
(copy-recursively "../bin" bin)
|
|
||||||
(copy-recursively "../lib" lib)))))
|
|
||||||
#:tests? #f))
|
#:tests? #f))
|
||||||
(native-inputs (list coreutils gambit-c util-linux))
|
(native-inputs (list gambit-c util-linux))
|
||||||
(propagated-inputs (list gambit-c openssl sqlite zlib))
|
(propagated-inputs (list gambit-c openssl sqlite zlib))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(synopsis "Meta-dialect of Scheme with post-modern features")
|
(synopsis "Meta-dialect of Scheme with post-modern features")
|
||||||
|
|
|
||||||
Reference in a new issue