guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/05: gnu: loksh: Update to 6.9.


From: guix-commits
Subject: 02/05: gnu: loksh: Update to 6.9.
Date: Wed, 5 May 2021 18:49:02 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit efe8dc71feddfaf1917f64fb6778fca79475f251
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed May 5 20:36:34 2021 +0200

    gnu: loksh: Update to 6.9.
    
    * gnu/packages/shells.scm (loksh): Update to 6.9.
    [source]: Check out recursively.
    [build-systems]: Switch to Meson.
    [inputs]: Remove libbsd.
    [arguments]: Remove the old build system's #:make-flags and #:phases
    customisation.
---
 gnu/packages/shells.scm | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index e9e9a84..cc260d4 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -65,6 +65,7 @@
   #:use-module (guix build-system cargo)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
@@ -750,30 +751,26 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
 (define-public loksh
   (package
     (name "loksh")
-    (version "6.6")
+    (version "6.9")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/dimkr/loksh";)
-             (commit version)))
+             (commit version)
+             ;; Include the ‘lolibc’ submodule, a static compatibility library
+             ;; created for and currently used only by loksh.
+             (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1a8s64n97ikvvi7ckirxnnjvcmhr3dd4rnqm2ivapyzb0wp42jk7"))))
-    (build-system gnu-build-system)
+        (base32 "0x33plxqhh5202hgqidgccz5hpg8d2q71ylgnm437g60mfi9z0px"))))
+    (build-system meson-build-system)
     (inputs
-     `(("libbsd" ,libbsd)
-       ("ncurses" ,ncurses)))
+     `(("ncurses" ,ncurses)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (arguments
-     `(#:tests? #f                      ; no tests included
-       #:make-flags (list "CC=gcc" "HAVE_LIBBSD=1"
-                          (string-append "PREFIX="
-                                         (assoc-ref %outputs "out")))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure))))         ; no configure script
+     `(#:tests? #f))                    ; no tests included
     (home-page "https://github.com/dimkr/loksh";)
     (synopsis "Korn Shell from OpenBSD")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]