ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: osc: Update to 0.165.0.

Browse source 
* gnu/packages/build-tools.scm (osc): Update to 0.165.0.
[source]: Use git-fetch.
[arguments]: Use python3. osc_hotshot.py is gone. So, do not attempt to delete
it. Rename fix-filename-and-remove-unused phase to fix-filename phase.
[inputs]: Add rpm. Remove python2-urlgrabber. Replace python2-m2crypto and
python2-pycurl with python-m2crypto and python-pycurl.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
This commit is contained in:
Jonathan Brielmaier 2019-04-24 12:25:16 +02:00 committed by Arun Isaac
parent c0023514a3
commit 41e09a159a
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/build-tools.scm
View file

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