From patchwork Tue Oct 30 20:47:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 54 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D71D61676B; Tue, 30 Oct 2018 20:48:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 94C6416762 for ; Tue, 30 Oct 2018 20:48:17 +0000 (GMT) Received: from localhost ([::1]:55455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHavw-0000id-Ki for patchwork@mira.cbaines.net; Tue, 30 Oct 2018 16:48:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHavm-0000hH-OL for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHavj-0006K2-F4 for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHavh-0006IY-R7 for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHavh-0007uv-LJ for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33210] [PATCH 1/3] gnu: Add sqlite-with-single-thread. References: <87a7mvqikl.fsf@lassieur.org> In-Reply-To: <87a7mvqikl.fsf@lassieur.org> Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Oct 2018 20:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33210 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33210@debbugs.gnu.org Received: via spool by 33210-submit@debbugs.gnu.org id=B33210.154093246130379 (code B ref 33210); Tue, 30 Oct 2018 20:48:01 +0000 Received: (at 33210) by debbugs.gnu.org; 30 Oct 2018 20:47:41 +0000 Received: from localhost ([127.0.0.1]:55948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHavM-0007tu-Sj for submit@debbugs.gnu.org; Tue, 30 Oct 2018 16:47:41 -0400 Received: from mail.lassieur.org ([83.152.10.219]:48280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHavL-0007tl-Dy for 33210@debbugs.gnu.org; Tue, 30 Oct 2018 16:47:40 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id b3644b6a (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <33210@debbugs.gnu.org>; Tue, 30 Oct 2018 20:46:17 +0000 (UTC) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Tue, 30 Oct 2018 21:47:24 +0100 Message-Id: <20181030204726.13354-1-clement@lassieur.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (sqlite-with-single-thread): New variable. --- gnu/packages/databases.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 87fb170e5..24914cd87 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki ;;; Copyright © 2018 Joshua Sierles, Nextjournal +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -1223,6 +1224,15 @@ is in the public domain.") "-DSQLITE_ENABLE_DBSTAT_VTAB " "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) +;; This is used by Cuirass. +(define-public sqlite-with-single-thread + (package (inherit sqlite) + (name "sqlite-with-single-thread") + (arguments + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags) + `(cons "--disable-threadsafe" ,flags)))))) + (define-public tdb (package (name "tdb") From patchwork Tue Oct 30 20:47:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 55 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D0E411676B; Tue, 30 Oct 2018 20:48:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 8448F16762 for ; Tue, 30 Oct 2018 20:48:20 +0000 (GMT) Received: from localhost ([::1]:55456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHavz-0000lG-LA for patchwork@mira.cbaines.net; Tue, 30 Oct 2018 16:48:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHavm-0000hJ-PC for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHavj-0006KH-G2 for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHavi-0006It-6z for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHavi-0007v2-5J for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33210] [PATCH 2/3] gnu: Add guile-sqlite3-with-single-thread. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Oct 2018 20:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33210 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33210@debbugs.gnu.org Received: via spool by 33210-submit@debbugs.gnu.org id=B33210.154093246430401 (code B ref 33210); Tue, 30 Oct 2018 20:48:02 +0000 Received: (at 33210) by debbugs.gnu.org; 30 Oct 2018 20:47:44 +0000 Received: from localhost ([127.0.0.1]:55951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHavQ-0007uF-5S for submit@debbugs.gnu.org; Tue, 30 Oct 2018 16:47:44 -0400 Received: from mail.lassieur.org ([83.152.10.219]:48280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHavM-0007tl-DP for 33210@debbugs.gnu.org; Tue, 30 Oct 2018 16:47:41 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id cdb2e5b7 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <33210@debbugs.gnu.org>; Tue, 30 Oct 2018 20:46:17 +0000 (UTC) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Tue, 30 Oct 2018 21:47:25 +0100 Message-Id: <20181030204726.13354-2-clement@lassieur.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181030204726.13354-1-clement@lassieur.org> References: <20181030204726.13354-1-clement@lassieur.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile.scm (guile-sqlite3-with-single-thread): New variable. --- gnu/packages/guile.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 9e3300337..4f9ddf913 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages networking) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -1166,6 +1168,13 @@ Guile's foreign function interface.") "This package provides Guile bindings to the SQLite database system.") (license license:gpl3+))) +(define-public guile-sqlite3-with-single-thread + (package + (inherit guile-sqlite3) + (name "guile-sqlite3-with-single-thread") + (inputs (alist-replace "sqlite" (list sqlite-with-single-thread) + (package-inputs guile-sqlite3))))) + (define-public guile2.0-sqlite3 (package-for-guile-2.0 guile-sqlite3)) From patchwork Tue Oct 30 20:47:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 56 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B0921676B; Tue, 30 Oct 2018 20:48:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 566DB16762 for ; Tue, 30 Oct 2018 20:48:21 +0000 (GMT) Received: from localhost ([::1]:55457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHaw0-0000mI-IY for patchwork@mira.cbaines.net; Tue, 30 Oct 2018 16:48:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHavm-0000hK-PB for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHavj-0006Kv-IV for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51697) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHavi-0006J7-LS for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHavi-0007vA-J7 for guix-patches@gnu.org; Tue, 30 Oct 2018 16:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33210] [PATCH 3/3] gnu: cuirass: Use SQLite in single-thread mode. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Oct 2018 20:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33210 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33210@debbugs.gnu.org Received: via spool by 33210-submit@debbugs.gnu.org id=B33210.154093246430407 (code B ref 33210); Tue, 30 Oct 2018 20:48:02 +0000 Received: (at 33210) by debbugs.gnu.org; 30 Oct 2018 20:47:44 +0000 Received: from localhost ([127.0.0.1]:55953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHavQ-0007uI-HT for submit@debbugs.gnu.org; Tue, 30 Oct 2018 16:47:44 -0400 Received: from mail.lassieur.org ([83.152.10.219]:48280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHavN-0007tl-GK for 33210@debbugs.gnu.org; Tue, 30 Oct 2018 16:47:41 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 777aa4e7 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <33210@debbugs.gnu.org>; Tue, 30 Oct 2018 20:46:17 +0000 (UTC) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Tue, 30 Oct 2018 21:47:26 +0100 Message-Id: <20181030204726.13354-3-clement@lassieur.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181030204726.13354-1-clement@lassieur.org> References: <20181030204726.13354-1-clement@lassieur.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ci.scm (cuirass)[inputs]: Replace GUILE-SQLITE3 with GUILE-SQLITE3-WITH-SINGLE-THREAD. --- gnu/packages/ci.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 1cac8b9fb..126948109 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -261,7 +261,7 @@ their dependencies.") ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json) - ("guile-sqlite3" ,guile-sqlite3) + ("guile-sqlite3" ,guile-sqlite3-with-single-thread) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among ;; the inputs to add it to GUILE_LOAD_PATH.