From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 4/6] gnu: python-llfuse: Update to 1.0, keep 0.41 variant. Date: Mon, 14 Mar 2016 19:34:24 -0400 Message-ID: <2b02c8822902a099fe7daf291684090eff6a6ed5.1457998381.git.leo@famulari.name> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afc0P-0000iK-RO for guix-devel@gnu.org; Mon, 14 Mar 2016 19:34:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afc0N-0000tu-DP for guix-devel@gnu.org; Mon, 14 Mar 2016 19:34:33 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:44540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afc0N-0000tc-8h for guix-devel@gnu.org; Mon, 14 Mar 2016 19:34:31 -0400 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 4226EC0001D for ; Mon, 14 Mar 2016 19:34:30 -0400 (EDT) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/python.scm (python-llfuse, python2-llfuse): Update to 1.0. (python-llfuse)[properties]: New field. [license]: Remove 'expat'. (python2-llfuse): Use 'strip-python2-variant'. [propagated-inputs]: Add python2-contextlib2. (python-llfuse@0.41): New variable. --- gnu/packages/python.scm | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index de2ce34..5aea1b3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5387,7 +5387,7 @@ should be stored on various operating systems.") (define-public python-llfuse (package (name "python-llfuse") - (version "0.41") + (version "1.0") (source (origin (method url-fetch) (uri (string-append @@ -5395,7 +5395,7 @@ should be stored on various operating systems.") "llfuse-" version ".tar.bz2")) (sha256 (base32 - "0yzy8ixpmxk00kdq6lx5vvwbs0n6s59qnja5q0js2ahbqyxiz2hb")))) + "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps")))) (build-system python-build-system) (inputs `(("fuse" ,fuse) @@ -5407,12 +5407,29 @@ should be stored on various operating systems.") (description "Python-LLFUSE is a set of Python bindings for the low level FUSE API.") (home-page "https://bitbucket.org/nikratio/python-llfuse/") - ;; Python-LLFUSE includes underscore.js, which is MIT (expat) licensed. - ;; The rest of the package is licensed under LGPL2.0 or later. - (license (list license:expat lgpl2.0+)))) + (license lgpl2.0+) + (properties `((python2-variant . ,(delay python2-llfuse)))))) (define-public python2-llfuse - (package-with-python2 python-llfuse)) + (package (inherit (package-with-python2 + (strip-python2-variant python-llfuse))) + (propagated-inputs `(("python2-contextlib2" ,python2-contextlib2))))) + +;; For attic@0.16 +(define-public python-llfuse@0.41 + (package (inherit python-llfuse) + (version "0.41") + (source (origin + (method url-fetch) + (uri (string-append + "https://bitbucket.org/nikratio/python-llfuse/downloads/" + "llfuse-" version ".tar.bz2")) + (sha256 + (base32 + "0yzy8ixpmxk00kdq6lx5vvwbs0n6s59qnja5q0js2ahbqyxiz2hb")))) + ;; Python-LLFUSE < 0.42 includes underscore.js, which is MIT (expat) + ;; licensed. The rest of the package is licensed under LGPL2.0 or later. + (license (list license:expat lgpl2.0+)))) (define-public python-msgpack (package -- 2.6.3