From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJFE2-0002ec-Km for guix-patches@gnu.org; Wed, 24 Apr 2019 06:34:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJF6L-0001JN-Hj for guix-patches@gnu.org; Wed, 24 Apr 2019 06:26:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJF6I-000184-IY for guix-patches@gnu.org; Wed, 24 Apr 2019 06:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hJF6I-000467-EG for guix-patches@gnu.org; Wed, 24 Apr 2019 06:26:02 -0400 Subject: [bug#35412] [PATCH 2/2] gnu: osc: Update to 0.165.0. References: <20190424100321.19312-1-jonathan.brielmaier@web.de> In-Reply-To: <20190424100321.19312-1-jonathan.brielmaier@web.de> Resent-Message-ID: From: Jonathan Brielmaier Date: Wed, 24 Apr 2019 12:25:16 +0200 Message-Id: <20190424102516.19876-1-jonathan.brielmaier@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35412@debbugs.gnu.org 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. =2D-- 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 =2D-- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2018 Marius Bakke ;;; Copyright =C2=A9 2018 Alex Vong ;;; Copyright =C2=A9 2019 Brett Gilio +;;; Copyright =C2=A9 2019 Jonathan Brielmaier ;;; ;;; 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 B= uild =2D- 2.21.0