From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: Add python2-gnomekeyring. Date: Sun, 19 Apr 2015 20:05:47 +0200 Message-ID: <87618s2dtw.fsf@mango.localdomain> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjtbW-0005Js-3w for guix-devel@gnu.org; Sun, 19 Apr 2015 14:06:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YjtbR-0003ZK-GB for guix-devel@gnu.org; Sun, 19 Apr 2015 14:06:02 -0400 Received: from sender1.zohomail.com ([74.201.84.162]:53040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjtbR-0003Yc-87 for guix-devel@gnu.org; Sun, 19 Apr 2015 14:05:57 -0400 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 --=-=-= Content-Type: text/plain Hi Guix, the first patch defines a function to create packages from python2-gnome-desktop components and redefines python2-rsvg using this function. The second patch adds python2-gnomekeyring using the very same generator function. ~~ Ricardo --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-python2-rsvg-Define-with-helper-function.patch Content-Transfer-Encoding: 8bit >From 9045e6d296593a7f81269ecfab327733853b68f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Mar 2015 08:38:13 +0100 Subject: [PATCH 1/2] gnu: python2-rsvg: Define with helper function. * gnu/packages/gnome.scm (python2-gnome-desktop-component): New variable. --- gnu/packages/gnome.scm | 56 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 33ce2e8..c303826 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Andy Wingo +;;; Copyright © 2015 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -1611,36 +1612,61 @@ commercial X servers. It is useful for creating XKB-related software (layout indicators etc).") (license license:lgpl2.0+))) -(define-public python2-rsvg - ;; XXX: This is actually a subset of gnome-python-desktop. +(define (python2-gnome-desktop-component comp syn desc ins lic) (package - (name "python2-rsvg") + (name (string-append "python2-" comp)) (version "2.32.0") (source (origin (method url-fetch) (uri (string-append - "mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-" + "mirror://gnome/sources/gnome-python-desktop/" + (version-major+minor version) "/gnome-python-desktop-" version ".tar.bz2")) (sha256 (base32 "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9")))) (build-system gnu-build-system) + (arguments + `(#:phases + (alist-cons-before + 'build 'enter-dir + (lambda _ (chdir ,comp)) + (alist-cons-after + 'install 'install-pth + (lambda* (#:key outputs #:allow-other-keys) + ;; The modules are stored in a subdirectory of python's + ;; site-packages directory. Add a .pth file so that python will + ;; add that subdirectory to its module search path. + (call-with-output-file + (string-append + (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python-2)) + "/site-packages" "/" ,comp ".pth") + (lambda (port) + (format port "gtk-2.0~%"))) + #t) + %standard-phases)))) + (inputs + `(("python2" ,python-2) + ("pygtk" ,python2-pygtk) + ,@ins)) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("python" ,python-2) - ("python2-pygtk" ,python2-pygtk) - ("librsvg" ,librsvg))) (home-page "http://www.gnome.org") - (synopsis "Python bindings to librsvg") - (description - "This packages provides Python bindings to librsvg, the SVG rendering -library.") + (synopsis syn) + (description desc) + (license lic))) - ;; This is the license of the rsvg bindings. The license of each module - ;; of gnome-python-desktop is given in 'COPYING'. - (license license:lgpl2.1+))) +(define-public python2-rsvg + (python2-gnome-desktop-component + "rsvg" + "Python bindings to librsvg" + "This module contains bindings allowing the use of librsvg in Python." + `(("librsvg" ,librsvg)) + license:lgpl2.1+)) (define-public glib-networking (package -- 2.1.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Add-python2-gnomekeyring.patch >From ba6cbc73f4ff3f1f5fc8e4ca26e867dc85291bd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 19 Apr 2015 18:59:01 +0200 Subject: [PATCH 2/2] gnu: Add python2-gnomekeyring. * gnu/packages/gnome.scm (python2-gnomekeyring): New variable. --- gnu/packages/gnome.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c303826..14d2520 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1668,6 +1668,15 @@ indicators etc).") `(("librsvg" ,librsvg)) license:lgpl2.1+)) +(define-public python2-gnomekeyring + (python2-gnome-desktop-component + "gnomekeyring" + "Python bindings to libgnome-keyring" + "This module contains bindings allowing the use of the GNOME keyring in +Python." + `(("libgnome-keyring" ,libgnome-keyring)) + license:lgpl2.1+)) + (define-public glib-networking (package (name "glib-networking") -- 2.1.0 --=-=-=--