[bug#28424] [PATCH 0/2] Unbundle sqlite from python-apsw

[bug#28424] [PATCH 0/2] Unbundle sqlite from python-apsw

[Jelle Licht]

This patch series fixes the use of a bundled sqlite amalgation reported
[1]. It should be applied to core-updates because it touches
sqlite.

[1]: http://lists.gnu.org/archive/html/bug-guix/2017-09/msg00038.html

Jelle Licht (2):
  gnu: sqlite: Update to 3.20.1.
  gnu: python-apsw: Update to 3.20.1-r1.

 gnu/packages/databases.scm | 4 ++--
 gnu/packages/python.scm    | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.14.1

[bug#28425] [PATCH 1/2] gnu: sqlite: Update to 3.20.1.

[Jelle Licht]

* gnu/packages/databases.scm (sqlite): Update to 3.20.1.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ba365523d..37890a91f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -754,7 +754,7 @@ for example from a shell script.")
 (define-public sqlite
   (package
    (name "sqlite")
-   (version "3.19.3")
+   (version "3.20.1")
    (source (origin
             (method url-fetch)
             (uri (let ((numeric-version
@@ -770,7 +770,7 @@ for example from a shell script.")
                                   numeric-version ".tar.gz")))
             (sha256
              (base32
-              "00b3l2qglpl1inx21fckiwxnfq5xf6441flc79rqg7zdvh1rq4h6"))))
+              "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc"))))
    (build-system gnu-build-system)
    (inputs `(("readline" ,readline)))
    (arguments
-- 
2.14.1

[bug#28426] [PATCH 2/2] gnu: python-apsw: Update to 3.20.1-r1.

[Jelle Licht]

* gnu/packages/python.scm (python-apsw): Update to 3.20.1-r1.
[origin]: Change to updated upstream url.
---
 gnu/packages/python.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3609ff055..6b9fe0325 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6089,14 +6089,15 @@ implementation of D-Bus.")
 (define-public python-apsw
   (package
     (name "python-apsw")
-    (version "3.9.2-r1")
+    (version "3.20.1-r1")
     (source
       (origin
         (method url-fetch)
-        (uri (pypi-uri "apsw" version))
+        (uri (string-append "https://github.com/rogerbinns/apsw/archive/"
+                            version ".tar.gz"))
         (sha256
           (base32
-           "0w4jb0wpx785qw42r3h4fh7gl5w2968q48i7gygybsfxck8nzffs"))))
+           "00ai7m2pqi26qaflhz314d8k5i3syw7xzr145fhfl0crhyh6adz2"))))
     (build-system python-build-system)
     (inputs
       `(("sqlite" ,sqlite)))
-- 
2.14.1

[bug#28425] [PATCH 1/2] gnu: sqlite: Update to 3.20.1.

[Catonano]

[-- Attachment #1: Type: text/plain, Size: 1216 bytes --]

2017-09-12 0:17 GMT+02:00 Jelle Licht <jlicht@fsfe.org>:

> * gnu/packages/databases.scm (sqlite): Update to 3.20.1.
> ---
>  gnu/packages/databases.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index ba365523d..37890a91f 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -754,7 +754,7 @@ for example from a shell script.")
>  (define-public sqlite
>    (package
>     (name "sqlite")
> -   (version "3.19.3")
> +   (version "3.20.1")
>     (source (origin
>              (method url-fetch)
>              (uri (let ((numeric-version
> @@ -770,7 +770,7 @@ for example from a shell script.")
>                                    numeric-version ".tar.gz")))
>              (sha256
>               (base32
> -              "00b3l2qglpl1inx21fckiwxnfq5xf6441flc79rqg7zdvh1rq4h6"))))
> +              "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc"))))
>     (build-system gnu-build-system)
>     (inputs `(("readline" ,readline)))
>     (arguments
> --
> 2.14.1
>
>
>
>
>

It just built successfully.

Are there any more checsks/tests I should perform in order to properly
review this ?

[-- Attachment #2: Type: text/html, Size: 1925 bytes --]

[bug#28425] [PATCH 1/2] gnu: sqlite: Update to 3.20.1.

[Jelle Licht]

Catonano <catonano@gmail.com> writes:

> 2017-09-12 0:17 GMT+02:00 Jelle Licht <jlicht@fsfe.org>:
>
>> * gnu/packages/databases.scm (sqlite): Update to 3.20.1.
>> ---
>>  gnu/packages/databases.scm | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
>> index ba365523d..37890a91f 100644
>> --- a/gnu/packages/databases.scm
>> +++ b/gnu/packages/databases.scm
>> @@ -754,7 +754,7 @@ for example from a shell script.")
>>  (define-public sqlite
>>    (package
>>     (name "sqlite")
>> -   (version "3.19.3")
>> +   (version "3.20.1")
>>     (source (origin
>>              (method url-fetch)
>>              (uri (let ((numeric-version
>> @@ -770,7 +770,7 @@ for example from a shell script.")
>>                                    numeric-version ".tar.gz")))
>>              (sha256
>>               (base32
>> -              "00b3l2qglpl1inx21fckiwxnfq5xf6441flc79rqg7zdvh1rq4h6"))))
>> +              "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8hj04m54fq9h1xw55dmjrpc"))))
>>     (build-system gnu-build-system)
>>     (inputs `(("readline" ,readline)))
>>     (arguments
>> --
>> 2.14.1
>>
>>
>>
>>
>>
>
> It just built successfully.
>
> Are there any more checsks/tests I should perform in order to properly
> review this ?

If you have the time, you could try building and using something which
depends on sqlite. I have verified python-apsw (my other patch) to work
properly already, but there are lots of dependents of sqlite which might
inadvertently break because of my patch.

[bug#28425] [PATCH 1/2] gnu: sqlite: Update to 3.20.1.

[Catonano]

[-- Attachment #1: Type: text/plain, Size: 2152 bytes --]

2017-09-12 15:24 GMT+02:00 Jelle Licht <jlicht@fsfe.org>:

>
> Catonano <catonano@gmail.com> writes:
>
> > 2017-09-12 0:17 GMT+02:00 Jelle Licht <jlicht@fsfe.org>:
> >
> >> * gnu/packages/databases.scm (sqlite): Update to 3.20.1.
> >> ---
> >>  gnu/packages/databases.scm | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> >> index ba365523d..37890a91f 100644
> >> --- a/gnu/packages/databases.scm
> >> +++ b/gnu/packages/databases.scm
> >> @@ -754,7 +754,7 @@ for example from a shell script.")
> >>  (define-public sqlite
> >>    (package
> >>     (name "sqlite")
> >> -   (version "3.19.3")
> >> +   (version "3.20.1")
> >>     (source (origin
> >>              (method url-fetch)
> >>              (uri (let ((numeric-version
> >> @@ -770,7 +770,7 @@ for example from a shell script.")
> >>                                    numeric-version ".tar.gz")))
> >>              (sha256
> >>               (base32
> >> -              "00b3l2qglpl1inx21fckiwxnfq5xf6
> 441flc79rqg7zdvh1rq4h6"))))
> >> +              "0hh7jnxfwvs2qlvmjwrgkvxb8sk4x8
> hj04m54fq9h1xw55dmjrpc"))))
> >>     (build-system gnu-build-system)
> >>     (inputs `(("readline" ,readline)))
> >>     (arguments
> >> --
> >> 2.14.1
> >>
> >>
> >>
> >>
> >>
> >
> > It just built successfully.
> >
> > Are there any more checsks/tests I should perform in order to properly
> > review this ?
>
> If you have the time, you could try building and using something which
> depends on sqlite. I have verified python-apsw (my other patch) to work
> properly already, but there are lots of dependents of sqlite which might
> inadvertently break because of my patch.
>

Jelle, I tried but core-updates is too much !

It was bootstrapping Guile 2.2.2 when I stopped it. And that can be a long
process, if I remember correctly

When I first reported to have built it successfully, I had branched from
master and git am'ed your patch there. So many things were available already

This second time I tried with the real core-updates branch

I'm afraid you'll need to set up your own Cuirass instance :-/

[-- Attachment #2: Type: text/html, Size: 3369 bytes --]

[bug#28424] [PATCH 0/2] Unbundle sqlite from python-apsw

[Ludovic Courtès]

Hi Jelle,

Jelle Licht <jlicht@fsfe.org> skribis:

> This patch series fixes the use of a bundled sqlite amalgation reported
> [1]. It should be applied to core-updates because it touches
> sqlite.
>
> [1]: http://lists.gnu.org/archive/html/bug-guix/2017-09/msg00038.html

Awesome.

> Jelle Licht (2):
>   gnu: sqlite: Update to 3.20.1.
>   gnu: python-apsw: Update to 3.20.1-r1.

I haven’t tried building them, but if it builds, both patches LGTM for
‘core-updates’.

Thanks for addressing this!

Ludo’.

bug#28424: [PATCH 0/2] Unbundle sqlite from python-apsw

[Jelle Licht]

Ludovic Courtès <ludo@gnu.org> writes:

> Hi Jelle,
>
> Jelle Licht <jlicht@fsfe.org> skribis:
>
>> This patch series fixes the use of a bundled sqlite amalgation reported
>> [1]. It should be applied to core-updates because it touches
>> sqlite.
>>
>> [1]: http://lists.gnu.org/archive/html/bug-guix/2017-09/msg00038.html
>
> Awesome.
>
>> Jelle Licht (2):
>>   gnu: sqlite: Update to 3.20.1.
>>   gnu: python-apsw: Update to 3.20.1-r1.
>
> I haven’t tried building them, but if it builds, both patches LGTM for
> ‘core-updates’.
>
> Thanks for addressing this!
>
> Ludo’.

Cool, pushed as b83ad3ace.