Subject: fossil 2.2

From: ng0 <[email-masked]>
Date: Fri, 9 Jun 2017 15:54:00 +0000

The appended patch updates fossil to 2.2.

I am not a fossil user, the test suite is
either correct or weird.

2.1 failed its testsuite, so I skipped it when
it was released.

It installs correctly, and test suite doesn't
fail, but this is the output of it:

test symlinks-dir-16 FAILED!
RESULT: symdirA/f1.txt
project-name: <unnamed>
repository:   /tmp/guix-build-fossil-2.2.drv-0/repo_1004/1497023253_42/symlinks.test/.rep.fossil
local-root:   /tmp/guix-build-fossil-2.2.drv-0/repo_1004/1497023253_42/symlinks.test/
config-db:    /tmp/guix-build-fossil-2.2.drv-0/home_1004/.fossil
project-code: b9d301d25ddc945d2d7cd9e20bac7e015becaddc
checkout:     793c7c81883dc93276a4e96bb4327bc83b85e780 2017-06-09 15:47:33 UTC
parent:       f5ba41d443e536ae23a4ca351d22ca33f13c8391 2017-06-09 15:47:33 UTC
tags:         trunk
comment:      c1 (user: guix)
check-ins:    2
Fossil was not compiled with TH1 docs support.
Fossil was not compiled with TH1 hooks support.
Fossil was not compiled with Tcl support.
test th1-checkout-1 FAILED!
RESULT:
test th1-checkout-2 FAILED!
RESULT:
test th1-header-2 FAILED!
RESULT: TH_ERROR: repository unavailable
test th1-artifact-3 FAILED!
RESULT: TH_ERROR: repository unavailable
test th1-artifact-7 FAILED!
RESULT: TH_ERROR: repository unavailable
test th1-globalState-1 FAILED!
RESULT:
test th1-globalState-8 FAILED!
RESULT:
test th1-encode64-3 FAILED!
RESULT: TH_ERROR: repository unavailable
The "sha1" package is not available.
***** Final results: 15 errors out of 34838 tests
***** Considered failures: pre-commit-warnings-fossil-1 test-framework-set-manifest symlinks-dir-6 symlinks-dir-11 symlinks-dir-12 symlinks-dir-13 symlinks-dir-16 th1-checkout-1 th1-checkout-2 th1-header-2 th1-artifact-3 th1-artifact-7 th1-globalState-1 th1-globalState-8 th1-encode64-3
***** Ignored results: 5 ignored errors out of 34838 tests
***** Ignored failures: merge5-sqlite3-issue stash-1-diff stash-WY-1-CODE stash-3-2 stash-3-2-show-1
phase `check' succeeded after 147.7 seconds
starting phase `install'

-- 
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
From c7f91d765a43e9e9c08573bc4b018657ae725b35 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Fri, 3 Mar 2017 13:25:53 +0000
Subject: [PATCH] gnu: fossil: Update to 2.2.

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

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cd2576c51..5e3d78aec 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1281,16 +1281,21 @@ repository\" with git-annex.")
 (define-public fossil
   (package
     (name "fossil")
-    (version "1.35")
+    (version "2.2")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://www.fossil-scm.org/index.html/uv/download/"
-             "fossil-src-" version ".tar.gz"))
+       ;; Older downloads are moved to another URL.
+       (uri (list
+             (string-append
+              "https://www.fossil-scm.org/index.html/uv/download/"
+              "fossil-src-" version ".tar.gz")
+             (string-append
+              "https://www.fossil-scm.org/index.html/uv/"
+              "fossil-src-" version ".tar.gz")))
        (sha256
         (base32
-         "07ds6rhq69bhydpm9a01mgdhxf88p9b6y5hdnhn8gjc7ba92zyf1"))))
+         "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("tcl" ,tcl)                     ;for configuration only
@@ -1321,7 +1326,7 @@ repository\" with git-annex.")
                       (setenv "TZ" "UTC")
                       ;; Fixing the th1 test would require many backports, so
                       ;; just disable for now.
-                      (delete-file "test/th1.test")
+                      ;; (delete-file "test/th1.test")
                       #t)))))
     (home-page "https://fossil-scm.org")
     (synopsis "Software configuration management system")
-- 
2.13.0