From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SFxHFNzsH2NVFAEAbAwnHQ (envelope-from ) for ; Tue, 13 Sep 2022 04:37:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +JJHFNzsH2NK3gAA9RJhRA (envelope-from ) for ; Tue, 13 Sep 2022 04:37:16 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D63542705C for ; Tue, 13 Sep 2022 04:37:15 +0200 (CEST) Received: from localhost ([::1]:51302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXvnW-0006Yt-Hf for larch@yhetil.org; Mon, 12 Sep 2022 22:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXvnK-0006Xh-Lw for guix-patches@gnu.org; Mon, 12 Sep 2022 22:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXvnK-00014Y-6G for guix-patches@gnu.org; Mon, 12 Sep 2022 22:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXvnK-0003E0-1Q for guix-patches@gnu.org; Mon, 12 Sep 2022 22:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57659] [PATCH v2] gnu: Add blesh. References: <412cc868c48c12fd60239cea4bf2797daa93919c.1662603065.git.kiasoc5@disroot.org> In-Reply-To: <412cc868c48c12fd60239cea4bf2797daa93919c.1662603065.git.kiasoc5@disroot.org> Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Sep 2022 02:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57659 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: mail@cbaines.net Cc: kiasoc5 , 57659@debbugs.gnu.org Received: via spool by 57659-submit@debbugs.gnu.org id=B57659.166303659012359 (code B ref 57659); Tue, 13 Sep 2022 02:37:02 +0000 Received: (at 57659) by debbugs.gnu.org; 13 Sep 2022 02:36:30 +0000 Received: from localhost ([127.0.0.1]:48442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXvmn-0003DG-Ul for submit@debbugs.gnu.org; Mon, 12 Sep 2022 22:36:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXvmm-0003D4-2P for 57659@debbugs.gnu.org; Mon, 12 Sep 2022 22:36:29 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5B6FE42BFD; Tue, 13 Sep 2022 04:35:51 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qdf1vI5WMhGN; Tue, 13 Sep 2022 04:35:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1663036549; bh=0nqGgcOnGJ0iwqJZxhdxxlvTZpJOM8HgCYt/GuOyPzc=; h=From:To:Cc:Subject:Date; b=KRXlOGtfJH1xgYUi/8kk+BWxGJF/zwJFXU83sDjn8X+SGaPK55vms0+iwR/4/hflI hP7JojjEyGsbLtN0E5fKoLlW6QZxCR0fO+o7hI701DKnY8AWLG0sBmDgtuujxCskiD /kj+mh4f6US2e1nCWuk4ZzJ9ltbt1NJpKeXsHikmP1okKBXVr7Pnl8K/QJHneo++NY CFfYMUth+UEJrMmkykzCW7PJJEtKT5L844QbJSnj4405I390FulzzTAHZpz14QqrHr /gWxvJsAHHd2xtMWgjccxUlm8hUfBazYVf+Wx57EdWLasJrDFJcQxPSVlooZDnlDLz bAC3S9GDeqx3Q== Date: Mon, 12 Sep 2022 22:32:02 -0400 Message-Id: <20220913023200.59316-1-kiasoc5@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches From: kiasoc5 via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663036636; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xLkoUFmnCFk6SPDmgkpnbaEPiup69gS4VFCaWrHJiWQ=; b=U4l5UedJHVjeOcBopmb7/hF3ye5BiyYol+VVxT41Yy81YtgtSfvGWgZlnKrK5o47LmeMlt lwmP2kCDP4itEwpe5ruObilFdPjuq5GXErlNm9gegoJCS8MKZDkbovdVAUFszbLu2abyad fx5iqmwYBOtkw+6E63onlO+JPSLmh6kezIj4uqUAqupk7E6zmQyIw0qYqkmhPeL+bkdPVx 2XHL+Nh4k8ZjaIDrMmTcucG2rwAmc0MshQ7AmvIrq5JlVgjUmRauCEShMlf/M5vVxakyeZ A+rmHgMMLITvlQQbRS+i3mpcNn6vNkZn4tbTosJMXKdAWp6BikyTSL+lcmjqfQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663036636; a=rsa-sha256; cv=none; b=e5Kvr2ly8rHmduUn8Zl2Jl+8VWq1TeDueoCl3QPlMkmZJVsHO4g90HMndDJOGYAqkMPgzD ZArpdYjbJYFU/n6gm3aQCIiDUaZabBTYIjTx+D+eyKoexZiNIN4UIE5XAMvUSyhbN6rd2E 5pNuaKumaWd+CL96zsRiGDbBCanSba6Zas4f8IzszAHa6TJdzX+jbYecjU6jQMvRGu8fUL lUrqySlkdZRVpl/V/yB+PVemfwSmesf68v2p7oBSE5b0vvWSlwVPHSuDy3Y4qjruVZkijZ zLRTL2xd1NtqYdS5x2rrpp2Pa9Jsv4EWALY6f+1+jT2fgqRfWTsQehRCqiz3iQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=KRXlOGtf; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=KRXlOGtf; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D63542705C X-Spam-Score: 0.70 X-Migadu-Scanner: scn1.migadu.com X-TUID: 0niztuBgFhs2 On Sun, Sep 11 2022, 08:59:15 PM +0100 Christopher Baines wrote: > Maybe more importantly, this package uses the copy build system, but > it looks like ble.sh should be built with make. I realise that the > output of this build process is a mostly readable shell script, but > the Guix package should still build the source to generate it. Does > that make sense? Updated to latest tag and use git reference for makefile. However the contrib submodule fails to install during build phase, and there are 2 test failures: ``` starting phase `build' mkdir -p out mkdir -p out/keymap mkdir -p out/lib DEPENDENCIES_PHONY=1 DEPENDENCIES_OUTPUT=out/ble.dep DEPENDENCIES_TARGET=out/ble.sh FULLVER=0.4.0-devel2 \ /gnu/store/690qz3fg334dpwn3pn6k59n4wc943p2b-gawk-5.1.0/bin/gawk -f ext/mwg_pp.awk ble.pp >/dev/null cp -p keymap/emacs.sh out/keymap/emacs.sh cp -p keymap/vi.sh out/keymap/vi.sh cp -p keymap/vi_digraph.sh out/keymap/vi_digraph.sh cp -p keymap/vi_digraph.txt out/keymap/vi_digraph.txt cp -p keymap/vi_test.sh out/keymap/vi_test.sh cp -p keymap/emacs.rlfunc.txt out/keymap/emacs.rlfunc.txt cp -p keymap/vi_imap.rlfunc.txt out/keymap/vi_imap.rlfunc.txt cp -p keymap/vi_nmap.rlfunc.txt out/keymap/vi_nmap.rlfunc.txt cp -p lib/init-term.sh out/lib/init-term.sh cp -p lib/init-bind.sh out/lib/init-bind.sh cp -p lib/init-cmap.sh out/lib/init-cmap.sh cp -p lib/init-msys1.sh out/lib/init-msys1.sh cp -p lib/core-complete.sh out/lib/core-complete.sh /gnu/store/690qz3fg334dpwn3pn6k59n4wc943p2b-gawk-5.1.0/bin/gawk -f ext/mwg_pp.awk lib/core-syntax.sh > out/lib/core-syntax.sh cp -p lib/core-test.sh out/lib/core-test.sh cp -p lib/core-edit.ignoreeof-messages.txt out/lib/core-edit.ignoreeof-messages.txt cp -p lib/vim-surround.sh out/lib/vim-surround.sh cp -p lib/vim-arpeggio.sh out/lib/vim-arpeggio.sh cp -p lib/test-main.sh out/lib/test-main.sh cp -p lib/test-util.sh out/lib/test-util.sh fatal: not a git repository (or any parent up to mount point /tmp) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). fatal: not a git repository (or any parent up to mount point /tmp) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). phase `build' succeeded after 0.2 seconds starting phase `check' bash make_command.sh check ble.sh: Insane environment: $USER is empty. ble.sh: modified USER=nixbld ble/term.sh: updating tput cache for TERM=dumb... done stty: 'standard input': Inappropriate ioctl for device MACHTYPE: x86_64-unknown-linux-gnu BLE_VERSION: 0.4.0-devel2+ BASH_VERSION: 5.1.8(1)-release [section] main: 14/14 (0 fail, 0 crash, 0 skip) /tmp/guix-build-blesh-0.4.0-devel2.drv-0/source/out/lib/test-util.sh:1671: ble/util/c2s 956; [[ $ret != μ ]] --- 289.exit.expect 2022-09-13 02:34:16.953615150 +0000 +++ 289.exit.result 2022-09-13 02:34:16.953615150 +0000 @@ -1 +1 @@ -0 +1 /tmp/guix-build-blesh-0.4.0-devel2.drv-0/source/out/lib/test-util.sh:1672: ble/util/c2s 12354; [[ $ret != あ ]] --- 289.exit.expect 2022-09-13 02:34:16.956948541 +0000 +++ 289.exit.result 2022-09-13 02:34:16.956948541 +0000 @@ -1 +1 @@ -0 +1 [section] util: 1045/1047 (2 fail, 0 crash, 0 skip) make: *** [GNUmakefile:158: check] Error 1 Test suite failed, dumping logs. error: in phase 'check': uncaught exception: %exception #<&invoke-error program: "make" arguments: ("check" "-j" "8") exit-status: 2 term-signal: #f stop-signal: #f> phase `check' failed after 1.9 seconds command "make" "check" "-j" "8" failed with status 2 builder for `/gnu/store/pli4h8yvddlv3mm1bgq47l2kfadm0dfi-blesh-0.4.0-devel2.drv' failed with exit code 1 build of /gnu/store/pli4h8yvddlv3mm1bgq47l2kfadm0dfi-blesh-0.4.0-devel2.drv failed View build log at '/var/log/guix/drvs/pl/i4h8yvddlv3mm1bgq47l2kfadm0dfi-blesh-0.4.0-devel2.drv.gz'. guix build: error: build of `/gnu/store/pli4h8yvddlv3mm1bgq47l2kfadm0dfi-blesh-0.4.0-devel2.drv' failed ``` Help appreciated. * gnu/packages/bash.scm (blesh): New variable. --- gnu/packages/bash.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 72758560cd..bf6d5fc1cc 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -37,6 +37,8 @@ (define-module (gnu packages bash) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages guile) + #:use-module (gnu packages version-control) + #:use-module (gnu packages less) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -456,3 +458,38 @@ (define-public bash-ctypes function interface (FFI) directly in your shell. In other words, it allows you to call routines in shared libraries from within Bash.") (license license:expat))) + +(define-public blesh + (package + (name "blesh") + (version "0.4.0-devel2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/akinomyoga/ble.sh") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02fdjyh4x6wr5hg3i86nsxhz8ysgjrvvxdmk6pqr0lm8ngw9p3sh")))) + (arguments + (list #:phases #~(modify-phases %standard-phases + ;TODO: install contrib submodule + (add-after 'unpack 'pretend-contrib-.git-exists + (lambda _ + (mkdir-p "contrib/.git"))) + (add-after 'unpack 'make-readlink-work + (lambda _ + (substitute* "ble.pp" + (("PATH=/bin:/usr/bin readlink" path-to-readlink) + (string-append #$coreutils "/bin/readlink"))))) + (delete 'configure)))) ;no configure + (build-system gnu-build-system) + (native-inputs (list git-minimal coreutils less)) + (home-page "https://github.com/akinomyoga/ble.sh/") + (synopsis "Bash Line Editor") + (description + "Bash Line Editor (ble.sh) is a command line editor written in pure Bash +which replaces the default GNU Readline. It adds syntax highlighting, auto +suggestions, vim modes, and more to Bash interactive sessions.") + (license license:bsd-3))) -- 2.37.3