GNU bug report logs - #78212
[PATCH 0/2] Update sqlite3, and fossil to 3.49.1, and 2.26.0.

Previous Next

To reply to this bug, email your comments to 78212 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH 0/2] Update sqlite3, and fossil to 3.49.1, and 2.26.0.
Date: Fri,  2 May 2025 13:47:40 +0000

This patch series updates sqlite, and fossil to their latest stable versions.

Ashish SHUKLA (2):
  gnu: sqlite: Update to 3.49.1.
  gnu: fossil: Update to 2.26.

 gnu/packages/sqlite.scm          | 34 +++++++++++++++++++++++++-------
 gnu/packages/version-control.scm |  4 ++--
 2 files changed, 29 insertions(+), 9 deletions(-)


base-commit: 3ca90163f7c232ab5f093f824be9e8e07b9f4ddd
-- 
2.49.0

Message #8 received at 78212 <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 78212 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH 1/2] gnu: sqlite: Update to 3.49.1.
Date: Fri,  2 May 2025 13:51:02 +0000

* gnu/packages/sqlite.scm (sqlite)[#:phases]<move-static-library>:
Update to check for the existence of file before patching it.

* gnu/packages/sqlite.scm (sqlite-next): Update to 3.49.1. Add
  arguments.

Change-Id: I74f8bb57090a050eb2e0c8cb5a1d4910efa714d5
---
 gnu/packages/sqlite.scm | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index dd21db0921..5b30865b08 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages sqlite)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix deprecation)
   #:use-module (ice-9 match)
@@ -99,10 +100,10 @@ (define-public sqlite
 
                        ;; Remove reference to the static library from the .la file
                        ;; so that Libtool looks for it in the usual places.
-                       (substitute* (string-append out "/lib/libsqlite3.la")
-                         (("^old_library=.*")
-                          "old_library=''\n"))
-                       #t))))))
+                       (when (file-exists? (string-append out "/lib/libsqlite3.la"))
+                         (substitute* (string-append out "/lib/libsqlite3.la")
+                           (("^old_library=.*")
+                            "old_library=''\n")))))))))
    (home-page "https://www.sqlite.org/")
    (synopsis "The SQLite database management system")
    (description
@@ -116,10 +117,29 @@ (define-public sqlite
 (define-public sqlite-next
   (package
     (inherit sqlite)
-    (version "3.46.0")
+    (version "3.49.1")
+    (arguments
+      (cons*
+        ;; disable tests; no check/test target
+        #:tests? #f
+        (substitute-keyword-arguments (package-arguments sqlite)
+          ((#:configure-flags flags #~(list))
+           #~(map (lambda (flag)
+                    (if (string-prefix? "CFLAGS=" flag)
+                      ;; enable for fossil
+                      (string-append flag " -DSQLITE_ENABLE_FTS4")
+                      flag))
+                  #$flags))
+          ((#:phases phases #~(list))
+           #~(modify-phases #$phases
+               (add-after 'unpack 'patch-unknown-option-check
+                 (lambda _
+                   (substitute* "autosetup/autosetup"
+                     (("user-error \"Unknown option" all)
+                      (string-append "# " all))))))))))
     (source (origin
               (method url-fetch)
-              (uri (sqlite-uri version 2024))
+              (uri (sqlite-uri version 2025))
               (sha256
                (base32
-                "0zbs853s8ly693qdg0l7vs4shwn3plmvdczr2s478wsj6dxnm3kg"))))))
+                "0m4jnnbpypixmkz5pkss470gf6dpx5942kmn4drmyv5krkc44rhh"))))))
-- 
2.49.0

Message #11 received at 78212 <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 78212 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH 2/2] gnu: fossil: Update to 2.26.
Date: Fri,  2 May 2025 13:51:03 +0000

* gnu/packages/version-control.scm (fossil): Update to 2.26.

Change-Id: I3ffbac667d9311fdc840f1594dff58cc1a3d3b0d
---
 gnu/packages/version-control.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ed96b524f8..babbe21c1f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3603,7 +3603,7 @@ (define-public git-annex-remote-rclone
 (define-public fossil
   (package
     (name "fossil")
-    (version "2.25")
+    (version "2.26")
     (source
      (origin
        (method url-fetch)
@@ -3611,7 +3611,7 @@ (define-public fossil
 	     "https://fossil-scm.org/home/tarball/version-" version
 	     "/fossil-" version ".tar.gz"))
        (sha256
-        (base32 "18gws90by2q6a6rk7h3mx46pn79lz4zi3saxlyrdz5982mw9rvp4"))))
+        (base32 "1akj5dabjym2zinxp4gqc649hcvbavb41bb9bm8c9m41w64gfd5v"))))
     (build-system gnu-build-system)
     (native-inputs
      (list tcl                          ;for configuration only
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.