diff options
| -rw-r--r-- | gnu/packages/build-tools.scm | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 71b1756d3b..697322639d 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,21 +242,22 @@ other lower-level build files.") (define-public osc (package (name "osc") - (version "0.162.1") + (version "0.165.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/openSUSE/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/openSUSE/osc") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0b4kpm96ns4smqyfjysbk2p78d36x44xprpna8zz85q1y5xn57aj")))) + (base32 + "0l6iw8a040l60ixxdms9rxajm38vqfdwgij2bm7ahgv1akza64jk")))) (build-system python-build-system) (arguments - `(#:python ,python-2 ; Module is python2 only. - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'install 'fix-filename-and-remove-unused + (add-after 'install 'fix-filename (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) ;; Main osc tool is renamed in spec file, not setup.py, let's @@ -262,13 +265,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)))))) + #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 |