all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#34449] [PATCH] gnu: Add trydiffoscope.
@ 2019-02-12  2:08 Vagrant Cascadian
  2019-02-12  7:31 ` Julien Lepiller
  0 siblings, 1 reply; 10+ messages in thread
From: Vagrant Cascadian @ 2019-02-12  2:08 UTC (permalink / raw)
  To: 34449

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


* 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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-12  2:08 [bug#34449] [PATCH] gnu: Add trydiffoscope Vagrant Cascadian
@ 2019-02-12  7:31 ` Julien Lepiller
  2019-02-12  8:16   ` Vagrant Cascadian
  0 siblings, 1 reply; 10+ messages in thread
From: Julien Lepiller @ 2019-02-12  7:31 UTC (permalink / raw)
  To: Vagrant Cascadian, 34449

Le 12 février 2019 03:08:36 GMT+01:00, Vagrant Cascadian <vagrant@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?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-12  7:31 ` Julien Lepiller
@ 2019-02-12  8:16   ` Vagrant Cascadian
  2019-02-12  9:34     ` Julien Lepiller
  2019-02-12 20:37     ` Leo Famulari
  0 siblings, 2 replies; 10+ messages in thread
From: Vagrant Cascadian @ 2019-02-12  8:16 UTC (permalink / raw)
  To: Julien Lepiller, 34449

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

On 2019-02-12, Julien Lepiller wrote:
> Le 12 février 2019 03:08:36 GMT+01:00, Vagrant Cascadian <vagrant@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-12  8:16   ` Vagrant Cascadian
@ 2019-02-12  9:34     ` Julien Lepiller
  2019-02-12 20:37     ` Leo Famulari
  1 sibling, 0 replies; 10+ messages in thread
From: Julien Lepiller @ 2019-02-12  9:34 UTC (permalink / raw)
  To: Vagrant Cascadian; +Cc: 34449

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 ;)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-12  8:16   ` Vagrant Cascadian
  2019-02-12  9:34     ` Julien Lepiller
@ 2019-02-12 20:37     ` Leo Famulari
  2019-02-13  8:05       ` Julien Lepiller
  2019-02-13 21:43       ` Vagrant Cascadian
  1 sibling, 2 replies; 10+ messages in thread
From: Leo Famulari @ 2019-02-12 20:37 UTC (permalink / raw)
  To: Vagrant Cascadian; +Cc: 34449

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

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-12 20:37     ` Leo Famulari
@ 2019-02-13  8:05       ` Julien Lepiller
  2019-02-13 21:43       ` Vagrant Cascadian
  1 sibling, 0 replies; 10+ messages in thread
From: Julien Lepiller @ 2019-02-13  8:05 UTC (permalink / raw)
  To: Leo Famulari, Vagrant Cascadian; +Cc: 34449

Le 12 février 2019 21:37:42 GMT+01:00, Leo Famulari <leo@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!

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-12 20:37     ` Leo Famulari
  2019-02-13  8:05       ` Julien Lepiller
@ 2019-02-13 21:43       ` Vagrant Cascadian
  2019-02-13 23:58         ` bug#34449: " Leo Famulari
  1 sibling, 1 reply; 10+ messages in thread
From: Vagrant Cascadian @ 2019-02-13 21:43 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 34449


[-- Attachment #1.1: Type: text/plain, Size: 2540 bytes --]

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-trydiffoscope.patch --]
[-- Type: text/x-diff, Size: 2961 bytes --]

From 54b99d80b90a9f56fa95654a4b1bf254acb27f9c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* bug#34449: [PATCH] gnu: Add trydiffoscope.
  2019-02-13 21:43       ` Vagrant Cascadian
@ 2019-02-13 23:58         ` Leo Famulari
  2019-02-14  0:26           ` [bug#34449] " Vagrant Cascadian
  0 siblings, 1 reply; 10+ messages in thread
From: Leo Famulari @ 2019-02-13 23:58 UTC (permalink / raw)
  To: Vagrant Cascadian; +Cc: 34449-done

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

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@member.fsf.org>
 ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019 Vagrant Cascadian <vagrant@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+)))
 


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-13 23:58         ` bug#34449: " Leo Famulari
@ 2019-02-14  0:26           ` Vagrant Cascadian
  2019-02-14  0:32             ` Leo Famulari
  0 siblings, 1 reply; 10+ messages in thread
From: Vagrant Cascadian @ 2019-02-14  0:26 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 34449

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

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#34449] [PATCH] gnu: Add trydiffoscope.
  2019-02-14  0:26           ` [bug#34449] " Vagrant Cascadian
@ 2019-02-14  0:32             ` Leo Famulari
  0 siblings, 0 replies; 10+ messages in thread
From: Leo Famulari @ 2019-02-14  0:32 UTC (permalink / raw)
  To: Vagrant Cascadian; +Cc: 34449-done

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

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. :)

:)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-02-14  0:34 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-12  2:08 [bug#34449] [PATCH] gnu: Add trydiffoscope Vagrant Cascadian
2019-02-12  7:31 ` Julien Lepiller
2019-02-12  8:16   ` Vagrant Cascadian
2019-02-12  9:34     ` Julien Lepiller
2019-02-12 20:37     ` Leo Famulari
2019-02-13  8:05       ` Julien Lepiller
2019-02-13 21:43       ` Vagrant Cascadian
2019-02-13 23:58         ` bug#34449: " Leo Famulari
2019-02-14  0:26           ` [bug#34449] " Vagrant Cascadian
2019-02-14  0:32             ` Leo Famulari

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.