[bug#35412] [PATCH 1/2] gnu: rpm: Use python3 instead of python2.

[bug#35412] [PATCH 1/2] gnu: rpm: Use python3 instead of python2.

[Jonathan Brielmaier]

osc depends on python-rpm and requires python3 now.

* gnu/packages/package-management.scm (rpm)[inputs]: Use python instead
of python-2.
---
 gnu/packages/package-management.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6708a761eb..f3b592b9e9 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -518,7 +518,7 @@ symlinks to the files in a common directory such as /usr/local.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("python" ,python-2)
+     `(("python" ,python)
        ("xz" ,xz)
        ("bdb" ,bdb)
        ("popt" ,popt)
--
2.21.0

[bug#35412] [PATCH 2/2] gnu: osc: Update to 0.165.0.

[Jonathan Brielmaier]

osc is now python3 compatible.

* gnu/packages/build-tools.scm (osc): Update to 0.165.0.
[arguments]: Module is now python3 only. "osc_hotshot.py" is gone.
[inputs]: Add rpm for python-rpm. Remove python2-urlgrabber. Change
m2crypto and pyurl to python3.
---
 gnu/packages/build-tools.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index daf55d84df..a572a05a49 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2019 Brett Gilio <brettg@posteo.net>
+;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
@@ -240,7 +242,7 @@ other lower-level build files.")
 (define-public osc
   (package
     (name "osc")
-    (version "0.162.1")
+    (version "0.165.0")
     (source
      (origin
        (method url-fetch)
@@ -248,12 +250,11 @@ other lower-level build files.")
                            "/archive/" version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0b4kpm96ns4smqyfjysbk2p78d36x44xprpna8zz85q1y5xn57aj"))))
+        (base32 "0w8z69fhjnlb7fm4fdvbi99kxndk63308f4mjzaljrcp4v9yr5am"))))
     (build-system python-build-system)
     (arguments
-     `(#:python ,python-2 ; Module is python2 only.
-       #:phases
-       (modify-phases %standard-phases
+     `(#:phases
+        (modify-phases %standard-phases
          (add-after 'install 'fix-filename-and-remove-unused
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
@@ -262,13 +263,11 @@ other lower-level build files.")
                (rename-file
                 (string-append bin "osc-wrapper.py")
                 (string-append bin "osc"))
-               ;; Remove unused and broken script.
-               (delete-file (string-append bin "osc_hotshot.py"))
              #t))))))
     (inputs
-     `(("python2-m2crypto" ,python2-m2crypto)
-       ("python2-pycurl" ,python2-pycurl)
-       ("python2-urlgrabber" ,python2-urlgrabber)))
+     `(("python-m2crypto" ,python-m2crypto)
+       ("python-pycurl" ,python-pycurl)
+       ("rpm" ,rpm))) ; for python-rpm
     (home-page "https://github.com/openSUSE/osc")
     (synopsis "Open Build Service command line tool")
     (description "@command{osc} is a command line interface to the Open Build
--
2.21.0

[bug#35412] [PATCH 2/2] gnu: osc: Update to 0.165.0.

[Jonathan Brielmaier]

ping

bug#35412: [PATCH 1/2] gnu: rpm: Use python3 instead of python2.

[Arun Isaac]

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


Thanks! I pushed your patches with a few modifications, of which the two
most notable are:

- I updated rpm to 4.14.2.1.
- GitHub autogenerated source tarballs are unstable (their hashes
change). So, I made osc use git-fetch instead of url-fetch.

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