diff mbox

[1/2] gnu: psyclpc: Make it reproducible.

Message ID 20161123190437.23966-2-ng0@libertad.pw
State New
Headers show

Commit Message

ng0 Nov. 23, 2016, 7:04 p.m. UTC
* gnu/packages/psyc.scm (psyclpc): Make it reproducible.
---
 gnu/packages/psyc.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

ng0 Nov. 23, 2016, 7:10 p.m. UTC | #1
ng0 <ng0@libertad.pw> writes:

> * gnu/packages/psyc.scm (psyclpc): Make it reproducible.
> ---
>  gnu/packages/psyc.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
> index 03df188..01bbae6 100644
> --- a/gnu/packages/psyc.scm
> +++ b/gnu/packages/psyc.scm
> @@ -1,5 +1,5 @@
>  ;;; GNU Guix --- Functional package management for GNU
> -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
> +;;; Copyright © 2016 ng0 <ng0@libertad.pw>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -155,7 +155,7 @@ including psyced.")
>  
>  ;; This commit removes the historic bundled pcre, not released as a tarball so far.

This comment should be updated to:
;; This commit removes the historic bundled pcre and makes psyclpc reproducible.

Can whoever commits the first or second patch into master update
the comment? Thanks!

>  (define-public psyclpc
> -  (let* ((commit "8bd51f2a4847860ba8b82dc79348ab37d516011e")
> +  (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba")
>           (revision "1"))
>    (package
>      (name "psyclpc")
> @@ -168,7 +168,7 @@ including psyced.")
>                (file-name (string-append name "-" version "-checkout"))
>                (sha256
>                 (base32
> -                "10w4kx9ygcv1lcmd7j4knvjiy8dac1y3hjfv3lhp67jpv6w3iagz"))))
> +                "1viwqymbhn3cwvx0zl58rlzl5gw47zxn0ldg2nbi55ghm5zxl1z5"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:tests? #f ; There are no tests/checks.
> -- 
> 2.10.2
>
>
Leo Famulari Nov. 26, 2016, 6:06 a.m. UTC | #2
On Wed, Nov 23, 2016 at 07:04:36PM +0000, ng0 wrote:
> * gnu/packages/psyc.scm (psyclpc): Make it reproducible.
> ---
>  gnu/packages/psyc.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
> index 03df188..01bbae6 100644
> --- a/gnu/packages/psyc.scm
> +++ b/gnu/packages/psyc.scm
> @@ -1,5 +1,5 @@
>  ;;; GNU Guix --- Functional package management for GNU
> -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
> +;;; Copyright © 2016 ng0 <ng0@libertad.pw>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -155,7 +155,7 @@ including psyced.")
>  
>  ;; This commit removes the historic bundled pcre, not released as a tarball so far.
>  (define-public psyclpc
> -  (let* ((commit "8bd51f2a4847860ba8b82dc79348ab37d516011e")
> +  (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba")
>           (revision "1"))

Is it a newer commit? I think the revision counter should increase to 2.
Or else `guix pcakage -u` won't update users' psyclpc installations.
Marius Bakke Nov. 26, 2016, 9:02 a.m. UTC | #3
Leo Famulari <leo@famulari.name> writes:

> On Wed, Nov 23, 2016 at 07:04:36PM +0000, ng0 wrote:
>> * gnu/packages/psyc.scm (psyclpc): Make it reproducible.
>> ---
>>  gnu/packages/psyc.scm | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
>> index 03df188..01bbae6 100644
>> --- a/gnu/packages/psyc.scm
>> +++ b/gnu/packages/psyc.scm
>> @@ -1,5 +1,5 @@
>>  ;;; GNU Guix --- Functional package management for GNU
>> -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
>> +;;; Copyright © 2016 ng0 <ng0@libertad.pw>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -155,7 +155,7 @@ including psyced.")
>>  
>>  ;; This commit removes the historic bundled pcre, not released as a tarball so far.
>>  (define-public psyclpc
>> -  (let* ((commit "8bd51f2a4847860ba8b82dc79348ab37d516011e")
>> +  (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba")
>>           (revision "1"))
>
> Is it a newer commit? I think the revision counter should increase to 2.
> Or else `guix pcakage -u` won't update users' psyclpc installations.

Doesn't it? I was under the impression that `guix package -u` detected
when the derivation has changed, and updates to the current version
regardless of version number.

I do agree that incrementing the revision is good regardless, since
users will know that the code has changed, and not just some dependency.
Leo Famulari Nov. 26, 2016, 6:26 p.m. UTC | #4
On Wed, Nov 23, 2016 at 07:10:52PM +0000, ng0 wrote:
> ng0 <ng0@libertad.pw> writes:
> 
> > * gnu/packages/psyc.scm (psyclpc): Make it reproducible.
> > ---
> >  gnu/packages/psyc.scm | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
> > index 03df188..01bbae6 100644
> > --- a/gnu/packages/psyc.scm
> > +++ b/gnu/packages/psyc.scm
> > @@ -1,5 +1,5 @@
> >  ;;; GNU Guix --- Functional package management for GNU
> > -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
> > +;;; Copyright © 2016 ng0 <ng0@libertad.pw>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -155,7 +155,7 @@ including psyced.")
> >  
> >  ;; This commit removes the historic bundled pcre, not released as a tarball so far.
> 
> This comment should be updated to:
> ;; This commit removes the historic bundled pcre and makes psyclpc reproducible.

Done!
Leo Famulari Nov. 26, 2016, 6:26 p.m. UTC | #5
On Sat, Nov 26, 2016 at 10:02:10AM +0100, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Wed, Nov 23, 2016 at 07:04:36PM +0000, ng0 wrote:
> >> * gnu/packages/psyc.scm (psyclpc): Make it reproducible.
> >> ---
> >>  gnu/packages/psyc.scm | 6 +++---
> >>  1 file changed, 3 insertions(+), 3 deletions(-)
> >> 
> >> diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
> >> index 03df188..01bbae6 100644
> >> --- a/gnu/packages/psyc.scm
> >> +++ b/gnu/packages/psyc.scm
> >> @@ -1,5 +1,5 @@
> >>  ;;; GNU Guix --- Functional package management for GNU
> >> -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
> >> +;;; Copyright © 2016 ng0 <ng0@libertad.pw>
> >>  ;;;
> >>  ;;; This file is part of GNU Guix.
> >>  ;;;
> >> @@ -155,7 +155,7 @@ including psyced.")
> >>  
> >>  ;; This commit removes the historic bundled pcre, not released as a tarball so far.
> >>  (define-public psyclpc
> >> -  (let* ((commit "8bd51f2a4847860ba8b82dc79348ab37d516011e")
> >> +  (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba")
> >>           (revision "1"))
> >
> > Is it a newer commit? I think the revision counter should increase to 2.
> > Or else `guix pcakage -u` won't update users' psyclpc installations.
> 
> Doesn't it? I was under the impression that `guix package -u` detected
> when the derivation has changed, and updates to the current version
> regardless of version number.

Ah, you're right!
ng0 Nov. 26, 2016, 8:28 p.m. UTC | #6
Leo Famulari <leo@famulari.name> writes:

> On Wed, Nov 23, 2016 at 07:04:36PM +0000, ng0 wrote:
>> * gnu/packages/psyc.scm (psyclpc): Make it reproducible.
>> ---
>>  gnu/packages/psyc.scm | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
>> index 03df188..01bbae6 100644
>> --- a/gnu/packages/psyc.scm
>> +++ b/gnu/packages/psyc.scm
>> @@ -1,5 +1,5 @@
>>  ;;; GNU Guix --- Functional package management for GNU
>> -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
>> +;;; Copyright © 2016 ng0 <ng0@libertad.pw>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -155,7 +155,7 @@ including psyced.")
>>  
>>  ;; This commit removes the historic bundled pcre, not released as a tarball so far.
>>  (define-public psyclpc
>> -  (let* ((commit "8bd51f2a4847860ba8b82dc79348ab37d516011e")
>> +  (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba")
>>           (revision "1"))
>
> Is it a newer commit? I think the revision counter should increase to 2.
> Or else `guix pcakage -u` won't update users' psyclpc installations.

Yes, I should've updated revision to "2" like you did, I wasn't
sure and I was unable to respond until now.
Thanks for making the changes.
diff mbox

Patch

diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
index 03df188..01bbae6 100644
--- a/gnu/packages/psyc.scm
+++ b/gnu/packages/psyc.scm
@@ -1,5 +1,5 @@ 
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -155,7 +155,7 @@  including psyced.")
 
 ;; This commit removes the historic bundled pcre, not released as a tarball so far.
 (define-public psyclpc
-  (let* ((commit "8bd51f2a4847860ba8b82dc79348ab37d516011e")
+  (let* ((commit "61cf9aa81297085e5c40170fd01221c752f8deba")
          (revision "1"))
   (package
     (name "psyclpc")
@@ -168,7 +168,7 @@  including psyced.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "10w4kx9ygcv1lcmd7j4knvjiy8dac1y3hjfv3lhp67jpv6w3iagz"))))
+                "1viwqymbhn3cwvx0zl58rlzl5gw47zxn0ldg2nbi55ghm5zxl1z5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; There are no tests/checks.