From 5240b7433a3cff12dcea49d02a940adb905357d4 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 4 Dec 2017 21:35:47 +0000 Subject: [PATCH 1/5] gnu: guile-xcb: Update to 1.3-1.db7d5a3. * gnu/packages/guile-wm.scm (guile-xcb): Update to 1.3-1.db7d5a3. (version): Use git-version. (source): Switch to git-fetch. (native-inputs): Add texinfo. (home-page): Update to new location. --- gnu/packages/guile-wm.scm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index c28c4753c..7a810ad52 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2016 Alex ter Weele ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,22 +25,27 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages guile) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages texinfo) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public guile-xcb + (let ((commit "db7d5a393cc37a56f66541b3f33938b40c6f35b3") + (revision "1")) (package (name "guile-xcb") - (version "1.3") + (version (git-version "1.3" revision commit)) (source (origin - (method url-fetch) - (uri (string-append "http://web.archive.org/web/20150803094848/" - "http://www.markwitmer.com/dist/guile-xcb-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwitmer/guile-xcb") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149")))) + "16w4vgzbmnwih4bgfn8rw85ryfvzhc6hyly6bic9sd7hhc82rcnd")))) (build-system gnu-build-system) (arguments '(;; Parallel builds fail. #:parallel-build? #f @@ -52,16 +58,17 @@ "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") "/share/guile/site/2.0")))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.0) ("xcb" ,xcb-proto))) - (home-page "http://www.markwitmer.com/guile-xcb/guile-xcb.html") + (home-page "https://github.com/mwitmer/guile-xcb") (synopsis "XCB bindings for Guile") (description "Guile-XCB implements the XCB protocol and provides all the tools necessary to write X client code in Guile Scheme without any external dependencies.") - (license gpl3+))) + (license gpl3+)))) (define-public guile-wm (package -- 2.15.1