nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Marius Bakke 2016-11-24 17:05:47 +01:00
parent c254ac3200
commit 3ad8cb4163
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/databases.scm
View File

@ -507,12 +507,9 @@ for example from a shell script.")
(define-public sqlite (define-public sqlite
(package (package
(name "sqlite") (name "sqlite")
(version "3.14.1") (version "3.15.1")
(source (origin (source (origin
(method url-fetch) (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 (uri (let ((numeric-version
(match (string-split version #\.) (match (string-split version #\.)
((first-digit other-digits ...) ((first-digit other-digits ...)
@ -522,23 +519,11 @@ for example from a shell script.")
(map (cut string-pad <> 2 #\0) (map (cut string-pad <> 2 #\0)
other-digits)) other-digits))
6 #\0)))))) 6 #\0))))))
(list (string-append "https://sqlite.org/2016/sqlite-autoconf-"
(string-append numeric-version ".tar.gz")))
"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")
))
(sha256 (sha256
(base32 (base32
"19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw")))) "1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("readline" ,readline))) (inputs `(("readline" ,readline)))
(arguments (arguments
@ -549,7 +534,7 @@ for example from a shell script.")
(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
"-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_UNLOCK_NOTIFY "
"-DSQLITE_ENABLE_DBSTAT_VTAB")))) "-DSQLITE_ENABLE_DBSTAT_VTAB"))))
(home-page "http://www.sqlite.org/") (home-page "https://www.sqlite.org/")
(synopsis "The SQLite database management system") (synopsis "The SQLite database management system")
(description (description
"SQLite is a software library that implements a self-contained, serverless, "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.") is in the public domain.")
(license 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 (define-public tdb
(package (package
(name "tdb") (name "tdb")

2
gnu/packages/php.scm
View File

@ -309,7 +309,7 @@
("pcre" ,pcre) ("pcre" ,pcre)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("readline" ,readline) ("readline" ,readline)
("sqlite" ,sqlite-3.15.1) ("sqlite" ,sqlite)
("tidy" ,tidy) ("tidy" ,tidy)
("zip" ,zip) ("zip" ,zip)
("zlib" ,zlib))) ("zlib" ,zlib)))