Subject: bug#29708: closed (Re: [bug#29708] Update s-shell)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 14 Dec 2017 17:27:02 +0000

Your bug report

#29708: Update s-shell

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
29708: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29708
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#29708] Update s-shell
From: [email-masked] (Ludovic Courtès)
To: ng0 <[email-masked]>
Cc: [email-masked]
Date: Thu, 14 Dec 2017 18:26:11 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

ng0 <[email-masked]> skribis:

> From cf2cbe9e9e525aa9dd697fcedb255a0fbc194ac9 Mon Sep 17 00:00:00 2001
> From: ng0 <[email-masked]>
> Date: Thu, 14 Dec 2017 13:22:58 +0000
> Subject: [PATCH] s-shell: Update to commit
>  da2e5c20c0c5f477ec3426dc2584889a789b1659.
>
> * gnu/packages/shells.scm (s-shell): Update to commit da2e5c20c0c5f477ec3426dc2584889a789b1659.
> (version): Use 'git-version'.

I adjusted the commit log and pushed.

Thanks!

Ludo’.

Subject: Update s-shell
From: ng0 <[email-masked]>
To: [email-masked]
Date: Thu, 14 Dec 2017 13:31:23 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Appended.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is
From cf2cbe9e9e525aa9dd697fcedb255a0fbc194ac9 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Thu, 14 Dec 2017 13:22:58 +0000
Subject: [PATCH] s-shell: Update to commit
 da2e5c20c0c5f477ec3426dc2584889a789b1659.

* gnu/packages/shells.scm (s-shell): Update to commit da2e5c20c0c5f477ec3426dc2584889a789b1659.
(version): Use 'git-version'.
---
 gnu/packages/shells.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 1f076999c..343f50d6d 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -511,11 +511,11 @@ Its features include:
       (license bsd-2))))
 
 (define-public s-shell
-  (let ((commit "6604341edb3a775ff94415762af3ee9bd86bfb3c")
-        (revision "1"))
+  (let ((commit "da2e5c20c0c5f477ec3426dc2584889a789b1659")
+        (revision "2"))
     (package
       (name "s-shell")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (version (git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -525,13 +525,15 @@ Its features include:
          (file-name (string-append name "-" version "-checkout"))
          (sha256
           (base32
-           "1075cml6dl15d770j3m12yz90cjacsdslbv3gank1nxd76vmpdcr"))))
+           "0qiny71ww5nhzy4mnc8652hn0mlxyb67h333gbdxp4j4qxsi13q4"))))
       (build-system gnu-build-system)
       (inputs
        `(("linenoise" ,linenoise)))
       (arguments
        `(#:tests? #f
-         #:make-flags (list "CC=gcc")
+         #:make-flags (list "CC=gcc"
+                            (string-append "PREFIX="
+                                           (assoc-ref %outputs "out")))
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'install-directory-fix
-- 
2.15.1