unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29708] Update s-shell
@ 2017-12-14 13:31 ng0
  2017-12-14 17:26 ` bug#29708: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: ng0 @ 2017-12-14 13:31 UTC (permalink / raw)
  To: 29708


[-- Attachment #1.1: Type: text/plain, Size: 133 bytes --]

Appended.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is

[-- Attachment #1.2: 0001-s-shell-Update-to-commit-da2e5c20c0c5f477ec3426dc258.patch --]
[-- Type: text/plain, Size: 1901 bytes --]

From cf2cbe9e9e525aa9dd697fcedb255a0fbc194ac9 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#29708: Update s-shell
  2017-12-14 13:31 [bug#29708] Update s-shell ng0
@ 2017-12-14 17:26 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2017-12-14 17:26 UTC (permalink / raw)
  To: ng0; +Cc: 29708-done

ng0 <ng0@n0.is> skribis:

> From cf2cbe9e9e525aa9dd697fcedb255a0fbc194ac9 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@n0.is>
> 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’.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-12-14 17:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-14 13:31 [bug#29708] Update s-shell ng0
2017-12-14 17:26 ` bug#29708: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).