[bug#51676] [PATCH] gnu: Add python-miniupnpc

[bug#51676] [PATCH] gnu: Add python-miniupnpc

[Stephen Paul Weber]

* gnu/packages/python-xyz.scm (python-miniupnpc): New variable.
---
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8ba72170c0..558e104cf1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3093,6 +3093,42 @@ server.")
      "@code{pafy} is a python library to retrieve YouTube content and metadata.")
     (license license:lgpl3+)))
 
+(define-public python-miniupnpc
+  (package
+    (name "python-miniupnpc")
+    (version "2.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/miniupnp/miniupnp")
+         (commit "36a65e3d841d4e85904fed690c0b755d5b380043")))
+       (file-name
+        (git-file-name name version))
+       (sha256
+        (base32 "0h7smsp1fnwsmgg3n70813ln9j5y20g61x25s4kn91vzkbbq9188"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'subdir
+           (lambda _
+             (chdir "miniupnpc")
+             (setenv "CC" ,(cc-for-target))
+             (substitute* "Makefile"
+               (("SH = /bin/sh") (string-append "SH = " (which "bash"))))
+             #t)))))
+    (inputs
+     `(("python" ,python))) ; We are building a Python extension.
+    (native-inputs
+     `(("which" ,which)))
+    (synopsis "UPnP client for Python")
+    (description "A client library for Python programs to set up port forwards
+using UPnP.")
+    (home-page "http://miniupnp.free.fr")
+    (license license:bsd-3)))
+
 (define-public python2-funcsigs
   (package
     (name "python2-funcsigs")
-- 
2.30.2

[bug#51676] [PATCH] gnu: Add python-miniupnpc

[Ludovic Courtès]

Hi Stephen,

Stephen Paul Weber <singpolyma@singpolyma.net> skribis:

> * gnu/packages/python-xyz.scm (python-miniupnpc): New variable.

[...]

> +    (version "2.2.3")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri
> +        (git-reference
> +         (url "https://github.com/miniupnp/miniupnp")
> +         (commit "36a65e3d841d4e85904fed690c0b755d5b380043")))

This commit:

--8<---------------cut here---------------start------------->8---
$ (cd /tmp/miniupnp/; git checkout 36a65e3d841d4e85904fed690c0b755d5b380043; git describe)
La posició de HEAD anterior era 2df8120 miniupnpc version 2.2.3
HEAD ara és a 36a65e3 miniupnpc/Changelog.txt: VERSION 2.2.3
miniupnpd_2_1-574-g36a65e3
--8<---------------cut here---------------end--------------->8---

… does not match the tag for 2.2.3:

--8<---------------cut here---------------start------------->8---
$ (cd /tmp/miniupnp/; git checkout miniupnpc_2_2_3; git log |head -1)
La posició de HEAD anterior era 36a65e3 miniupnpc/Changelog.txt: VERSION 2.2.3
HEAD ara és a 2df8120 miniupnpc version 2.2.3
commit 2df8120326ed4246e049a7a6de707539604cd514
--8<---------------cut here---------------end--------------->8---

> +    (description "A client library for Python programs to set up port forwards
> +using UPnP.")

Please make it a full sentence, as per:

  https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html

Could you send an updated patch that addresses these two issues?

Thanks,
Ludo’.

[bug#51676] [PATCH v2] gnu: Add python-miniupnpc

[Stephen Paul Weber]

* gnu/packages/python-xyz.scm (python-miniupnpc): New variable.
---
 gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0091165d37..0ad5dfd85c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3150,6 +3150,40 @@ server.")
      "@code{pafy} is a python library to retrieve YouTube content and metadata.")
     (license license:lgpl3+)))
 
+(define-public python-miniupnpc
+  (package
+    (name "python-miniupnpc")
+    (version "2.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/miniupnp/miniupnp")
+         (commit "miniupnpc_2_2_3")))
+       (file-name
+        (git-file-name name version))
+       (sha256
+        (base32 "0h7smsp1fnwsmgg3n70813ln9j5y20g61x25s4kn91vzkbbq9188"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'subdir
+           (lambda _
+             (chdir "miniupnpc")
+             (setenv "CC" ,(cc-for-target))
+             (substitute* "Makefile"
+               (("SH = /bin/sh") (string-append "SH = " (which "bash"))))
+             #t)))))
+    (inputs (list python)) ; We are building a Python extension.
+    (native-inputs (list which))
+    (synopsis "UPnP client for Python")
+    (description "Miniupnpc is a client library for Python programs to set up
+port forwards using UPnP.")
+    (home-page "http://miniupnp.free.fr")
+    (license license:bsd-3)))
+
 (define-public python2-funcsigs
   (package
     (name "python2-funcsigs")
-- 
2.30.2

[bug#51676] [PATCH v2] gnu: Add python-miniupnpc

[Xinglu Chen]

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

Stephen schrieb am Donnerstag der 13. Januar 2022 um 20:09 -05:

> * gnu/packages/python-xyz.scm (python-miniupnpc): New variable.
> ---
>  gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 0091165d37..0ad5dfd85c 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -3150,6 +3150,40 @@ server.")
>       "@code{pafy} is a python library to retrieve YouTube content and metadata.")
>      (license license:lgpl3+)))
>  
> +(define-public python-miniupnpc
> +  (package
> +    (name "python-miniupnpc")
> +    (version "2.2.3")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri
> +        (git-reference
> +         (url "https://github.com/miniupnp/miniupnp")
> +         (commit "miniupnpc_2_2_3")))

The version should not be hard-coded.  You could use
‘string-replace-substring’ from (ice-9 string-fun).

  (string-replace-substring version "." "_")


> +       (file-name
> +        (git-file-name name version))
> +       (sha256
> +        (base32 "0h7smsp1fnwsmgg3n70813ln9j5y20g61x25s4kn91vzkbbq9188"))))

I am getting a hash mismatch

--8<---------------cut here---------------start------------->8---
expected hash: 0h7smsp1fnwsmgg3n70813ln9j5y20g61x25s4kn91vzkbbq9188
actual hash:   03q1rlzvfzm15g1bfw2zqzavlsyaypnaf2k3cz6ha7k5rirkdy0l
--8<---------------cut here---------------end--------------->8---

> +    (build-system python-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'subdir
> +           (lambda _
> +             (chdir "miniupnpc")
> +             (setenv "CC" ,(cc-for-target))
> +             (substitute* "Makefile"
> +               (("SH = /bin/sh") (string-append "SH = " (which "bash"))))

Nitpick: Could we just match on /bin/sh?

> +             #t)))))

Phases don’t have to return #t.

> +    (inputs (list python)) ; We are building a Python extension.
> +    (native-inputs (list which))
> +    (synopsis "UPnP client for Python")
> +    (description "Miniupnpc is a client library for Python programs to set up
> +port forwards using UPnP.")

Acronyms should be expanded at least once, see “17.4.4 Synopses and
Descriptions” in the manual.

  @acronym{UPnP, Universal Plug and Play}

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

[bug#51676] [PATCH v3] gnu: Add python-miniupnpc

[Stephen Paul Weber]

* gnu/packages/python-xyz.scm (python-miniupnpc): New variable.
---
 gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 537a2eef35..dccaa7b103 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3156,6 +3156,41 @@ server.")
      "@code{pafy} is a python library to retrieve YouTube content and metadata.")
     (license license:lgpl3+)))
 
+(define-public python-miniupnpc
+  (package
+    (name "python-miniupnpc")
+    (version "2.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/miniupnp/miniupnp")
+         (commit
+           (string-append
+             "miniupnpc_" (string-replace-substring version "." "_")))))
+       (file-name
+        (git-file-name name version))
+       (sha256
+        (base32 "03q1rlzvfzm15g1bfw2zqzavlsyaypnaf2k3cz6ha7k5rirkdy0l"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'subdir
+           (lambda _
+             (chdir "miniupnpc")
+             (setenv "CC" ,(cc-for-target))
+             (substitute* "Makefile"
+               (("/bin/sh") (which "bash"))))))))
+    (inputs (list python)) ; We are building a Python extension.
+    (native-inputs (list which))
+    (synopsis "UPnP client for Python")
+    (description "Miniupnpc is a client library for Python programs to set up
+port forwards using @acronym{UPnP, Universal Plug and Play}.")
+    (home-page "http://miniupnp.free.fr")
+    (license license:bsd-3)))
+
 (define-public python2-funcsigs
   (package
     (name "python2-funcsigs")
-- 
2.30.2

bug#51676: [PATCH v3] gnu: Add python-miniupnpc

[Nicolas Goaziou]

Hello,

Stephen Paul Weber <singpolyma@singpolyma.net> writes:

> * gnu/packages/python-xyz.scm (python-miniupnpc): New variable.

I removed `which' native-inputs, used G-expressions, and
`search-input-files' instead of `which' function.

Applied. Thank you

Regards,
-- 
Nicolas Goaziou