[PATCH] gnu: Add python-libusb1.

Done

Details

2 participants

Marius Bakke
Vagrant Cascadian

Owner: unassigned

Submitted by: Vagrant Cascadian

Severity: normal

Debbugs page

Vagrant Cascadian wrote 7 years ago

Recipients:(address . guix-patches@gnu.org)

Message-ID:87r2kwne89.fsf@aikidev.net

Add new package definition for python-libusb1, needed to upgrade

python-trezor to newer versions.

live well,

vagrant

From 282280cbaba47389f7a9c3e14eb8fe7834adbd39 Mon Sep 17 00:00:00 2001

* gnu/packages/libusb.scm (python-libusb1): New variable.

---

gnu/packages/libusb.scm | 38 ++++++++++++++++++++++++++++++++++++++

1 file changed, 38 insertions(+)

Toggle diff (51 lines)diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 62c936c19..9fa2d816a 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -214,6 +214,44 @@ with usb4java.")
 implementing @code{javax.usb} (JSR-80).")
     (license expat)))
 
+(define-public python-libusb1
+  (package
+    (name "python-libusb1")
+    (version "1.6.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "libusb1" version))
+       (sha256
+        (base32
+         "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:modules ((srfi srfi-1)
+                  (srfi srfi-26)
+                  (guix build utils)
+                  (guix build python-build-system))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-libusb-reference
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "usb1/libusb1.py"
+               (("libusb_path = ctypes.util.find_library\\(base_name\\)")
+                (string-append
+                 "libusb_path = \""
+                 (find (negate symbolic-link?)
+                       (find-files (assoc-ref inputs "libusb")
+                                   "^libusb.*\\.so\\..*"))
+                 "\"")))
+             #t)))))
+    (inputs `(("libusb" ,libusb)))
+    (home-page
+     "http://github.com/vpelletier/python-libusb1")
+    (synopsis "Pure-python wrapper for libusb-1.0")
+    (description
+     "Pure-python wrapper for libusb-1.0")
+    (license lgpl2.1+)))
+
 (define-public python-pyusb
   (package
     (name "python-pyusb")
-- 
2.11.0

Marius Bakke wrote 7 years ago

Recipients:

Message-ID:877emmejjg.fsf@fastmail.com

Vagrant Cascadian <vagrant@debian.org> writes:

Toggle quote (3 lines)

> Add new package definition for python-libusb1, needed to upgrade

> python-trezor to newer versions.

Thanks! I have some minor nitpicks:

[...]

Toggle quote (2 lines)

> * gnu/packages/libusb.scm (python-libusb1): New variable.

Can you also add yourself to the copyright header in this file?

[...]

Toggle quote (16 lines)> +(define-public python-libusb1
> +  (package
> +    (name "python-libusb1")
> +    (version "1.6.4")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "libusb1" version))
> +       (sha256
> +        (base32
> +         "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:modules ((srfi srfi-1)
> +                  (srfi srfi-26)

Is srfi-26 actually used here?

Toggle quote (19 lines)> +                  (guix build utils)
> +                  (guix build python-build-system))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'fix-libusb-reference
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "usb1/libusb1.py"
> +               (("libusb_path = ctypes.util.find_library\\(base_name\\)")
> +                (string-append
> +                 "libusb_path = \""
> +                 (find (negate symbolic-link?)
> +                       (find-files (assoc-ref inputs "libusb")
> +                                   "^libusb.*\\.so\\..*"))
> +                 "\"")))
> +             #t)))))
> +    (inputs `(("libusb" ,libusb)))
> +    (home-page
> +     "http://github.com/vpelletier/python-libusb1")

This line break is unnecessary :-)

Toggle quote (4 lines)

> + (synopsis "Pure-python wrapper for libusb-1.0")

> + (description

> + "Pure-python wrapper for libusb-1.0")

This description is rather thin. Can you try to make it into one or

more full sentences?

Toggle quote (2 lines)

> + (license lgpl2.1+)))

I noticed the source contains GPL2 in COPYING, and LGPL2.1 as

"COPYING.LESSER". Can you make sure we don't install the former?

Can you send an updated patch? Thanks in advance!

Vagrant Cascadian wrote 7 years ago

Recipients:

Message-ID:87bmbyoadk.fsf@aikidev.net

On 2018-06-25, Marius Bakke wrote:

Toggle quote (13 lines)> Vagrant Cascadian <vagrant@debian.org> writes:
>
>> Add new package definition for python-libusb1, needed to upgrade
>> python-trezor to newer versions.
>
> Thanks!  I have some minor nitpicks:
>
> [...]
>
>> * gnu/packages/libusb.scm (python-libusb1): New variable.
>
> Can you also add yourself to the copyright header in this file?

Sure.

Toggle quote (18 lines)>> +(define-public python-libusb1
>> +  (package
>> +    (name "python-libusb1")
>> +    (version "1.6.4")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (pypi-uri "libusb1" version))
>> +       (sha256
>> +        (base32
>> +         "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"))))
>> +    (build-system python-build-system)
>> +    (arguments
>> +     `(#:modules ((srfi srfi-1)
>> +                  (srfi srfi-26)
>
> Is srfi-26 actually used here?

No idea, I admittedly cargo-culted this from python-pyusb...

fix-libusb-reference didn't work until I added the modules block, and I

didn't narrow-down which of the specific modules were actually needed.

Toggle quote (21 lines)>> +                  (guix build utils)
>> +                  (guix build python-build-system))
>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'unpack 'fix-libusb-reference
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             (substitute* "usb1/libusb1.py"
>> +               (("libusb_path = ctypes.util.find_library\\(base_name\\)")
>> +                (string-append
>> +                 "libusb_path = \""
>> +                 (find (negate symbolic-link?)
>> +                       (find-files (assoc-ref inputs "libusb")
>> +                                   "^libusb.*\\.so\\..*"))
>> +                 "\"")))
>> +             #t)))))
>> +    (inputs `(("libusb" ,libusb)))
>> +    (home-page
>> +     "http://github.com/vpelletier/python-libusb1")
>
> This line break is unnecessary :-)

Ok.

Toggle quote (7 lines)

>> + (synopsis "Pure-python wrapper for libusb-1.0")

>> + (description

>> + "Pure-python wrapper for libusb-1.0")

> This description is rather thin. Can you try to make it into one or

> more full sentences?

Will try.

Toggle quote (5 lines)

>> + (license lgpl2.1+)))

> I noticed the source contains GPL2 in COPYING, and LGPL2.1 as

> "COPYING.LESSER". Can you make sure we don't install the former?

I was a bit confused by that, but looking at all the actual code, it

only appears to be LGPL2.1. So you're saying to explicitly remove

COPYING from the package?

Toggle quote (2 lines)

> Can you send an updated patch? Thanks in advance!

Sure. Thanks for the review!

live well,

vagrant

Marius Bakke wrote 7 years ago

Recipients:

Message-ID:87efguzhg0.fsf@fastmail.com

Vagrant Cascadian <vagrant@debian.org> writes:

Toggle quote (9 lines)

>>> + (license lgpl2.1+)))

>> I noticed the source contains GPL2 in COPYING, and LGPL2.1 as

>> "COPYING.LESSER". Can you make sure we don't install the former?

> I was a bit confused by that, but looking at all the actual code, it

> only appears to be LGPL2.1. So you're saying to explicitly remove

> COPYING from the package?

Yes, it seems COPYING is simply a leftover, so I'd prefer not to install

it somehow (e.g. by overriding the 'install-license-files' phase).

Vagrant Cascadian wrote 7 years ago

Recipients:

Message-ID:8736xanm8j.fsf@aikidev.net

On 2018-06-25, Marius Bakke wrote:

Toggle quote (6 lines)> Vagrant Cascadian <vagrant@debian.org> writes:
>
>> Add new package definition for python-libusb1, needed to upgrade
>> python-trezor to newer versions.
>
> Thanks!  I have some minor nitpicks:

...

Toggle quote (2 lines)

> Can you send an updated patch? Thanks in advance!

Updated patch attached:

- Add myself to copyright headers

- Drop unused srfi-26

- Remove needless line break

- Flesh out description a bit...

- Remove COPYING file, which didn't match the licensing of the files

The removal of COPYING was pretty much a shotgun-style approach, but I

couldn't figure out how to do a more surgical removal, and there weren't

any other COPYING files in the source.

The description could probably be further improved... but that's as far

as I got for now... :)

live well,

vagrant

From 088c81c4ca3a95bf51f04aec836aaedee8ab9ba8 Mon Sep 17 00:00:00 2001

* gnu/packages/libusb.scm (python-libusb1): New variable.

---

gnu/packages/libusb.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 44 insertions(+)

Toggle diff (64 lines)diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 62c936c19..39814bc90 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -214,6 +215,49 @@ with usb4java.")
 implementing @code{javax.usb} (JSR-80).")
     (license expat)))
 
+(define-public python-libusb1
+  (package
+    (name "python-libusb1")
+    (version "1.6.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "libusb1" version))
+       (sha256
+        (base32
+         "03b7xrz8vqg8w0za5r503jhcmbd1ls5610jcja1rqz833nf0v4wc"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:modules ((srfi srfi-1)
+                  (guix build utils)
+                  (guix build python-build-system))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'install-license-files 'remove-incorrect-license
+           (lambda* (#:key out #:allow-other-keys)
+             ;; Was reliscensed to LGPL 2.1+, but old COPYING file still left
+             ;; in source. Remove it so it does not get installed.
+             (delete-file-recursively "COPYING")
+             #t))
+         (add-after 'unpack 'fix-libusb-reference
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "usb1/libusb1.py"
+               (("libusb_path = ctypes.util.find_library\\(base_name\\)")
+                (string-append
+                 "libusb_path = \""
+                 (find (negate symbolic-link?)
+                       (find-files (assoc-ref inputs "libusb")
+                                   "^libusb.*\\.so\\..*"))
+                 "\"")))
+             #t)))))
+    (inputs `(("libusb" ,libusb)))
+    (home-page "http://github.com/vpelletier/python-libusb1")
+    (synopsis "Pure-python wrapper for libusb-1.0")
+    (description "Libusb is a library that gives applications easy access to
+USB devices on various operating systems. This is a python wrapper for
+acessing libusb-1.0")
+    (license lgpl2.1+)))
+
 (define-public python-pyusb
   (package
     (name "python-pyusb")
-- 
2.11.0

Marius Bakke wrote 7 years ago

Recipients:

Message-ID:87bmbxxm59.fsf@fastmail.com

Vagrant Cascadian <vagrant@debian.org> writes:

Toggle quote (25 lines)> On 2018-06-25, Marius Bakke wrote:
>> Vagrant Cascadian <vagrant@debian.org> writes:
>>
>>> Add new package definition for python-libusb1, needed to upgrade
>>> python-trezor to newer versions.
>>
>> Thanks!  I have some minor nitpicks:
> ...
>> Can you send an updated patch?  Thanks in advance!
>
> Updated patch attached:
>
> - Add myself to copyright headers
> - Drop unused srfi-26
> - Remove needless line break
> - Flesh out description a bit...
> - Remove COPYING file, which didn't match the licensing of the files
>
> The removal of COPYING was pretty much a shotgun-style approach, but I
> couldn't figure out how to do a more surgical removal, and there weren't
> any other COPYING files in the source.
>
> The description could probably be further improved... but that's as far
> as I got for now... :)

Thanks! Applied with these cosmetic changes (mostly to please `guix lint`):

1 file changed, 5 insertions(+), 5 deletions(-)
gnu/packages/libusb.scm | 10 +++++-----

modified   gnu/packages/libusb.scm
@@ -235,9 +235,9 @@ implementing @code{javax.usb} (JSR-80).")
        (modify-phases %standard-phases
          (add-before 'install-license-files 'remove-incorrect-license
            (lambda* (#:key out #:allow-other-keys)
-             ;; Was reliscensed to LGPL 2.1+, but old COPYING file still left
+             ;; Was relicensed to LGPL 2.1+, but old COPYING file still left
              ;; in source. Remove it so it does not get installed.
-             (delete-file-recursively "COPYING")
+             (delete-file "COPYING")
              #t))
          (add-after 'unpack 'fix-libusb-reference
            (lambda* (#:key inputs #:allow-other-keys)
@@ -251,11 +251,11 @@ implementing @code{javax.usb} (JSR-80).")
                  "\"")))
              #t)))))
     (inputs `(("libusb" ,libusb)))
-    (home-page "http://github.com/vpelletier/python-libusb1")
+    (home-page "https://github.com/vpelletier/python-libusb1")
     (synopsis "Pure-python wrapper for libusb-1.0")
     (description "Libusb is a library that gives applications easy access to
-USB devices on various operating systems. This is a python wrapper for
-acessing libusb-1.0")
+USB devices on various operating systems.  This package provides a Python
+wrapper for accessing libusb-1.0.")
     (license lgpl2.1+)))
 
 (define-public python-pyusb

[back]

Marius Bakke wrote 7 years ago

Re: [bug#31958] [PATCH] gnu: Add python-pyblake2.

Recipients:(address . 31957-done@debbugs.gnu.org)

Message-ID:878t71xlhu.fsf@fastmail.com

Vagrant Cascadian <vagrant@debian.org> writes:

Toggle quote (43 lines)> On 2018-06-25, Marius Bakke wrote:
>> Vagrant Cascadian <vagrant@debian.org> writes:
>>>> According to COPYING, this software is actually "octuple-licensed":
>>>>
>>>> * CC0 Universal 1.0 - http://creativecommons.org/publicdomain/zero/1.0
>>>> * Unlicense — http://unlicense.org/
>>>> * WTFPL Version 2 - http://www.wtfpl.net/
>>>> * Apache Public License 2.0 - https://www.apache.org/licenses/LICENSE-2.0
>>>> * OpenSSL License - https://www.openssl.org/source/license.html
>>>> * MIT License - https://opensource.org/licenses/MIT
>>>> * The BSD 3-Clause License - https://opensource.org/licenses/BSD-3-Clause
>>>> * ISC License - https://opensource.org/licenses/ISC
>>>>
>>>> Can you add each of these, along with an explaning comment?
>>>
>>> And all of those are merely fallback licenses to the author's intention
>>> of public domain... and in the files themselves (pyblake2module.c,
>>> setup.py), they only reference:
>>>
>>>   http://creativecommons.org/publicdomain/zero/1.0
>>>
>>> But if it's more appropriate for guix to list all possible licenses,
>>> sure. :)
>>
>> Right.  I missed the top comment of the COPYING file[0], which dedicates
>> the software to the public domain.  But it also says that you are free
>> to choose any of the others at your discretion.
>>
>> So I think CC0 is appropriate, but please add a comment explaning the
>> situation.  Thanks!
>>
>> [0] https://github.com/dchest/pyblake2/blob/master/COPYING
>
> Updated patch:
> - fixed commit message
> - moved to python-crypto.scm
> - removed needless linebreak
> - updated description
> - updated licensing to public-domain/cc0
> - clarified additional licensing in comments
>
> Hopefully that covers everything.

Thank you!

I shortened the description a bit while adding @code{} notations where

appropriate, and also added a copyright statement for you. Hope that

was okay :-)

I also moved the package so it wasn't squeezed between the Python3 and

Python2 variants of python-py-bcrypt.

(...and closing the previous patch bug while at it...)

Pushed as e64088f0b521145286bfe3f028699e418baf4832!

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 31957@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 31957

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date