From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: [PATCH]: gnu: sqlite: Update to 3.15.1 Date: Thu, 24 Nov 2016 17:12:45 +0100 Message-ID: <87oa14hn5u.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9wdo-00017Y-S0 for guix-devel@gnu.org; Thu, 24 Nov 2016 11:12:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9wdk-0007Du-Dl for guix-devel@gnu.org; Thu, 24 Nov 2016 11:12:52 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:33981) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c9wdk-0007CP-4M for guix-devel@gnu.org; Thu, 24 Nov 2016 11:12:48 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4E8BF2081B for ; Thu, 24 Nov 2016 11:12:47 -0500 (EST) Received: from localhost (128.92-221-147.customer.lyse.net [92.221.147.128]) by mail.messagingengine.com (Postfix) with ESMTPA id DAAA82415E for ; Thu, 24 Nov 2016 11:12:46 -0500 (EST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain One for core-updates. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-sqlite-Update-to-3.15.1.patch >From 1fa80764f9000403f6b9d5e9ac1e334961cd83f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 24 Nov 2016 17:05:47 +0100 Subject: [PATCH] gnu: sqlite: Update to 3.15.1. * gnu/packages/databases.scm (sqlite): Update to 3.15.1. [source]: Download from sqlite.org. [home-page]: Use HTTPS. (sqlite-3.15.1): Remove. * gnu/packages/php.scm (php)[inputs]: Change 'sqlite-3.15.1' to 'sqlite'. --- gnu/packages/databases.scm | 45 +++++---------------------------------------- gnu/packages/php.scm | 2 +- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d6746f0..859e242 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -507,12 +507,9 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.14.1") + (version "3.15.1") (source (origin (method url-fetch) - ;; TODO: Download from sqlite.org once this bug : - ;; http://lists.gnu.org/archive/html/bug-guile/2013-01/msg00027.html - ;; has been fixed. (uri (let ((numeric-version (match (string-split version #\.) ((first-digit other-digits ...) @@ -522,23 +519,11 @@ for example from a shell script.") (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (list - (string-append - "https://fossies.org/linux/misc/sqlite-autoconf-" - numeric-version ".tar.gz") - (string-append - "http://distfiles.gentoo.org/distfiles/" - "/sqlite-autoconf-" numeric-version ".tar.gz")) - - ;; XXX: As of 2015-09-08, SourceForge is squatting the URL - ;; below, returning 200 and showing an advertising page. - ;; (string-append - ;; "mirror://sourceforge/sqlite.mirror/SQLite%20" version - ;; "/sqlite-autoconf-" numeric-version ".tar.gz") - )) + (string-append "https://sqlite.org/2016/sqlite-autoconf-" + numeric-version ".tar.gz"))) (sha256 (base32 - "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw")))) + "1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments @@ -549,7 +534,7 @@ for example from a shell script.") (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_DBSTAT_VTAB")))) - (home-page "http://www.sqlite.org/") + (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description "SQLite is a software library that implements a self-contained, serverless, @@ -558,26 +543,6 @@ widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license public-domain))) -(define-public sqlite-3.15.1 - (package (inherit sqlite) - (version "3.15.1") - (source (origin - (method url-fetch) - (uri (let ((numeric-version - (match (string-split version #\.) - ((first-digit other-digits ...) - (string-append first-digit - (string-pad-right - (string-concatenate - (map (cut string-pad <> 2 #\0) - other-digits)) - 6 #\0)))))) - (string-append "https://sqlite.org/2016/sqlite-autoconf-" - numeric-version ".tar.gz"))) - (sha256 - (base32 - "1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx")))))) - (define-public tdb (package (name "tdb") diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 9ccbede..245892f 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -309,7 +309,7 @@ ("pcre" ,pcre) ("postgresql" ,postgresql) ("readline" ,readline) - ("sqlite" ,sqlite-3.15.1) + ("sqlite" ,sqlite) ("tidy" ,tidy) ("zip" ,zip) ("zlib" ,zlib))) -- 2.10.2 --=-=-=--