[bug#34633] gnu: fossil: Update to 2.8.

Message ID 20190223112249.0619338f@riseup.net
State Accepted
Headers show
Series [bug#34633] gnu: fossil: Update to 2.8. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Jovany Leandro G.C Feb. 23, 2019, 4:30 p.m. UTC
From 6f8d5108e98378e0fbabd4b193829b1becfcb86f Mon Sep 17 00:00:00 2001
From: "Jovany Leandro G.C" <bit4bit@riseup.net>
Date: Sat, 23 Feb 2019 11:13:47 -0500
Subject: [PATCH 1/1] gnu: fossil: Update to 2.8.

* gnu/packages/version-control.scm (fossil): Update to 2.8.
---
 gnu/packages/version-control.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Efraim Flashner Feb. 27, 2019, 8:41 a.m. UTC | #1
I added a copyright line for you and fleshed out the commit message.
Pushed as 66d05055bbfbdb657a0743c6b6a2332cb319fc42.

Patch

diff --git a/gnu/packages/version-control.scm
b/gnu/packages/version-control.scm index 5ca9471a4..82a481a10 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1867,7 +1867,7 @@  repository\" with git-annex.")
 (define-public fossil
   (package
     (name "fossil")
-    (version "2.5")
+    (version "2.8")
     (source
      (origin
        (method url-fetch)
@@ -1881,7 +1881,7 @@  repository\" with git-annex.")
               "fossil-src-" version ".tar.gz")))
        (sha256
         (base32
-         "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r"))))
+         "0pbinf8d2kj1j7niblhzjd2l2khg6r2pn2xvig6gavz27p3vwcka"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("tcl" ,tcl)                     ;for configuration only
@@ -1890,12 +1890,17 @@  repository\" with git-annex.")
     (inputs
      `(("openssl" ,openssl)
        ("zlib" ,zlib)
-       ("sqlite" ,sqlite)))
+       ("sqlite" ,sqlite-3.26.0)))
     (arguments
      `(#:configure-flags (list "--with-openssl=auto"
                                "--disable-internal-sqlite")
        #:test-target "test"
        #:phases (modify-phases %standard-phases
+                  (add-after  'patch-source-shebangs 'patch-sh
+                    (lambda _
+                      (substitute* '("auto.def")
+                        (("/bin/sh") (which "sh")))
+                      #t))
                   (replace 'configure
                     (lambda* (#:key outputs (configure-flags '())
                               #:allow-other-keys)