GNU bug report logs - #34449
[PATCH] gnu: Add trydiffoscope.

Previous Next

Package: guix-patches;

Reported by: Vagrant Cascadian <vagrant <at> reproducible-builds.org>

Date: Tue, 12 Feb 2019 02:10:02 UTC

Severity: normal

Tags: patch

Done: Leo Famulari <leo <at> famulari.name>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34449 in the body.
You can then email your comments to 34449 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Tue, 12 Feb 2019 02:10:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Vagrant Cascadian <vagrant <at> reproducible-builds.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 12 Feb 2019 02:10:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add trydiffoscope.
Date: Mon, 11 Feb 2019 18:08:36 -0800
[Message part 1 (text/plain, inline)]
* gnu/packages/package-management (trydiffoscope): New variable.
---
 gnu/packages/package-management.scm | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 587d028d92..49208e3191 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -606,6 +606,50 @@ various binary formats into more human readable forms to compare them.  It can
 compare two tarballs, ISO images, or PDFs just as easily.")
     (license license:gpl3+)))
 
+(define-public trydiffoscope
+ (package
+   (name "trydiffoscope")
+   (version "67.0.1")
+   (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://salsa.debian.org/reproducible-builds/trydiffoscope.git")
+            (commit version)))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32
+        "03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((share (string-append (assoc-ref outputs "out") "/usr/share/")))
+               (mkdir-p (string-append share "/man/man1/" ))
+               (invoke "rst2man.py"
+                       "trydiffoscope.1.rst"
+                       (string-append share "/man/man1/trydiffoscope.1"))
+               (mkdir-p (string-append share "/doc/" ,name "-" ,version))
+               (install-file "./README.rst"
+                          (string-append share "/doc/" ,name "-" ,version))))))))
+    (native-inputs
+     `(("gzip" ,gzip)
+       ("python-docutils" ,python-docutils)))
+    (build-system python-build-system)
+    (home-page "https://try.diffoscope.org")
+    (synopsis "Compare files and archives in depth")
+    (description
+     "This is a minimal diffoscope client that connects to the service:
+
+https://try.diffoscope.org.
+
+Diffoscope tries to get to the bottom of what makes files or directories
+different.  It recursively unpacks archives of many kinds and transforms
+various binary formats into more human readable forms to compare them.  It can
+compare two tarballs, ISO images, or PDFs just as easily.")
+    (license license:gpl3+)))
+
 (define-public python-anaconda-client
   (package
     (name "python-anaconda-client")
-- 
2.20.1

[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Tue, 12 Feb 2019 07:32:02 GMT) Full text and rfc822 format available.

Message #8 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: Vagrant Cascadian <vagrant <at> reproducible-builds.org>,34449 <at> debbugs.gnu.org
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Tue, 12 Feb 2019 08:31:28 +0100
Le 12 février 2019 03:08:36 GMT+01:00, Vagrant Cascadian <vagrant <at> reproducible-builds.org> a écrit :
>
>* gnu/packages/package-management (trydiffoscope): New variable.
>---
> gnu/packages/package-management.scm | 44 +++++++++++++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
>diff --git a/gnu/packages/package-management.scm
>b/gnu/packages/package-management.scm
>index 587d028d92..49208e3191 100644
>--- a/gnu/packages/package-management.scm
>+++ b/gnu/packages/package-management.scm
>@@ -606,6 +606,50 @@ various binary formats into more human readable
>forms to compare them.  It can
> compare two tarballs, ISO images, or PDFs just as easily.")
>     (license license:gpl3+)))
> 
>+(define-public trydiffoscope
>+ (package
>+   (name "trydiffoscope")
>+   (version "67.0.1")
>+   (source
>+    (origin
>+      (method git-fetch)
>+      (uri (git-reference
>+            (url
>"https://salsa.debian.org/reproducible-builds/trydiffoscope.git")
>+            (commit version)))
>+      (file-name (git-file-name name version))
>+      (sha256
>+       (base32
>+        "03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh"))))
>+    (arguments
>+     `(#:phases
>+       (modify-phases %standard-phases
>+         (add-after 'install 'install-doc
>+           (lambda* (#:key outputs #:allow-other-keys)
>+             (let* ((share (string-append (assoc-ref outputs "out")
>"/usr/share/")))
>+               (mkdir-p (string-append share "/man/man1/" ))
>+               (invoke "rst2man.py"
>+                       "trydiffoscope.1.rst"
>+                       (string-append share
>"/man/man1/trydiffoscope.1"))
>+               (mkdir-p (string-append share "/doc/" ,name "-"
>,version))
>+               (install-file "./README.rst"
>+                          (string-append share "/doc/" ,name "-"
>,version))))))))
>+    (native-inputs
>+     `(("gzip" ,gzip)
>+       ("python-docutils" ,python-docutils)))
>+    (build-system python-build-system)
>+    (home-page "https://try.diffoscope.org")
>+    (synopsis "Compare files and archives in depth")
>+    (description
>+     "This is a minimal diffoscope client that connects to the
>service:
>+
>+https://try.diffoscope.org.
>+
>+Diffoscope tries to get to the bottom of what makes files or
>directories
>+different.  It recursively unpacks archives of many kinds and
>transforms
>+various binary formats into more human readable forms to compare them.
> It can
>+compare two tarballs, ISO images, or PDFs just as easily.")
>+    (license license:gpl3+)))
>+
> (define-public python-anaconda-client
>   (package
>     (name "python-anaconda-client")

Hi,

Iiuc, this is a client to connect to a service that runs diffoscope for you. But we already have diffoscope, so what's the point? Also this looks like saass to me, so I think we should refrain from adding it to guix. What do you think?




Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Tue, 12 Feb 2019 08:18:01 GMT) Full text and rfc822 format available.

Message #11 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Julien Lepiller <julien <at> lepiller.eu>, 34449 <at> debbugs.gnu.org
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Tue, 12 Feb 2019 00:16:42 -0800
[Message part 1 (text/plain, inline)]
On 2019-02-12, Julien Lepiller wrote:
> Le 12 février 2019 03:08:36 GMT+01:00, Vagrant Cascadian <vagrant <at> reproducible-builds.org> a écrit :
>>
>>* gnu/packages/package-management (trydiffoscope): New variable.
...
>>+    (synopsis "Compare files and archives in depth")
>>+    (description
>>+     "This is a minimal diffoscope client that connects to the
>>service:
>>+
>>+https://try.diffoscope.org.
>>+
>>+Diffoscope tries to get to the bottom of what makes files or
>>directories
>>+different.  It recursively unpacks archives of many kinds and
>>transforms
>>+various binary formats into more human readable forms to compare them.
>> It can
>>+compare two tarballs, ISO images, or PDFs just as easily.")
>>+    (license license:gpl3+)))
>>+
>> (define-public python-anaconda-client
>>   (package
>>     (name "python-anaconda-client")

> Iiuc, this is a client to connect to a service that runs diffoscope
> for you. But we already have diffoscope, so what's the point?

Yes, that's the jist of it.  The main advantage is that it has a much
smaller dependency chain locally.

I find it useful on some of the not-particularly-fast ARM systems I've
been running GNU Guix, where storage may be limited or slow, and
substitutes may not be available as often, and build times
are... remarkable.


> Also this looks like saass to me, so I think we should refrain from
> adding it to guix.

It is essentially SaaSS.  The server-side is at least licensed under the
AGPL, if that mitigates concerns somewhat.

I'm not sure it supports it out of the box yet, but I suspect upstream
would be amenable to patches to make it easy for people to run their own
"diffoscope" services.


> What do you think?

I thought it was useful enough to be worth submitting, though I'd
understand if it's deemed inappropriate for GNU Guix. Still learning the
ropes. :)


live well,
  vagrant
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Tue, 12 Feb 2019 09:35:01 GMT) Full text and rfc822 format available.

Message #14 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Cc: 34449 <at> debbugs.gnu.org
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Tue, 12 Feb 2019 10:34:49 +0100
Le 2019-02-12 09:16, Vagrant Cascadian a écrit :
> 
>> Iiuc, this is a client to connect to a service that runs diffoscope
>> for you. But we already have diffoscope, so what's the point?
> 
> Yes, that's the jist of it.  The main advantage is that it has a much
> smaller dependency chain locally.
> 
> I find it useful on some of the not-particularly-fast ARM systems I've
> been running GNU Guix, where storage may be limited or slow, and
> substitutes may not be available as often, and build times
> are... remarkable.
> 
> 
>> Also this looks like saass to me, so I think we should refrain from
>> adding it to guix.
> 
> It is essentially SaaSS.  The server-side is at least licensed under 
> the
> AGPL, if that mitigates concerns somewhat.
> 
> I'm not sure it supports it out of the box yet, but I suspect upstream
> would be amenable to patches to make it easy for people to run their 
> own
> "diffoscope" services.
> 
> 
>> What do you think?
> 
> I thought it was useful enough to be worth submitting, though I'd
> understand if it's deemed inappropriate for GNU Guix. Still learning 
> the
> ropes. :)
> 
> 
> live well,
>   vagrant

I'm not completely sure either, that's why I was asking for a second 
opinion ;)




Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Tue, 12 Feb 2019 20:38:02 GMT) Full text and rfc822 format available.

Message #17 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Cc: 34449 <at> debbugs.gnu.org, Julien Lepiller <julien <at> lepiller.eu>
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Tue, 12 Feb 2019 15:37:42 -0500
[Message part 1 (text/plain, inline)]
On Tue, Feb 12, 2019 at 12:16:42AM -0800, Vagrant Cascadian wrote:
> On 2019-02-12, Julien Lepiller wrote:
> >>+    (synopsis "Compare files and archives in depth")

This synopsis doesn't make clear that this is a client for a remote
service. Can you rewrite it?

> >>+    (description
> >>+     "This is a minimal diffoscope client that connects to the
> >>service:

Also, I think it's better to replace "diffoscope client" with something
like "client for the remote diffoscope service located at [...]" since
diffoscope is not inherently a client-service tool. Also it would be
great to mention the full diffoscope package :)

Can you send an updated patch?

> > Iiuc, this is a client to connect to a service that runs diffoscope
> > for you. But we already have diffoscope, so what's the point?
> 
> Yes, that's the jist of it.  The main advantage is that it has a much
> smaller dependency chain locally.
> 
> I find it useful on some of the not-particularly-fast ARM systems I've
> been running GNU Guix, where storage may be limited or slow, and
> substitutes may not be available as often, and build times
> are... remarkable.

Yes, and diffoscope runs can also be really expensive. It's nice to
offload them.

Also, if the service makes statements about whether submissions are
logged or made public, can you put that in the package description?

> > Also this looks like saass to me, so I think we should refrain from
> > adding it to guix.
> 
> It is essentially SaaSS.  The server-side is at least licensed under the
> AGPL, if that mitigates concerns somewhat.
> 
> I'm not sure it supports it out of the box yet, but I suspect upstream
> would be amenable to patches to make it easy for people to run their own
> "diffoscope" services.
> 
> 
> > What do you think?

We can have SaaSS in Guix. There are already some packages that are
SaaSS. So I think this package is okay.

It's "extra okay" in my opinion since the service is AGPL, part of
Debian, and we have a package for the tool in question.

Guix is developed under the Free System Distribution Guidelines, which
don't mention remote services or SaaSS at all:

https://www.gnu.org/distros/free-system-distribution-guidelines.en.html

And some discussion on the subject of services in the context of free
software that largely reflect how we handle SaaSS in Guix:

https://www.gnu.org/philosophy/network-services-arent-free-or-nonfree.en.html
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Wed, 13 Feb 2019 08:06:02 GMT) Full text and rfc822 format available.

Message #20 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Julien Lepiller <julien <at> lepiller.eu>
To: Leo Famulari <leo <at> famulari.name>,
 Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Cc: 34449 <at> debbugs.gnu.org
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Wed, 13 Feb 2019 09:05:40 +0100
Le 12 février 2019 21:37:42 GMT+01:00, Leo Famulari <leo <at> famulari.name> a écrit :
>On Tue, Feb 12, 2019 at 12:16:42AM -0800, Vagrant Cascadian wrote:
>> On 2019-02-12, Julien Lepiller wrote:
>> >>+    (synopsis "Compare files and archives in depth")
>
>This synopsis doesn't make clear that this is a client for a remote
>service. Can you rewrite it?
>
>> >>+    (description
>> >>+     "This is a minimal diffoscope client that connects to the
>> >>service:
>
>Also, I think it's better to replace "diffoscope client" with something
>like "client for the remote diffoscope service located at [...]" since
>diffoscope is not inherently a client-service tool. Also it would be
>great to mention the full diffoscope package :)
>
>Can you send an updated patch?
>
>> > Iiuc, this is a client to connect to a service that runs diffoscope
>> > for you. But we already have diffoscope, so what's the point?
>> 
>> Yes, that's the jist of it.  The main advantage is that it has a much
>> smaller dependency chain locally.
>> 
>> I find it useful on some of the not-particularly-fast ARM systems
>I've
>> been running GNU Guix, where storage may be limited or slow, and
>> substitutes may not be available as often, and build times
>> are... remarkable.
>
>Yes, and diffoscope runs can also be really expensive. It's nice to
>offload them.
>
>Also, if the service makes statements about whether submissions are
>logged or made public, can you put that in the package description?
>
>> > Also this looks like saass to me, so I think we should refrain from
>> > adding it to guix.
>> 
>> It is essentially SaaSS.  The server-side is at least licensed under
>the
>> AGPL, if that mitigates concerns somewhat.
>> 
>> I'm not sure it supports it out of the box yet, but I suspect
>upstream
>> would be amenable to patches to make it easy for people to run their
>own
>> "diffoscope" services.
>> 
>> 
>> > What do you think?
>
>We can have SaaSS in Guix. There are already some packages that are
>SaaSS. So I think this package is okay.
>
>It's "extra okay" in my opinion since the service is AGPL, part of
>Debian, and we have a package for the tool in question.
>
>Guix is developed under the Free System Distribution Guidelines, which
>don't mention remote services or SaaSS at all:
>
>https://www.gnu.org/distros/free-system-distribution-guidelines.en.html
>
>And some discussion on the subject of services in the context of free
>software that largely reflect how we handle SaaSS in Guix:
>
>https://www.gnu.org/philosophy/network-services-arent-free-or-nonfree.en.html

Thanks for the links!




Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Wed, 13 Feb 2019 21:44:01 GMT) Full text and rfc822 format available.

Message #23 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 34449 <at> debbugs.gnu.org, Julien Lepiller <julien <at> lepiller.eu>
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Wed, 13 Feb 2019 13:43:13 -0800
[Message part 1 (text/plain, inline)]
On 2019-02-12, Leo Famulari wrote:
> On Tue, Feb 12, 2019 at 12:16:42AM -0800, Vagrant Cascadian wrote:
>> On 2019-02-12, Julien Lepiller wrote:
>> >>+    (synopsis "Compare files and archives in depth")
>
> This synopsis doesn't make clear that this is a client for a remote
> service. Can you rewrite it?
>
>> >>+    (description
>> >>+     "This is a minimal diffoscope client that connects to the
>> >>service:
>
> Also, I think it's better to replace "diffoscope client" with something
> like "client for the remote diffoscope service located at [...]" since
> diffoscope is not inherently a client-service tool. Also it would be
> great to mention the full diffoscope package :)
>
> Can you send an updated patch?

>> > Iiuc, this is a client to connect to a service that runs diffoscope
>> > for you. But we already have diffoscope, so what's the point?
>> 
>> Yes, that's the jist of it.  The main advantage is that it has a much
>> smaller dependency chain locally.
>> 
>> I find it useful on some of the not-particularly-fast ARM systems I've
>> been running GNU Guix, where storage may be limited or slow, and
>> substitutes may not be available as often, and build times
>> are... remarkable.
>
> Yes, and diffoscope runs can also be really expensive. It's nice to
> offload them.
>
> Also, if the service makes statements about whether submissions are
> logged or made public, can you put that in the package description?

I couldn't really think of a straightforward way to mention the
diffoscope package, but the attached patch updates the synopsis and
description to address the other mentioned issues.


>> > What do you think?
>
> We can have SaaSS in Guix. There are already some packages that are
> SaaSS. So I think this package is okay.
>
> It's "extra okay" in my opinion since the service is AGPL, part of
> Debian, and we have a package for the tool in question.
>
> Guix is developed under the Free System Distribution Guidelines, which
> don't mention remote services or SaaSS at all:
>
> https://www.gnu.org/distros/free-system-distribution-guidelines.en.html
>
> And some discussion on the subject of services in the context of free
> software that largely reflect how we handle SaaSS in Guix:
>
> https://www.gnu.org/philosophy/network-services-arent-free-or-nonfree.en.html

Thanks for sharing your perspective and links to further reading on
these issues!  It really helps to get a feel for the norms of the
project.


live well,
  vagrant

[0001-gnu-Add-trydiffoscope.patch (text/x-diff, inline)]
From 54b99d80b90a9f56fa95654a4b1bf254acb27f9c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Date: Mon, 11 Feb 2019 20:21:39 +0000
Subject: [PATCH] gnu: Add trydiffoscope.

* gnu/packages/package-management (trydiffoscope): New variable.
---
 gnu/packages/package-management.scm | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index af9667cd91..51d6698ee0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -606,6 +606,54 @@ various binary formats into more human readable forms to compare them.  It can
 compare two tarballs, ISO images, or PDFs just as easily.")
     (license license:gpl3+)))
 
+(define-public trydiffoscope
+ (package
+   (name "trydiffoscope")
+   (version "67.0.1")
+   (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://salsa.debian.org/reproducible-builds/trydiffoscope.git")
+            (commit version)))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32
+        "03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((share (string-append (assoc-ref outputs "out") "/usr/share/")))
+               (mkdir-p (string-append share "/man/man1/" ))
+               (invoke "rst2man.py"
+                       "trydiffoscope.1.rst"
+                       (string-append share "/man/man1/trydiffoscope.1"))
+               (mkdir-p (string-append share "/doc/" ,name "-" ,version))
+               (install-file "./README.rst"
+                          (string-append share "/doc/" ,name "-" ,version))))))))
+    (native-inputs
+     `(("gzip" ,gzip)
+       ("python-docutils" ,python-docutils)))
+    (build-system python-build-system)
+    (home-page "https://try.diffoscope.org")
+    (synopsis "Client for remote service to compare files and archives in depth")
+    (description
+     "This is a client for the remote diffoscope service located at:
+
+https://try.diffoscope.org
+
+Diffoscope tries to get to the bottom of what makes files or directories
+different.  It recursively unpacks archives of many kinds and transforms
+various binary formats into more human readable forms to compare them.  It can
+compare two tarballs, ISO images, or PDFs just as easily.
+
+Results are displayed by default, stored as local text or html files, or made
+available via a URL on https://try.diffoscope.org. Results stored on the
+server are purged after 30 days.")
+    (license license:gpl3+)))
+
 (define-public python-anaconda-client
   (package
     (name "python-anaconda-client")
-- 
2.20.1

[signature.asc (application/pgp-signature, inline)]

Reply sent to Leo Famulari <leo <at> famulari.name>:
You have taken responsibility. (Wed, 13 Feb 2019 23:59:02 GMT) Full text and rfc822 format available.

Notification sent to Vagrant Cascadian <vagrant <at> reproducible-builds.org>:
bug acknowledged by developer. (Wed, 13 Feb 2019 23:59:02 GMT) Full text and rfc822 format available.

Message #28 received at 34449-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Cc: Julien Lepiller <julien <at> lepiller.eu>, 34449-done <at> debbugs.gnu.org
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Wed, 13 Feb 2019 18:58:05 -0500
[Message part 1 (text/plain, inline)]
On Wed, Feb 13, 2019 at 01:43:13PM -0800, Vagrant Cascadian wrote:
> I couldn't really think of a straightforward way to mention the
> diffoscope package, but the attached patch updates the synopsis and
> description to address the other mentioned issues.

Okay, sometimes these non-code parts are actually the hardest! :)

I pushed as commit 706460a35754a47bf832a40de4f22271e7088226 with the
changes below.

I found that the software didn't work without the requests module, and
that the man page was being installed to a location that is not
idiomatic for Guix.

`trydiffoscope --webbrowser foo bar` is super nice!

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 51d6698ee0..eff8d5c3fd 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2018 Sou Bunnbu <iyzsong <at> member.fsf.org>
 ;;; Copyright © 2018 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2019 Efraim Flashner <efraim <at> flashner.co.il>
+;;; Copyright © 2019 Vagrant Cascadian <vagrant <at> reproducible-builds.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -625,24 +626,25 @@ compare two tarballs, ISO images, or PDFs just as easily.")
        (modify-phases %standard-phases
          (add-after 'install 'install-doc
            (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((share (string-append (assoc-ref outputs "out") "/usr/share/")))
+             (let* ((share (string-append (assoc-ref outputs "out") "/share/")))
                (mkdir-p (string-append share "/man/man1/" ))
                (invoke "rst2man.py"
                        "trydiffoscope.1.rst"
                        (string-append share "/man/man1/trydiffoscope.1"))
                (mkdir-p (string-append share "/doc/" ,name "-" ,version))
                (install-file "./README.rst"
-                          (string-append share "/doc/" ,name "-" ,version))))))))
+                          (string-append share "/doc/" ,name "-" ,version)))
+             #t)))))
+    (propagated-inputs
+     `(("python-requests" ,python-requests)))
     (native-inputs
      `(("gzip" ,gzip)
        ("python-docutils" ,python-docutils)))
     (build-system python-build-system)
     (home-page "https://try.diffoscope.org")
-    (synopsis "Client for remote service to compare files and archives in depth")
-    (description
-     "This is a client for the remote diffoscope service located at:
-
-https://try.diffoscope.org
+    (synopsis "Client for remote diffoscope service")
+    (description "This is a client for the @url{https://try.diffoscope.org,
+remote diffoscope service}.
 
 Diffoscope tries to get to the bottom of what makes files or directories
 different.  It recursively unpacks archives of many kinds and transforms
@@ -650,7 +652,7 @@ various binary formats into more human readable forms to compare them.  It can
 compare two tarballs, ISO images, or PDFs just as easily.
 
 Results are displayed by default, stored as local text or html files, or made
-available via a URL on https://try.diffoscope.org. Results stored on the
+available via a URL on @url{https://try.diffoscope.org}.  Results stored on the
 server are purged after 30 days.")
     (license license:gpl3+)))
 

[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Thu, 14 Feb 2019 00:28:02 GMT) Full text and rfc822 format available.

Message #31 received at 34449 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 34449 <at> debbugs.gnu.org, Julien Lepiller <julien <at> lepiller.eu>
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Wed, 13 Feb 2019 16:26:49 -0800
[Message part 1 (text/plain, inline)]
On 2019-02-13, Leo Famulari wrote:
> On Wed, Feb 13, 2019 at 01:43:13PM -0800, Vagrant Cascadian wrote:
>> I couldn't really think of a straightforward way to mention the
>> diffoscope package, but the attached patch updates the synopsis and
>> description to address the other mentioned issues.
>
> Okay, sometimes these non-code parts are actually the hardest! :)

Indeed.


> I pushed as commit 706460a35754a47bf832a40de4f22271e7088226 with the
> changes below.

Thanks!


> I found that the software didn't work without the requests module, and

I was surpised it worked without it for me (I had seen that it used
requests); could my user profile have somehow leaked python-requests
from some other package?


> that the man page was being installed to a location that is not
> idiomatic for Guix.

I wondered why it wasn't showing up in MANPATH... now I know, thanks!
/usr/share is a hard habit to break. :)


live well,
  vagrant
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#34449; Package guix-patches. (Thu, 14 Feb 2019 00:34:02 GMT) Full text and rfc822 format available.

Message #34 received at 34449-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
Cc: Julien Lepiller <julien <at> lepiller.eu>, 34449-done <at> debbugs.gnu.org
Subject: Re: [bug#34449] [PATCH] gnu: Add trydiffoscope.
Date: Wed, 13 Feb 2019 19:32:47 -0500
[Message part 1 (text/plain, inline)]
On Wed, Feb 13, 2019 at 04:26:49PM -0800, Vagrant Cascadian wrote:
> I was surpised it worked without it for me (I had seen that it used
> requests); could my user profile have somehow leaked python-requests
> from some other package?

I actually don't know how Python looks up module dependencies so... not
sure :) Depending on how you tested the package, it could be that the
requests module was propagated (installed into your profile) by another
package and that trydiffoscope found it there.

> I wondered why it wasn't showing up in MANPATH... now I know, thanks!
> /usr/share is a hard habit to break. :)

:)
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Thu, 14 Mar 2019 11:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 5 years and 42 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.