From 93a6f5520c96934b896c70bab8c00ba912711569 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 12 Feb 2013 22:06:47 +0100 Subject: gnu: gmp: Update to version 5.1.1. * gnu/packages/multiprecision.scm (gmp): Update to version 5.1.1. --- gnu/packages/multiprecision.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 7778552b40..5e0dee0620 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -27,18 +27,15 @@ (define-public gmp (package (name "gmp") - (version "5.1.0") + (version "5.1.1") (source (origin (method url-fetch) (uri - ;; Note: this version is not available from GNU mirrors - ;; because it was made with an Automake affected by - ;; CVE-2012-3386. - (string-append "ftp://ftp.gmplib.org/pub/gmp-" - version "/gmp-" version ".tar.bz2")) + (string-append "mirror://gnu/gmp/gmp-" + version ".tar.xz")) (sha256 (base32 - "15n7xxgasbxdch8ii8z9ic6fxc2ysk3q8iavf55abjp5iylspnfz")))) + "1hili06lcf0clg5qfvz7knm6pmj6ab54yhsvskp1mdny5xw4vmjb")))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) (arguments `(#:configure-flags -- cgit v1.2.3 From c3f9761771d6a6bdafbe7626082d7c01599611d8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 24 Feb 2013 16:41:27 +0100 Subject: gnu: openldap: Disable tests, they fail too randomly probably due to timeouts in the server. * gnu/packages/openldap.scm (openldap): Drop all tests. --- gnu/packages/openldap.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index d2525a6310..a4a28ccf1b 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -55,7 +55,7 @@ ("libtool" ,libtool "bin") ("zlib" ,zlib))) (arguments - `(#:parallel-tests? #f + `(#:tests? #f #:phases (alist-replace 'configure @@ -63,19 +63,7 @@ (let ((configure (assoc-ref %standard-phases 'configure))) (apply configure args) (copy-file (which "libtool") "libtool"))) - (alist-replace - 'check - (lambda* (#:key #:allow-other-keys #:rest args) - (let ((check (assoc-ref %standard-phases 'check))) - (for-each (lambda (f) - (substitute* (string-append "tests/scripts/" f) - (("/bin/rm") "rm"))) - '("all" "its-all" "passwd-search" "sql-all" "test027-emptydn")) - ;; disable especially finicky tests - (delete-file "tests/scripts/test058-syncrepl-asymmetric") - (delete-file "tests/scripts/test061-syncreplication-initiation") - (apply check args))) - %standard-phases)))) + %standard-phases))) (synopsis "openldap, an implementation of the Lightweight Directory Access Protocol") (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") -- cgit v1.2.3 From b5c18c78c2ff53fe3d489120d50f3732ee36d939 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 24 Feb 2013 17:54:51 +0100 Subject: gnu: curl: Let patch-shebang handle /usr/bin/env. * gnu/packages/curl.scm (curl): Drop manual rewriting of #!/usr/bin/env. --- gnu/packages/curl.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 00fd0f3232..4f5d96087e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -55,18 +55,7 @@ ("pkg-config" ,pkg-config) ("zlib" ,zlib))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi") - #:phases - (alist-replace - 'unpack - (lambda* (#:key #:allow-other-keys #:rest args) - (let ((unpack (assoc-ref %standard-phases 'unpack))) - (apply unpack args) - ;; The following patch-shebang phase will replace perl - ;; by the correct path. - (substitute* "tests/runtests.pl" - (("#!/usr/bin/env perl") "#!/usr/bin/perl")))) - %standard-phases))) + `(#:configure-flags '("--with-gnutls" "--with-gssapi"))) (synopsis "curl, command line tool for transferring data with URL syntax") (description "curl is a command line tool for transferring data with URL syntax, -- cgit v1.2.3 From b6f5801e1c74f26b2884a51e292876f28ff25393 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 24 Feb 2013 18:06:22 +0100 Subject: gnu: wget: Drop manual handling of /usr/bin/env. * gnu/packages/wget.scm (wget): Drop patch-/usr/bin/env phase. --- gnu/packages/wget.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index ea31a1e70d..1f2f53c97f 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -43,13 +43,6 @@ `(("gnutls" ,gnutls) ("perl" ,perl) ("gettext" ,guix:gettext))) - (arguments - '(#:phases - (alist-cons-before 'build 'patch-/usr/bin/env - (lambda _ - (for-each patch-shebang - '("doc/texi2pod.pl" "tests/run-px"))) - %standard-phases))) (home-page "http://www.gnu.org/software/wget/") (synopsis "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP") -- cgit v1.2.3 From 76978d406242c8680fa6b3c3ad122906445540f2 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 13 Feb 2013 00:41:05 +0100 Subject: gnu: Add signing-party. * gnu/packages/gnupg.scm (signing-party): New variable. --- gnu/packages/gnupg.scm | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 046d4c2d76..f26582fb22 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -227,3 +227,107 @@ pius-keyring-mgr and pius-party-worksheet help organisers of PGP keysigning parties.") (license gpl2) (home-page "http://www.phildev.net/pius/index.shtml"))) + +(define-public signing-party + (package + (name "signing-party") + (version "1.1.4") + (source (origin + (method url-fetch) + (uri (string-append "http://ftp.debian.org/debian/pool/main/s/signing-party/signing-party_" + version ".orig.tar.gz")) + (sha256 (base32 + "188gp0prbh8qs29lq3pbf0qibfd6jq4fk7i0pfrybl8aahvm84rx")))) + (build-system gnu-build-system) + (inputs `(("perl" ,perl))) + (arguments + `(#:tests? #f + #:phases + (alist-replace + 'unpack + (lambda* (#:key #:allow-other-keys #:rest args) + (let ((unpack (assoc-ref %standard-phases 'unpack))) + (apply unpack args) + ;; remove spurious symlink + (delete-file "keyanalyze/pgpring/depcomp"))) + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "keyanalyze/Makefile" + (("LDLIBS") (string-append "CC=" (which "gcc") "\nLDLIBS"))) + (substitute* "keyanalyze/Makefile" + (("./configure") (string-append "./configure --prefix=" out))) + (substitute* "keyanalyze/pgpring/configure" + (("/bin/sh") (which "bash"))) + (substitute* "gpgwrap/Makefile" + (("\\} clean") (string-append "} clean\ninstall:\n\tinstall -D bin/gpgwrap " + out "/bin/gpgwrap\n"))) + (substitute* '("gpgsigs/Makefile" "keyanalyze/Makefile" + "keylookup/Makefile" "sig2dot/Makefile" + "springgraph/Makefile") + (("/usr") out)))) + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((out (assoc-ref outputs "out")) + (install (assoc-ref %standard-phases 'install))) + (apply install args) + (for-each + (lambda (dir file) + (copy-file (string-append dir "/" file) + (string-append out "/bin/" file))) + '("caff" "caff" "caff" "gpgdir" "gpg-key2ps" + "gpglist" "gpg-mailkeys" "gpgparticipants") + '("caff" "pgp-clean" "pgp-fixkey" "gpgdir" "gpg-key2ps" + "gpglist" "gpg-mailkeys" "gpgparticipants")) + (for-each + (lambda (dir file) + (copy-file (string-append dir "/" file) + (string-append out "/share/man/man1/" file))) + '("caff" "caff" "caff" "gpgdir" + "gpg-key2ps" "gpglist" "gpg-mailkeys" + "gpgparticipants" "gpgsigs" "gpgwrap/doc" + "keyanalyze" "keyanalyze/pgpring" "keyanalyze") + '("caff.1" "pgp-clean.1" "pgp-fixkey.1" "gpgdir.1" + "gpg-key2ps.1" "gpglist.1" "gpg-mailkeys.1" + "gpgparticipants.1" "gpgsigs.1" "gpgwrap.1" + "process_keys.1" "pgpring.1" "keyanalyze.1")))) + %standard-phases))))) + (synopsis "collection of scripts for simplifying gnupg key signing") + (description + "signing-party is a collection for all kinds of PGP/GnuPG related things, +including tools for signing keys, keyring analysis, and party preparation. + + * caff: CA - Fire and Forget signs and mails a key + + * pgp-clean: removes all non-self signatures from key + + * pgp-fixkey: removes broken packets from keys + + * gpg-mailkeys: simply mail out a signed key to its owner + + * gpg-key2ps: generate PostScript file with fingerprint paper strips + + * gpgdir: recursive directory encryption tool + + * gpglist: show who signed which of your UIDs + + * gpgsigs: annotates list of GnuPG keys with already done signatures + + * gpgparticipants: create list of party participants for the organiser + + * gpgwrap: a passphrase wrapper + + * keyanalyze: minimum signing distance (MSD) analysis on keyrings + + * keylookup: ncurses wrapper around gpg --search + + * sig2dot: converts a list of GnuPG signatures to a .dot file + + * springgraph: creates a graph from a .dot file") + ;; gpl2+ for almost all programs, except for keyanalyze: gpl2 + ;; and caff and gpgsigs: bsd-3, see + ;; http://packages.debian.org/changelogs/pool/main/s/signing-party/current/copyright + (license gpl2) + (home-page "http://pgp-tools.alioth.debian.org/"))) -- cgit v1.2.3 From 922f11ad226810f64e663790fc5b366939c8b546 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 13 Feb 2013 02:18:46 +0000 Subject: gnu: Add GNU Wdiff. * gnu/packages/wdiff.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/wdiff.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 gnu/packages/wdiff.scm (limited to 'gnu') diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm new file mode 100644 index 0000000000..02d536c7de --- /dev/null +++ b/gnu/packages/wdiff.scm @@ -0,0 +1,61 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Nikita Karetnikov +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages wdiff) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages screen) + #:use-module (gnu packages which)) + +(define-public wdiff + (package + (name "wdiff") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/wdiff/wdiff-" + version ".tar.gz")) + (sha256 + (base32 + "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j")))) + (build-system gnu-build-system) + (arguments + `(#:phases (alist-cons-before + 'check 'fix-sh + (lambda _ + (substitute* "tests/testsuite" + (("#! /bin/sh") + (string-append "#!" (which "sh"))))) + %standard-phases))) + (inputs `(("screen" ,screen) + ("which" ,which))) + (home-page "https://www.gnu.org/software/wdiff/") + (synopsis + "GNU Wdiff, a tool for comparing files on a word by word basis") + (description + "GNU Wdiff is a front end to 'diff' for comparing files on a word per +word basis. A word is anything between whitespace. This is useful for +comparing two texts in which a few words have been changed and for which +paragraphs have been refilled. It works by creating two temporary files, one +word per line, and then executes 'diff' on these files. It collects the +'diff' output and uses it to produce a nicer display of word differences +between the original files.") + (license gpl3+))) \ No newline at end of file -- cgit v1.2.3 From ab744c1af5668b1fa1b0688614aa9c12813f4921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Feb 2013 16:09:29 +0100 Subject: gnu: Add missing patch for mcron. * gnu/packages/patches/mcron-install.patch: New file. * Makefile.am (dist_patch_DATA): Add it. --- gnu/packages/patches/mcron-install.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 gnu/packages/patches/mcron-install.patch (limited to 'gnu') diff --git a/gnu/packages/patches/mcron-install.patch b/gnu/packages/patches/mcron-install.patch new file mode 100644 index 0000000000..3cd291f576 --- /dev/null +++ b/gnu/packages/patches/mcron-install.patch @@ -0,0 +1,22 @@ +This patch allows us to install the Vixie-compatible binaries as +non-root without creating /var/run, etc. + +--- mcron-1.0.6/makefile.in 2010-06-19 20:44:17.000000000 +0200 ++++ mcron-1.0.6/makefile.in 2010-07-04 16:16:25.000000000 +0200 +@@ -1004,15 +1004,11 @@ mcron.c : main.scm crontab.scm makefile. + @rm -f mcron.escaped.scm > /dev/null 2>&1 + + install-exec-hook: +- @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" -a "`id -u`" -eq "0" ]; then \ ++ @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \ + rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \ + $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \ + rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \ + $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \ +- $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \ +- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \ +- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \ +- $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \ + elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \ + echo "Not installing Vixie-style programs"; \ + else \ -- cgit v1.2.3 From ddff766e38e446ae84bd099f4473406706ba2d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 13 Feb 2013 21:42:34 +0100 Subject: gnu: guile-static: Use libgc build with `USE_LIBC_PRIVATES'. * gnu/packages/make-bootstrap.scm (%guile-static): Use libgc build with CPPFLAGS=-DUSE_LIBC_PRIVATES. * gnu/packages/bdw-gc.scm (libgc): Add TODO to always do it. --- gnu/packages/bdw-gc.scm | 1 + gnu/packages/make-bootstrap.scm | 87 +++++++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 98526512f8..c338eab871 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -35,6 +35,7 @@ (base32 "05jwadjbrv8pr7z9cb4miskicxqpxm0pca4h2rg5cgbpajr2bx7b")))) (build-system gnu-build-system) + ;; TODO: Build with -DUSE_LIBC_PRIVATES (see make-bootstrap.scm). (synopsis "The Boehm-Demers-Weiser conservative garbage collector for C and C++") (description diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 8275344b6c..9e9ba939da 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gawk) #:use-module (gnu packages guile) + #:use-module (gnu packages bdw-gc) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) #:use-module (ice-9 match) @@ -399,44 +400,54 @@ ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather ;; than in hard-coded configure-time paths. - (let ((guile (package (inherit guile-2.0) - (inputs - `(("patch/relocatable" - ,(search-patch "guile-relocatable.patch")) - ("patch/utf8" - ,(search-patch "guile-default-utf8.patch")) - ,@(package-inputs guile-2.0))) - (arguments - `(;; When `configure' checks for ltdl availability, it - ;; doesn't try to link using libtool, and thus fails - ;; because of a missing -ldl. Work around that. - #:configure-flags '("LDFLAGS=-ldl") - - #:phases (alist-cons-before - 'configure 'static-guile - (lambda _ - (substitute* "libguile/Makefile.in" - ;; Create a statically-linked `guile' - ;; executable. - (("^guile_LDFLAGS =") - "guile_LDFLAGS = -all-static") - - ;; Add `-ldl' *after* libguile-2.0.la. - (("^guile_LDADD =(.*)$" _ ldadd) - (string-append "guile_LDADD = " - (string-trim-right ldadd) - " -ldl\n")))) - %standard-phases) - - ;; Allow Guile to be relocated, as is needed during - ;; bootstrap. - #:patches - (list (assoc-ref %build-inputs "patch/relocatable") - (assoc-ref %build-inputs "patch/utf8")) - - ;; There are uses of `dynamic-link' in - ;; {foreign,coverage}.test that don't fly here. - #:tests? #f))))) + (let* ((libgc (package (inherit libgc) + (arguments + ;; Make it so that we don't rely on /proc. This is + ;; especially useful in an initrd run before /proc is + ;; mounted. + '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES"))))) + (guile (package (inherit guile-2.0) + (inputs + `(("patch/relocatable" + ,(search-patch "guile-relocatable.patch")) + ("patch/utf8" + ,(search-patch "guile-default-utf8.patch")) + ,@(package-inputs guile-2.0))) + (propagated-inputs + `(("bdw-gc" ,libgc) + ,@(alist-delete "bdw-gc" + (package-propagated-inputs guile-2.0)))) + (arguments + `(;; When `configure' checks for ltdl availability, it + ;; doesn't try to link using libtool, and thus fails + ;; because of a missing -ldl. Work around that. + #:configure-flags '("LDFLAGS=-ldl") + + #:phases (alist-cons-before + 'configure 'static-guile + (lambda _ + (substitute* "libguile/Makefile.in" + ;; Create a statically-linked `guile' + ;; executable. + (("^guile_LDFLAGS =") + "guile_LDFLAGS = -all-static") + + ;; Add `-ldl' *after* libguile-2.0.la. + (("^guile_LDADD =(.*)$" _ ldadd) + (string-append "guile_LDADD = " + (string-trim-right ldadd) + " -ldl\n")))) + %standard-phases) + + ;; Allow Guile to be relocated, as is needed during + ;; bootstrap. + #:patches + (list (assoc-ref %build-inputs "patch/relocatable") + (assoc-ref %build-inputs "patch/utf8")) + + ;; There are uses of `dynamic-link' in + ;; {foreign,coverage}.test that don't fly here. + #:tests? #f))))) (package-with-explicit-inputs (static-package guile) %standard-inputs-with-relocatable-glibc (current-source-location)))) -- cgit v1.2.3 From 9ede36f0ed2ea3c2a6a020b52e51b741b07cbc1f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Feb 2013 20:29:30 -0500 Subject: Inhibit duplicates in fold-packages. * gnu/packages.scm (fold2): New procedure. (fold-packages): Rework to suppress duplicates. --- gnu/packages.scm | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages.scm b/gnu/packages.scm index 792fe44efa..f2f98de476 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2013 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 ftw) + #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-39) @@ -106,20 +108,34 @@ (false-if-exception (resolve-interface name)))) (package-files))) +(define (fold2 f seed1 seed2 lst) + (if (null? lst) + (values seed1 seed2) + (call-with-values + (lambda () (f (car lst) seed1 seed2)) + (lambda (seed1 seed2) + (fold2 f seed1 seed2 (cdr lst)))))) + (define (fold-packages proc init) "Call (PROC PACKAGE RESULT) for each available package, using INIT as -the initial value of RESULT." - (fold (lambda (module result) - (fold (lambda (var result) - (if (package? var) - (proc var result) - result)) - result - (module-map (lambda (sym var) - (false-if-exception (variable-ref var))) - module))) - init - (package-modules))) +the initial value of RESULT. It is guaranteed to never traverse the +same package twice." + (identity ; discard second return value + (fold2 (lambda (module result seen) + (fold2 (lambda (var result seen) + (if (and (package? var) + (not (vhash-assq var seen))) + (values (proc var result) + (vhash-consq var #t seen)) + (values result seen))) + result + seen + (module-map (lambda (sym var) + (false-if-exception (variable-ref var))) + module))) + init + vlist-null + (package-modules)))) (define* (find-packages-by-name name #:optional version) "Return the list of packages with the given NAME. If VERSION is not #f, -- cgit v1.2.3 From 854d62777938eaf5552d8e90a3848e3a8fdbbbbd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 12 Feb 2013 01:24:21 -0500 Subject: Build newest versions unless specified, and implement upgrades. * gnu/packages.scm (find-newest-available-packages): New exported procedure. * guix-build.in (newest-available-packages, find-best-packages-by-name): New procedures. (find-package): Use find-best-packages-by-name, to guarantee that if a version number is not specified, only the newest versions will be considered. * guix-package.in (%options): Add --upgrade/-u option. (newest-available-packages, find-best-packages-by-name, upgradeable?): New procedures. (find-package): Use find-best-packages-by-name, to guarantee that if a version number is not specified, only the newest versions will be considered. (process-actions): Implement upgrade option. * doc/guix.texi (Invoking guix-package): In the description of --install, mention that if no version number is specified, the newest available version will be selected. --- gnu/packages.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages.scm b/gnu/packages.scm index f2f98de476..b639541788 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -22,6 +22,7 @@ #:use-module (guix utils) #:use-module (ice-9 ftw) #:use-module (ice-9 vlist) + #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-39) @@ -30,7 +31,8 @@ %patch-directory %bootstrap-binaries-path fold-packages - find-packages-by-name)) + find-packages-by-name + find-newest-available-packages)) ;;; Commentary: ;;; @@ -153,3 +155,25 @@ then only return packages whose version is equal to VERSION." (cons package result) result)) '())) + +(define (find-newest-available-packages) + "Return a vhash keyed by package names, and with +associated values of the form + + (newest-version newest-package ...) + +where the preferred package is listed first." + + ;; FIXME: Currently, the preferred package is whichever one + ;; was found last by 'fold-packages'. Find a better solution. + (fold-packages (lambda (p r) + (let ((name (package-name p)) + (version (package-version p))) + (match (vhash-assoc name r) + ((_ newest-so-far . pkgs) + (case (version-compare version newest-so-far) + ((>) (vhash-cons name `(,version ,p) r)) + ((=) (vhash-cons name `(,version ,p ,@pkgs) r)) + ((<) r))) + (#f (vhash-cons name `(,version ,p) r))))) + vlist-null)) -- cgit v1.2.3 From f9c36483294f0e2eba9d0cde312023546aba9069 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Wed, 13 Feb 2013 23:20:11 +0100 Subject: gnu: Add vim. * gnu/packages/vim.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/vim.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 gnu/packages/vim.scm (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm new file mode 100644 index 0000000000..a80f50a4a6 --- /dev/null +++ b/gnu/packages/vim.scm @@ -0,0 +1,74 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Cyril Roelandt +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages vim) + #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages gawk) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) + #:use-module (gnu packages system) ; For GNU hostname + #:use-module (gnu packages tcsh)) + +(define-public vim + (package + (name "vim") + (version "7.3") + (source (origin + (method url-fetch) + (uri (string-append "ftp://ftp.vim.org/pub/vim/unix/vim-" + version ".tar.bz2")) + (sha256 + (base32 + "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:parallel-tests? #f + #:phases + (alist-replace + 'configure + (lambda* (#:key #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure))) + (apply configure args) + (substitute* "runtime/tools/mve.awk" + (("/usr/bin/nawk") (which "gawk"))) + (substitute* "src/testdir/Makefile" + (("/bin/sh") (which "sh"))))) + %standard-phases))) + (inputs + `(("gawk", gawk) + ("inetutils", inetutils) + ("ncurses", ncurses) + ("perl", perl) + ("tcsh" ,tcsh))) ; For runtime/tools/vim32 + (home-page "http://www.vim.org/") + (synopsis "VIM 7.3, a text editor based on vi.") + (description + "Vim is a highly configurable text editor built to enable efficient text +editing. It is an improved version of the vi editor distributed with most UNIX +systems. + +Vim is often called a \"programmer's editor,\" and so useful for programming +that many consider it an entire IDE. It's not just for programmers, though. Vim +is perfect for all kinds of text editing, from composing email to editing +configuration files. ") + (license license:vim))) -- cgit v1.2.3 From 2e48455d276501a27ddc6dada07407ce03256312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Feb 2013 00:26:52 +0100 Subject: gnu: linux-libre: Choose a config without debugging features. * gnu/packages/linux.scm (linux-libre): Choose "defconfig" instead of "allmodconfig" since the latter enables all debugging features. Add `CONFIG_CIFS=m'. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f3e7d18627..b97315580b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -133,7 +133,13 @@ (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))) (let ((build (assoc-ref %standard-phases 'build))) - (and (zero? (system* "make" "allmodconfig")) + (and (zero? (system* "make" "defconfig")) + (begin + (format #t "enabling additional modules...~%") + (substitute* ".config" + (("^# CONFIG_CIFS.*$") + "CONFIG_CIFS=m\n")) + (zero? (system* "make" "oldconfig"))) ;; Call the default `build' phase so `-j' is correctly ;; passed. -- cgit v1.2.3 From e70a28b87e7280ac3d73a7cd5d9c3240e31e19e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Feb 2013 00:29:28 +0100 Subject: gnu: guile-static: Add bindings for low-level Linux syscalls. * gnu/packages/make-bootstrap.scm (%guile-static): Add `guile-linux-syscalls.patch' as an input, and use it. * gnu/packages/patches/guile-linux-syscalls.patch: New file. * Makefile.am (dist_patch_DATA): Add it. --- gnu/packages/make-bootstrap.scm | 5 +- gnu/packages/patches/guile-linux-syscalls.patch | 234 ++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/guile-linux-syscalls.patch (limited to 'gnu') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 9e9ba939da..218f5a8e25 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -412,6 +412,8 @@ ,(search-patch "guile-relocatable.patch")) ("patch/utf8" ,(search-patch "guile-default-utf8.patch")) + ("patch/syscalls" + ,(search-patch "guile-linux-syscalls.patch")) ,@(package-inputs guile-2.0))) (propagated-inputs `(("bdw-gc" ,libgc) @@ -443,7 +445,8 @@ ;; bootstrap. #:patches (list (assoc-ref %build-inputs "patch/relocatable") - (assoc-ref %build-inputs "patch/utf8")) + (assoc-ref %build-inputs "patch/utf8") + (assoc-ref %build-inputs "patch/syscalls")) ;; There are uses of `dynamic-link' in ;; {foreign,coverage}.test that don't fly here. diff --git a/gnu/packages/patches/guile-linux-syscalls.patch b/gnu/packages/patches/guile-linux-syscalls.patch new file mode 100644 index 0000000000..c0cb0f6d70 --- /dev/null +++ b/gnu/packages/patches/guile-linux-syscalls.patch @@ -0,0 +1,234 @@ +This patch adds bindings to Linux syscalls for which glibc has symbols. + +diff --git a/libguile/posix.c b/libguile/posix.c +index 324f21b..ace5211 100644 +--- a/libguile/posix.c ++++ b/libguile/posix.c +@@ -2286,6 +2286,227 @@ scm_init_popen (void) + } + #endif + ++ ++/* Linux! */ ++ ++#include ++#include "libguile/foreign.h" ++#include "libguile/bytevectors.h" ++ ++SCM_DEFINE (scm_mount, "mount", 3, 2, 0, ++ (SCM source, SCM target, SCM type, SCM flags, SCM data), ++ "Mount file system of @var{type} specified by @var{source} " ++ "on @var{target}.") ++#define FUNC_NAME s_scm_mount ++{ ++ int err; ++ char *c_source, *c_target, *c_type; ++ unsigned long c_flags; ++ void *c_data; ++ ++ c_source = scm_to_locale_string (source); ++ c_target = scm_to_locale_string (target); ++ c_type = scm_to_locale_string (type); ++ c_flags = SCM_UNBNDP (flags) ? 0 : scm_to_ulong (flags); ++ c_data = SCM_UNBNDP (data) ? NULL : scm_to_pointer (data); ++ ++ err = mount (c_source, c_target, c_type, c_flags, c_data); ++ if (err != 0) ++ err = errno; ++ ++ free (c_source); ++ free (c_target); ++ free (c_type); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++/* Linux's module installation syscall. See `kernel/module.c' in Linux; ++ the function itself is part of the GNU libc. ++ ++ Load the LEN bytes at MODULE as a kernel module, with arguments from ++ ARGS, a space-separated list of options. */ ++extern long init_module (void *module, unsigned long len, const char *args); ++ ++SCM_DEFINE (scm_load_linux_module, "load-linux-module", 1, 1, 0, ++ (SCM data, SCM options), ++ "Load the Linux kernel module whose contents are in bytevector " ++ "DATA (the contents of a @code{.ko} file), with the arguments " ++ "from the OPTIONS string.") ++#define FUNC_NAME s_scm_load_linux_module ++{ ++ long err; ++ void *c_data; ++ unsigned long c_len; ++ char *c_options; ++ ++ SCM_VALIDATE_BYTEVECTOR (SCM_ARG1, data); ++ ++ c_data = SCM_BYTEVECTOR_CONTENTS (data); ++ c_len = SCM_BYTEVECTOR_LENGTH (data); ++ c_options = ++ scm_to_locale_string (SCM_UNBNDP (options) ? scm_nullstr : options); ++ ++ err = init_module (c_data, c_len, c_options); ++ ++ free (c_options); ++ ++ if (err != 0) ++ { ++ /* XXX: `insmod' actually provides better translation of some of ++ the error codes. */ ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++/* Linux network interfaces. See . */ ++ ++#include ++#include ++#include "libguile/socket.h" ++ ++SCM_VARIABLE_INIT (flag_IFF_UP, "IFF_UP", ++ scm_from_int (IFF_UP)); ++SCM_VARIABLE_INIT (flag_IFF_BROADCAST, "IFF_BROADCAST", ++ scm_from_int (IFF_BROADCAST)); ++SCM_VARIABLE_INIT (flag_IFF_DEBUG, "IFF_DEBUG", ++ scm_from_int (IFF_DEBUG)); ++SCM_VARIABLE_INIT (flag_IFF_LOOPBACK, "IFF_LOOPBACK", ++ scm_from_int (IFF_LOOPBACK)); ++SCM_VARIABLE_INIT (flag_IFF_POINTOPOINT, "IFF_POINTOPOINT", ++ scm_from_int (IFF_POINTOPOINT)); ++SCM_VARIABLE_INIT (flag_IFF_NOTRAILERS, "IFF_NOTRAILERS", ++ scm_from_int (IFF_NOTRAILERS)); ++SCM_VARIABLE_INIT (flag_IFF_RUNNING, "IFF_RUNNING", ++ scm_from_int (IFF_RUNNING)); ++SCM_VARIABLE_INIT (flag_IFF_NOARP, "IFF_NOARP", ++ scm_from_int (IFF_NOARP)); ++SCM_VARIABLE_INIT (flag_IFF_PROMISC, "IFF_PROMISC", ++ scm_from_int (IFF_PROMISC)); ++SCM_VARIABLE_INIT (flag_IFF_ALLMULTI, "IFF_ALLMULTI", ++ scm_from_int (IFF_ALLMULTI)); ++ ++SCM_DEFINE (scm_set_network_interface_address, "set-network-interface-address", ++ 3, 0, 0, ++ (SCM socket, SCM name, SCM address), ++ "Configure network interface @var{name}.") ++#define FUNC_NAME s_scm_set_network_interface_address ++{ ++ char *c_name; ++ struct ifreq ifr; ++ struct sockaddr *c_address; ++ size_t sa_len; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ c_address = scm_to_sockaddr (address, &sa_len); ++ ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ memcpy (&ifr.ifr_addr, c_address, sa_len); ++ ++ err = ioctl (fd, SIOCSIFADDR, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ free (c_address); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_set_network_interface_flags, "set-network-interface-flags", ++ 3, 0, 0, ++ (SCM socket, SCM name, SCM flags), ++ "Change the flags of network interface @var{name} to " ++ "@var{flags}.") ++#define FUNC_NAME s_scm_set_network_interface_flags ++{ ++ struct ifreq ifr; ++ char *c_name; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ ifr.ifr_flags = scm_to_short (flags); ++ ++ err = ioctl (fd, SIOCSIFFLAGS, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_network_interface_flags, "network-interface-flags", ++ 2, 0, 0, ++ (SCM socket, SCM name), ++ "Return the flags of network interface @var{name}.") ++#define FUNC_NAME s_scm_network_interface_flags ++{ ++ struct ifreq ifr; ++ char *c_name; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ ++ err = ioctl (fd, SIOCGIFFLAGS, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return scm_from_short (ifr.ifr_flags); ++} ++#undef FUNC_NAME ++ + void + scm_init_posix () + { -- cgit v1.2.3 From 52e6e2461f266feee99b6fb02dfd700fba589f77 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Fri, 15 Feb 2013 10:46:29 +0000 Subject: gnu: Add GNU Parted. * gnu/packages/parted.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/parted.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 gnu/packages/parted.scm (limited to 'gnu') diff --git a/gnu/packages/parted.scm b/gnu/packages/parted.scm new file mode 100644 index 0000000000..b99c52e457 --- /dev/null +++ b/gnu/packages/parted.scm @@ -0,0 +1,71 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Nikita Karetnikov +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages parted) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages check) + #:use-module ((gnu packages gettext) + #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages linux) + #:use-module (gnu packages readline)) + +(define-public parted + (package + (name "parted") + (version "3.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/parted/parted-" + version ".tar.xz")) + (sha256 + (base32 + "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y")))) + (build-system gnu-build-system) + (arguments `(#:configure-flags '("--disable-device-mapper") + #:phases (alist-cons-before + 'configure 'fix-mkswap + (lambda* (#:key inputs #:allow-other-keys) + (let ((util-linux (assoc-ref inputs + "util-linux"))) + (substitute* + "tests/t9050-partition-table-types.sh" + (("mkswap") + (string-append util-linux "/sbin/mkswap"))))) + %standard-phases))) + (inputs + ;; XXX: add 'lvm2'. + `(("check" ,check) + ("gettext" ,guix:gettext) + ("readline" ,readline) + ("util-linux" ,util-linux))) + (home-page "http://www.gnu.org/software/parted/") + (synopsis + "GNU Parted, a tool to manipulate partitions") + (description + "GNU Parted is an industrial-strength package for creating, destroying, +resizing, checking and copying partitions, and the file systems on them. This +is useful for creating space for new operating systems, reorganising disk +usage, copying data on hard disks and disk imaging. + +It contains a library, libparted, and a command-line frontend, parted, which +also serves as a sample implementation and script backend.") + (license gpl3+))) \ No newline at end of file -- cgit v1.2.3 From b7e9ee3327be03f5bc529cfb90b31da1b5586d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Feb 2013 22:04:51 +0100 Subject: gnu: samba: Augment the RUNPATH of executables to point to $out/lib. * gnu/packages/samba.scm (samba): Add `add-lib-to-runpath' phase, and PatchELF as an input. --- gnu/packages/samba.scm | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index d414c285f8..93c9f70a50 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) + #:use-module (gnu packages patchelf) #:use-module (gnu packages perl) #:use-module (gnu packages python)) @@ -103,10 +104,45 @@ anywhere.") "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before 'configure 'chdir - (lambda _ - (chdir "source3")) - %standard-phases) + '(#:phases (alist-cons-before + 'configure 'chdir + (lambda _ + (chdir "source3")) + (alist-cons-after + 'strip 'add-lib-to-runpath + (lambda* (#:key outputs #:allow-other-keys) + (define (file-rpath file) + ;; Return the RPATH of FILE. + (let* ((p (open-pipe* OPEN_READ "patchelf" + "--print-rpath" file)) + (l (read-line p))) + (and (zero? (close-pipe p)) l))) + + (define (augment-rpath file dir) + ;; Add DIR to the RPATH of FILE. + (let* ((rpath (file-rpath file)) + (rpath* (if rpath + (string-append dir ":" rpath) + dir))) + (format #t "~a: changing RPATH from `~a' to `~a'~%" + file (or rpath "") rpath*) + (zero? (system* "patchelf" "--set-rpath" + rpath* file)))) + + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + ;; Add LIB to the RUNPATH of all the executables. + (with-directory-excursion out + (for-each (cut augment-rpath <> lib) + (append (find-files "bin" ".*") + (find-files "sbin" ".*")))))) + %standard-phases)) + + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-26)) ;; This flag is required to allow for "make test". #:configure-flags '("--enable-socket-wrapper") @@ -126,7 +162,8 @@ anywhere.") ("popt" ,popt) ("openldap" ,openldap) ("linux-pam" ,linux-pam) - ("readline" ,readline))) + ("readline" ,readline) + ("patchelf" ,patchelf))) (native-inputs ; for the test suite `(("perl" ,perl) ("python" ,python))) -- cgit v1.2.3 From e7d2c60809827182e9f716ab5de2e5ad77d7c252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Feb 2013 22:36:05 +0100 Subject: gnu: qemu: Add dependency on Samba. * gnu/packages/qemu.scm (qemu-kvm): Add dependency on Samba; pass `--smbd' to ./configure. --- gnu/packages/qemu.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index e6859aadf0..785d470079 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages libjpeg) #:use-module (gnu packages attr) #:use-module (gnu packages linux) + #:use-module (gnu packages samba) #:use-module (gnu packages perl)) (define-public qemu-kvm @@ -52,14 +53,17 @@ (lambda* (#:key inputs outputs #:allow-other-keys) ;; The `configure' script doesn't understand some of the ;; GNU options. Thus, add a new phase that's compatible. - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out")) + (samba (assoc-ref inputs "samba"))) (setenv "SHELL" (which "bash")) ;; The binaries need to be linked against -lrt. (setenv "LDFLAGS" "-lrt") (zero? (system* "./configure" - (string-append "--prefix=" out))))) + (string-append "--prefix=" out) + (string-append "--smbd=" samba + "/sbin/smbd"))))) %standard-phases))) (inputs ; TODO: Add optional inputs. `(;; ("mesa" ,mesa) @@ -76,7 +80,8 @@ ;; ("alsa-lib" ,alsa-lib) ;; ("SDL" ,SDL) ("zlib" ,zlib) - ("attr" ,attr))) + ("attr" ,attr) + ("samba" ,samba))) ; an optional dependency (home-page "http://www.linux-kvm.org/") (synopsis "Virtualization for Linux on x86 hardware containing virtualization extensions") -- cgit v1.2.3 From 9322c6822f3c285212a07f38562c3d6425464e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Feb 2013 00:29:43 +0100 Subject: gnu: guile-static: Add bindings for `reboot'. * gnu/packages/patches/guile-linux-syscalls.patch: Add `scm_reboot'. --- gnu/packages/patches/guile-linux-syscalls.patch | 46 +++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/guile-linux-syscalls.patch b/gnu/packages/patches/guile-linux-syscalls.patch index c0cb0f6d70..1fb24bde27 100644 --- a/gnu/packages/patches/guile-linux-syscalls.patch +++ b/gnu/packages/patches/guile-linux-syscalls.patch @@ -1,10 +1,13 @@ This patch adds bindings to Linux syscalls for which glibc has symbols. +Using the FFI would have been nice, but that's not an option when using +a statically-linked Guile in an initrd that doesn't have libc.so around. + diff --git a/libguile/posix.c b/libguile/posix.c -index 324f21b..ace5211 100644 +index 324f21b..cbee94d 100644 --- a/libguile/posix.c +++ b/libguile/posix.c -@@ -2286,6 +2286,227 @@ scm_init_popen (void) +@@ -2286,6 +2286,266 @@ scm_init_popen (void) } #endif @@ -92,6 +95,45 @@ index 324f21b..ace5211 100644 +} +#undef FUNC_NAME + ++/* Rebooting, halting, and all that. */ ++ ++#include ++ ++SCM_VARIABLE_INIT (flag_RB_AUTOBOOT, "RB_AUTOBOOT", ++ scm_from_int (RB_AUTOBOOT)); ++SCM_VARIABLE_INIT (flag_RB_HALT_SYSTEM, "RB_HALT_SYSTEM", ++ scm_from_int (RB_HALT_SYSTEM)); ++SCM_VARIABLE_INIT (flag_RB_ENABLE_CAD, "RB_ENABLE_CAD", ++ scm_from_int (RB_ENABLE_CAD)); ++SCM_VARIABLE_INIT (flag_RB_DISABLE_CAD, "RB_DISABLE_CAD", ++ scm_from_int (RB_DISABLE_CAD)); ++SCM_VARIABLE_INIT (flag_RB_POWER_OFF, "RB_POWER_OFF", ++ scm_from_int (RB_POWER_OFF)); ++SCM_VARIABLE_INIT (flag_RB_SW_SUSPEND, "RB_SW_SUSPEND", ++ scm_from_int (RB_SW_SUSPEND)); ++SCM_VARIABLE_INIT (flag_RB_KEXEC, "RB_KEXEC", ++ scm_from_int (RB_KEXEC)); ++ ++SCM_DEFINE (scm_reboot, "reboot", 0, 1, 0, ++ (SCM command), ++ "Reboot the system. @var{command} must be one of the @code{RB_} " ++ "constants; if omitted, @var{RB_AUTOBOOT} is used, thus " ++ "performing a hard reset.") ++#define FUNC_NAME s_scm_reboot ++{ ++ int c_command; ++ ++ if (SCM_UNBNDP (command)) ++ c_command = RB_AUTOBOOT; ++ else ++ c_command = scm_to_int (command); ++ ++ reboot (c_command); ++ ++ return SCM_UNSPECIFIED; /* likely unreached */ ++} ++#undef FUNC_NAME ++ +/* Linux network interfaces. See . */ + +#include -- cgit v1.2.3 From 99d90fc102f4fbcc63b106f817b023687926a9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Feb 2013 00:30:25 +0100 Subject: gnu: guile-static: Change `name' field. * gnu/packages/make-bootstrap.scm (%guile-static): Add `name' field with `-static' suffix. --- gnu/packages/make-bootstrap.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 218f5a8e25..3bb926bd36 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -407,6 +407,7 @@ ;; mounted. '(#:configure-flags '("CPPFLAGS=-DUSE_LIBC_PRIVATES"))))) (guile (package (inherit guile-2.0) + (name (string-append (package-name guile-2.0) "-static")) (inputs `(("patch/relocatable" ,(search-patch "guile-relocatable.patch")) -- cgit v1.2.3 From 106ca9d0c160137ac41466b6d7cf18eee4f4583e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Feb 2013 02:09:10 +0100 Subject: gnu: qemu-kvm: Add patch to have multiple SMB shares. * gnu/packages/qemu.scm (qemu-kvm/smb-shares): New variable. * gnu/packages/patches/qemu-multiple-smb-shares.patch: New file. * Makefile.am (dist_patch_DATA): Add it. --- gnu/packages/patches/qemu-multiple-smb-shares.patch | 20 ++++++++++++++++++++ gnu/packages/qemu.scm | 13 +++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 gnu/packages/patches/qemu-multiple-smb-shares.patch (limited to 'gnu') diff --git a/gnu/packages/patches/qemu-multiple-smb-shares.patch b/gnu/packages/patches/qemu-multiple-smb-shares.patch new file mode 100644 index 0000000000..c20066cbfe --- /dev/null +++ b/gnu/packages/patches/qemu-multiple-smb-shares.patch @@ -0,0 +1,20 @@ +This file extends `-smb' to add a share for the Nix store, and changes +the name of the default share. + +--- a/net/slirp.c ++++ b/net/slirp.c +@@ -515,8 +515,12 @@ static int slirp_smb(SlirpState* s, const char *exported_dir, + "log file=%s/log.smbd\n" + "smb passwd file=%s/smbpasswd\n" + "security = share\n" +- "[qemu]\n" +- "path=%s\n" ++ "[store]\n" ++ "path=/nix/store\n" ++ "read only=yes\n" ++ "guest ok=yes\n" ++ "[xchg]\n" ++ "path=%s/xchg\n" + "read only=no\n" + "guest ok=yes\n", + s->smb_dir, diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 785d470079..b10935ce0d 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -22,6 +22,7 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:select (gpl2)) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -96,6 +97,18 @@ underway to get the required changes upstream.") ;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'. (license gpl2))) +(define-public qemu-kvm/smb-shares + ;; A patched QEMU-KVM where `-net smb' yields two shares instead of one: one + ;; for the store, and another one for exchanges with the host. + (package (inherit qemu-kvm) + (name "qemu-kvm-with-multiple-smb-shares") + (inputs `(,@(package-inputs qemu-kvm) + ("patch/smb-shares" + ,(search-patch "qemu-multiple-smb-shares.patch")))) + (arguments + `(#:patches (list (assoc-ref %build-inputs "patch/smb-shares")) + ,@(package-arguments qemu-kvm))))) + (define-public qemu ;; The real one, with a complete target list. (package (inherit qemu-kvm) -- cgit v1.2.3 From 3855e242a24025cc6f83731e7cf5d2ea73aeb23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Feb 2013 03:25:59 +0100 Subject: gnu: Add support for Guile in Linux initrd. * gnu/packages/linux-initrd.scm: New file. --- gnu/packages/linux-initrd.scm | 288 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) create mode 100644 gnu/packages/linux-initrd.scm (limited to 'gnu') diff --git a/gnu/packages/linux-initrd.scm b/gnu/packages/linux-initrd.scm new file mode 100644 index 0000000000..348e411d07 --- /dev/null +++ b/gnu/packages/linux-initrd.scm @@ -0,0 +1,288 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages linux-initrd) + #:use-module (guix utils) + #:use-module (guix licenses) + #:use-module (gnu packages) + #:use-module (gnu packages cpio) + #:use-module (gnu packages compression) + #:use-module (gnu packages linux) + #:use-module ((gnu packages make-bootstrap) + #:select (%guile-static-stripped)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system trivial)) + + +;;; Commentary: +;;; +;;; Tools to build initial RAM disks (initrd's) for Linux-Libre, and in +;;; particular initrd's that run Guile. +;;; +;;; Code: + + +(define* (expression->initrd exp + #:key + (guile %guile-static-stripped) + (cpio cpio) + (gzip gzip) + (name "guile-initrd") + (system (%current-system)) + (linux #f) + (linux-modules '())) + "Return a package that contains a Linux initrd (a gzipped cpio archive) +containing GUILE and that evaluates EXP upon booting. LINUX-MODULES is a list +of `.ko' file names to be copied from LINUX into the initrd." + ;; TODO: Add a `modules' parameter. + + ;; General Linux overview in `Documentation/early-userspace/README' and + ;; `Documentation/filesystems/ramfs-rootfs-initramfs.txt'. + + (define builder + `(begin + (use-modules (guix build utils) + (ice-9 pretty-print) + (ice-9 popen) + (ice-9 match) + (ice-9 ftw) + (srfi srfi-26) + (system base compile) + (rnrs bytevectors) + ((system foreign) #:select (sizeof))) + + (let ((guile (assoc-ref %build-inputs "guile")) + (cpio (string-append (assoc-ref %build-inputs "cpio") + "/bin/cpio")) + (gzip (string-append (assoc-ref %build-inputs "gzip") + "/bin/gzip")) + (out (assoc-ref %outputs "out"))) + (mkdir out) + (mkdir "contents") + (with-directory-excursion "contents" + (copy-recursively guile ".") + (call-with-output-file "init" + (lambda (p) + (format p "#!/bin/guile -ds~%!#~%" guile) + (pretty-print ',exp p))) + (chmod "init" #o555) + (chmod "bin/guile" #o555) + + ;; Compile `init'. + (let ((go-dir (format #f ".cache/guile/ccache/~a-~a-~a-~a" + (effective-version) + (if (eq? (native-endianness) (endianness little)) + "LE" + "BE") + (sizeof '*) + (effective-version)))) + (mkdir-p go-dir) + (compile-file "init" + #:opts %auto-compilation-options + #:output-file (string-append go-dir "/init.go"))) + + (let* ((linux (assoc-ref %build-inputs "linux")) + (module-dir (and linux + (string-append linux "/lib/modules")))) + (mkdir "modules") + ,@(map (lambda (module) + `(match (find-files module-dir ,module) + ((file) + (format #t "copying '~a'...~%" file) + (copy-file file (string-append "modules/" + ,module))) + (() + (error "module not found" ,module module-dir)) + ((_ ...) + (error "several modules by that name" + ,module module-dir)))) + linux-modules)) + + ;; Reset the timestamps of all the files that will make it in the + ;; initrd. + (for-each (cut utime <> 0 0 0 0) + (find-files "." ".*")) + + (system* cpio "--version") + (let ((pipe (open-pipe* OPEN_WRITE cpio "-o" + "-O" (string-append out "/initrd") + "-H" "newc" "--null"))) + (define print0 + (let ((len (string-length "./"))) + (lambda (file) + (format pipe "~a\0" (string-drop file len))))) + + ;; Note: as per `ramfs-rootfs-initramfs.txt', always add + ;; directory entries before the files that are inside of it: "The + ;; Linux kernel cpio extractor won't create files in a directory + ;; that doesn't exist, so the directory entries must go before + ;; the files that go in those directories." + (file-system-fold (const #t) + (lambda (file stat result) ; leaf + (print0 file)) + (lambda (dir stat result) ; down + (unless (string=? dir ".") + (print0 dir))) + (const #f) ; up + (const #f) ; skip + (const #f) + #f + ".") + + (and (zero? (close-pipe pipe)) + (with-directory-excursion out + (and (zero? (system* gzip "--best" "initrd")) + (rename-file "initrd.gz" "initrd"))))))))) + + (let ((name* name)) + (package + (name name*) + (version "0") + (source #f) + (build-system trivial-build-system) + (arguments `(#:modules ((guix build utils)) + #:builder ,builder)) + (inputs `(("guile" ,guile) + ("cpio" ,cpio) + ("gzip" ,gzip) + ,@(if linux + `(("linux" ,linux)) + '()))) + (synopsis "An initial RAM disk (initrd) for the Linux kernel") + (description + "An initial RAM disk (initrd), really a gzipped cpio archive, for use by +the Linux kernel.") + (license gpl3+) + (home-page "http://www.gnu.org/software/guix/")))) + +(define-public qemu-initrd + (expression->initrd + '(begin + (use-modules (rnrs io ports) + (srfi srfi-1) + (srfi srfi-26) + (ice-9 match) + ((system foreign) #:select (string->pointer)) + ((system base compile) #:select (compile-file))) + + (display "Welcome, this is GNU/Guile!\n") + (display "Use '--repl' for an initrd REPL.\n\n") + + (mkdir "/proc") + (mount "none" "/proc" "proc") + + (mkdir "/sys") + (mount "none" "/sys" "sysfs") + + (let* ((command (string-trim-both + (call-with-input-file "/proc/cmdline" + get-string-all))) + (args (string-split command char-set:blank)) + (option (lambda (opt) + (let ((opt (string-append opt "="))) + (and=> (find (cut string-prefix? opt <>) + args) + (lambda (arg) + (substring arg (+ 1 (string-index arg #\=)))))))) + (to-load (option "--load")) + (root (option "--root"))) + + (when (member "--repl" args) + ((@ (system repl repl) start-repl))) + + (let ((slurp (lambda (module) + (call-with-input-file + (string-append "/modules/" module) + get-bytevector-all)))) + (display "loading CIFS and companion modules...\n") + (for-each (compose load-linux-module slurp) + (list "md4.ko" "ecb.ko" "cifs.ko"))) + + ;; See net/slirp.c for default QEMU networking values. + (display "configuring network...\n") + (let* ((sock (socket AF_INET SOCK_STREAM 0)) + (address (make-socket-address AF_INET + (inet-pton AF_INET + "10.0.2.10") + 0)) + (flags (network-interface-flags sock "eth0"))) + (set-network-interface-address sock "eth0" address) + (set-network-interface-flags sock "eth0" + (logior flags IFF_UP)) + (if (logand (network-interface-flags sock "eth0") IFF_UP) + (display "network interface is up\n") + (display "network interface is DOWN\n")) + + (mkdir "/etc") + (call-with-output-file "/etc/resolv.conf" + (lambda (p) + (display "nameserver 10.0.2.3\n" p))) + (sleep 1)) + + ;; Prepare the real root file system under /root. + (unless (file-exists? "/root") + (mkdir "/root")) + (if root + (mount root "/root" "ext3") + (mount "none" "/root" "tmpfs")) + (mkdir "/root/proc") + (mount "none" "/root/proc" "proc") + (mkdir "/root/sys") + (mount "none" "/root/sys" "sysfs") + (mkdir "/root/xchg") + (mkdir "/root/nix") + (mkdir "/root/nix/store") + + (mkdir "/root/dev") + (let ((makedev (lambda (major minor) + (+ (* major 256) minor)))) + (mknod "/root/dev/null" 'char-special #o666 (makedev 1 3)) + (mknod "/root/dev/zero" 'char-special #o666 (makedev 1 5))) + + ;; Mount the host's store and exchange directory. + (display "mounting QEMU's SMB shares...\n") + (let ((server "10.0.2.4")) + (mount (string-append "//" server "/store") "/root/nix/store" "cifs" 0 + (string->pointer "guest,sec=none")) + (mount (string-append "//" server "/xchg") "/root/xchg" "cifs" 0 + (string->pointer "guest,sec=none"))) + + (if to-load + (begin + (format #t "loading boot file '~a'...\n" to-load) + (compile-file (string-append "/root/" to-load) + #:output-file "/root/loader.go" + #:opts %auto-compilation-options) + (match (primitive-fork) + (0 + (chroot "/root") + (load-compiled "/loader.go")) + (pid + (format #t "boot file loaded under PID ~a~%" pid) + (let ((status (waitpid pid))) + (reboot))))) + (begin + (display "no boot file passed via '--load'\n") + (display "entering a warm and cozy REPL\n") + ((@ (system repl repl) start-repl)))))) + #:name "qemu-initrd" + #:linux linux-libre + #:linux-modules '("cifs.ko" "md4.ko" "ecb.ko"))) + +;;; linux-initrd.scm ends here -- cgit v1.2.3 From d2474c2620a3b4a81e364ee3b741419a778f2472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 16 Feb 2013 03:28:26 +0100 Subject: Add (gnu system vm). * gnu/system/vm.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/system/vm.scm | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 gnu/system/vm.scm (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm new file mode 100644 index 0000000000..3dae35d776 --- /dev/null +++ b/gnu/system/vm.scm @@ -0,0 +1,263 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu system vm) + #:use-module (guix store) + #:use-module (guix derivations) + #:use-module (guix packages) + #:use-module ((gnu packages base) #:select (%final-inputs guile-final)) + #:use-module (gnu packages qemu) + #:use-module (gnu packages parted) + #:use-module (gnu packages grub) + #:use-module (gnu packages linux) + #:use-module (gnu packages linux-initrd) + #:use-module ((gnu packages make-bootstrap) + #:select (%guile-static-stripped)) + #:use-module (srfi srfi-26) + #:use-module (ice-9 match) + #:export (expression->derivation-in-linux-vm + qemu-image)) + + +;;; Commentary: +;;; +;;; Tools to evaluate build expressions within virtual machines. +;;; +;;; Code: + +(define* (expression->derivation-in-linux-vm store name system exp inputs + #:key + (linux linux-libre) + (initrd qemu-initrd) + (qemu qemu-kvm/smb-shares) + (env-vars '()) + (modules '()) + (guile-for-build + (%guile-for-build)) + + (make-disk-image? #f) + (disk-image-size + (* 100 (expt 2 20)))) + "Evaluate EXP in a QEMU virtual machine running LINUX with INITRD. In the +virtual machine, EXP has access to all of INPUTS from the store; it should put +its output files in the `/xchg' directory, which is copied to the derivation's +output when the VM terminates. + +When MAKE-DISK-IMAGE? is true, then create a QEMU disk image of +DISK-IMAGE-SIZE bytes and return it." + (define input-alist + (map (match-lambda + ((input package) + `(,input . ,(package-output store package "out" system))) + ((input package sub-drv) + `(,input . ,(package-output store package sub-drv system)))) + inputs)) + + (define exp* + ;; EXP, but with INPUTS available. + `(let ((%build-inputs ',input-alist)) + ,exp)) + + (define builder + ;; Code that launches the VM that evaluates EXP. + `(begin + (use-modules (guix build utils)) + + (let ((out (assoc-ref %outputs "out")) + (cu (string-append (assoc-ref %build-inputs "coreutils") + "/bin")) + (qemu (string-append (assoc-ref %build-inputs "qemu") + "/bin/qemu-system-" + (car (string-split ,system #\-)))) + (img (string-append (assoc-ref %build-inputs "qemu") + "/bin/qemu-img")) + (linux (string-append (assoc-ref %build-inputs "linux") + "/bzImage")) + (initrd (string-append (assoc-ref %build-inputs "initrd") + "/initrd")) + (builder (assoc-ref %build-inputs "builder"))) + + ;; XXX: QEMU uses "rm -rf" when it's done to remove the temporary SMB + ;; directory, so it really needs `rm' in $PATH. + (setenv "PATH" cu) + + ,(if make-disk-image? + `(zero? (system* img "create" "image.qcow2" + ,(number->string disk-image-size))) + '(begin)) + + (mkdir "xchg") + (and (zero? + (system* qemu "-nographic" "-no-reboot" + "-net" "nic,model=e1000" + "-net" (string-append "user,smb=" (getcwd)) + "-kernel" linux + "-initrd" initrd + "-append" (string-append "console=ttyS0 --load=" + builder) + ,@(if make-disk-image? + '("-hda" "image.qcow2") + '()))) + ,(if make-disk-image? + '(copy-file "image.qcow2" ; XXX: who mkdir'd OUT? + out) + '(begin + (mkdir out) + (copy-recursively "xchg" out))))))) + + (let ((user-builder (add-text-to-store store "builder-in-linux-vm" + (object->string exp*) + '())) + (->drv (cut package-derivation store <> system)) + (coreutils (car (assoc-ref %final-inputs "coreutils")))) + (build-expression->derivation store name system builder + `(("qemu" ,(->drv qemu)) + ("linux" ,(->drv linux)) + ("initrd" ,(->drv initrd)) + ("coreutils" ,(->drv coreutils)) + ("builder" ,user-builder) + ,@(map (match-lambda + ((name package sub-drv ...) + `(,name ,(->drv package) + ,@sub-drv))) + inputs)) + #:env-vars env-vars + #:modules `((guix build utils) + ,@modules) + #:guile-for-build guile-for-build))) + +(define* (qemu-image store #:key + (name "qemu-image") + (system (%current-system)) + (disk-image-size (* 100 (expt 2 20))) + (linux linux-libre) + (initrd qemu-initrd) + (inputs '())) + "Return a bootable, stand-alone QEMU image." + (expression->derivation-in-linux-vm + store "qemu-image" system + `(let ((parted (string-append (assoc-ref %build-inputs "parted") + "/sbin/parted")) + (mkfs (string-append (assoc-ref %build-inputs "e2fsprogs") + "/sbin/mkfs.ext3")) + (grub (string-append (assoc-ref %build-inputs "grub") + "/sbin/grub-install")) + (umount (string-append (assoc-ref %build-inputs "util-linux") + "/bin/umount")) ; XXX: add to Guile + (initrd (string-append (assoc-ref %build-inputs "initrd") + "/initrd")) + (linux (string-append (assoc-ref %build-inputs "linux") + "/bzImage")) + (makedev (lambda (major minor) + (+ (* major 256) minor)))) + + ;; GRUB is full of shell scripts. + (setenv "PATH" + (string-append (dirname grub) ":" + (assoc-ref %build-inputs "coreutils") "/bin:" + (assoc-ref %build-inputs "findutils") "/bin:" + (assoc-ref %build-inputs "sed") "/bin:" + (assoc-ref %build-inputs "grep") "/bin:" + (assoc-ref %build-inputs "gawk") "/bin")) + + (display "creating partition table...\n") + (mknod "/dev/vda" 'block-special #o644 (makedev 8 0)) + (and (zero? (system* parted "/dev/vda" "mklabel" "msdos" + "mkpart" "primary" "ext2" "1MiB" + ,(format #f "~aB" + (- disk-image-size + (* 5 (expt 2 20)))))) + (begin + (display "creating ext3 partition...\n") + (mknod "/dev/vda1" 'block-special #o644 (makedev 8 1)) + (and (zero? (system* mkfs "-F" "/dev/vda1")) + (begin + (display "mounting partition...\n") + (mkdir "/fs") + (mount "/dev/vda1" "/fs" "ext3") + (mkdir "/fs/boot") + (mkdir "/fs/boot/grub") + (copy-file linux "/fs/boot/bzImage") + (copy-file initrd "/fs/boot/initrd") + (call-with-output-file "/fs/boot/grub/grub.cfg" + (lambda (p) + (display " +set timeout=10 +search.file /boot/bzImage + +menuentry \"Boot-to-Guile! Happy Birthday Guile 2.0! (Guile, Guix & co.)\" { + linux /boot/bzImage --repl + initrd /boot/initrd +}" p))) + (and (zero? + (system* grub "--no-floppy" + "--boot-directory" "/fs/boot" + "/dev/vda")) + (zero? + (system* umount "/fs")))))))) + `(("parted" ,parted) + ("grub" ,grub) + ("e2fsprogs" ,e2fsprogs) + ("linux" ,linux-libre) + ("initrd" ,qemu-initrd) + + ;; For shell scripts. + ("sed" ,(car (assoc-ref %final-inputs "sed"))) + ("grep" ,(car (assoc-ref %final-inputs "grep"))) + ("coreutils" ,(car (assoc-ref %final-inputs "coreutils"))) + ("findutils" ,(car (assoc-ref %final-inputs "findutils"))) + ("gawk" ,(car (assoc-ref %final-inputs "gawk"))) + ("util-linux" ,util-linux)) + #:make-disk-image? #t + #:disk-image-size disk-image-size)) + + +;;; +;;; Guile 2.0 potluck examples. +;;; + +(define (example1) + (let ((store #f)) + (dynamic-wind + (lambda () + (set! store (open-connection))) + (lambda () + (parameterize ((%guile-for-build (package-derivation store guile-final))) + (expression->derivation-in-linux-vm + store "vm-test" (%current-system) + '(begin + (display "hello from boot!\n") + (call-with-output-file "/xchg/hello" + (lambda (p) + (display "world" p)))) + '()))) + (lambda () + (close-connection store))))) + +(define (example2) + (let ((store #f)) + (dynamic-wind + (lambda () + (set! store (open-connection))) + (lambda () + (parameterize ((%guile-for-build (package-derivation store guile-final))) + (qemu-image store #:disk-image-size (* 30 (expt 2 20))))) + (lambda () + (close-connection store))))) + +;;; vm.scm ends here -- cgit v1.2.3 From ed407c8055ef0f0037d6239878b14845407fd920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 17 Feb 2013 15:01:52 +0100 Subject: gnu: texinfo: Update to 5.0. * gnu/packages/texinfo.scm (texinfo): Update to 5.0. --- gnu/packages/texinfo.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 9a264c627c..dba5cd2c2e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès +;;; Copyright © 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,28 +22,26 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages compression) + #:use-module (gnu packages perl) #:use-module (gnu packages ncurses)) (define-public texinfo (package (name "texinfo") - (version "4.13a") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://gnu/texinfo/texinfo-" - version - ".tar.lzma")) - (sha256 - (base32 - "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d")))) + (version "5.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/texinfo/texinfo-" + version ".tar.xz")) + (sha256 + (base32 + "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) ("xz" ,xz))) - (home-page - "http://www.gnu.org/software/texinfo/") - (synopsis - "GNU Texinfo, the GNU documentation system") + (inputs `(("perl" ,perl) ; yuck! + ("ncurses" ,ncurses) + ("xz" ,xz))) + (home-page "http://www.gnu.org/software/texinfo/") + (synopsis "GNU Texinfo, the GNU documentation system") (description "Texinfo is the official documentation format of the GNU project. It was invented by Richard Stallman and Bob Chassell many years -- cgit v1.2.3 From ba4bcae03585c89c05c5fa8fbeef9450b24c2be8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 17 Feb 2013 13:25:06 -0500 Subject: gnu: guile-reader: Rename packages to avoid version number confusion. * gnu/packages/guile.scm (guile-reader): Change the character preceding the guile version number from '-' to '_' so that it will not be misinterpreted as the package version number. --- gnu/packages/guile.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 729a921346..58e7c2910c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -162,7 +162,7 @@ call interface, and powerful string processing.") "Build Guile-Reader against GUILE, a package of some version of Guile 1.8 or 2.0." (package - (name (string-append "guile-reader-for-guile-" (package-version guile))) + (name (string-append "guile-reader-for-guile_" (package-version guile))) (version "0.6") (source (origin (method url-fetch) -- cgit v1.2.3 From 3c81cdf19c5da61f712e98f70cb187a089b0b900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 20 Feb 2013 21:06:57 +0100 Subject: gnu: texinfo: Make Perl a propagated input. * gnu/packages/texinfo.scm (texinfo): Make PERL a propagated input. --- gnu/packages/texinfo.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index dba5cd2c2e..96016c053d 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -37,9 +37,10 @@ (base32 "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla")))) (build-system gnu-build-system) - (inputs `(("perl" ,perl) ; yuck! - ("ncurses" ,ncurses) + (inputs `(("ncurses" ,ncurses) ("xz" ,xz))) + ;; TODO: Remove Perl from here when 'patch-shebang' DTRT with /usr/bin/env. + (propagated-inputs `(("perl" ,perl))) ; yuck! (home-page "http://www.gnu.org/software/texinfo/") (synopsis "GNU Texinfo, the GNU documentation system") (description -- cgit v1.2.3 From 6ec8f7778f3f44f842782ecf164885ef6dbb1e4f Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Fri, 15 Feb 2013 13:50:45 +0000 Subject: gnu: gcc: Remove extraneous newline in 'LIB_SPEC'. * gnu/packages/base.scm (gcc-4.7): Remove trailing newline when patching 'LIB_SPEC'. --- gnu/packages/base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 23bf00b241..5c39ec3db8 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -449,7 +449,7 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") ;; RUNPATH to GCC even when `libgcc_s' is not NEEDED. ;; There's not much that can be done to avoid it, though. (format #f "#define LIB_SPEC \"-L~a/lib %{!static:-rpath=~a/lib \ -%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a~%" +%{!static-libgcc:-rpath=~a/lib64 -rpath=~a/lib}} \" ~a" libc libc out out suffix)) (("#define STARTFILE_SPEC.*$" line) (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\" -- cgit v1.2.3 From 618cea694d92dd73482b2a08675c9dec84d512ac Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Tue, 19 Feb 2013 11:17:08 +0000 Subject: gnu: linux-libre-headers: Set 'ARCH' to 'mips'. * gnu/packages/linux.scm (system->linux-architecture): New procedure. (linux-libre-headers): Adjust accordingly. --- gnu/packages/linux.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b97315580b..31e6c9bf73 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -31,18 +31,22 @@ #:use-module (guix download) #:use-module (guix build-system gnu)) +(define (system->linux-architecture arch) + (let ((arch (car (string-split arch #\-)))) + (cond ((string=? arch "i686") "i386") + ((string-prefix? "mips" arch) "mips") + (else arch)))) + (define-public linux-libre-headers (let* ((version* "3.3.8") (build-phase - '(lambda* (#:key system #:allow-other-keys) - (let ((arch (car (string-split system #\-)))) - (setenv "ARCH" - (cond ((string=? arch "i686") "i386") - (else arch))) - (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))) + (lambda (arch) + `(lambda _ + (setenv "ARCH" ,(system->linux-architecture arch)) + (format #t "`ARCH' set to `~a'~%" (getenv "ARCH")) - (and (zero? (system* "make" "defconfig")) - (zero? (system* "make" "mrproper" "headers_check"))))) + (and (zero? (system* "make" "defconfig")) + (zero? (system* "make" "mrproper" "headers_check")))))) (install-phase `(lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -73,7 +77,7 @@ (guix build utils) (srfi srfi-1)) #:phases (alist-replace - 'build ,build-phase + 'build ,(build-phase (%current-system)) (alist-replace 'install ,install-phase (alist-delete 'configure %standard-phases))) -- cgit v1.2.3 From aaf4cb20adbb20b6c7ea9e421f89d0b7acba961a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 27 Feb 2013 09:25:00 +0100 Subject: gnu: linux: Make `system->linux-architecture' public, and add ARM. * gnu/packages/linux.scm (system->linux-architecture): Make public. Add "arm". --- gnu/packages/linux.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 31e6c9bf73..b687e363f6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -31,10 +31,13 @@ #:use-module (guix download) #:use-module (guix build-system gnu)) -(define (system->linux-architecture arch) +(define-public (system->linux-architecture arch) + "Return the Linux architecture name for ARCH, a Guix system name such as +\"x86_64-linux\"." (let ((arch (car (string-split arch #\-)))) (cond ((string=? arch "i686") "i386") ((string-prefix? "mips" arch) "mips") + ((string-prefix? "arm" arch) "arm") (else arch)))) (define-public linux-libre-headers -- cgit v1.2.3 From 827d28914a16ef2d10ebdad4695efdb02ace07fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 27 Feb 2013 09:38:11 +0100 Subject: gnu: Add cross tool chain. * gnu/packages/cross-base.scm: New file. * gnu/packages/patches/gcc-cross-environment-variables.patch: New file. * Makefile.am (MODULES): Add cross-base.scm. (dist_patch_DATA): Add gcc-cross-environment-variables.patch. * gnu/packages/base.scm (gcc-4.7): Use `LDFLAGS_FOR_TARGET' instead of `LDFLAGS_FOR_BUILD', and use `-B' instead of `-L'. * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add case for "mips64el-linux". --- gnu/packages/base.scm | 4 +- gnu/packages/bootstrap.scm | 1 + gnu/packages/cross-base.scm | 243 +++++++++++++++++++++ .../patches/gcc-cross-environment-variables.patch | 24 ++ 4 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/cross-base.scm create mode 100644 gnu/packages/patches/gcc-cross-environment-variables.patch (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5c39ec3db8..5aeb050863 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -412,8 +412,8 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") #:make-flags (let ((libc (assoc-ref %build-inputs "libc"))) `(,@(if libc - (list (string-append "LDFLAGS_FOR_BUILD=" - "-L" libc "/lib " + (list (string-append "LDFLAGS_FOR_TARGET=" + "-B" libc "/lib " "-Wl,-dynamic-linker " "-Wl," libc ,(glibc-dynamic-linker))) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 22ee98879a..809eb84295 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -134,6 +134,7 @@ check whether everything is alright." "Return the name of Glibc's dynamic linker for SYSTEM." (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2") ((string=? system "i686-linux") "/lib/ld-linux.so.2") + ((string=? system "mips64el-linux") "/lib/ld.so.1") (else (error "dynamic linker name not known for this system" system)))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm new file mode 100644 index 0000000000..69dc9f5b0b --- /dev/null +++ b/gnu/packages/cross-base.scm @@ -0,0 +1,243 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages cross-base) + #:use-module (guix licenses) + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages linux) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix utils) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (ice-9 match)) + +(define (cross p target) + (package (inherit p) + (location (source-properties->location (current-source-location))) + (name (string-append (package-name p) "-cross-" target)) + (arguments + (substitute-keyword-arguments (package-arguments p) + ((#:configure-flags flags) + `(cons ,(string-append "--target=" target) + ,flags)))))) + +(define cross-binutils + (cut cross binutils <>)) + +(define* (cross-gcc target + #:optional (xbinutils (cross-binutils target)) libc) + "Return a cross-compiler for TARGET, where TARGET is a GNU triplet. Use +XBINUTILS as the associated cross-Binutils. If LIBC is false, then build a +GCC that does not target a libc; otherwise, target that libc." + (define args + ;; Get the arguments as if we were building for TARGET. In particular, we + ;; want `glibc-dynamic-linker' to return the right thing. + (parameterize ((%current-system (gnu-triplet->nix-system target))) + (package-arguments gcc-4.7))) + + (package (inherit gcc-4.7) + (name (string-append "gcc-cross-" + (if libc "" "sans-libc-") + target)) + (arguments + `(#:implicit-inputs? #f + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26)) + #:patches (list (assoc-ref %build-inputs "patch/cross-env-vars")) + + ,@(substitute-keyword-arguments args + ((#:configure-flags flags) + `(append (list ,(string-append "--target=" target) + ,@(if libc + '() + `( ;; Disable features not needed at this stage. + "--disable-shared" "--enable-static" + + ;; Disable C++ because libstdc++'s + ;; configure script otherwise fails with + ;; "Link tests are not allowed after + ;; GCC_NO_EXECUTABLES." + "--enable-languages=c" + + "--disable-threads" ; libgcc, would need libc + "--disable-libmudflap" + "--disable-libgomp" + "--disable-libssp" + "--disable-libquadmath" + "--disable-decimal-float" ; would need libc + ))) + + ,(if libc + flags + `(remove (cut string-match "--enable-languages.*" <>) + ,flags)))) + ((#:make-flags flags) + (if libc + `(let ((libc (assoc-ref %build-inputs "libc"))) + ;; FLAGS_FOR_TARGET are needed for the target libraries to + ;; receive the -Bxxx for the startfiles. + (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/lib") + ,flags)) + flags)) + ((#:phases phases) + (let ((phases + `(alist-cons-after + 'install 'make-cross-binutils-visible + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec/gcc/" + ,target)) + (binutils (string-append + (assoc-ref inputs "binutils-cross") + "/bin/" ,target "-"))) + (for-each (lambda (file) + (symlink (string-append binutils file) + (string-append libexec "/" + file))) + '("as" "ld" "nm")) + #t)) + ,phases))) + (if libc + `(alist-cons-before + 'configure 'set-cross-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Add the cross Linux headers to CROSS_CPATH, and remove + ;; them from CPATH. + (let ((libc (assoc-ref inputs "libc")) + (linux (assoc-ref inputs + "libc/cross-linux-headers"))) + (define (cross? x) + ;; Return #t if X is a cross-libc or cross Linux. + (or (string-prefix? libc x) + (string-prefix? linux x))) + + (setenv "CROSS_CPATH" + (string-append libc "/include:" + linux "/include")) + (setenv "CROSS_LIBRARY_PATH" + (string-append libc "/lib")) + + (let ((cpath (search-path-as-string->list + (getenv "CPATH"))) + (libpath (search-path-as-string->list + (getenv "LIBRARY_PATH")))) + (setenv "CPATH" + (list->search-path-as-string + (remove cross? cpath) ":")) + (setenv "LIBRARY_PATH" + (list->search-path-as-string + (remove cross? libpath) ":")) + #t))) + ,phases) + phases))) + ((#:strip-binaries? _) + ;; Disable stripping as this can break binaries, with object files + ;; of libgcc.a showing up as having an unknown architecture. See + ;; + ;; for instance. + #f)))) + (inputs + `(("patch/cross-env-vars" + ,(search-patch "gcc-cross-environment-variables.patch")) + + ("binutils-cross" ,xbinutils) + + ;; Call it differently so that the builder can check whether the "libc" + ;; input is #f. + ("libc-native" ,@(assoc-ref %final-inputs "libc")) + + ;; Remaining inputs. + ,@(let ((inputs (append (package-inputs gcc-4.7) + (alist-delete "libc" %final-inputs)))) + (if libc + `(("libc" ,libc) + ,@inputs) + inputs)))))) + +(define* (cross-libc target + #:optional + (xgcc (cross-gcc target)) + (xbinutils (cross-binutils target))) + "Return a libc cross-built for TARGET, a GNU triplet. Use XGCC and +XBINUTILS and the cross tool chain." + (define xlinux-headers + (package (inherit linux-libre-headers) + (name (string-append (package-name linux-libre-headers) + "-cross-" target)) + (arguments + (substitute-keyword-arguments (package-arguments linux-libre-headers) + ((#:phases phases) + `(alist-replace + 'build + (lambda _ + (setenv "ARCH" ,(system->linux-architecture target)) + (format #t "`ARCH' set to `~a' (cross compiling)~%" (getenv "ARCH")) + + (and (zero? (system* "make" "defconfig")) + (zero? (system* "make" "mrproper" "headers_check")))) + ,phases)))) + (inputs `(("cross-gcc" ,xgcc) + ("cross-binutils" ,xbinutils) + ,@(package-inputs linux-libre-headers))))) + + (package (inherit glibc) + (name (string-append "glibc-cross-" target)) + (arguments + (substitute-keyword-arguments + `(#:strip-binaries? #f ; disable stripping (see above) + ,@(package-arguments glibc)) + ((#:configure-flags flags) + `(cons ,(string-append "--host=" target) + ,flags)) + ((#:phases phases) + `(alist-cons-before + 'configure 'set-cross-linux-headers-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((linux (assoc-ref inputs "cross-linux-headers"))) + (setenv "CROSS_CPATH" + (string-append linux "/include")) + #t)) + ,phases)))) + (propagated-inputs `(("cross-linux-headers" ,xlinux-headers))) + (inputs `(("cross-gcc" ,xgcc) + ("cross-binutils" ,xbinutils) + ,@(package-inputs glibc))))) + + +;;; +;;; Concrete cross toolchains. +;;; + +(define-public xgcc-mips64el + (let ((triplet "mips64el-linux-gnu")) + (cross-gcc triplet + (cross-binutils triplet) + (cross-libc triplet)))) + +;; (define-public xgcc-armel +;; (let ((triplet "armel-linux-gnueabi")) +;; (cross-gcc triplet +;; (cross-binutils triplet) +;; (cross-libc triplet)))) diff --git a/gnu/packages/patches/gcc-cross-environment-variables.patch b/gnu/packages/patches/gcc-cross-environment-variables.patch new file mode 100644 index 0000000000..30a07ec3db --- /dev/null +++ b/gnu/packages/patches/gcc-cross-environment-variables.patch @@ -0,0 +1,24 @@ +Search path environment variables for cross-compilers. See the discussion +at . + +--- gcc-4.7.2/gcc/incpath.c 2012-01-27 00:34:58.000000000 +0100 ++++ gcc-4.7.2/gcc/incpath.c 2013-02-12 10:11:27.000000000 +0100 +@@ -452,7 +452,7 @@ register_include_chains (cpp_reader *pfi + + /* CPATH and language-dependent environment variables may add to the + include chain. */ +- add_env_var_paths ("CPATH", BRACKET); ++ add_env_var_paths ("CROSS_CPATH", BRACKET); + add_env_var_paths (lang_env_vars[idx], SYSTEM); + + target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc); + +--- gcc-4.7.2/gcc/system.h 2012-02-17 00:16:28.000000000 +0100 ++++ gcc-4.7.2/gcc/system.h 2013-02-12 10:22:17.000000000 +0100 +@@ -1023,4 +1023,6 @@ helper_const_non_const_cast (const char + #define DEBUG_VARIABLE + #endif + ++#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" ++ + #endif /* ! GCC_SYSTEM_H */ -- cgit v1.2.3 From 7f614e49e877cbf3e909ed74b3e6822dc39eabe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 5 Mar 2013 18:38:05 +0100 Subject: gnu: glibc: Install locale data. * gnu/packages/base.scm (glibc): Add `outputs' field. Pass `--localedir' and set `libc_cv_localedir'. Add `install-locales' phase. --- gnu/packages/base.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5aeb050863..537bd5af6d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -508,13 +508,28 @@ used in the GNU system including the GNU/Linux variant.") ;; users should automatically pull Linux headers as well. (propagated-inputs `(("linux-headers" ,linux-libre-headers))) + ;; Store the locales separately (~100 MiB). Note that "out" retains a + ;; reference to them anyway, so there's no space savings here. + ;; TODO: Eventually we may want to add a $LOCALE_ARCHIVE search path like + ;; Nixpkgs does. + (outputs '("out" "locales")) + (arguments `(#:out-of-source? #t #:patches (list (assoc-ref %build-inputs "patch/ld.so.cache")) #:configure-flags (list "--enable-add-ons" "--sysconfdir=/etc" - "--localedir=/var/run/current-system/sw/lib/locale" ; XXX + (string-append "--localedir=" (assoc-ref %outputs "locales") + "/share/locale") + + ;; `--localedir' is not honored, so work around it. + ;; See . + (string-append "libc_cv_localedir=" + (assoc-ref %outputs "locales") + "/share/locale") + + (string-append "--with-headers=" (assoc-ref %build-inputs "linux-headers") "/include") @@ -580,7 +595,12 @@ used in the GNU system including the GNU/Linux variant.") (substitute* "libio/iopopen.c" (("/bin/sh") (string-append out "/bin/bash"))))) - %standard-phases))) + (alist-cons-after + 'install 'install-locales + (lambda _ + (zero? (system* "make" "localedata/install-locales"))) + %standard-phases)))) + (inputs `(("patch/ld.so.cache" ,(search-patch "glibc-no-ld-so-cache.patch")) ("static-bash" ,(static-package bash-light)))) -- cgit v1.2.3 From 9aea24b608659bfe6d6a72afff31edecd8e717c6 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 23 Feb 2013 19:09:26 +0100 Subject: gnu: xorg: Initial import from nix. * gnu/packages/xorg.scm: New module. * Makefile.am: Add it. --- gnu/packages/xorg.scm | 3658 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3658 insertions(+) create mode 100644 gnu/packages/xorg.scm (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm new file mode 100644 index 0000000000..bbbd7a943a --- /dev/null +++ b/gnu/packages/xorg.scm @@ -0,0 +1,3658 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages xorg) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages bison) + #:use-module (gnu packages compression) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages glib) + #:use-module (gnu packages gperf) + #:use-module (gnu packages libpng) + #:use-module (gnu packages linux) + #:use-module (gnu packages m4) + #:use-module (gnu packages openssl) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python)) + +(define-public applewmproto + (package + (name "applewmproto") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/applewmproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public bdftopcf + (package + (name "bdftopcf") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/bdftopcf-" + version + ".tar.bz2")) + (sha256 + (base32 + "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w")))) + (build-system gnu-build-system) + (inputs + `(("libxfont" ,libxfont) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public bigreqsproto + (package + (name "bigreqsproto") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/bigreqsproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public compositeproto + (package + (name "compositeproto") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/compositeproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("fixesproto" ,fixesproto))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public damageproto + (package + (name "damageproto") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/damageproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public dmxproto + (package + (name "dmxproto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/dmxproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public encodings + (package + (name "encodings") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/encodings-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public fixesproto + (package + (name "fixesproto") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/fixesproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-alias + (package + (name "font-alias") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-alias-" + version + ".tar.bz2")) + (sha256 + (base32 + "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-arabic-misc + (package + (name "font-arabic-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-arabic-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bh-ttf + (package + (name "font-bh-ttf") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-cronyx-cyrillic + (package + (name "font-cronyx-cyrillic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-cursor-misc + (package + (name "font-cursor-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-daewoo-misc + (package + (name "font-daewoo-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-dec-misc + (package + (name "font-dec-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-dec-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-isas-misc + (package + (name "font-isas-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-isas-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-jis-misc + (package + (name "font-jis-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-micro-misc + (package + (name "font-micro-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-micro-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-cyrillic + (package + (name "font-misc-cyrillic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-ethiopic + (package + (name "font-misc-ethiopic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-" + version + ".tar.bz2")) + (sha256 + (base32 + "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-meltho + (package + (name "font-misc-meltho") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" + version + ".tar.bz2")) + (sha256 + (base32 + "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-misc + (package + (name "font-misc-misc") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("font-util" ,font-util) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-mutt-misc + (package + (name "font-mutt-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-mutt-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-schumacher-misc + (package + (name "font-schumacher-misc") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("font-util" ,font-util) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-screen-cyrillic + (package + (name "font-screen-cyrillic") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-sony-misc + (package + (name "font-sony-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-sony-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public fontsproto + (package + (name "fontsproto") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/fontsproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-sun-misc + (package + (name "font-sun-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-sun-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-util + (package + (name "font-util") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-util-" + version + ".tar.bz2")) + (sha256 + (base32 + "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-winitzki-cyrillic + (package + (name "font-winitzki-cyrillic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public gccmakedep + (package + (name "gccmakedep") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/gccmakedep-" + version + ".tar.bz2")) + (sha256 + (base32 + "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public glproto + (package + (name "glproto") + (version "1.4.16") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/glproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public iceauth + (package + (name "iceauth") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/iceauth-" + version + ".tar.bz2")) + (sha256 + (base32 + "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public imake + (package + (name "imake") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/imake-" + version + ".tar.bz2")) + (sha256 + (base32 + "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public inputproto + (package + (name "inputproto") + (version "2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/inputproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public kbproto + (package + (name "kbproto") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/kbproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libAppleWM + (package + (name "libAppleWM") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libAppleWM-" + version + ".tar.bz2")) + (sha256 + (base32 + "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("applewmproto" ,applewmproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libFS + (package + (name "libFS") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libFS-" + version + ".tar.bz2")) + (sha256 + (base32 + "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("fontsproto" ,fontsproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libICE + (package + (name "libICE") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libICE-" + version + ".tar.bz2")) + (sha256 + (base32 + "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libSM + (package + (name "libSM") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libSM-" + version + ".tar.bz2")) + (sha256 + (base32 + "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("util-linux" ,util-linux) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libICE" ,libICE))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libWindowsWM + (package + (name "libWindowsWM") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libWindowsWM-" + version + ".tar.bz2")) + (sha256 + (base32 + "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("windowswmproto" ,windowswmproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxScrnSaver + (package + (name "libxScrnSaver") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxScrnSaver-" + version + ".tar.bz2")) + (sha256 + (base32 + "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("scrnsaverproto" ,scrnsaverproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxau + (package + (name "libxau") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxau-" + version + ".tar.bz2")) + (sha256 + (base32 + "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxaw + (package + (name "libxaw") + (version "1.0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxaw-" + version + ".tar.bz2")) + (sha256 + (base32 + "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxmu" ,libxmu))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcomposite + (package + (name "libxcomposite") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcomposite-" + version + ".tar.bz2")) + (sha256 + (base32 + "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("libx11" ,libx11) + ("compositeproto" ,compositeproto) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxfixes" ,libxfixes))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcursor + (package + (name "libxcursor") + (version "1.1.13") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcursor-" + version + ".tar.bz2")) + (sha256 + (base32 + "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxdamage + (package + (name "libxdamage") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxdamage-" + version + ".tar.bz2")) + (sha256 + (base32 + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("damageproto" ,damageproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxdmcp + (package + (name "libxdmcp") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxdmcp-" + version + ".tar.bz2")) + (sha256 + (base32 + "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxext + (package + (name "libxext") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxext-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + (build-system gnu-build-system) + (inputs + `(("libxau" ,libxau) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("xproto" ,xproto))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxfixes + (package + (name "libxfixes") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxfixes-" + version + ".tar.bz2")) + (sha256 + (base32 + "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxfont + (package + (name "libxfont") + (version "1.4.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxfont-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xtrans" ,xtrans) + ("xproto" ,xproto) + ("freetype" ,freetype) + ("fontsproto" ,fontsproto) + ("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxft + (package + (name "libxft") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxft-" + version + ".tar.bz2")) + (sha256 + (base32 + "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) + (build-system gnu-build-system) + (inputs + `(("renderproto" ,renderproto) + ("libx11" ,libx11) + ("xproto" ,xproto) + ("libxrender" ,libxrender) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libxrender" ,libxrender))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxi + (package + (name "libxi") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxi-" + version + ".tar.bz2")) + (sha256 + (base32 + "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxinerama + (package + (name "libxinerama") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxinerama-" + version + ".tar.bz2")) + (sha256 + (base32 + "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) + (build-system gnu-build-system) + (inputs + `(("xineramaproto" ,xineramaproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxmu + (package + (name "libxmu") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxmu-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxp + (package + (name "libxp") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libxp-" + version + ".tar.bz2")) + (sha256 + (base32 + "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("printproto" ,printproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxpm + (package + (name "libxpm") + (version "3.5.10") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxpm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxrandr + (package + (name "libxrandr") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libxrandr-" + version + ".tar.bz2")) + (sha256 + (base32 + "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("randrproto" ,randrproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxrender + (package + (name "libxrender") + (version "0.9.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxrender-" + version + ".tar.bz2")) + (sha256 + (base32 + "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxres + (package + (name "libxres") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxres-" + version + ".tar.bz2")) + (sha256 + (base32 + "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("resourceproto" ,resourceproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxt + (package + (name "libxt") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxt-" + version + ".tar.bz2")) + (sha256 + (base32 + "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("libSM" ,libSM) + ("kbproto" ,kbproto) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libSM" ,libSM))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxtst + (package + (name "libxtst") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxtst-" + version + ".tar.bz2")) + (sha256 + (base32 + "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) + (build-system gnu-build-system) + (inputs + `(("libxi" ,libxi) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("recordproto" ,recordproto) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxv + (package + (name "libxv") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxv-" + version + ".tar.bz2")) + (sha256 + (base32 + "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxvMC + (package + (name "libxvMC") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (inputs + `(("libxv" ,libxv) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libdmx + (package + (name "libdmx") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libdmx-" + version + ".tar.bz2")) + (sha256 + (base32 + "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("dmxproto" ,dmxproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libfontenc + (package + (name "libfontenc") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libfontenc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libpciaccess + (package + (name "libpciaccess") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpciaccess-" + version + ".tar.bz2")) + (sha256 + (base32 + "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libpthread-stubs + (package + (name "libpthread-stubs") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + version + ".tar.bz2")) + (sha256 + (base32 + "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcb + (package + (name "libxcb") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxdmcp" ,libxdmcp) + ("xcb-proto" ,xcb-proto) + ("libxau" ,libxau) + ("libpthread-stubs" ,libpthread-stubs) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxkbfile + (package + (name "libxkbfile") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxkbfile-" + version + ".tar.bz2")) + (sha256 + (base32 + "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("kbproto" ,kbproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public lndir + (package + (name "lndir") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/lndir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public luit + (package + (name "luit") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/luit-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")))) + (build-system gnu-build-system) + (inputs + `(("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public makedepend + (package + (name "makedepend") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/makedepend-" + version + ".tar.bz2")) + (sha256 + (base32 + "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public mkfontdir + (package + (name "mkfontdir") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public mkfontscale + (package + (name "mkfontscale") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontscale-" + version + ".tar.bz2")) + (sha256 + (base32 + "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("freetype" ,freetype) + ("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public pixman + (package + (name "pixman") + (version "0.26.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/pixman-" + version + ".tar.bz2")) + (sha256 + (base32 + "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("perl" ,perl))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public printproto + (package + (name "printproto") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/printproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) + (build-system gnu-build-system) + (inputs + `(("libxau" ,libxau) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public randrproto + (package + (name "randrproto") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/randrproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public recordproto + (package + (name "recordproto") + (version "1.14.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/recordproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public renderproto + (package + (name "renderproto") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/renderproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public resourceproto + (package + (name "resourceproto") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/resourceproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public scrnsaverproto + (package + (name "scrnsaverproto") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public sessreg + (package + (name "sessreg") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/sessreg-" + version + ".tar.bz2")) + (sha256 + (base32 + "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public setxkbmap + (package + (name "setxkbmap") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/setxkbmap-" + version + ".tar.bz2")) + (sha256 + (base32 + "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x")))) + (build-system gnu-build-system) + (inputs + `(("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public smproxy + (package + (name "smproxy") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/smproxy-" + version + ".tar.bz2")) + (sha256 + (base32 + "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxmu" ,libxmu) + ("libSM" ,libSM) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public twm + (package + (name "twm") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/twm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("libSM" ,libSM) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config) + ("flex" ,flex) + ("bison" ,bison))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public util-macros + (package + (name "util-macros") + (version "1.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/util-macros-" + version + ".tar.bz2")) + (sha256 + (base32 + "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public videoproto + (package + (name "videoproto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/videoproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public windowswmproto + (package + (name "windowswmproto") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/windowswmproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xauth + (package + (name "xauth") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xauth-" + version + ".tar.bz2")) + (sha256 + (base32 + "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xbacklight + (package + (name "xbacklight") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xbacklight-" + version + ".tar.bz2")) + (sha256 + (base32 + "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xcb-util" ,xcb-util) + ("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xbitmaps + (package + (name "xbitmaps") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xbitmaps-" + version + ".tar.bz2")) + (sha256 + (base32 + "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-proto + (package + (name "xcb-proto") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util + (package + (name "xcb-util") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-" + version + ".tar.bz2")) + (sha256 + (base32 + "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("gperf" ,gperf) + ("m4" ,m4) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-image + (package + (name "xcb-util-image") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-image-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xcb-util" ,xcb-util) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-keysyms + (package + (name "xcb-util-keysyms") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-keysyms-" + version + ".tar.bz2")) + (sha256 + (base32 + "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-renderutil + (package + (name "xcb-util-renderutil") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-renderutil-" + version + ".tar.bz2")) + (sha256 + (base32 + "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-wm + (package + (name "xcb-util-wm") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-wm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xclock + (package + (name "xclock") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xclock-" + version + ".tar.bz2")) + (sha256 + (base32 + "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxrender" ,libxrender) + ("libxmu" ,libxmu) + ("libxkbfile" ,libxkbfile) + ("libxft" ,libxft) + ("libxaw" ,libxaw) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcmiscproto + (package + (name "xcmiscproto") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcmiscproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcmsdb + (package + (name "xcmsdb") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcmsdb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcursorgen + (package + (name "xcursorgen") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcursorgen-" + version + ".tar.bz2")) + (sha256 + (base32 + "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw")))) + (build-system gnu-build-system) + (inputs + `(("libxcursor" ,libxcursor) + ("libx11" ,libx11) + ("libpng" ,libpng) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcursor-themes + (package + (name "xcursor-themes") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" + version + ".tar.bz2")) + (sha256 + (base32 + "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) + (build-system gnu-build-system) + (inputs + `(("libxcursor" ,libxcursor) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xdm + (package + (name "xdm") + (version "1.1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xdm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) + ("libxinerama" ,libxinerama) + ("libxft" ,libxft) + ("libxext" ,libxext) + ("libxdmcp" ,libxdmcp) + ("libxaw" ,libxaw) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xdpyinfo + (package + (name "xdpyinfo") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xdpyinfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) + (build-system gnu-build-system) + (inputs + `(("libxxf86vm" ,libxxf86vm) + ("libxxf86misc" ,libxxf86misc) + ("libxxf86dga" ,libxxf86dga) + ("libxtst" ,libxtst) + ("libxrender" ,libxrender) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("libxext" ,libxext) + ("libxcomposite" ,libxcomposite) + ("libxcb" ,libxcb) + ("libx11" ,libx11) + ("libdmx" ,libdmx) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xdriinfo + (package + (name "xdriinfo") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xdriinfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) + (build-system gnu-build-system) + (inputs + `(("mesa" ,mesa) + ("glproto" ,glproto) + ("libx11" ,libx11) + ("glproto" ,glproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xev + (package + (name "xev") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xev-" + version + ".tar.bz2")) + (sha256 + (base32 + "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xextproto + (package + (name "xextproto") + (version "7.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xextproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xeyes + (package + (name "xeyes") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xeyes-" + version + ".tar.bz2")) + (sha256 + (base32 + "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxrender" ,libxrender) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xfs + (package + (name "xfs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xfs-" + version + ".tar.bz2")) + (sha256 + (base32 + "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("libxfont" ,libxfont) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xgamma + (package + (name "xgamma") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xgamma-" + version + ".tar.bz2")) + (sha256 + (base32 + "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3")))) + (build-system gnu-build-system) + (inputs + `(("libxxf86vm" ,libxxf86vm) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xhost + (package + (name "xhost") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xhost-" + version + ".tar.bz2")) + (sha256 + (base32 + "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xineramaproto + (package + (name "xineramaproto") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xineramaproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xinit + (package + (name "xinit") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xinit-" + version + ".tar.bz2")) + (sha256 + (base32 + "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("xauth" ,xauth))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xinput + (package + (name "xinput") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xinput-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkbcomp + (package + (name "xkbcomp") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkbcomp-" + version + ".tar.bz2")) + (sha256 + (base32 + "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkbevd + (package + (name "xkbevd") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkbevd-" + version + ".tar.bz2")) + (sha256 + (base32 + "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm")))) + (build-system gnu-build-system) + (inputs + `(("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkbutils + (package + (name "xkbutils") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkbutils-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxaw" ,libxaw) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkeyboard-config + (package + (name "xkeyboard-config") + (version "2.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkeyboard-config-" + version + ".tar.bz2")) + (sha256 + (base32 + "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkill + (package + (name "xkill") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkill-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xlsatoms + (package + (name "xlsatoms") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xlsatoms-" + version + ".tar.bz2")) + (sha256 + (base32 + "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) + (build-system gnu-build-system) + (inputs + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xlsclients + (package + (name "xlsclients") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xlsclients-" + version + ".tar.bz2")) + (sha256 + (base32 + "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) + (build-system gnu-build-system) + (inputs + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xmessage + (package + (name "xmessage") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xmessage-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxaw" ,libxaw) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xmodmap + (package + (name "xmodmap") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xmodmap-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-cf-files + (package + (name "xorg-cf-files") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/xorg-cf-files-" + version + ".tar.bz2")) + (sha256 + (base32 + "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-docs + (package + (name "xorg-docs") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xorg-docs-" + version + ".tar.bz2")) + (sha256 + (base32 + "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-server + (package + (name "xorg-server") + (version "1.12.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xserver/xorg-server-" + version + ".tar.bz2")) + (sha256 + (base32 + "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a")))) + (build-system gnu-build-system) + (inputs + `(("bigreqsproto" ,bigreqsproto) + ("xtrans" ,xtrans) + ("xcmiscproto" ,xcmiscproto) + ("damageproto" ,damageproto) + ("libxfont" ,libxfont) + ("pixman" ,pixman) + ("libxext" ,libxext) + ("recordproto" ,recordproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) + ("libdmx" ,libdmx) + ("dmxproto" ,dmxproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xineramaproto" ,xineramaproto) + ("resourceproto" ,resourceproto) + ("scrnsaverproto" ,scrnsaverproto) + ("compositeproto" ,compositeproto) + ("xf86driproto" ,xf86driproto) + ("glproto" ,glproto) + ("xf86bigfontproto" ,xf86bigfontproto) + ("dbus" ,dbus) + ("mesa" ,mesa) + ("systemd" ,systemd) + ("zlib" ,zlib) + ("libxv" ,libxv) + ("libxt" ,libxt) + ("libxres" ,libxres) + ("libxrender" ,libxrender) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) + ("libxkbfile" ,libxkbfile) + ("libxfixes" ,libxfixes) + ("libxdmcp" ,libxdmcp) + ("libxaw" ,libxaw) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("openssl" ,openssl) + ("libdrm" ,libdrm) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("kbproto" ,kbproto) + ("dri2proto" ,dri2proto) + ("randrproto" ,randrproto) + ("xextproto" ,xextproto) + ("inputproto" ,inputproto) + ("libpciaccess" ,libpciaccess))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-sgml-doctools + (package + (name "xorg-sgml-doctools") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-" + version + ".tar.bz2")) + (sha256 + (base32 + "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xpr + (package + (name "xpr") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xpr-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xprop + (package + (name "xprop") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xprop-" + version + ".tar.bz2")) + (sha256 + (base32 + "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xproto + (package + (name "xproto") + (version "7.0.23") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xrandr + (package + (name "xrandr") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xrandr-" + version + ".tar.bz2")) + (sha256 + (base32 + "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xrdb + (package + (name "xrdb") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xrdb-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xrefresh + (package + (name "xrefresh") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xrefresh-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xset + (package + (name "xset") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xset-" + version + ".tar.bz2")) + (sha256 + (base32 + "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) + (build-system gnu-build-system) + (inputs + `(("libxxf86misc" ,libxxf86misc) + ("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xsetroot + (package + (name "xsetroot") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xsetroot-" + version + ".tar.bz2")) + (sha256 + (base32 + "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxcursor" ,libxcursor) + ("xbitmaps" ,xbitmaps) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xtrans + (package + (name "xtrans") + (version "1.2.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xtrans-" + version + ".tar.bz2")) + (sha256 + (base32 + "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xvinfo + (package + (name "xvinfo") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xvinfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0")))) + (build-system gnu-build-system) + (inputs + `(("libxext" ,libxext) + ("libxv" ,libxv) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xwd + (package + (name "xwd") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xwd-" + version + ".tar.bz2")) + (sha256 + (base32 + "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xwininfo + (package + (name "xwininfo") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xwininfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xwud + (package + (name "xwud") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xwud-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + \ No newline at end of file -- cgit v1.2.3 From 5f1d0fb08562cbdc94216ff39b4cb28b6eb357e3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 25 Feb 2013 22:24:25 +0100 Subject: gnu: xorg: Add and remove packages to mirror X11R7.7/src/everything * gnu/packages/xorg.scm: Remove packages not from ftp://ftp.freedesktop.org/pub/xorg/X11R7.7/src/everything/ . Add missing packages, for the time being with a 0 hash and without dependencies. Correct spelling (all lower case for package names). --- gnu/packages/xorg.scm | 3253 +++++++++++++++++++++++++++++++------------------ 1 file changed, 2039 insertions(+), 1214 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bbbd7a943a..1b6d607a54 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -35,7 +35,8 @@ #:use-module (gnu packages openssl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages xml)) (define-public applewmproto (package @@ -81,8 +82,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public bigreqsproto (package (name "bigreqsproto") @@ -103,8 +104,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public compositeproto (package (name "compositeproto") @@ -127,8 +128,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public damageproto (package (name "damageproto") @@ -149,8 +150,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public dmxproto (package (name "dmxproto") @@ -171,8 +172,29 @@ (synopsis #f) (description #f) (license #f))) - - + + +(define-public dri2proto + (package + (name "dri2proto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/dri2proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public encodings (package (name "encodings") @@ -193,8 +215,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public fixesproto (package (name "fixesproto") @@ -217,170 +239,149 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public font-alias + + +(define-public font-adobe-100dpi (package - (name "font-alias") + (name "font-adobe-100dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-alias-" + "mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-" version ".tar.bz2")) (sha256 (base32 - "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-arabic-misc + + +(define-public font-adobe-75dpi (package - (name "font-arabic-misc") + (name "font-adobe-75dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-arabic-misc-" + "mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-" version ".tar.bz2")) (sha256 (base32 - "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-bh-ttf + + +(define-public font-adobe-utopia-100dpi (package - (name "font-bh-ttf") - (version "1.0.3") + (name "font-adobe-utopia-100dpi") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" + "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-" version ".tar.bz2")) (sha256 (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-cronyx-cyrillic + + +(define-public font-adobe-utopia-75dpi (package - (name "font-cronyx-cyrillic") - (version "1.0.3") + (name "font-adobe-utopia-75dpi") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" + "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-" version ".tar.bz2")) (sha256 (base32 - "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-cursor-misc + + +(define-public font-adobe-utopia-type1 (package - (name "font-cursor-misc") - (version "1.0.3") + (name "font-adobe-utopia-type1") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" + "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-" version ".tar.bz2")) (sha256 (base32 - "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-daewoo-misc + + +(define-public font-alias (package - (name "font-daewoo-misc") + (name "font-alias") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" + "mirror://xorg/X11R7.7/src/everything/font-alias-" version ".tar.bz2")) (sha256 (base32 - "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) + "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-dec-misc + + +(define-public font-arabic-misc (package - (name "font-dec-misc") + (name "font-arabic-misc") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-dec-misc-" + "mirror://xorg/X11R7.7/src/everything/font-arabic-misc-" version ".tar.bz2")) (sha256 (base32 - "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1")))) + "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah")))) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -390,122 +391,106 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public font-isas-misc + + +(define-public font-bh-100dpi (package - (name "font-isas-misc") + (name "font-bh-100dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-isas-misc-" + "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-" version ".tar.bz2")) (sha256 (base32 - "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-jis-misc + + +(define-public font-bh-75dpi (package - (name "font-jis-misc") + (name "font-bh-75dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" + "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-" version ".tar.bz2")) (sha256 (base32 - "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-micro-misc + + +(define-public font-bh-lucidatypewriter-100dpi (package - (name "font-micro-misc") + (name "font-bh-lucidatypewriter-100dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-micro-misc-" + "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-" version ".tar.bz2")) (sha256 (base32 - "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-misc-cyrillic + + +(define-public font-bh-lucidatypewriter-75dpi (package - (name "font-misc-cyrillic") + (name "font-bh-lucidatypewriter-75dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-" + "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-" version ".tar.bz2")) (sha256 (base32 - "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-misc-ethiopic + + +(define-public font-bh-type1 (package - (name "font-misc-ethiopic") + (name "font-bh-type1") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-" + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" version ".tar.bz2")) (sha256 (base32 - "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) (build-system gnu-build-system) (inputs `(("mkfontscale" ,mkfontscale) @@ -515,22 +500,22 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public font-misc-meltho + + +(define-public font-bitstream-100dpi (package - (name "font-misc-meltho") + (name "font-bitstream-100dpi") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" version ".tar.bz2")) (sha256 (base32 - "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) (build-system gnu-build-system) (inputs `(("mkfontscale" ,mkfontscale) @@ -540,126 +525,123 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public font-misc-misc + + +(define-public font-bitstream-75dpi (package - (name "font-misc-misc") - (version "1.1.2") + (name "font-bitstream-75dpi") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-misc-misc-" + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" version ".tar.bz2")) (sha256 (base32 - "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) (build-system gnu-build-system) (inputs `(("mkfontscale" ,mkfontscale) ("mkfontdir" ,mkfontdir) - ("font-util" ,font-util) - ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-mutt-misc + + +(define-public font-bitstream-type1 (package - (name "font-mutt-misc") + (name "font-bitstream-type1") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-mutt-misc-" + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" version ".tar.bz2")) (sha256 (base32 - "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx")))) + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) (build-system gnu-build-system) (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-schumacher-misc + + +(define-public font-cronyx-cyrillic (package - (name "font-schumacher-misc") - (version "1.1.2") + (name "font-cronyx-cyrillic") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-" + "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" version ".tar.bz2")) (sha256 (base32 - "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) + "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("font-util" ,font-util) + `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-screen-cyrillic + + +(define-public font-cursor-misc (package - (name "font-screen-cyrillic") - (version "1.0.4") + (name "font-cursor-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-" + "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" version ".tar.bz2")) (sha256 (base32 - "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2")))) + "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) (build-system gnu-build-system) (inputs - `(("mkfontdir" ,mkfontdir) + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-sony-misc + + +(define-public font-daewoo-misc (package - (name "font-sony-misc") + (name "font-daewoo-misc") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-sony-misc-" + "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" version ".tar.bz2")) (sha256 (base32 - "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0")))) + "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -669,44 +651,47 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public fontsproto + + +(define-public font-dec-misc (package - (name "fontsproto") - (version "2.1.2") + (name "font-dec-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/fontsproto-" + "mirror://xorg/X11R7.7/src/everything/font-dec-misc-" version ".tar.bz2")) (sha256 (base32 - "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) + "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-sun-misc + + +(define-public font-ibm-type1 (package - (name "font-sun-misc") + (name "font-ibm-type1") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-sun-misc-" + "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" version ".tar.bz2")) (sha256 (base32 - "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -716,44 +701,47 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public font-util + + +(define-public font-isas-misc (package - (name "font-util") - (version "1.3.0") + (name "font-isas-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-util-" + "mirror://xorg/X11R7.7/src/everything/font-isas-misc-" version ".tar.bz2")) (sha256 (base32 - "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz")))) + "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public font-winitzki-cyrillic + + +(define-public font-jis-misc (package - (name "font-winitzki-cyrillic") + (name "font-jis-misc") (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-" + "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" version ".tar.bz2")) (sha256 (base32 - "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb")))) + "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -763,2086 +751,2997 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public gccmakedep + + +(define-public font-micro-misc (package - (name "gccmakedep") - (version "1.0.2") + (name "font-micro-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/util/gccmakedep-" + "mirror://xorg/X11R7.7/src/everything/font-micro-misc-" version ".tar.bz2")) (sha256 (base32 - "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86")))) + "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public glproto + + +(define-public font-misc-cyrillic (package - (name "glproto") - (version "1.4.16") + (name "font-misc-cyrillic") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/proto/glproto-" + "mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-" version ".tar.bz2")) (sha256 (base32 - "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal")))) + "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public iceauth + + +(define-public font-misc-ethiopic (package - (name "iceauth") - (version "1.0.5") + (name "font-misc-ethiopic") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/iceauth-" + "mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-" version ".tar.bz2")) (sha256 (base32 - "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl")))) + "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libICE" ,libICE) + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public imake + + +(define-public font-misc-meltho (package - (name "imake") - (version "1.0.5") + (name "font-misc-meltho") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/util/imake-" + "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" version ".tar.bz2")) (sha256 (base32 - "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr")))) + "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public inputproto + + +(define-public font-misc-misc (package - (name "inputproto") - (version "2.2") + (name "font-misc-misc") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/inputproto-" + "mirror://xorg/X11R7.7/src/everything/font-misc-misc-" version ".tar.bz2")) (sha256 (base32 - "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy")))) + "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("font-util" ,font-util) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public kbproto + + +(define-public font-mutt-misc (package - (name "kbproto") - (version "1.0.6") + (name "font-mutt-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/kbproto-" + "mirror://xorg/X11R7.7/src/everything/font-mutt-misc-" version ".tar.bz2")) (sha256 (base32 - "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03")))) + "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libAppleWM + + +(define-public font-schumacher-misc (package - (name "libAppleWM") - (version "1.4.1") + (name "font-schumacher-misc") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libAppleWM-" + "mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-" version ".tar.bz2")) (sha256 (base32 - "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) + "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("applewmproto" ,applewmproto) + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("font-util" ,font-util) + ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libFS + + +(define-public font-screen-cyrillic (package - (name "libFS") + (name "font-screen-cyrillic") (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libFS-" + "mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-" version ".tar.bz2")) (sha256 (base32 - "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh")))) + "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2")))) (build-system gnu-build-system) (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) - ("fontsproto" ,fontsproto) + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libICE + + +(define-public font-sony-misc (package - (name "libICE") - (version "1.0.8") + (name "font-sony-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libICE-" + "mirror://xorg/X11R7.7/src/everything/font-sony-misc-" version ".tar.bz2")) (sha256 (base32 - "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) + "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0")))) (build-system gnu-build-system) (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libSM + + +(define-public font-sun-misc (package - (name "libSM") - (version "1.2.1") + (name "font-sun-misc") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libSM-" + "mirror://xorg/X11R7.7/src/everything/font-sun-misc-" version ".tar.bz2")) (sha256 (base32 - "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck")))) + "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8")))) (build-system gnu-build-system) (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) - ("util-linux" ,util-linux) - ("libICE" ,libICE) + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libICE" ,libICE))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libWindowsWM + + +(define-public font-util (package - (name "libWindowsWM") - (version "1.0.1") + (name "font-util") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libWindowsWM-" + "mirror://xorg/X11R7.7/src/everything/font-util-" version ".tar.bz2")) (sha256 (base32 - "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15")))) + "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz")))) (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("windowswmproto" ,windowswmproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxScrnSaver + + +(define-public font-winitzki-cyrillic (package - (name "libxScrnSaver") - (version "1.2.2") + (name "font-winitzki-cyrillic") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxScrnSaver-" + "mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-" version ".tar.bz2")) (sha256 (base32 - "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("scrnsaverproto" ,scrnsaverproto) + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxau + + +(define-public font-xfree86-type1 (package - (name "libxau") - (version "1.0.7") + (name "font-xfree86-type1") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxau-" + "mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-" version ".tar.bz2")) (sha256 (base32 - "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxaw + + +(define-public fontsproto (package - (name "libxaw") - (version "1.0.11") + (name "fontsproto") + (version "2.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxaw-" + "mirror://xorg/X11R7.7/src/everything/fontsproto-" version ".tar.bz2")) (sha256 (base32 - "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) + "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libxmu" ,libxmu))) + (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxcomposite + + +(define-public glproto (package - (name "libxcomposite") - (version "0.4.3") + (name "glproto") + (version "1.4.16") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcomposite-" + "mirror://xorg/X11R7.7/src/everything/glproto-" version ".tar.bz2")) (sha256 (base32 - "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j")))) + "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("libx11" ,libx11) - ("compositeproto" ,compositeproto) - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libxfixes" ,libxfixes))) + (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxcursor + + +(define-public iceauth (package - (name "libxcursor") - (version "1.1.13") + (name "iceauth") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcursor-" + "mirror://xorg/X11R7.7/src/everything/iceauth-" version ".tar.bz2")) (sha256 (base32 - "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) + "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl")))) (build-system gnu-build-system) (inputs - `(("libxrender" ,libxrender) - ("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) + `(("xproto" ,xproto) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxdamage + + +(define-public inputproto (package - (name "libxdamage") - (version "1.1.3") + (name "inputproto") + (version "2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxdamage-" + "mirror://xorg/X11R7.7/src/everything/inputproto-" version ".tar.bz2")) (sha256 (base32 - "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("xextproto" ,xextproto) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) - ("damageproto" ,damageproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxdmcp + + +(define-public kbproto (package - (name "libxdmcp") - (version "1.1.1") + (name "kbproto") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxdmcp-" + "mirror://xorg/X11R7.7/src/everything/kbproto-" version ".tar.bz2")) (sha256 (base32 - "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls")))) + "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxext + + +(define-public libapplewm (package - (name "libxext") - (version "1.3.1") + (name "libapplewm") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxext-" + "mirror://xorg/X11R7.7/src/everything/libAppleWM-" version ".tar.bz2")) (sha256 (base32 - "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) (build-system gnu-build-system) (inputs - `(("libxau" ,libxau) - ("xproto" ,xproto) - ("xextproto" ,xextproto) + `(("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) + ("applewmproto" ,applewmproto) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("xproto" ,xproto))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxfixes + + +(define-public libfs (package - (name "libxfixes") - (version "5.0") + (name "libfs") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxfixes-" + "mirror://xorg/X11R7.7/src/everything/libFS-" version ".tar.bz2")) (sha256 (base32 - "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) + "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("fontsproto" ,fontsproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxfont + + +(define-public libice (package - (name "libxfont") - (version "1.4.5") + (name "libice") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxfont-" + "mirror://xorg/X11R7.7/src/everything/libICE-" version ".tar.bz2")) (sha256 (base32 - "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) + "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("xtrans" ,xtrans) + `(("xtrans" ,xtrans) ("xproto" ,xproto) - ("freetype" ,freetype) - ("fontsproto" ,fontsproto) - ("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxft + + +(define-public libsm (package - (name "libxft") - (version "2.3.1") + (name "libsm") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxft-" + "mirror://xorg/X11R7.7/src/everything/libSM-" version ".tar.bz2")) (sha256 (base32 - "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) + "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck")))) (build-system gnu-build-system) (inputs - `(("renderproto" ,renderproto) - ("libx11" ,libx11) - ("xproto" ,xproto) - ("libxrender" ,libxrender) + `(("xtrans" ,xtrans) ("xproto" ,xproto) - ("libx11" ,libx11) - ("freetype" ,freetype) - ("fontconfig" ,fontconfig) + ("util-linux" ,util-linux) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libxrender" ,libxrender))) + `(("libice" ,libice))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxi + + +(define-public libwindowswm (package - (name "libxi") - (version "1.6.1") + (name "libwindowswm") + (version "1.0.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxi-" + "mirror://xorg/X11R7.7/src/everything/libWindowsWM-" version ".tar.bz2")) (sha256 (base32 - "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) + "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) + `(("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) - ("inputproto" ,inputproto) + ("windowswmproto" ,windowswmproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxinerama + + +(define-public libx11 (package - (name "libxinerama") - (version "1.1.2") + (name "libx11") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxinerama-" + "mirror://xorg/X11R7.7/src/everything/libX11-" version ".tar.bz2")) (sha256 (base32 - "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xineramaproto" ,xineramaproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxmu + + +(define-public libxscrnsaver (package - (name "libxmu") - (version "1.1.1") + (name "libxscrnsaver") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxmu-" + "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" version ".tar.bz2")) (sha256 (base32 - "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) + "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("xextproto" ,xextproto) + `(("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) + ("scrnsaverproto" ,scrnsaverproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxp + + +(define-public libxau (package - (name "libxp") - (version "1.0.1") + (name "libxau") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/lib/libxp-" + "mirror://xorg/X11R7.7/src/everything/libXau-" version ".tar.bz2")) (sha256 (base32 - "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi")))) + "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libxau" ,libxau) - ("libx11" ,libx11) - ("printproto" ,printproto) - ("pkg-config" ,pkg-config))) + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxpm + + +(define-public libxaw (package - (name "libxpm") - (version "3.5.10") + (name "libxaw") + (version "1.0.11") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxpm-" + "mirror://xorg/X11R7.7/src/everything/libXaw-" version ".tar.bz2")) (sha256 (base32 - "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) + "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) (build-system gnu-build-system) (inputs `(("libxt" ,libxt) ("xproto" ,xproto) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxmu" ,libxmu))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxrandr + + +(define-public libxcomposite (package - (name "libxrandr") - (version "1.4.0") + (name "libxcomposite") + (version "0.4.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/lib/libxrandr-" + "mirror://xorg/X11R7.7/src/everything/libXcomposite-" version ".tar.bz2")) (sha256 (base32 - "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3")))) + "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("libx11" ,libx11) + ("compositeproto" ,compositeproto) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxfixes" ,libxfixes))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcursor + (package + (name "libxcursor") + (version "1.1.13") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXcursor-" + version + ".tar.bz2")) + (sha256 + (base32 + "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) + ("libxfixes" ,libxfixes) ("libx11" ,libx11) - ("renderproto" ,renderproto) - ("randrproto" ,randrproto) + ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxrender + + +(define-public libxdamage (package - (name "libxrender") - (version "0.9.7") + (name "libxdamage") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxrender-" + "mirror://xorg/X11R7.7/src/everything/libXdamage-" version ".tar.bz2")) (sha256 (base32 - "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) ("libx11" ,libx11) - ("renderproto" ,renderproto) + ("fixesproto" ,fixesproto) + ("damageproto" ,damageproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxres + + +(define-public libxdmcp (package - (name "libxres") - (version "1.0.6") + (name "libxdmcp") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxres-" + "mirror://xorg/X11R7.7/src/everything/libXdmcp-" version ".tar.bz2")) (sha256 (base32 - "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz")))) + "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxext + (package + (name "libxext") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXext-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + (build-system gnu-build-system) + (inputs + `(("libxau" ,libxau) + ("xproto" ,xproto) ("xextproto" ,xextproto) - ("libxext" ,libxext) ("libx11" ,libx11) - ("resourceproto" ,resourceproto) ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("xproto" ,xproto))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxt + + +(define-public libxfixes (package - (name "libxt") - (version "1.1.3") + (name "libxfixes") + (version "5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxt-" + "mirror://xorg/X11R7.7/src/everything/libXfixes-" version ".tar.bz2")) (sha256 (base32 - "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) + "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) + ("xextproto" ,xextproto) ("libx11" ,libx11) - ("libSM" ,libSM) - ("kbproto" ,kbproto) - ("libICE" ,libICE) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxfont + (package + (name "libxfont") + (version "1.4.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXfont-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xtrans" ,xtrans) + ("xproto" ,xproto) + ("freetype" ,freetype) + ("fontsproto" ,fontsproto) + ("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxft + (package + (name "libxft") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXft-" + version + ".tar.bz2")) + (sha256 + (base32 + "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) + (build-system gnu-build-system) + (inputs + `(("renderproto" ,renderproto) + ("libx11" ,libx11) + ("xproto" ,xproto) + ("libxrender" ,libxrender) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("libSM" ,libSM))) + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libxrender" ,libxrender))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxtst + + +(define-public libxi (package - (name "libxtst") - (version "1.2.1") + (name "libxi") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxtst-" + "mirror://xorg/X11R7.7/src/everything/libXi-" version ".tar.bz2")) (sha256 (base32 - "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) + "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) (build-system gnu-build-system) (inputs - `(("libxi" ,libxi) + `(("xproto" ,xproto) ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) - ("recordproto" ,recordproto) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxv + + +(define-public libxinerama + (package + (name "libxinerama") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXinerama-" + version + ".tar.bz2")) + (sha256 + (base32 + "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) + (build-system gnu-build-system) + (inputs + `(("xineramaproto" ,xineramaproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxmu + (package + (name "libxmu") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXmu-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxp + (package + (name "libxp") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXp-" + version + ".tar.bz2")) + (sha256 + (base32 + "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) +;; ("printproto" ,printproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxpm + (package + (name "libxpm") + (version "3.5.10") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXpm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxrandr + (package + (name "libxrandr") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/XqqR7.7/src/everything/libXrandr-" + version + ".tar.bz2")) + (sha256 + (base32 + "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("randrproto" ,randrproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxrender + (package + (name "libxrender") + (version "0.9.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXrender-" + version + ".tar.bz2")) + (sha256 + (base32 + "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxres + (package + (name "libxres") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXres-" + version + ".tar.bz2")) + (sha256 + (base32 + "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("resourceproto" ,resourceproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxt + (package + (name "libxt") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXt-" + version + ".tar.bz2")) + (sha256 + (base32 + "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("libsm" ,libsm) + ("kbproto" ,kbproto) + ("libice" ,libice) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libsm" ,libsm))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxtst + (package + (name "libxtst") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXtst-" + version + ".tar.bz2")) + (sha256 + (base32 + "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) + (build-system gnu-build-system) + (inputs + `(("libxi" ,libxi) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("recordproto" ,recordproto) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxv + (package + (name "libxv") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXv-" + version + ".tar.bz2")) + (sha256 + (base32 + "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxvmc + (package + (name "libxvmc") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (inputs + `(("libxv" ,libxv) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxxf86dga + (package + (name "libxxf86dga") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXxf86dga-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxxf86vm + (package + (name "libxxf86vm") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libdmx + (package + (name "libdmx") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libdmx-" + version + ".tar.bz2")) + (sha256 + (base32 + "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("dmxproto" ,dmxproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libfontenc + (package + (name "libfontenc") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libfontenc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libpciaccess + (package + (name "libpciaccess") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpciaccess-" + version + ".tar.bz2")) + (sha256 + (base32 + "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libpthread-stubs + (package + (name "libpthread-stubs") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + version + ".tar.bz2")) + (sha256 + (base32 + "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcb + (package + (name "libxcb") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxdmcp" ,libxdmcp) + ("xcb-proto" ,xcb-proto) + ("libxau" ,libxau) + ("libpthread-stubs" ,libpthread-stubs) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxkbfile + (package + (name "libxkbfile") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxkbfile-" + version + ".tar.bz2")) + (sha256 + (base32 + "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("kbproto" ,kbproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public luit + (package + (name "luit") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/luit-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")))) + (build-system gnu-build-system) + (inputs + `(("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public makedepend + (package + (name "makedepend") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/makedepend-" + version + ".tar.bz2")) + (sha256 + (base32 + "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public mkfontdir + (package + (name "mkfontdir") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public mkfontscale + (package + (name "mkfontscale") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontscale-" + version + ".tar.bz2")) + (sha256 + (base32 + "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("freetype" ,freetype) + ("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public randrproto + (package + (name "randrproto") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/randrproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public recordproto + (package + (name "recordproto") + (version "1.14.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/recordproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public renderproto + (package + (name "renderproto") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/renderproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public resourceproto + (package + (name "resourceproto") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/resourceproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public scrnsaverproto + (package + (name "scrnsaverproto") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public sessreg + (package + (name "sessreg") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/sessreg-" + version + ".tar.bz2")) + (sha256 + (base32 + "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public setxkbmap + (package + (name "setxkbmap") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/setxkbmap-" + version + ".tar.bz2")) + (sha256 + (base32 + "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x")))) + (build-system gnu-build-system) + (inputs + `(("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public smproxy + (package + (name "smproxy") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/smproxy-" + version + ".tar.bz2")) + (sha256 + (base32 + "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxmu" ,libxmu) + ("libsm" ,libsm) + ("libice" ,libice) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public util-macros + (package + (name "util-macros") + (version "1.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/util-macros-" + version + ".tar.bz2")) + (sha256 + (base32 + "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public videoproto + (package + (name "videoproto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/videoproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public windowswmproto + (package + (name "windowswmproto") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/windowswmproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public x11perf + (package + (name "x11perf") + (version "1.5.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/x11perf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xauth + (package + (name "xauth") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xauth-" + version + ".tar.bz2")) + (sha256 + (base32 + "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xbacklight + (package + (name "xbacklight") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xbacklight-" + version + ".tar.bz2")) + (sha256 + (base32 + "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) +;; ("xcb-util" ,xcb-util) + ("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xbitmaps + (package + (name "xbitmaps") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xbitmaps-" + version + ".tar.bz2")) + (sha256 + (base32 + "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-proto + (package + (name "xcb-proto") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcb-proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcmiscproto + (package + (name "xcmiscproto") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcmiscproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcmsdb + (package + (name "xcmsdb") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcmsdb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcursor-themes (package - (name "libxv") - (version "1.0.7") + (name "xcursor-themes") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxv-" + "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" version ".tar.bz2")) (sha256 (base32 - "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) + "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("videoproto" ,videoproto) + `(("libxcursor" ,libxcursor) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxvMC + + +(define-public xcursorgen (package - (name "libxvMC") - (version "1.0.7") + (name "xcursorgen") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxvMC-" + "mirror://xorg/X11R7.7/src/everything/xcursorgen-" version ".tar.bz2")) (sha256 (base32 - "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw")))) (build-system gnu-build-system) (inputs - `(("libxv" ,libxv) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) + `(("libxcursor" ,libxcursor) ("libx11" ,libx11) - ("videoproto" ,videoproto) + ("libpng" ,libpng) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libdmx + + +(define-public xdpyinfo (package - (name "libdmx") - (version "1.1.2") + (name "xdpyinfo") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libdmx-" + "mirror://xorg/X11R7.7/src/everything/xdpyinfo-" version ".tar.bz2")) (sha256 (base32 - "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) + "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) + `(("libxxf86vm" ,libxxf86vm) +;; ("libxxf86misc" ,libxxf86misc) + ("libxxf86dga" ,libxxf86dga) + ("libxtst" ,libxtst) + ("libxrender" ,libxrender) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) ("libxext" ,libxext) + ("libxcomposite" ,libxcomposite) + ("libxcb" ,libxcb) ("libx11" ,libx11) - ("dmxproto" ,dmxproto) + ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libfontenc + + +(define-public xdriinfo (package - (name "libfontenc") - (version "1.1.1") + (name "xdriinfo") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libfontenc-" + "mirror://xorg/X11R7.7/src/everything/xdriinfo-" version ".tar.bz2")) (sha256 (base32 - "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) + "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("xproto" ,xproto) + `(;;("mesa" ,mesa) + ("glproto" ,glproto) + ("libx11" ,libx11) + ("glproto" ,glproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libpciaccess + + +(define-public xev (package - (name "libpciaccess") - (version "0.13.1") + (name "xev") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpciaccess-" + "mirror://xorg/X11R7.7/src/everything/xev-" version ".tar.bz2")) (sha256 (base32 - "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) + "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libpthread-stubs + + +(define-public xextproto (package - (name "libpthread-stubs") - (version "0.3") + (name "xextproto") + (version "7.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + "mirror://xorg/X11R7.7/src/everything/xextproto-" version ".tar.bz2")) (sha256 (base32 - "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) + "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxcb + + +(define-public xf86-input-evdev (package - (name "libxcb") - (version "1.9") + (name "xf86-input-evdev") + (version "2.7.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/libxcb-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-" version ".tar.bz2")) (sha256 (base32 - "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxdmcp" ,libxdmcp) - ("xcb-proto" ,xcb-proto) - ("libxau" ,libxau) - ("libpthread-stubs" ,libpthread-stubs) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libxkbfile + + +(define-public xf86-input-joystick (package - (name "libxkbfile") - (version "1.0.8") + (name "xf86-input-joystick") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxkbfile-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-" version ".tar.bz2")) (sha256 (base32 - "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("kbproto" ,kbproto) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public lndir + + +(define-public xf86-input-keyboard (package - (name "lndir") - (version "1.0.3") + (name "xf86-input-keyboard") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/util/lndir-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-" version ".tar.bz2")) (sha256 (base32 - "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public luit + + +(define-public xf86-input-mouse (package - (name "luit") - (version "1.1.1") + (name "xf86-input-mouse") + (version "1.7.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/luit-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-" version ".tar.bz2")) (sha256 (base32 - "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libfontenc" ,libfontenc) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public makedepend + + +(define-public xf86-input-synaptics (package - (name "makedepend") - (version "1.0.4") + (name "xf86-input-synaptics") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/makedepend-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-" version ".tar.bz2")) (sha256 (base32 - "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public mkfontdir + + +(define-public xf86-input-vmmouse (package - (name "mkfontdir") - (version "1.0.7") + (name "xf86-input-vmmouse") + (version "12.8.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-" version ".tar.bz2")) (sha256 (base32 - "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public mkfontscale + + +(define-public xf86-input-void (package - (name "mkfontscale") - (version "1.1.0") + (name "xf86-input-void") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/mkfontscale-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-void-" version ".tar.bz2")) (sha256 (base32 - "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) - ("xproto" ,xproto) - ("freetype" ,freetype) - ("libfontenc" ,libfontenc) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public pixman + + +(define-public xf86-video-ark (package - (name "pixman") - (version "0.26.2") + (name "xf86-video-ark") + (version "0.7.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/lib/pixman-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-" version ".tar.bz2")) (sha256 (base32 - "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("pkg-config" ,pkg-config) ("perl" ,perl))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public printproto + + +(define-public xf86-video-ast (package - (name "printproto") - (version "1.0.5") + (name "xf86-video-ast") + (version "0.93.10") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/proto/printproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-" version ".tar.bz2")) (sha256 (base32 - "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxau" ,libxau) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public randrproto + + +(define-public xf86-video-ati (package - (name "randrproto") - (version "1.4.0") + (name "xf86-video-ati") + (version "6.14.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/proto/randrproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-" version ".tar.bz2")) (sha256 (base32 - "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public recordproto + + +(define-public xf86-video-cirrus (package - (name "recordproto") - (version "1.14.2") + (name "xf86-video-cirrus") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/recordproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-" version ".tar.bz2")) (sha256 (base32 - "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public renderproto + + +(define-public xf86-video-dummy (package - (name "renderproto") - (version "0.11.1") + (name "xf86-video-dummy") + (version "0.3.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/renderproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" version ".tar.bz2")) (sha256 (base32 - "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public resourceproto + + +(define-public xf86-video-fbdev (package - (name "resourceproto") - (version "1.2.0") + (name "xf86-video-fbdev") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/resourceproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-" version ".tar.bz2")) (sha256 (base32 - "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public scrnsaverproto + + +(define-public xf86-video-geode (package - (name "scrnsaverproto") - (version "1.2.2") + (name "xf86-video-geode") + (version "2.11.13") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" version ".tar.bz2")) (sha256 (base32 - "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public sessreg + + +(define-public xf86-video-glide (package - (name "sessreg") - (version "1.0.7") + (name "xf86-video-glide") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/sessreg-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-glide" version ".tar.bz2")) (sha256 (base32 - "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public setxkbmap + + +(define-public xf86-video-glint (package - (name "setxkbmap") - (version "1.3.0") + (name "xf86-video-glint") + (version "1.2.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/setxkbmap-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-" version ".tar.bz2")) (sha256 (base32 - "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxkbfile" ,libxkbfile) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public smproxy + + +(define-public xf86-video-i128 (package - (name "smproxy") - (version "1.0.5") + (name "xf86-video-i128") + (version "1.3.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/smproxy-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-" version ".tar.bz2")) (sha256 (base32 - "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxmu" ,libxmu) - ("libSM" ,libSM) - ("libICE" ,libICE) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public twm + + +(define-public xf86-video-intel (package - (name "twm") - (version "1.0.7") + (name "xf86-video-intel") + (version "2.19.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/twm-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-" version ".tar.bz2")) (sha256 (base32 - "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libxmu" ,libxmu) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("libSM" ,libSM) - ("libICE" ,libICE) - ("pkg-config" ,pkg-config) - ("flex" ,flex) - ("bison" ,bison))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public util-macros + + +(define-public xf86-video-mach64 (package - (name "util-macros") - (version "1.17") + (name "xf86-video-mach64") + (version "6.9.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/util-macros-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-" version ".tar.bz2")) (sha256 (base32 - "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public videoproto + + +(define-public xf86-video-mga (package - (name "videoproto") - (version "2.3.1") + (name "xf86-video-mga") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/videoproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-" version ".tar.bz2")) (sha256 (base32 - "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public windowswmproto + + +(define-public xf86-video-neomagic (package - (name "windowswmproto") - (version "1.0.4") + (name "xf86-video-neomagic") + (version "1.2.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/windowswmproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-" version ".tar.bz2")) (sha256 (base32 - "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xauth + + +(define-public xf86-video-newport (package - (name "xauth") - (version "1.0.7") + (name "xf86-video-newport") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xauth-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-" version ".tar.bz2")) (sha256 (base32 - "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxmu" ,libxmu) - ("libxext" ,libxext) - ("libxau" ,libxau) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xbacklight + + +(define-public xf86-video-nv (package - (name "xbacklight") - (version "1.2.0") + (name "xf86-video-nv") + (version "2.1.18") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xbacklight-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-" version ".tar.bz2")) (sha256 (base32 - "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) - ("xcb-util" ,xcb-util) - ("libxcb" ,libxcb) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xbitmaps + + +(define-public xf86-video-openchrome (package - (name "xbitmaps") - (version "1.1.1") + (name "xf86-video-openchrome") + (version "0.2.906") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xbitmaps-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-" version ".tar.bz2")) (sha256 (base32 - "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-proto + + +(define-public xf86-video-r128 (package - (name "xcb-proto") - (version "1.8") + (name "xf86-video-r128") + (version "6.8.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-proto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-" version ".tar.bz2")) (sha256 (base32 - "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-util + + +(define-public xf86-video-savage (package - (name "xcb-util") - (version "0.3.9") + (name "xf86-video-savage") + (version "2.3.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-" version ".tar.bz2")) (sha256 (base32 - "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("gperf" ,gperf) - ("m4" ,m4) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-util-image + + +(define-public xf86-video-siliconmotion (package - (name "xcb-util-image") - (version "0.3.9") + (name "xf86-video-siliconmotion") + (version "1.7.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-image-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-" version ".tar.bz2")) (sha256 (base32 - "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xcb-util" ,xcb-util) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-util-keysyms + + +(define-public xf86-video-sis (package - (name "xcb-util-keysyms") - (version "0.3.9") + (name "xf86-video-sis") + (version "0.10.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-keysyms-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-" version ".tar.bz2")) (sha256 (base32 - "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-util-renderutil + + +(define-public xf86-video-suncg6 (package - (name "xcb-util-renderutil") - (version "0.3.8") + (name "xf86-video-suncg6") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-renderutil-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-" version ".tar.bz2")) (sha256 (base32 - "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-util-wm + + +(define-public xf86-video-sunffb (package - (name "xcb-util-wm") - (version "0.3.9") + (name "xf86-video-sunffb") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-wm-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-" version ".tar.bz2")) (sha256 (base32 - "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xclock + + +(define-public xf86-video-tdfx (package - (name "xclock") - (version "1.0.6") + (name "xf86-video-tdfx") + (version "1.4.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xclock-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-" version ".tar.bz2")) (sha256 (base32 - "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxrender" ,libxrender) - ("libxmu" ,libxmu) - ("libxkbfile" ,libxkbfile) - ("libxft" ,libxft) - ("libxaw" ,libxaw) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcmiscproto + + +(define-public xf86-video-tga (package - (name "xcmiscproto") - (version "1.2.2") + (name "xf86-video-tga") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcmiscproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-" version ".tar.bz2")) (sha256 (base32 - "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcmsdb + + +(define-public xf86-video-trident (package - (name "xcmsdb") - (version "1.0.4") + (name "xf86-video-trident") + (version "1.3.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcmsdb-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-" version ".tar.bz2")) (sha256 (base32 - "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcursorgen + + +(define-public xf86-video-v4l (package - (name "xcursorgen") - (version "1.0.5") + (name "xf86-video-v4l") + (version "0.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcursorgen-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" version ".tar.bz2")) (sha256 (base32 - "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxcursor" ,libxcursor) - ("libx11" ,libx11) - ("libpng" ,libpng) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xcursor-themes + + +(define-public xf86-video-vesa (package - (name "xcursor-themes") - (version "1.0.3") + (name "xf86-video-vesa") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-" version ".tar.bz2")) (sha256 (base32 - "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxcursor" ,libxcursor) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xdm + + +(define-public xf86-video-vmware (package - (name "xdm") - (version "1.1.11") + (name "xf86-video-vmware") + (version "12.0.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xdm-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-" version ".tar.bz2")) (sha256 (base32 - "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("libxinerama" ,libxinerama) - ("libxft" ,libxft) - ("libxext" ,libxext) - ("libxdmcp" ,libxdmcp) - ("libxaw" ,libxaw) - ("libxau" ,libxau) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xdpyinfo + + +(define-public xf86-video-voodoo (package - (name "xdpyinfo") - (version "1.3.0") + (name "xf86-video-voodoo") + (version "1.2.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xdpyinfo-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-" version ".tar.bz2")) (sha256 (base32 - "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxxf86vm" ,libxxf86vm) - ("libxxf86misc" ,libxxf86misc) - ("libxxf86dga" ,libxxf86dga) - ("libxtst" ,libxtst) - ("libxrender" ,libxrender) - ("libxinerama" ,libxinerama) - ("libxi" ,libxi) - ("libxext" ,libxext) - ("libxcomposite" ,libxcomposite) - ("libxcb" ,libxcb) - ("libx11" ,libx11) - ("libdmx" ,libdmx) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xdriinfo + + +(define-public xf86-video-wsfb (package - (name "xdriinfo") - (version "1.0.4") + (name "xf86-video-wsfb") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xdriinfo-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" version ".tar.bz2")) (sha256 (base32 - "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("mesa" ,mesa) - ("glproto" ,glproto) - ("libx11" ,libx11) - ("glproto" ,glproto) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xev + + +(define-public xf86bigfontproto (package - (name "xev") + (name "xf86bigfontproto") (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xev-" + "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-" version ".tar.bz2")) (sha256 (base32 - "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("xproto" ,xproto) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xextproto + + +(define-public xf86dgaproto (package - (name "xextproto") - (version "7.2.1") + (name "xf86dgaproto") + (version "2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xextproto-" + "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-" version ".tar.bz2")) (sha256 (base32 - "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xeyes + + +(define-public xf86driproto (package - (name "xeyes") - (version "1.1.1") + (name "xf86driproto") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xeyes-" + "mirror://xorg/X11R7.7/src/everything/xf86driproto-" version ".tar.bz2")) (sha256 (base32 - "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxrender" ,libxrender) - ("libxmu" ,libxmu) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xfs + + +(define-public xf86vidmodeproto (package - (name "xfs") - (version "1.1.2") + (name "xf86vidmodeproto") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xfs-" + "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-" version ".tar.bz2")) (sha256 (base32 - "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) - ("libxfont" ,libxfont) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - + + (define-public xgamma (package (name "xgamma") @@ -2866,8 +3765,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xhost (package (name "xhost") @@ -2892,8 +3791,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xineramaproto (package (name "xineramaproto") @@ -2914,34 +3813,8 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public xinit - (package - (name "xinit") - (version "1.3.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xinit-" - version - ".tar.bz2")) - (sha256 - (base32 - "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1")))) - (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("xauth" ,xauth))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xinput (package (name "xinput") @@ -2970,8 +3843,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xkbcomp (package (name "xkbcomp") @@ -2996,8 +3869,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xkbevd (package (name "xkbevd") @@ -3021,8 +3894,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xkbutils (package (name "xkbutils") @@ -3049,8 +3922,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xkeyboard-config (package (name "xkeyboard-config") @@ -3071,8 +3944,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xkill (package (name "xkill") @@ -3096,8 +3969,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xlsatoms (package (name "xlsatoms") @@ -3119,8 +3992,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xlsclients (package (name "xlsclients") @@ -3142,33 +4015,8 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public xmessage - (package - (name "xmessage") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xmessage-" - version - ".tar.bz2")) - (sha256 - (base32 - "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxaw" ,libxaw) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xmodmap (package (name "xmodmap") @@ -3192,30 +4040,8 @@ (synopsis #f) (description #f) (license #f))) - - -(define-public xorg-cf-files - (package - (name "xorg-cf-files") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/util/xorg-cf-files-" - version - ".tar.bz2")) - (sha256 - (base32 - "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xorg-docs (package (name "xorg-docs") @@ -3236,8 +4062,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xorg-server (package (name "xorg-server") @@ -3246,7 +4072,7 @@ (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xserver/xorg-server-" + "mirror://xorg/X11R7.7/src/everything/xorg-server-" version ".tar.bz2")) (sha256 @@ -3259,7 +4085,7 @@ ("xcmiscproto" ,xcmiscproto) ("damageproto" ,damageproto) ("libxfont" ,libxfont) - ("pixman" ,pixman) +;; ("pixman" ,pixman) ("libxext" ,libxext) ("recordproto" ,recordproto) ("xf86vidmodeproto" ,xf86vidmodeproto) @@ -3274,8 +4100,8 @@ ("glproto" ,glproto) ("xf86bigfontproto" ,xf86bigfontproto) ("dbus" ,dbus) - ("mesa" ,mesa) - ("systemd" ,systemd) +;; ("mesa" ,mesa) +;; ("systemd" ,systemd) ("zlib" ,zlib) ("libxv" ,libxv) ("libxt" ,libxt) @@ -3290,7 +4116,7 @@ ("libxau" ,libxau) ("libx11" ,libx11) ("openssl" ,openssl) - ("libdrm" ,libdrm) +;; ("libdrm" ,libdrm) ("renderproto" ,renderproto) ("pkg-config" ,pkg-config))) (propagated-inputs @@ -3304,8 +4130,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xorg-sgml-doctools (package (name "xorg-sgml-doctools") @@ -3326,8 +4152,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xpr (package (name "xpr") @@ -3352,8 +4178,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xprop (package (name "xprop") @@ -3377,8 +4203,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xproto (package (name "xproto") @@ -3399,8 +4225,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xrandr (package (name "xrandr") @@ -3426,8 +4252,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xrdb (package (name "xrdb") @@ -3451,8 +4277,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xrefresh (package (name "xrefresh") @@ -3475,8 +4301,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xset (package (name "xset") @@ -3493,7 +4319,7 @@ "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(("libxxf86misc" ,libxxf86misc) + `(;;("libxxf86misc" ,libxxf86misc) ("xproto" ,xproto) ("libxmu" ,libxmu) ("libxext" ,libxext) @@ -3503,8 +4329,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xsetroot (package (name "xsetroot") @@ -3530,8 +4356,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xtrans (package (name "xtrans") @@ -3552,8 +4378,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xvinfo (package (name "xvinfo") @@ -3578,8 +4404,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xwd (package (name "xwd") @@ -3604,8 +4430,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xwininfo (package (name "xwininfo") @@ -3630,8 +4456,8 @@ (synopsis #f) (description #f) (license #f))) - - + + (define-public xwud (package (name "xwud") @@ -3655,4 +4481,3 @@ (synopsis #f) (description #f) (license #f))) - \ No newline at end of file -- cgit v1.2.3 From 88ee93f917194a6b027a972c302bfbe4824b8825 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 25 Feb 2013 22:52:48 +0100 Subject: gnu: xorg: Transform propagated into normal inputs. * gnu/packages/xorg.scm: Transform propagated into normal inputs; allows to keep packages in alphabetical order. --- gnu/packages/xorg.scm | 95 ++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 55 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1b6d607a54..e2137154a4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -121,9 +121,9 @@ (base32 "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (propagated-inputs - `(("fixesproto" ,fixesproto))) + (inputs + `(("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) @@ -1287,8 +1287,6 @@ ("util-linux" ,util-linux) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libice" ,libice))) (home-page #f) (synopsis #f) (description #f) @@ -1417,8 +1415,6 @@ ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libxmu" ,libxmu))) (home-page #f) (synopsis #f) (description #f) @@ -1446,8 +1442,6 @@ ("libx11" ,libx11) ("compositeproto" ,compositeproto) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libxfixes" ,libxfixes))) (home-page #f) (synopsis #f) (description #f) @@ -1555,8 +1549,6 @@ ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("xproto" ,xproto))) (home-page #f) (synopsis #f) (description #f) @@ -1644,10 +1636,6 @@ ("freetype" ,freetype) ("fontconfig" ,fontconfig) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libxrender" ,libxrender))) (home-page #f) (synopsis #f) (description #f) @@ -1899,8 +1887,6 @@ ("kbproto" ,kbproto) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libsm" ,libsm))) (home-page #f) (synopsis #f) (description #f) @@ -4081,51 +4067,50 @@ (build-system gnu-build-system) (inputs `(("bigreqsproto" ,bigreqsproto) - ("xtrans" ,xtrans) - ("xcmiscproto" ,xcmiscproto) + ("compositeproto" ,compositeproto) ("damageproto" ,damageproto) - ("libxfont" ,libxfont) -;; ("pixman" ,pixman) - ("libxext" ,libxext) - ("recordproto" ,recordproto) - ("xf86vidmodeproto" ,xf86vidmodeproto) - ("libdmx" ,libdmx) + ("dbus" ,dbus) ("dmxproto" ,dmxproto) - ("xf86dgaproto" ,xf86dgaproto) - ("xineramaproto" ,xineramaproto) - ("resourceproto" ,resourceproto) - ("scrnsaverproto" ,scrnsaverproto) - ("compositeproto" ,compositeproto) - ("xf86driproto" ,xf86driproto) + ("dri2proto" ,dri2proto) ("glproto" ,glproto) - ("xf86bigfontproto" ,xf86bigfontproto) - ("dbus" ,dbus) -;; ("mesa" ,mesa) -;; ("systemd" ,systemd) - ("zlib" ,zlib) - ("libxv" ,libxv) - ("libxt" ,libxt) - ("libxres" ,libxres) - ("libxrender" ,libxrender) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("libxkbfile" ,libxkbfile) - ("libxfixes" ,libxfixes) - ("libxdmcp" ,libxdmcp) - ("libxaw" ,libxaw) - ("libxau" ,libxau) + ("inputproto" ,inputproto) + ("kbproto" ,kbproto) + ("libdmx" ,libdmx) +;; ("libdrm" ,libdrm) + ("libpciaccess" ,libpciaccess) ("libx11" ,libx11) + ("libxau" ,libxau) + ("libxaw" ,libxaw) + ("libxdmcp" ,libxdmcp) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxfont" ,libxfont) + ("libxkbfile" ,libxkbfile) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxrender" ,libxrender) + ("libxres" ,libxres) + ("libxt" ,libxt) + ("libxv" ,libxv) +;; ("mesa" ,mesa) ("openssl" ,openssl) -;; ("libdrm" ,libdrm) - ("renderproto" ,renderproto) - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("kbproto" ,kbproto) - ("dri2proto" ,dri2proto) +;; ("pixman" ,pixman) + ("pkg-config" ,pkg-config) + ("recordproto" ,recordproto) ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("resourceproto" ,resourceproto) + ("scrnsaverproto" ,scrnsaverproto) +;; ("systemd" ,systemd) + ("xcmiscproto" ,xcmiscproto) ("xextproto" ,xextproto) - ("inputproto" ,inputproto) - ("libpciaccess" ,libpciaccess))) + ("xf86bigfontproto" ,xf86bigfontproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) + ("xineramaproto" ,xineramaproto) + ("xtrans" ,xtrans) + ("zlib" ,zlib))) (home-page #f) (synopsis #f) (description #f) -- cgit v1.2.3 From b49317cac3fb0412e4f7215eed5328e9efb33b60 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 26 Feb 2013 22:15:43 +0100 Subject: gnu: xorg: Add missing hashes. * gnu/packages/xorg.scm: Add hashes to all packages. --- gnu/packages/xorg.scm | 120 +++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e2137154a4..a018282456 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -187,7 +187,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -254,7 +254,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -275,7 +275,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -296,7 +296,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -317,7 +317,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -338,7 +338,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -406,7 +406,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -427,7 +427,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -448,7 +448,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -469,7 +469,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -691,7 +691,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx")))) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -1067,7 +1067,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -1100,7 +1100,7 @@ (define-public glproto (package (name "glproto") - (version "1.4.16") + (version "1.4.15") (source (origin (method url-fetch) @@ -1110,7 +1110,7 @@ ".tar.bz2")) (sha256 (base32 - "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal")))) + "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page #f) @@ -1333,7 +1333,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -1992,7 +1992,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2013,7 +2013,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2533,7 +2533,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2859,7 +2859,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2880,7 +2880,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2901,7 +2901,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2922,7 +2922,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2943,7 +2943,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2964,7 +2964,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2985,7 +2985,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3006,7 +3006,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3027,7 +3027,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3048,7 +3048,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3069,7 +3069,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3090,7 +3090,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3111,7 +3111,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3132,7 +3132,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3153,7 +3153,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3174,7 +3174,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3195,7 +3195,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3216,7 +3216,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3237,7 +3237,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3258,7 +3258,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3279,7 +3279,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3300,7 +3300,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3321,7 +3321,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3342,7 +3342,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3363,7 +3363,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3384,7 +3384,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3405,7 +3405,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3426,7 +3426,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3447,7 +3447,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3468,7 +3468,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3489,7 +3489,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3510,7 +3510,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3531,7 +3531,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3552,7 +3552,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3573,7 +3573,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3594,7 +3594,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3615,7 +3615,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3636,7 +3636,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3657,7 +3657,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3678,7 +3678,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3699,7 +3699,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3720,7 +3720,7 @@ ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) -- cgit v1.2.3 From d385b8355d532bc91292254f8221aefd5e31ee41 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Feb 2013 23:10:25 +0100 Subject: gnu: xorg: Add licenses. Comment out packages with non-free license, without license, or not available on the ftp servers. Remove package not present in the distribution. * gnu/packages/xorg.scm (*): Add licenses. * gnu/packages/xorg.scm (libxp): Remove variable of package that is not present in the R7.7 distribution. * gnu/packages/xorg.scm (libpthread, libxcb): Comment out variables, which are referenced, but not present on the ftp servers. * gnu/packages/xorg.scm (font-adobe-utopia-100dpi, font-adobe-utopia-75dpi, font-adobe-utopia-type1, font-bh-100dpi, font-bh-75dpi, font-bh-lucidatypewriter-100dpi, font-bh-lucidatypewriter-75dpi, font-bh-type1, font-bitstream-100dpi, font-bitstream-75dpi, font-daewoo-misc, font-ibm-type1, font-jis-misc, font-misc-meltho, xf86-video-dummy): Comment out variables, packages have non-free licenses. * gnu/packages/xorg.scm (font-cursor-misc, xf86-video-v4l, xorg-docs): Comment out variables, packages have no license. --- gnu/packages/xorg.scm | 1549 ++++++++++++++++++++++++------------------------- 1 file changed, 763 insertions(+), 786 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a018282456..adc62f9ffa 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -57,7 +57,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public bdftopcf @@ -81,7 +81,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public bigreqsproto @@ -103,7 +103,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public compositeproto @@ -127,7 +127,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public damageproto @@ -149,7 +149,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public dmxproto @@ -171,7 +171,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public dri2proto @@ -192,7 +192,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public encodings @@ -214,7 +214,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public fixesproto @@ -238,7 +238,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-adobe-100dpi @@ -259,7 +259,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-adobe-75dpi @@ -280,70 +280,70 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public font-adobe-utopia-100dpi - (package - (name "font-adobe-utopia-100dpi") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-adobe-utopia-75dpi - (package - (name "font-adobe-utopia-75dpi") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-adobe-utopia-type1 - (package - (name "font-adobe-utopia-type1") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-" - version - ".tar.bz2")) - (sha256 - (base32 - "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) + + +;; (define-public font-adobe-utopia-100dpi +;; (package +;; (name "font-adobe-utopia-100dpi") +;; (version "1.0.4") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-adobe-utopia-75dpi +;; (package +;; (name "font-adobe-utopia-75dpi") +;; (version "1.0.4") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-adobe-utopia-type1 +;; (package +;; (name "font-adobe-utopia-type1") +;; (version "1.0.4") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-alias @@ -365,7 +365,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-arabic-misc @@ -390,166 +390,166 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public font-bh-100dpi - (package - (name "font-bh-100dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-75dpi - (package - (name "font-bh-75dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-lucidatypewriter-100dpi - (package - (name "font-bh-lucidatypewriter-100dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-lucidatypewriter-75dpi - (package - (name "font-bh-lucidatypewriter-75dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-type1 - (package - (name "font-bh-type1") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bitstream-100dpi - (package - (name "font-bitstream-100dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bitstream-75dpi - (package - (name "font-bitstream-75dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) + + +;; (define-public font-bh-100dpi +;; (package +;; (name "font-bh-100dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-75dpi +;; (package +;; (name "font-bh-75dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-lucidatypewriter-100dpi +;; (package +;; (name "font-bh-lucidatypewriter-100dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-lucidatypewriter-75dpi +;; (package +;; (name "font-bh-lucidatypewriter-75dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-type1 +;; (package +;; (name "font-bh-type1") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bitstream-100dpi +;; (package +;; (name "font-bitstream-100dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bitstream-75dpi +;; (package +;; (name "font-bitstream-75dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-bitstream-type1 @@ -574,7 +574,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-cronyx-cyrillic @@ -599,58 +599,58 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public font-cursor-misc - (package - (name "font-cursor-misc") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-daewoo-misc - (package - (name "font-daewoo-misc") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) - (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) + + +;; (define-public font-cursor-misc +;; (package +;; (name "font-cursor-misc") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license none))) +;; +;; +;; (define-public font-daewoo-misc +;; (package +;; (name "font-daewoo-misc") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-dec-misc @@ -675,32 +675,32 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-ibm-type1 - (package - (name "font-ibm-type1") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" - version - ".tar.bz2")) - (sha256 - (base32 - "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx")))) - (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-ibm-type1 +;; (package +;; (name "font-ibm-type1") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-isas-misc @@ -725,32 +725,32 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-jis-misc - (package - (name "font-jis-misc") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) - (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-jis-misc +;; (package +;; (name "font-jis-misc") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-micro-misc @@ -775,7 +775,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public font-misc-cyrillic @@ -800,7 +800,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-misc-ethiopic @@ -825,32 +825,32 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-misc-meltho - (package - (name "font-misc-meltho") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" - version - ".tar.bz2")) - (sha256 - (base32 - "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-misc-meltho +;; (package +;; (name "font-misc-meltho") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-misc-misc @@ -877,7 +877,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public font-mutt-misc @@ -902,7 +902,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-schumacher-misc @@ -929,7 +929,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-screen-cyrillic @@ -954,7 +954,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-sony-misc @@ -979,7 +979,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-sun-misc @@ -1004,7 +1004,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-util @@ -1026,7 +1026,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-winitzki-cyrillic @@ -1051,7 +1051,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public font-xfree86-type1 @@ -1072,7 +1072,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public fontsproto @@ -1094,7 +1094,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public glproto @@ -1116,7 +1116,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public iceauth @@ -1141,7 +1141,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public inputproto @@ -1163,7 +1163,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public kbproto @@ -1185,7 +1185,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libapplewm @@ -1212,7 +1212,59 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libdmx + (package + (name "libdmx") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libdmx-" + version + ".tar.bz2")) + (sha256 + (base32 + "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("dmxproto" ,dmxproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) + + +(define-public libfontenc + (package + (name "libfontenc") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libfontenc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libfs @@ -1238,7 +1290,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libice @@ -1263,7 +1315,53 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libpciaccess + (package + (name "libpciaccess") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpciaccess-" + version + ".tar.bz2")) + (sha256 + (base32 + "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) + + +;; file referenced, but not present on servers +;; (define-public libpthread-stubs +;; (package +;; (name "libpthread-stubs") +;; (version "0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license license:???))) (define-public libsm @@ -1290,7 +1388,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libwindowswm @@ -1317,55 +1415,28 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libx11 (package - (name "libx11") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libX11-" - version - ".tar.bz2")) - (sha256 - (base32 - "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libxscrnsaver - (package - (name "libxscrnsaver") - (version "1.2.2") + (name "libx11") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" + "mirror://xorg/X11R7.7/src/everything/libX11-" version ".tar.bz2")) (sha256 (base32 - "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("scrnsaverproto" ,scrnsaverproto) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxau @@ -1388,7 +1459,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxaw @@ -1418,7 +1489,38 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +;; file referenced, but not present on servers +;; (define-public libxcb +;; (package +;; (name "libxcb") +;; (version "1.9") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/libxcb-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("xproto" ,xproto) +;; ("libxdmcp" ,libxdmcp) +;; ("xcb-proto" ,xcb-proto) +;; ("libxau" ,libxau) +;; ("libpthread-stubs" ,libpthread-stubs) +;; ("libxslt" ,libxslt) +;; ("pkg-config" ,pkg-config) +;; ("python" ,python))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license license:???))) (define-public libxcomposite @@ -1445,7 +1547,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxcursor @@ -1473,7 +1575,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxdamage @@ -1502,7 +1604,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxdmcp @@ -1525,7 +1627,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxext @@ -1552,7 +1654,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxfixes @@ -1579,7 +1681,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxfont @@ -1608,7 +1710,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxft @@ -1639,7 +1741,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxi @@ -1667,7 +1769,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxinerama @@ -1694,63 +1796,60 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public libxmu +(define-public libxkbfile (package - (name "libxmu") - (version "1.1.1") + (name "libxkbfile") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXmu-" + "mirror://xorg/X11R7.7/src/everything/libxkbfile-" version ".tar.bz2")) (sha256 (base32 - "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) + "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) + `(("libx11" ,libx11) + ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public libxp +(define-public libxmu (package - (name "libxp") - (version "1.0.1") + (name "libxmu") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXp-" + "mirror://xorg/X11R7.7/src/everything/libXmu-" version ".tar.bz2")) (sha256 (base32 - "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi")))) + "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) ("libxext" ,libxext) - ("libxau" ,libxau) ("libx11" ,libx11) -;; ("printproto" ,printproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxpm @@ -1778,7 +1877,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxrandr @@ -1808,7 +1907,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxrender @@ -1834,7 +1933,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxres @@ -1862,7 +1961,34 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libxscrnsaver + (package + (name "libxscrnsaver") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" + version + ".tar.bz2")) + (sha256 + (base32 + "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("scrnsaverproto" ,scrnsaverproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libxt @@ -1890,7 +2016,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxtst @@ -1919,7 +2045,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxv @@ -1947,7 +2073,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxvmc @@ -1976,7 +2102,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxxf86dga @@ -1997,7 +2123,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxxf86vm @@ -2018,159 +2144,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public libdmx - (package - (name "libdmx") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libdmx-" - version - ".tar.bz2")) - (sha256 - (base32 - "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("dmxproto" ,dmxproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libfontenc - (package - (name "libfontenc") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libfontenc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) - ("xproto" ,xproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libpciaccess - (package - (name "libpciaccess") - (version "0.13.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpciaccess-" - version - ".tar.bz2")) - (sha256 - (base32 - "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libpthread-stubs - (package - (name "libpthread-stubs") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" - version - ".tar.bz2")) - (sha256 - (base32 - "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libxcb - (package - (name "libxcb") - (version "1.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcb-" - version - ".tar.bz2")) - (sha256 - (base32 - "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxdmcp" ,libxdmcp) - ("xcb-proto" ,xcb-proto) - ("libxau" ,libxau) - ("libpthread-stubs" ,libpthread-stubs) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libxkbfile - (package - (name "libxkbfile") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxkbfile-" - version - ".tar.bz2")) - (sha256 - (base32 - "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) - (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("kbproto" ,kbproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) (define-public luit @@ -2194,7 +2168,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public makedepend @@ -2217,7 +2191,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public mkfontdir @@ -2239,7 +2213,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public mkfontscale @@ -2266,7 +2240,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public randrproto @@ -2288,7 +2262,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public recordproto @@ -2310,7 +2284,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public renderproto @@ -2332,7 +2306,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public resourceproto @@ -2354,7 +2328,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public scrnsaverproto @@ -2376,7 +2350,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public sessreg @@ -2399,7 +2373,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public setxkbmap @@ -2424,7 +2398,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public smproxy @@ -2451,7 +2425,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public util-macros @@ -2473,7 +2447,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public videoproto @@ -2495,7 +2469,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public windowswmproto @@ -2517,7 +2491,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public x11perf @@ -2538,7 +2512,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xauth @@ -2565,7 +2539,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xbacklight @@ -2586,12 +2560,12 @@ (inputs `(("libxrender" ,libxrender) ;; ("xcb-util" ,xcb-util) - ("libxcb" ,libxcb) +;; ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xbitmaps @@ -2613,30 +2587,31 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xcb-proto - (package - (name "xcb-proto") - (version "1.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcb-proto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) - (build-system gnu-build-system) - (inputs - `(("pkg-config" ,pkg-config) ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; file referenced, but not present on servers +;; (define-public xcb-proto +;; (package +;; (name "xcb-proto") +;; (version "1.8") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xcb-proto-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("pkg-config" ,pkg-config) ("python" ,python))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license license:x11))) (define-public xcmiscproto @@ -2658,7 +2633,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xcmsdb @@ -2682,7 +2657,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xcursor-themes @@ -2706,7 +2681,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xcursorgen @@ -2732,7 +2707,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xdpyinfo @@ -2760,14 +2735,14 @@ ("libxi" ,libxi) ("libxext" ,libxext) ("libxcomposite" ,libxcomposite) - ("libxcb" ,libxcb) +;; ("libxcb" ,libxcb) ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xdriinfo @@ -2794,7 +2769,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xev @@ -2821,7 +2796,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xextproto @@ -2843,7 +2818,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-evdev @@ -2864,7 +2839,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-joystick @@ -2885,7 +2860,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-keyboard @@ -2906,7 +2881,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-mouse @@ -2927,7 +2902,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-synaptics @@ -2948,7 +2923,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-vmmouse @@ -2969,7 +2944,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-void @@ -2990,7 +2965,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-ark @@ -3011,7 +2986,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-ast @@ -3032,7 +3007,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-ati @@ -3053,7 +3028,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-cirrus @@ -3074,28 +3049,28 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xf86-video-dummy - (package - (name "xf86-video-dummy") - (version "0.3.5") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public xf86-video-dummy +;; (package +;; (name "xf86-video-dummy") +;; (version "0.3.5") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public xf86-video-fbdev @@ -3116,7 +3091,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-geode @@ -3137,7 +3112,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-glide @@ -3158,7 +3133,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-glint @@ -3179,7 +3154,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-i128 @@ -3200,7 +3175,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-intel @@ -3221,7 +3196,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-mach64 @@ -3242,7 +3217,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-mga @@ -3263,7 +3238,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-neomagic @@ -3284,7 +3259,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-newport @@ -3305,7 +3280,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-nv @@ -3326,7 +3301,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-openchrome @@ -3347,7 +3322,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-r128 @@ -3368,7 +3343,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-savage @@ -3389,7 +3364,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-siliconmotion @@ -3410,7 +3385,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-sis @@ -3431,7 +3406,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:bsd-3))) (define-public xf86-video-suncg6 @@ -3452,7 +3427,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-sunffb @@ -3473,7 +3448,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-tdfx @@ -3494,7 +3469,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-tga @@ -3515,7 +3490,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-trident @@ -3536,28 +3511,28 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xf86-video-v4l - (package - (name "xf86-video-v4l") - (version "0.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public xf86-video-v4l +;; (package +;; (name "xf86-video-v4l") +;; (version "0.2.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license none))) (define-public xf86-video-vesa @@ -3578,7 +3553,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-vmware @@ -3599,7 +3574,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-voodoo @@ -3620,7 +3595,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-wsfb @@ -3641,7 +3616,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:bsd-2))) (define-public xf86bigfontproto @@ -3662,7 +3637,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86dgaproto @@ -3683,7 +3658,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86driproto @@ -3704,7 +3679,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86vidmodeproto @@ -3725,7 +3700,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xgamma @@ -3750,7 +3725,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xhost @@ -3776,7 +3751,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xineramaproto @@ -3798,7 +3773,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xinput @@ -3828,7 +3803,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkbcomp @@ -3854,7 +3829,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkbevd @@ -3879,7 +3854,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkbutils @@ -3907,7 +3882,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkeyboard-config @@ -3929,7 +3904,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkill @@ -3954,7 +3929,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xlsatoms @@ -3973,11 +3948,12 @@ "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) (build-system gnu-build-system) (inputs - `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + `(;("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xlsclients @@ -3996,11 +3972,12 @@ "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) (build-system gnu-build-system) (inputs - `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + `(;("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xmodmap @@ -4025,29 +4002,29 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xorg-docs - (package - (name "xorg-docs") - (version "1.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xorg-docs-" - version - ".tar.bz2")) - (sha256 - (base32 - "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public xorg-docs +;; (package +;; (name "xorg-docs") +;; (version "1.7") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xorg-docs-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license none))) (define-public xorg-server @@ -4114,7 +4091,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xorg-sgml-doctools @@ -4136,7 +4113,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xpr @@ -4162,7 +4139,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xprop @@ -4187,7 +4164,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xproto @@ -4209,7 +4186,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xrandr @@ -4236,7 +4213,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xrdb @@ -4261,7 +4238,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xrefresh @@ -4285,7 +4262,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xset @@ -4304,7 +4281,7 @@ "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(;;("libxxf86misc" ,libxxf86misc) + `(;("libxxf86misc" ,libxxf86misc) ("xproto" ,xproto) ("libxmu" ,libxmu) ("libxext" ,libxext) @@ -4313,7 +4290,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xsetroot @@ -4340,7 +4317,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xtrans @@ -4362,7 +4339,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xvinfo @@ -4388,7 +4365,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xwd @@ -4414,7 +4391,7 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xwininfo @@ -4434,13 +4411,13 @@ (build-system gnu-build-system) (inputs `(("xproto" ,xproto) - ("libxcb" ,libxcb) +;; ("libxcb" ,libxcb) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xwud @@ -4465,4 +4442,4 @@ (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -- cgit v1.2.3 From dd85efda47ef67125abc18d387730d0f266bdf10 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Feb 2013 23:32:53 +0100 Subject: gnu: xorg: Downgrade package versions to those present in X11R7.7 * gnu/packages/xorg.scm (dri2proto, libxcb, libxrandr, randrproto, xbacklight, xcb-proto, xorg-server): Use the versions present in X11R7.7. --- gnu/packages/xorg.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index adc62f9ffa..ee6771b34d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -177,7 +177,7 @@ (define-public dri2proto (package (name "dri2proto") - (version "2.3.1") + (version "2.6") (source (origin (method url-fetch) @@ -1496,7 +1496,7 @@ ;; (define-public libxcb ;; (package ;; (name "libxcb") -;; (version "1.9") +;; (version "1.8.1") ;; (source ;; (origin ;; (method url-fetch) @@ -1883,7 +1883,7 @@ (define-public libxrandr (package (name "libxrandr") - (version "1.4.0") + (version "1.3.2") (source (origin (method url-fetch) @@ -1893,7 +1893,7 @@ ".tar.bz2")) (sha256 (base32 - "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3")))) + "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) @@ -2246,7 +2246,7 @@ (define-public randrproto (package (name "randrproto") - (version "1.4.0") + (version "1.3.2") (source (origin (method url-fetch) @@ -2256,7 +2256,7 @@ ".tar.bz2")) (sha256 (base32 - "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45")))) + "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page #f) @@ -2545,7 +2545,7 @@ (define-public xbacklight (package (name "xbacklight") - (version "1.2.0") + (version "1.1.2") (source (origin (method url-fetch) @@ -2555,7 +2555,7 @@ ".tar.bz2")) (sha256 (base32 - "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji")))) + "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) @@ -2594,7 +2594,7 @@ ;; (define-public xcb-proto ;; (package ;; (name "xcb-proto") -;; (version "1.8") +;; (version "1.7.1") ;; (source ;; (origin ;; (method url-fetch) @@ -4030,7 +4030,7 @@ (define-public xorg-server (package (name "xorg-server") - (version "1.12.4") + (version "1.12.2") (source (origin (method url-fetch) @@ -4040,7 +4040,7 @@ ".tar.bz2")) (sha256 (base32 - "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a")))) + "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) (build-system gnu-build-system) (inputs `(("bigreqsproto" ,bigreqsproto) -- cgit v1.2.3 From 0820a58b3ca29910efcf39b7f0fcdcbaf2a1364a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 3 Mar 2013 19:50:26 +0100 Subject: gnu: xorg: Fix http mirror and uncomment xcb packages. * guix/download.scm (%mirrors): Fix main http mirror address. * gnu/packages/xorg.scm (libpthread-stubs, libxcb, xcb-proto): Uncomment and add licenses. --- gnu/packages/xorg.scm | 141 ++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 72 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ee6771b34d..ebabcab437 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1341,27 +1341,26 @@ (license license:x11))) -;; file referenced, but not present on servers -;; (define-public libpthread-stubs -;; (package -;; (name "libpthread-stubs") -;; (version "0.3") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) -;; (build-system gnu-build-system) -;; (inputs `(("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) -;; (license license:???))) +(define-public libpthread-stubs + (package + (name "libpthread-stubs") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + version + ".tar.bz2")) + (sha256 + (base32 + "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libsm @@ -1492,35 +1491,34 @@ (license license:x11))) -;; file referenced, but not present on servers -;; (define-public libxcb -;; (package -;; (name "libxcb") -;; (version "1.8.1") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/libxcb-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) -;; (build-system gnu-build-system) -;; (inputs -;; `(("xproto" ,xproto) -;; ("libxdmcp" ,libxdmcp) -;; ("xcb-proto" ,xcb-proto) -;; ("libxau" ,libxau) -;; ("libpthread-stubs" ,libpthread-stubs) -;; ("libxslt" ,libxslt) -;; ("pkg-config" ,pkg-config) -;; ("python" ,python))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) -;; (license license:???))) +(define-public libxcb + (package + (name "libxcb") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxdmcp" ,libxdmcp) + ("xcb-proto" ,xcb-proto) + ("libxau" ,libxau) + ("libpthread-stubs" ,libpthread-stubs) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libxcomposite @@ -2590,28 +2588,27 @@ (license license:x11))) -;; file referenced, but not present on servers -;; (define-public xcb-proto -;; (package -;; (name "xcb-proto") -;; (version "1.7.1") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/xcb-proto-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) -;; (build-system gnu-build-system) -;; (inputs -;; `(("pkg-config" ,pkg-config) ("python" ,python))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) -;; (license license:x11))) +(define-public xcb-proto + (package + (name "xcb-proto") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcb-proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public xcmiscproto -- cgit v1.2.3 From 5223c82627a8eba9056fc4d5a48acea29a979c1d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 3 Mar 2013 20:11:26 +0100 Subject: gnu: xorg: Add home-page, synopsis and description. * gnu/packages/xorg.scm: Add home-page and (generic) synopsis and description. --- gnu/packages/xorg.scm | 1098 ++++++++++++++++++++++++------------------------- 1 file changed, 549 insertions(+), 549 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ebabcab437..4777f68045 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -54,9 +54,9 @@ "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -78,9 +78,9 @@ (inputs `(("libxfont" ,libxfont) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -100,9 +100,9 @@ "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -124,9 +124,9 @@ (inputs `(("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -146,9 +146,9 @@ "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -168,9 +168,9 @@ "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -189,9 +189,9 @@ (base32 "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -211,9 +211,9 @@ "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -235,9 +235,9 @@ (inputs `(("xextproto" ,xextproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -256,9 +256,9 @@ (base32 "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -277,9 +277,9 @@ (base32 "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -298,9 +298,9 @@ ;; (base32 ;; "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -319,9 +319,9 @@ ;; (base32 ;; "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -340,9 +340,9 @@ ;; (base32 ;; "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -362,9 +362,9 @@ "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -387,9 +387,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -408,9 +408,9 @@ ;; (base32 ;; "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -429,9 +429,9 @@ ;; (base32 ;; "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -450,9 +450,9 @@ ;; (base32 ;; "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -471,9 +471,9 @@ ;; (base32 ;; "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -496,9 +496,9 @@ ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -521,9 +521,9 @@ ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -546,9 +546,9 @@ ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -571,9 +571,9 @@ `(("mkfontscale" ,mkfontscale) ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -596,9 +596,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -622,9 +622,9 @@ ;; ("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license none))) ;; ;; @@ -647,9 +647,9 @@ ;; `(("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -672,9 +672,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -697,9 +697,9 @@ ;; `(("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -722,9 +722,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -747,9 +747,9 @@ ;; `(("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -772,9 +772,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -797,9 +797,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -822,9 +822,9 @@ `(("mkfontscale" ,mkfontscale) ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -847,9 +847,9 @@ ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -874,9 +874,9 @@ ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -899,9 +899,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -926,9 +926,9 @@ ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -951,9 +951,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -976,9 +976,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1001,9 +1001,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1023,9 +1023,9 @@ "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1048,9 +1048,9 @@ `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -1069,9 +1069,9 @@ (base32 "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1091,9 +1091,9 @@ "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1113,9 +1113,9 @@ "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1138,9 +1138,9 @@ `(("xproto" ,xproto) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1160,9 +1160,9 @@ "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1182,9 +1182,9 @@ "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1209,9 +1209,9 @@ ("libx11" ,libx11) ("applewmproto" ,applewmproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1236,9 +1236,9 @@ ("libx11" ,libx11) ("dmxproto" ,dmxproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1261,9 +1261,9 @@ `(("zlib" ,zlib) ("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1287,9 +1287,9 @@ ("xproto" ,xproto) ("fontsproto" ,fontsproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1312,9 +1312,9 @@ `(("xtrans" ,xtrans) ("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1335,9 +1335,9 @@ (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1357,9 +1357,9 @@ "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1384,9 +1384,9 @@ ("util-linux" ,util-linux) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1411,9 +1411,9 @@ ("libx11" ,libx11) ("windowswmproto" ,windowswmproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1432,9 +1432,9 @@ (base32 "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1455,9 +1455,9 @@ (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1485,9 +1485,9 @@ ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1515,9 +1515,9 @@ ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1542,9 +1542,9 @@ ("libx11" ,libx11) ("compositeproto" ,compositeproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1570,9 +1570,9 @@ ("libx11" ,libx11) ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1599,9 +1599,9 @@ ("fixesproto" ,fixesproto) ("damageproto" ,damageproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1622,9 +1622,9 @@ (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1649,9 +1649,9 @@ ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1676,9 +1676,9 @@ ("libx11" ,libx11) ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1705,9 +1705,9 @@ ("fontsproto" ,fontsproto) ("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1736,9 +1736,9 @@ ("freetype" ,freetype) ("fontconfig" ,fontconfig) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1764,9 +1764,9 @@ ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1791,9 +1791,9 @@ ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1816,9 +1816,9 @@ `(("libx11" ,libx11) ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1844,9 +1844,9 @@ ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1872,9 +1872,9 @@ ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1902,9 +1902,9 @@ ("renderproto" ,renderproto) ("randrproto" ,randrproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1928,9 +1928,9 @@ ("libx11" ,libx11) ("renderproto" ,renderproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1956,9 +1956,9 @@ ("libx11" ,libx11) ("resourceproto" ,resourceproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1983,9 +1983,9 @@ ("libx11" ,libx11) ("scrnsaverproto" ,scrnsaverproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2011,9 +2011,9 @@ ("kbproto" ,kbproto) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2040,9 +2040,9 @@ ("recordproto" ,recordproto) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2068,9 +2068,9 @@ ("libx11" ,libx11) ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2097,9 +2097,9 @@ ("libx11" ,libx11) ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2118,9 +2118,9 @@ (base32 "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2139,9 +2139,9 @@ (base32 "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2163,9 +2163,9 @@ (inputs `(("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2186,9 +2186,9 @@ (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2208,9 +2208,9 @@ "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2235,9 +2235,9 @@ ("freetype" ,freetype) ("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2257,9 +2257,9 @@ "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2279,9 +2279,9 @@ "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2301,9 +2301,9 @@ "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2323,9 +2323,9 @@ "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2345,9 +2345,9 @@ "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2368,9 +2368,9 @@ (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2393,9 +2393,9 @@ `(("libxkbfile" ,libxkbfile) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2420,9 +2420,9 @@ ("libsm" ,libsm) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2442,9 +2442,9 @@ "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2464,9 +2464,9 @@ "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2486,9 +2486,9 @@ "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2507,9 +2507,9 @@ (base32 "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2534,9 +2534,9 @@ ("libxau" ,libxau) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2560,9 +2560,9 @@ ;; ("xcb-util" ,xcb-util) ;; ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2582,9 +2582,9 @@ "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2605,9 +2605,9 @@ (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config) ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2627,9 +2627,9 @@ "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2651,9 +2651,9 @@ (inputs `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2675,9 +2675,9 @@ (inputs `(("libxcursor" ,libxcursor) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2701,9 +2701,9 @@ ("libx11" ,libx11) ("libpng" ,libpng) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2736,9 +2736,9 @@ ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2763,9 +2763,9 @@ ("libx11" ,libx11) ("glproto" ,glproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2790,9 +2790,9 @@ ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2812,9 +2812,9 @@ "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2833,9 +2833,9 @@ (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2854,9 +2854,9 @@ (base32 "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2875,9 +2875,9 @@ (base32 "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2896,9 +2896,9 @@ (base32 "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2917,9 +2917,9 @@ (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2938,9 +2938,9 @@ (base32 "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2959,9 +2959,9 @@ (base32 "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2980,9 +2980,9 @@ (base32 "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3001,9 +3001,9 @@ (base32 "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3022,9 +3022,9 @@ (base32 "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3043,9 +3043,9 @@ (base32 "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3064,9 +3064,9 @@ ;; (base32 ;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -3085,9 +3085,9 @@ (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3106,9 +3106,9 @@ (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3127,9 +3127,9 @@ (base32 "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3148,9 +3148,9 @@ (base32 "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3169,9 +3169,9 @@ (base32 "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3190,9 +3190,9 @@ (base32 "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3211,9 +3211,9 @@ (base32 "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3232,9 +3232,9 @@ (base32 "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3253,9 +3253,9 @@ (base32 "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3274,9 +3274,9 @@ (base32 "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3295,9 +3295,9 @@ (base32 "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3316,9 +3316,9 @@ (base32 "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3337,9 +3337,9 @@ (base32 "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3358,9 +3358,9 @@ (base32 "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3379,9 +3379,9 @@ (base32 "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3400,9 +3400,9 @@ (base32 "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:bsd-3))) @@ -3421,9 +3421,9 @@ (base32 "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3442,9 +3442,9 @@ (base32 "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3463,9 +3463,9 @@ (base32 "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3484,9 +3484,9 @@ (base32 "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3505,9 +3505,9 @@ (base32 "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3526,9 +3526,9 @@ ;; (base32 ;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license none))) @@ -3547,9 +3547,9 @@ (base32 "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3568,9 +3568,9 @@ (base32 "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3589,9 +3589,9 @@ (base32 "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3610,9 +3610,9 @@ (base32 "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:bsd-2))) @@ -3631,9 +3631,9 @@ (base32 "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3652,9 +3652,9 @@ (base32 "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3673,9 +3673,9 @@ (base32 "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3694,9 +3694,9 @@ (base32 "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3719,9 +3719,9 @@ `(("libxxf86vm" ,libxxf86vm) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3745,9 +3745,9 @@ ("libxau" ,libxau) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3767,9 +3767,9 @@ "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3797,9 +3797,9 @@ ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3823,9 +3823,9 @@ ("libxkbfile" ,libxkbfile) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3848,9 +3848,9 @@ `(("libxkbfile" ,libxkbfile) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3876,9 +3876,9 @@ ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3898,9 +3898,9 @@ "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3923,9 +3923,9 @@ `(("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3947,9 +3947,9 @@ (inputs `(;("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3971,9 +3971,9 @@ (inputs `(;("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3996,9 +3996,9 @@ `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4018,9 +4018,9 @@ ;; "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) ;; (build-system gnu-build-system) ;; (inputs `(("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license none))) @@ -4085,9 +4085,9 @@ ("xineramaproto" ,xineramaproto) ("xtrans" ,xtrans) ("zlib" ,zlib))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4107,9 +4107,9 @@ "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4133,9 +4133,9 @@ ("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4158,9 +4158,9 @@ `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4180,9 +4180,9 @@ "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4207,9 +4207,9 @@ ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4232,9 +4232,9 @@ `(("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4256,9 +4256,9 @@ (inputs `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4284,9 +4284,9 @@ ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4311,9 +4311,9 @@ ("xbitmaps" ,xbitmaps) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4333,9 +4333,9 @@ "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4359,9 +4359,9 @@ ("libxv" ,libxv) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4385,9 +4385,9 @@ ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4411,9 +4411,9 @@ ;; ("libxcb" ,libxcb) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4436,7 +4436,7 @@ `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) -- cgit v1.2.3 From 9d12d38f381cec2eddaa325314ac5b623f38e524 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 3 Mar 2013 20:24:42 +0100 Subject: gnu: xorg: Uncomment dependencies on libxcb. * gnu/packages/xorg.scm (xbacklight, xdpyinfo, xlsatoms, xlsclients, xwininfo): Uncomment dependency on libxcb. --- gnu/packages/xorg.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4777f68045..90e899c6b1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2558,7 +2558,7 @@ (inputs `(("libxrender" ,libxrender) ;; ("xcb-util" ,xcb-util) -;; ("libxcb" ,libxcb) + ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2732,7 +2732,7 @@ ("libxi" ,libxi) ("libxext" ,libxext) ("libxcomposite" ,libxcomposite) -;; ("libxcb" ,libxcb) + ("libxcb" ,libxcb) ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) @@ -3945,7 +3945,7 @@ "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) (build-system gnu-build-system) (inputs - `(;("libxcb" ,libxcb) + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3969,7 +3969,7 @@ "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) (build-system gnu-build-system) (inputs - `(;("libxcb" ,libxcb) + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4408,7 +4408,7 @@ (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -;; ("libxcb" ,libxcb) + ("libxcb" ,libxcb) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") -- cgit v1.2.3 From 48ebc134f4456e81d4c660da652a752382890662 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 14:38:42 +0100 Subject: gnu: xorg: Correct typo in download location. * gnu/packages/xorg.scm (xf86-video-glide): Correct typo. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 90e899c6b1..ea7546d8c8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3120,7 +3120,7 @@ (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-glide" + "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" version ".tar.bz2")) (sha256 -- cgit v1.2.3 From 6eb126c5f2870209837919b93b899857046497b5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 22:08:52 +0100 Subject: gnu: xorg: Add inputs and propagated-inputs, propagate some inputs. Rename two packages to avoid clashes between package names and versions. * gnu/packages/xorg.scm (font-adobe-100dpi): Rename to font-adobe100dpi. * gnu/packages/xorg.scm (font-adobe-75dpi): Rename to font-adobe75dpi. * gnu/packages/xorg.scm: Add pkg-xonfig as input to several packages. * gnu/packages/xorg.scm (encodings): Add input mkfontscale. * gnu/packages/xorg.scm (libx11): Add inputs inputprotoi, xextproto, xtrans. * gnu/packages/xorg.scm (libxpm): Add input gettext. * gnu/packages/xorg.scm (libxxf86dga): Add inputs libx11, libxext, xf86dgaproto. * gnu/packages/xorg.scm (libxxf86vm): Add inputs libx11i, libxext, xf86vidmodeproto. * gnu/packages/xorg.scm (x11perf): Add inputs libx11i, libxfti, libxmu, libxrender. * gnu/packages/xorg.scm (xcursor-themes): Add input xcursorgen. * gnu/packages/xorg.scm (xdpyinfo): Add input inputproto. * gnu/packages/xorg.scm (font-xfree86-type1): Add input mkfontdir. * gnu/packages/xorg.scm (libx11): Add propagated inputs kbproto, libxcb. * gnu/packages/xorg.scm (mkfontdir): Add propagated input mkfontscale. * gnu/packages/xorg.scm (fixesproto): Propagate input xextproto. * gnu/packages/xorg.scm (libice): Propagate input xproto. * gnu/packages/xorg.scm (libxau): Propagate input xproto. * gnu/packages/xorg.scm (libxaw): Propagate inputs libxext, libxmu, libxpm. * gnu/packages/xorg.scm (libxcb): Propagate inputs libpthread-stubs, libxaui, libxdmcp. * gnu/packages/xorg.scm (libxcursor): Propagate inputs libx11, libxfixes, libxrender, xproto. * gnu/packages/xorg.scm (libxext): Propagate input xextproto. * gnu/packages/xorg.scm (libxfixes): Propagate input fixesproto. * gnu/packages/xorg.scm (libxfont): Propagate inputs fontsproto, freetype, libfontenc, xproto. * gnu/packages/xorg.scm (libxinerama): Propagate input xineramaproto. * gnu/packages/xorg.scm (libxrandr): Propagate inputs libxext, randrproto. * gnu/packages/xorg.scm (libxrender): Propagate input renderproto. * gnu/packages/xorg.scm (libxt): Propagate inputs libx11, libice, libsm. * gnu/packages/xorg.scm (libxtst): Propagate input recordproto. * gnu/packages/xorg.scm (xbacklight): Propagate inputs libx11, libxrandr. * gnu/packages/xorg.scm (xkeyboard-config): Propagate inputs libx11, xkbcomp. * gnu/packages/xorg.scm (xproto): Propagate input util-macros. --- gnu/packages/xorg.scm | 2157 ++++++++++++++++++++++++++----------------------- 1 file changed, 1139 insertions(+), 1018 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ea7546d8c8..d6439ec4d4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -27,6 +27,8 @@ #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) + #:use-module ((gnu packages gettext) + #:renamer (symbol-prefix-proc 'gnu:)) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) #:use-module (gnu packages libpng) @@ -38,6 +40,13 @@ #:use-module (gnu packages python) #:use-module (gnu packages xml)) + + +;; packages without propagated input +;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to +;; be defined first, the split makes book-keeping easier.) + + (define-public applewmproto (package (name "applewmproto") @@ -210,40 +219,18 @@ (base32 "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:public-domain))) - - -(define-public fixesproto - (package - (name "fixesproto") - (version "5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/fixesproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) - (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) + `(("mkfontscale" ,mkfontscale) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") - (license license:x11))) + (license license:public-domain))) -(define-public font-adobe-100dpi +(define-public font-adobe100dpi (package - (name "font-adobe-100dpi") + (name "font-adobe100dpi") (version "1.0.3") (source (origin @@ -262,9 +249,9 @@ (license license:x11))) -(define-public font-adobe-75dpi +(define-public font-adobe75dpi (package - (name "font-adobe-75dpi") + (name "font-adobe75dpi") (version "1.0.3") (source (origin @@ -283,9 +270,9 @@ (license license:x11))) -;; (define-public font-adobe-utopia-100dpi +;; (define-public font-adobe-utopia100dpi ;; (package -;; (name "font-adobe-utopia-100dpi") +;; (name "font-adobe-utopia100dpi") ;; (version "1.0.4") ;; (source ;; (origin @@ -304,9 +291,9 @@ ;; (license non-free))) ;; ;; -;; (define-public font-adobe-utopia-75dpi +;; (define-public font-adobe-utopia75dpi ;; (package -;; (name "font-adobe-utopia-75dpi") +;; (name "font-adobe-utopia75dpi") ;; (version "1.0.4") ;; (source ;; (origin @@ -393,9 +380,9 @@ (license license:x11))) -;; (define-public font-bh-100dpi +;; (define-public font-bh100dpi ;; (package -;; (name "font-bh-100dpi") +;; (name "font-bh100dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -414,9 +401,9 @@ ;; (license non-free))) ;; ;; -;; (define-public font-bh-75dpi +;; (define-public font-bh75dpi ;; (package -;; (name "font-bh-75dpi") +;; (name "font-bh75dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -435,9 +422,9 @@ ;; (license non-free))) ;; ;; -;; (define-public font-bh-lucidatypewriter-100dpi +;; (define-public font-bh-lucidatypewriter100dpi ;; (package -;; (name "font-bh-lucidatypewriter-100dpi") +;; (name "font-bh-lucidatypewriter100dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -456,9 +443,9 @@ ;; (license non-free))) ;; ;; -;; (define-public font-bh-lucidatypewriter-75dpi +;; (define-public font-bh-lucidatypewriter75dpi ;; (package -;; (name "font-bh-lucidatypewriter-75dpi") +;; (name "font-bh-lucidatypewriter75dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -502,9 +489,9 @@ ;; (license non-free))) ;; ;; -;; (define-public font-bitstream-100dpi +;; (define-public font-bitstream100dpi ;; (package -;; (name "font-bitstream-100dpi") +;; (name "font-bitstream100dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -527,9 +514,9 @@ ;; (license non-free))) ;; ;; -;; (define-public font-bitstream-75dpi +;; (define-public font-bitstream75dpi ;; (package -;; (name "font-bitstream-75dpi") +;; (name "font-bitstream75dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -1069,6 +1056,9 @@ (base32 "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -1293,31 +1283,6 @@ (license license:x11))) -(define-public libice - (package - (name "libice") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libICE-" - version - ".tar.bz2")) - (sha256 - (base32 - "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) - (build-system gnu-build-system) - (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libpciaccess (package (name "libpciaccess") @@ -1417,130 +1382,137 @@ (license license:x11))) -(define-public libx11 +(define-public libxcomposite (package - (name "libx11") - (version "1.5.0") + (name "libxcomposite") + (version "0.4.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libX11-" + "mirror://xorg/X11R7.7/src/everything/libXcomposite-" version ".tar.bz2")) (sha256 (base32 - "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) + "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j")))) (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("libx11" ,libx11) + ("compositeproto" ,compositeproto) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxau +(define-public libxdamage (package - (name "libxau") - (version "1.0.7") + (name "libxdamage") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXau-" + "mirror://xorg/X11R7.7/src/everything/libXdamage-" version ".tar.bz2")) (sha256 (base32 - "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("damageproto" ,damageproto) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxaw +(define-public libxdmcp (package - (name "libxaw") - (version "1.0.11") + (name "libxdmcp") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXaw-" + "mirror://xorg/X11R7.7/src/everything/libXdmcp-" version ".tar.bz2")) (sha256 (base32 - "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) + "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxcb +(define-public libxft (package - (name "libxcb") - (version "1.8.1") + (name "libxft") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcb-" + "mirror://xorg/X11R7.7/src/everything/libXft-" version ".tar.bz2")) (sha256 (base32 - "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) + "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libxdmcp" ,libxdmcp) - ("xcb-proto" ,xcb-proto) - ("libxau" ,libxau) - ("libpthread-stubs" ,libpthread-stubs) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python))) + `(("renderproto" ,renderproto) + ("libx11" ,libx11) + ("xproto" ,xproto) + ("libxrender" ,libxrender) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxcomposite +(define-public libxi (package - (name "libxcomposite") - (version "0.4.3") + (name "libxi") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXcomposite-" + "mirror://xorg/X11R7.7/src/everything/libXi-" version ".tar.bz2")) (sha256 (base32 - "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j")))) + "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) - ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) - ("compositeproto" ,compositeproto) + ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1548,27 +1520,24 @@ (license license:x11))) -(define-public libxcursor +(define-public libxkbfile (package - (name "libxcursor") - (version "1.1.13") + (name "libxkbfile") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXcursor-" + "mirror://xorg/X11R7.7/src/everything/libxkbfile-" version ".tar.bz2")) (sha256 (base32 - "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) + "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) (build-system gnu-build-system) (inputs - `(("libxrender" ,libxrender) - ("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) + `(("libx11" ,libx11) + ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1576,28 +1545,27 @@ (license license:x11))) -(define-public libxdamage +(define-public libxmu (package - (name "libxdamage") - (version "1.1.3") + (name "libxmu") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXdamage-" + "mirror://xorg/X11R7.7/src/everything/libXmu-" version ".tar.bz2")) (sha256 (base32 - "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libxfixes" ,libxfixes) + `(("libxt" ,libxt) + ("xproto" ,xproto) ("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) - ("fixesproto" ,fixesproto) - ("damageproto" ,damageproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1605,49 +1573,56 @@ (license license:x11))) -(define-public libxdmcp +(define-public libxpm (package - (name "libxdmcp") - (version "1.1.1") + (name "libxpm") + (version "3.5.10") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXdmcp-" + "mirror://xorg/X11R7.7/src/everything/libXpm-" version ".tar.bz2")) (sha256 (base32 - "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls")))) + "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + `(("gettext" ,gnu:gettext) + ("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxext +(define-public libxres (package - (name "libxext") - (version "1.3.1") + (name "libxres") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXext-" + "mirror://xorg/X11R7.7/src/everything/libXres-" version ".tar.bz2")) (sha256 (base32 - "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz")))) (build-system gnu-build-system) (inputs - `(("libxau" ,libxau) - ("xproto" ,xproto) + `(("xproto" ,xproto) ("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) + ("resourceproto" ,resourceproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1655,26 +1630,26 @@ (license license:x11))) -(define-public libxfixes +(define-public libxscrnsaver (package - (name "libxfixes") - (version "5.0") + (name "libxscrnsaver") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXfixes-" + "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" version ".tar.bz2")) (sha256 (base32 - "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) + "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) + `(("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) - ("fixesproto" ,fixesproto) + ("scrnsaverproto" ,scrnsaverproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1682,28 +1657,27 @@ (license license:x11))) -(define-public libxfont +(define-public libxv (package - (name "libxfont") - (version "1.4.5") + (name "libxv") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXfont-" + "mirror://xorg/X11R7.7/src/everything/libXv-" version ".tar.bz2")) (sha256 (base32 - "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) + "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("xtrans" ,xtrans) - ("xproto" ,xproto) - ("freetype" ,freetype) - ("fontsproto" ,fontsproto) - ("libfontenc" ,libfontenc) + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1711,30 +1685,28 @@ (license license:x11))) -(define-public libxft +(define-public libxvmc (package - (name "libxft") - (version "2.3.1") + (name "libxvmc") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXft-" + "mirror://xorg/X11R7.7/src/everything/libXvMC-" version ".tar.bz2")) (sha256 (base32 - "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) (build-system gnu-build-system) (inputs - `(("renderproto" ,renderproto) - ("libx11" ,libx11) - ("xproto" ,xproto) - ("libxrender" ,libxrender) + `(("libxv" ,libxv) ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) - ("freetype" ,freetype) - ("fontconfig" ,fontconfig) + ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1742,79 +1714,75 @@ (license license:x11))) -(define-public libxi +(define-public libxxf86dga (package - (name "libxi") - (version "1.6.1") + (name "libxxf86dga") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXi-" + "mirror://xorg/X11R7.7/src/everything/libXxf86dga-" version ".tar.bz2")) (sha256 (base32 - "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) + "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) + `(("libx11" ,libx11) ("libxext" ,libxext) - ("libx11" ,libx11) - ("inputproto" ,inputproto) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxinerama +(define-public libxxf86vm (package - (name "libxinerama") + (name "libxxf86vm") (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXinerama-" + "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" version ".tar.bz2")) (sha256 (base32 - "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) + "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) (build-system gnu-build-system) (inputs - `(("xineramaproto" ,xineramaproto) - ("xextproto" ,xextproto) + `(("libx11" ,libx11) ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xf86vidmodeproto" ,xf86vidmodeproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxkbfile +(define-public luit (package - (name "libxkbfile") - (version "1.0.8") + (name "luit") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxkbfile-" + "mirror://xorg/X11R7.7/src/everything/luit-" version ".tar.bz2")) (sha256 (base32 - "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) + "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) - ("kbproto" ,kbproto) + `(("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1822,55 +1790,49 @@ (license license:x11))) -(define-public libxmu +(define-public makedepend (package - (name "libxmu") - (version "1.1.1") + (name "makedepend") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXmu-" + "mirror://xorg/X11R7.7/src/everything/makedepend-" version ".tar.bz2")) (sha256 (base32 - "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) + "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxpm +(define-public mkfontscale (package - (name "libxpm") - (version "3.5.10") + (name "mkfontscale") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXpm-" + "mirror://xorg/X11R7.7/src/everything/mkfontscale-" version ".tar.bz2")) (sha256 (base32 - "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) + "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) + `(("zlib" ,zlib) ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) + ("freetype" ,freetype) + ("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1878,195 +1840,157 @@ (license license:x11))) -(define-public libxrandr +(define-public randrproto (package - (name "libxrandr") + (name "randrproto") (version "1.3.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/XqqR7.7/src/everything/libXrandr-" + "mirror://xorg/X11R7.7/src/everything/randrproto-" version ".tar.bz2")) (sha256 (base32 - "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y")))) + "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr")))) (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("renderproto" ,renderproto) - ("randrproto" ,randrproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxrender +(define-public recordproto (package - (name "libxrender") - (version "0.9.7") + (name "recordproto") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXrender-" + "mirror://xorg/X11R7.7/src/everything/recordproto-" version ".tar.bz2")) (sha256 (base32 - "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) + "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libx11" ,libx11) - ("renderproto" ,renderproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxres +(define-public renderproto (package - (name "libxres") - (version "1.0.6") + (name "renderproto") + (version "0.11.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXres-" + "mirror://xorg/X11R7.7/src/everything/renderproto-" version ".tar.bz2")) (sha256 (base32 - "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz")))) + "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("resourceproto" ,resourceproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxscrnsaver +(define-public resourceproto (package - (name "libxscrnsaver") - (version "1.2.2") + (name "resourceproto") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" + "mirror://xorg/X11R7.7/src/everything/resourceproto-" version ".tar.bz2")) (sha256 (base32 - "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("scrnsaverproto" ,scrnsaverproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxt +(define-public scrnsaverproto (package - (name "libxt") - (version "1.1.3") + (name "scrnsaverproto") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXt-" + "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-" version ".tar.bz2")) (sha256 (base32 - "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) + "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libx11" ,libx11) - ("libsm" ,libsm) - ("kbproto" ,kbproto) - ("libice" ,libice) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxtst +(define-public sessreg (package - (name "libxtst") - (version "1.2.1") + (name "sessreg") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXtst-" + "mirror://xorg/X11R7.7/src/everything/sessreg-" version ".tar.bz2")) (sha256 (base32 - "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) + "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47")))) (build-system gnu-build-system) (inputs - `(("libxi" ,libxi) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("recordproto" ,recordproto) - ("inputproto" ,inputproto) - ("pkg-config" ,pkg-config))) + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxv +(define-public setxkbmap (package - (name "libxv") - (version "1.0.7") + (name "setxkbmap") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXv-" + "mirror://xorg/X11R7.7/src/everything/setxkbmap-" version ".tar.bz2")) (sha256 (base32 - "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) + "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) + `(("libxkbfile" ,libxkbfile) ("libx11" ,libx11) - ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2074,28 +1998,26 @@ (license license:x11))) -(define-public libxvmc +(define-public smproxy (package - (name "libxvmc") - (version "1.0.7") + (name "smproxy") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXvMC-" + "mirror://xorg/X11R7.7/src/everything/smproxy-" version ".tar.bz2")) (sha256 (base32 - "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67")))) (build-system gnu-build-system) (inputs - `(("libxv" ,libxv) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("videoproto" ,videoproto) + `(("libxt" ,libxt) + ("libxmu" ,libxmu) + ("libsm" ,libsm) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2103,137 +2025,146 @@ (license license:x11))) -(define-public libxxf86dga +(define-public util-macros (package - (name "libxxf86dga") - (version "1.1.3") + (name "util-macros") + (version "1.17") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXxf86dga-" + "mirror://xorg/X11R7.7/src/everything/util-macros-" version ".tar.bz2")) (sha256 (base32 - "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) + "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public libxxf86vm +(define-public videoproto (package - (name "libxxf86vm") - (version "1.1.2") + (name "videoproto") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" + "mirror://xorg/X11R7.7/src/everything/videoproto-" version ".tar.bz2")) (sha256 (base32 - "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) + "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public luit +(define-public windowswmproto (package - (name "luit") - (version "1.1.1") + (name "windowswmproto") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/luit-" + "mirror://xorg/X11R7.7/src/everything/windowswmproto-" version ".tar.bz2")) (sha256 (base32 - "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")))) + "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) (build-system gnu-build-system) - (inputs - `(("libfontenc" ,libfontenc) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public makedepend +(define-public x11perf (package - (name "makedepend") - (version "1.0.4") + (name "x11perf") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/makedepend-" + "mirror://xorg/X11R7.7/src/everything/x11perf-" version ".tar.bz2")) (sha256 (base32 - "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb")))) + "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + `(("libx11" ,libx11) + ("libxft" ,libxft) + ("libxmu" ,libxmu) + ("libxrender" ,libxrender) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public mkfontdir +(define-public xauth (package - (name "mkfontdir") + (name "xauth") (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + "mirror://xorg/X11R7.7/src/everything/xauth-" version ".tar.bz2")) (sha256 (base32 - "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public mkfontscale +(define-public xbacklight (package - (name "mkfontscale") - (version "1.1.0") + (name "xbacklight") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/mkfontscale-" + "mirror://xorg/X11R7.7/src/everything/xbacklight-" version ".tar.bz2")) (sha256 (base32 - "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff")))) + "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("xproto" ,xproto) - ("freetype" ,freetype) - ("libfontenc" ,libfontenc) + `(("libx11" ,libx11) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2241,20 +2172,20 @@ (license license:x11))) -(define-public randrproto +(define-public xbitmaps (package - (name "randrproto") - (version "1.3.2") + (name "xbitmaps") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/randrproto-" + "mirror://xorg/X11R7.7/src/everything/xbitmaps-" version ".tar.bz2")) (sha256 (base32 - "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr")))) + "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2263,42 +2194,43 @@ (license license:x11))) -(define-public recordproto +(define-public xcb-proto (package - (name "recordproto") - (version "1.14.2") + (name "xcb-proto") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/recordproto-" + "mirror://xorg/X11R7.7/src/everything/xcb-proto-" version ".tar.bz2")) (sha256 (base32 - "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) + "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public renderproto +(define-public xcmiscproto (package - (name "renderproto") - (version "0.11.1") + (name "xcmiscproto") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/renderproto-" + "mirror://xorg/X11R7.7/src/everything/xcmiscproto-" version ".tar.bz2")) (sha256 (base32 - "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) + "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2307,91 +2239,110 @@ (license license:x11))) -(define-public resourceproto +(define-public xcmsdb (package - (name "resourceproto") - (version "1.2.0") + (name "xcmsdb") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/resourceproto-" + "mirror://xorg/X11R7.7/src/everything/xcmsdb-" version ".tar.bz2")) (sha256 (base32 - "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) + "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public scrnsaverproto +(define-public xcursor-themes (package - (name "scrnsaverproto") - (version "1.2.2") + (name "xcursor-themes") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-" + "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" version ".tar.bz2")) (sha256 (base32 - "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) + "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libxcursor" ,libxcursor) + ("pkg-config" ,pkg-config) + ("xcursorgen" ,xcursorgen))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public sessreg +(define-public xcursorgen (package - (name "sessreg") - (version "1.0.7") + (name "xcursorgen") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/sessreg-" + "mirror://xorg/X11R7.7/src/everything/xcursorgen-" version ".tar.bz2")) (sha256 (base32 - "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47")))) + "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + `(("libxcursor" ,libxcursor) + ("libx11" ,libx11) + ("libpng" ,libpng) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public setxkbmap +(define-public xdpyinfo (package - (name "setxkbmap") + (name "xdpyinfo") (version "1.3.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/setxkbmap-" + "mirror://xorg/X11R7.7/src/everything/xdpyinfo-" version ".tar.bz2")) (sha256 (base32 - "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x")))) + "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) (build-system gnu-build-system) (inputs - `(("libxkbfile" ,libxkbfile) + `(("inputproto" ,inputproto) + ("libxxf86vm" ,libxxf86vm) +;; ("libxxf86misc" ,libxxf86misc) + ("libxxf86dga" ,libxxf86dga) + ("libxtst" ,libxtst) + ("libxrender" ,libxrender) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("libxext" ,libxext) + ("libxcomposite" ,libxcomposite) + ("libxcb" ,libxcb) ("libx11" ,libx11) + ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2399,26 +2350,26 @@ (license license:x11))) -(define-public smproxy +(define-public xdriinfo (package - (name "smproxy") - (version "1.0.5") + (name "xdriinfo") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/smproxy-" + "mirror://xorg/X11R7.7/src/everything/xdriinfo-" version ".tar.bz2")) (sha256 (base32 - "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67")))) + "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) - ("libxmu" ,libxmu) - ("libsm" ,libsm) - ("libice" ,libice) + `(;;("mesa" ,mesa) + ("glproto" ,glproto) + ("libx11" ,libx11) + ("glproto" ,glproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2426,42 +2377,47 @@ (license license:x11))) -(define-public util-macros +(define-public xev (package - (name "util-macros") - (version "1.17") + (name "xev") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/util-macros-" + "mirror://xorg/X11R7.7/src/everything/xev-" version ".tar.bz2")) (sha256 (base32 - "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) + "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public videoproto +(define-public xextproto (package - (name "videoproto") - (version "2.3.1") + (name "xextproto") + (version "7.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/videoproto-" + "mirror://xorg/X11R7.7/src/everything/xextproto-" version ".tar.bz2")) (sha256 (base32 - "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) + "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2470,20 +2426,20 @@ (license license:x11))) -(define-public windowswmproto +(define-public xf86-input-evdev (package - (name "windowswmproto") - (version "1.0.4") + (name "xf86-input-evdev") + (version "2.7.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/windowswmproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-" version ".tar.bz2")) (sha256 (base32 - "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) + "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2492,94 +2448,86 @@ (license license:x11))) -(define-public x11perf +(define-public xf86-input-joystick (package - (name "x11perf") - (version "1.5.4") + (name "xf86-input-joystick") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/x11perf-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-" version ".tar.bz2")) (sha256 (base32 - "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) + "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xauth +(define-public xf86-input-keyboard (package - (name "xauth") - (version "1.0.7") + (name "xf86-input-keyboard") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xauth-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-" version ".tar.bz2")) (sha256 (base32 - "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4")))) + "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) - (inputs - `(("libxmu" ,libxmu) - ("libxext" ,libxext) - ("libxau" ,libxau) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xbacklight +(define-public xf86-input-mouse (package - (name "xbacklight") - (version "1.1.2") + (name "xf86-input-mouse") + (version "1.7.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xbacklight-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-" version ".tar.bz2")) (sha256 (base32 - "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg")))) + "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) -;; ("xcb-util" ,xcb-util) - ("libxcb" ,libxcb) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xbitmaps +(define-public xf86-input-synaptics (package - (name "xbitmaps") - (version "1.1.1") + (name "xf86-input-synaptics") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xbitmaps-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-" version ".tar.bz2")) (sha256 (base32 - "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) + "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2588,43 +2536,42 @@ (license license:x11))) -(define-public xcb-proto +(define-public xf86-input-vmmouse (package - (name "xcb-proto") - (version "1.7.1") + (name "xf86-input-vmmouse") + (version "12.8.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcb-proto-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-" version ".tar.bz2")) (sha256 (base32 - "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd")))) + "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) - (inputs - `(("pkg-config" ,pkg-config) ("python" ,python))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xcmiscproto +(define-public xf86-input-void (package - (name "xcmiscproto") - (version "1.2.2") + (name "xf86-input-void") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcmiscproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-input-void-" version ".tar.bz2")) (sha256 (base32 - "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) + "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2633,183 +2580,174 @@ (license license:x11))) -(define-public xcmsdb +(define-public xf86-video-ark (package - (name "xcmsdb") - (version "1.0.4") + (name "xf86-video-ark") + (version "0.7.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcmsdb-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-" version ".tar.bz2")) (sha256 (base32 - "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74")))) + "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xcursor-themes +(define-public xf86-video-ast (package - (name "xcursor-themes") - (version "1.0.3") + (name "xf86-video-ast") + (version "0.93.10") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-" version ".tar.bz2")) (sha256 (base32 - "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) + "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) - (inputs - `(("libxcursor" ,libxcursor) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xcursorgen +(define-public xf86-video-ati (package - (name "xcursorgen") - (version "1.0.5") + (name "xf86-video-ati") + (version "6.14.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcursorgen-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-" version ".tar.bz2")) (sha256 (base32 - "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw")))) + "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) - (inputs - `(("libxcursor" ,libxcursor) - ("libx11" ,libx11) - ("libpng" ,libpng) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xdpyinfo +(define-public xf86-video-cirrus (package - (name "xdpyinfo") - (version "1.3.0") + (name "xf86-video-cirrus") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xdpyinfo-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-" version ".tar.bz2")) (sha256 (base32 - "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) + "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) - (inputs - `(("libxxf86vm" ,libxxf86vm) -;; ("libxxf86misc" ,libxxf86misc) - ("libxxf86dga" ,libxxf86dga) - ("libxtst" ,libxtst) - ("libxrender" ,libxrender) - ("libxinerama" ,libxinerama) - ("libxi" ,libxi) - ("libxext" ,libxext) - ("libxcomposite" ,libxcomposite) - ("libxcb" ,libxcb) - ("libx11" ,libx11) - ("libdmx" ,libdmx) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xdriinfo +;; (define-public xf86-video-dummy +;; (package +;; (name "xf86-video-dummy") +;; (version "0.3.5") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license non-free))) + + +(define-public xf86-video-fbdev (package - (name "xdriinfo") - (version "1.0.4") + (name "xf86-video-fbdev") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xdriinfo-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-" version ".tar.bz2")) (sha256 (base32 - "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) + "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (inputs - `(;;("mesa" ,mesa) - ("glproto" ,glproto) - ("libx11" ,libx11) - ("glproto" ,glproto) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xev +(define-public xf86-video-geode (package - (name "xev") - (version "1.2.0") + (name "xf86-video-geode") + (version "2.11.13") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xev-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" version ".tar.bz2")) (sha256 (base32 - "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip")))) + "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("xproto" ,xproto) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xextproto +(define-public xf86-video-glide (package - (name "xextproto") - (version "7.2.1") + (name "xf86-video-glide") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xextproto-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" version ".tar.bz2")) (sha256 (base32 - "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) + "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2818,503 +2756,526 @@ (license license:x11))) -(define-public xf86-input-evdev +(define-public xf86-video-glint (package - (name "xf86-input-evdev") - (version "2.7.0") + (name "xf86-video-glint") + (version "1.2.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-" version ".tar.bz2")) (sha256 (base32 - "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) + "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-input-joystick +(define-public xf86-video-i128 (package - (name "xf86-input-joystick") - (version "1.6.1") + (name "xf86-video-i128") + (version "1.3.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-" version ".tar.bz2")) (sha256 (base32 - "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) + "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-input-keyboard +(define-public xf86-video-intel (package - (name "xf86-input-keyboard") - (version "1.6.1") + (name "xf86-video-intel") + (version "2.19.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-" version ".tar.bz2")) (sha256 (base32 - "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) + "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-input-mouse +(define-public xf86-video-mach64 (package - (name "xf86-input-mouse") - (version "1.7.2") + (name "xf86-video-mach64") + (version "6.9.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-" version ".tar.bz2")) (sha256 (base32 - "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) + "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-input-synaptics +(define-public xf86-video-mga (package - (name "xf86-input-synaptics") - (version "1.6.1") + (name "xf86-video-mga") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-" version ".tar.bz2")) (sha256 (base32 - "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) + "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-input-vmmouse +(define-public xf86-video-neomagic (package - (name "xf86-input-vmmouse") - (version "12.8.0") + (name "xf86-video-neomagic") + (version "1.2.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-" version ".tar.bz2")) (sha256 (base32 - "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) + "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-input-void +(define-public xf86-video-newport (package - (name "xf86-input-void") - (version "1.4.0") + (name "xf86-video-newport") + (version "0.2.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-input-void-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-" version ".tar.bz2")) (sha256 (base32 - "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) + "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-ark +(define-public xf86-video-nv (package - (name "xf86-video-ark") - (version "0.7.4") + (name "xf86-video-nv") + (version "2.1.18") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-" version ".tar.bz2")) (sha256 (base32 - "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) + "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-ast +(define-public xf86-video-openchrome (package - (name "xf86-video-ast") - (version "0.93.10") + (name "xf86-video-openchrome") + (version "0.2.906") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-" version ".tar.bz2")) (sha256 (base32 - "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) + "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-ati +(define-public xf86-video-r128 (package - (name "xf86-video-ati") - (version "6.14.4") + (name "xf86-video-r128") + (version "6.8.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-" version ".tar.bz2")) (sha256 (base32 - "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) + "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-cirrus +(define-public xf86-video-savage (package - (name "xf86-video-cirrus") - (version "1.4.0") + (name "xf86-video-savage") + (version "2.3.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-" version ".tar.bz2")) (sha256 (base32 - "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) + "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -;; (define-public xf86-video-dummy -;; (package -;; (name "xf86-video-dummy") -;; (version "0.3.5") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) -;; (build-system gnu-build-system) -;; (home-page "http://www.x.org/wiki/") -;; (synopsis "xorg implementation of the X Window System") -;; (description "X.org provides an implementation of the X Window System") -;; (license non-free))) - - -(define-public xf86-video-fbdev +(define-public xf86-video-siliconmotion (package - (name "xf86-video-fbdev") - (version "0.4.2") + (name "xf86-video-siliconmotion") + (version "1.7.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-" version ".tar.bz2")) (sha256 (base32 - "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) + "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-geode +(define-public xf86-video-sis (package - (name "xf86-video-geode") - (version "2.11.13") + (name "xf86-video-sis") + (version "0.10.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-" version ".tar.bz2")) (sha256 (base32 - "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) + "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") - (license license:x11))) + (license license:bsd-3))) -(define-public xf86-video-glide +(define-public xf86-video-suncg6 (package - (name "xf86-video-glide") - (version "1.2.0") + (name "xf86-video-suncg6") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-" version ".tar.bz2")) (sha256 (base32 - "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) + "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-glint +(define-public xf86-video-sunffb (package - (name "xf86-video-glint") - (version "1.2.7") + (name "xf86-video-sunffb") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-" version ".tar.bz2")) (sha256 (base32 - "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) + "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-i128 +(define-public xf86-video-tdfx (package - (name "xf86-video-i128") - (version "1.3.5") + (name "xf86-video-tdfx") + (version "1.4.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-" version ".tar.bz2")) (sha256 (base32 - "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) + "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-intel +(define-public xf86-video-tga (package - (name "xf86-video-intel") - (version "2.19.0") + (name "xf86-video-tga") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-" version ".tar.bz2")) (sha256 (base32 - "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) + "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-mach64 +(define-public xf86-video-trident (package - (name "xf86-video-mach64") - (version "6.9.1") + (name "xf86-video-trident") + (version "1.3.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-" version ".tar.bz2")) (sha256 (base32 - "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) + "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-mga +;; (define-public xf86-video-v4l +;; (package +;; (name "xf86-video-v4l") +;; (version "0.2.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license none))) + + +(define-public xf86-video-vesa (package - (name "xf86-video-mga") - (version "1.5.0") + (name "xf86-video-vesa") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-" version ".tar.bz2")) (sha256 (base32 - "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) + "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-neomagic +(define-public xf86-video-vmware (package - (name "xf86-video-neomagic") - (version "1.2.6") + (name "xf86-video-vmware") + (version "12.0.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-" version ".tar.bz2")) (sha256 (base32 - "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) + "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-newport +(define-public xf86-video-voodoo (package - (name "xf86-video-newport") - (version "0.2.4") + (name "xf86-video-voodoo") + (version "1.2.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-" version ".tar.bz2")) (sha256 (base32 - "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) + "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-nv +(define-public xf86-video-wsfb (package - (name "xf86-video-nv") - (version "2.1.18") + (name "xf86-video-wsfb") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" version ".tar.bz2")) (sha256 (base32 - "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) + "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") - (license license:x11))) + (license license:bsd-2))) -(define-public xf86-video-openchrome +(define-public xf86bigfontproto (package - (name "xf86-video-openchrome") - (version "0.2.906") + (name "xf86bigfontproto") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-" + "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-" version ".tar.bz2")) (sha256 (base32 - "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) + "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) (build-system gnu-build-system) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3322,20 +3283,20 @@ (license license:x11))) -(define-public xf86-video-r128 +(define-public xf86dgaproto (package - (name "xf86-video-r128") - (version "6.8.2") + (name "xf86dgaproto") + (version "2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-" + "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-" version ".tar.bz2")) (sha256 (base32 - "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) + "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) (build-system gnu-build-system) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3343,20 +3304,20 @@ (license license:x11))) -(define-public xf86-video-savage +(define-public xf86driproto (package - (name "xf86-video-savage") - (version "2.3.4") + (name "xf86driproto") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-" + "mirror://xorg/X11R7.7/src/everything/xf86driproto-" version ".tar.bz2")) (sha256 (base32 - "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) + "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) (build-system gnu-build-system) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3364,20 +3325,20 @@ (license license:x11))) -(define-public xf86-video-siliconmotion +(define-public xf86vidmodeproto (package - (name "xf86-video-siliconmotion") - (version "1.7.6") + (name "xf86vidmodeproto") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-" + "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-" version ".tar.bz2")) (sha256 (base32 - "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) + "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) (build-system gnu-build-system) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3385,338 +3346,440 @@ (license license:x11))) -(define-public xf86-video-sis +(define-public xgamma (package - (name "xf86-video-sis") - (version "0.10.4") + (name "xgamma") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-" + "mirror://xorg/X11R7.7/src/everything/xgamma-" version ".tar.bz2")) (sha256 (base32 - "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) + "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3")))) (build-system gnu-build-system) + (inputs + `(("libxxf86vm" ,libxxf86vm) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") - (license license:bsd-3))) + (license license:x11))) -(define-public xf86-video-suncg6 +(define-public xhost (package - (name "xf86-video-suncg6") - (version "1.1.1") + (name "xhost") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-" + "mirror://xorg/X11R7.7/src/everything/xhost-" version ".tar.bz2")) (sha256 (base32 - "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) + "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18")))) (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-sunffb +(define-public xineramaproto (package - (name "xf86-video-sunffb") + (name "xineramaproto") (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-" + "mirror://xorg/X11R7.7/src/everything/xineramaproto-" version ".tar.bz2")) (sha256 (base32 - "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) + "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-tdfx +(define-public xinput (package - (name "xf86-video-tdfx") - (version "1.4.4") + (name "xinput") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-" + "mirror://xorg/X11R7.7/src/everything/xinput-" version ".tar.bz2")) (sha256 (base32 - "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) + "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a")))) (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-tga +(define-public xkbcomp (package - (name "xf86-video-tga") - (version "1.2.1") + (name "xkbcomp") + (version "1.2.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-" + "mirror://xorg/X11R7.7/src/everything/xkbcomp-" version ".tar.bz2")) (sha256 (base32 - "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) + "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i")))) (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-trident +(define-public xkbevd (package - (name "xf86-video-trident") - (version "1.3.5") + (name "xkbevd") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-" + "mirror://xorg/X11R7.7/src/everything/xkbevd-" version ".tar.bz2")) (sha256 (base32 - "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) + "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm")))) (build-system gnu-build-system) + (inputs + `(("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -;; (define-public xf86-video-v4l -;; (package -;; (name "xf86-video-v4l") -;; (version "0.2.0") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) -;; (build-system gnu-build-system) -;; (home-page "http://www.x.org/wiki/") -;; (synopsis "xorg implementation of the X Window System") -;; (description "X.org provides an implementation of the X Window System") -;; (license none))) - - -(define-public xf86-video-vesa +(define-public xkbutils (package - (name "xf86-video-vesa") - (version "2.3.1") + (name "xkbutils") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-" + "mirror://xorg/X11R7.7/src/everything/xkbutils-" version ".tar.bz2")) (sha256 (base32 - "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) + "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4")))) (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxaw" ,libxaw) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-vmware +(define-public xkeyboard-config (package - (name "xf86-video-vmware") - (version "12.0.2") + (name "xkeyboard-config") + (version "2.6") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-" + "mirror://xorg/X11R7.7/src/everything/xkeyboard-config-" version ".tar.bz2")) (sha256 (base32 - "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) + "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config) + ("xkbcomp" ,xkbcomp))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-voodoo +(define-public xkill (package - (name "xf86-video-voodoo") - (version "1.2.4") + (name "xkill") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-" + "mirror://xorg/X11R7.7/src/everything/xkill-" version ".tar.bz2")) (sha256 (base32 - "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) + "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx")))) (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86-video-wsfb +(define-public xlsatoms (package - (name "xf86-video-wsfb") - (version "0.4.0") + (name "xlsatoms") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" + "mirror://xorg/X11R7.7/src/everything/xlsatoms-" version ".tar.bz2")) (sha256 (base32 - "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) + "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) (build-system gnu-build-system) + (inputs + `(("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") - (license license:bsd-2))) + (license license:x11))) -(define-public xf86bigfontproto +(define-public xlsclients (package - (name "xf86bigfontproto") - (version "1.2.0") + (name "xlsclients") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-" + "mirror://xorg/X11R7.7/src/everything/xlsclients-" version ".tar.bz2")) (sha256 (base32 - "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) + "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) (build-system gnu-build-system) + (inputs + `(("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86dgaproto +(define-public xmodmap (package - (name "xf86dgaproto") - (version "2.1") + (name "xmodmap") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-" + "mirror://xorg/X11R7.7/src/everything/xmodmap-" version ".tar.bz2")) (sha256 (base32 - "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) + "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg")))) (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86driproto +;; (define-public xorg-docs +;; (package +;; (name "xorg-docs") +;; (version "1.7") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xorg-docs-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license none))) + + +(define-public xorg-server (package - (name "xf86driproto") - (version "2.1.1") + (name "xorg-server") + (version "1.12.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86driproto-" + "mirror://xorg/X11R7.7/src/everything/xorg-server-" version ".tar.bz2")) (sha256 (base32 - "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) + "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) (build-system gnu-build-system) + (inputs + `(("bigreqsproto" ,bigreqsproto) + ("compositeproto" ,compositeproto) + ("damageproto" ,damageproto) + ("dbus" ,dbus) + ("dmxproto" ,dmxproto) + ("dri2proto" ,dri2proto) + ("glproto" ,glproto) + ("inputproto" ,inputproto) + ("kbproto" ,kbproto) + ("libdmx" ,libdmx) +;; ("libdrm" ,libdrm) + ("libpciaccess" ,libpciaccess) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("libxaw" ,libxaw) + ("libxdmcp" ,libxdmcp) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxfont" ,libxfont) + ("libxkbfile" ,libxkbfile) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxrender" ,libxrender) + ("libxres" ,libxres) + ("libxt" ,libxt) + ("libxv" ,libxv) +;; ("mesa" ,mesa) + ("openssl" ,openssl) +;; ("pixman" ,pixman) + ("pkg-config" ,pkg-config) + ("recordproto" ,recordproto) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("resourceproto" ,resourceproto) + ("scrnsaverproto" ,scrnsaverproto) +;; ("systemd" ,systemd) + ("xcmiscproto" ,xcmiscproto) + ("xextproto" ,xextproto) + ("xf86bigfontproto" ,xf86bigfontproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) + ("xineramaproto" ,xineramaproto) + ("xtrans" ,xtrans) + ("zlib" ,zlib))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xf86vidmodeproto +(define-public xorg-sgml-doctools (package - (name "xf86vidmodeproto") - (version "2.3.1") + (name "xorg-sgml-doctools") + (version "1.11") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-" + "mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-" version ".tar.bz2")) (sha256 (base32 - "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) + "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xgamma +(define-public xpr (package - (name "xgamma") - (version "1.0.5") + (name "xpr") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xgamma-" + "mirror://xorg/X11R7.7/src/everything/xpr-" version ".tar.bz2")) (sha256 (base32 - "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3")))) + "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy")))) (build-system gnu-build-system) (inputs - `(("libxxf86vm" ,libxxf86vm) + `(("xproto" ,xproto) + ("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3725,24 +3788,23 @@ (license license:x11))) -(define-public xhost +(define-public xprop (package - (name "xhost") - (version "1.0.5") + (name "xprop") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xhost-" + "mirror://xorg/X11R7.7/src/everything/xprop-" version ".tar.bz2")) (sha256 (base32 - "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18")))) + "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407")))) (build-system gnu-build-system) (inputs - `(("libxmu" ,libxmu) - ("libxau" ,libxau) + `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3751,51 +3813,51 @@ (license license:x11))) -(define-public xineramaproto +(define-public xrandr (package - (name "xineramaproto") - (version "1.2.1") + (name "xrandr") + (version "1.3.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xineramaproto-" + "mirror://xorg/X11R7.7/src/everything/xrandr-" version ".tar.bz2")) (sha256 (base32 - "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) + "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xinput +(define-public xrdb (package - (name "xinput") - (version "1.6.0") + (name "xrdb") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xinput-" + "mirror://xorg/X11R7.7/src/everything/xrdb-" version ".tar.bz2")) (sha256 (base32 - "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a")))) + "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934")))) (build-system gnu-build-system) (inputs - `(("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("libxinerama" ,libxinerama) - ("libxi" ,libxi) - ("libxext" ,libxext) + `(("libxmu" ,libxmu) ("libx11" ,libx11) - ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3803,25 +3865,23 @@ (license license:x11))) -(define-public xkbcomp +(define-public xrefresh (package - (name "xkbcomp") - (version "1.2.4") + (name "xrefresh") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xkbcomp-" + "mirror://xorg/X11R7.7/src/everything/xrefresh-" version ".tar.bz2")) (sha256 (base32 - "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i")))) + "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libxkbfile" ,libxkbfile) - ("libx11" ,libx11) + `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3829,23 +3889,26 @@ (license license:x11))) -(define-public xkbevd +(define-public xset (package - (name "xkbevd") - (version "1.1.3") + (name "xset") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xkbevd-" + "mirror://xorg/X11R7.7/src/everything/xset-" version ".tar.bz2")) (sha256 (base32 - "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm")))) + "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(("libxkbfile" ,libxkbfile) + `(;("libxxf86misc" ,libxxf86misc) + ("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3854,27 +3917,26 @@ (license license:x11))) -(define-public xkbutils +(define-public xsetroot (package - (name "xkbutils") - (version "1.0.3") + (name "xsetroot") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xkbutils-" + "mirror://xorg/X11R7.7/src/everything/xsetroot-" version ".tar.bz2")) (sha256 (base32 - "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4")))) + "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libxaw" ,libxaw) + `(("libxmu" ,libxmu) + ("libxcursor" ,libxcursor) + ("xbitmaps" ,xbitmaps) ("libx11" ,libx11) - ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3882,20 +3944,20 @@ (license license:x11))) -(define-public xkeyboard-config +(define-public xtrans (package - (name "xkeyboard-config") - (version "2.6") + (name "xtrans") + (version "1.2.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xkeyboard-config-" + "mirror://xorg/X11R7.7/src/everything/xtrans-" version ".tar.bz2")) (sha256 (base32 - "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) + "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3904,23 +3966,24 @@ (license license:x11))) -(define-public xkill +(define-public xvinfo (package - (name "xkill") - (version "1.0.3") + (name "xvinfo") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xkill-" + "mirror://xorg/X11R7.7/src/everything/xvinfo-" version ".tar.bz2")) (sha256 (base32 - "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx")))) + "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0")))) (build-system gnu-build-system) (inputs - `(("libxmu" ,libxmu) + `(("libxext" ,libxext) + ("libxv" ,libxv) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3929,23 +3992,25 @@ (license license:x11))) -(define-public xlsatoms +(define-public xwd (package - (name "xlsatoms") - (version "1.1.1") + (name "xwd") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xlsatoms-" + "mirror://xorg/X11R7.7/src/everything/xwd-" version ".tar.bz2")) (sha256 (base32 - "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) + "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82")))) (build-system gnu-build-system) (inputs - `(("libxcb" ,libxcb) + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3953,23 +4018,25 @@ (license license:x11))) -(define-public xlsclients +(define-public xwininfo (package - (name "xlsclients") + (name "xwininfo") (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xlsclients-" + "mirror://xorg/X11R7.7/src/everything/xwininfo-" version ".tar.bz2")) (sha256 (base32 - "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) + "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg")))) (build-system gnu-build-system) (inputs - `(("libxcb" ,libxcb) + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3977,20 +4044,20 @@ (license license:x11))) -(define-public xmodmap +(define-public xwud (package - (name "xmodmap") - (version "1.0.7") + (name "xwud") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xmodmap-" + "mirror://xorg/X11R7.7/src/everything/xwud-" version ".tar.bz2")) (sha256 (base32 - "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg")))) + "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) @@ -4002,135 +4069,109 @@ (license license:x11))) -;; (define-public xorg-docs -;; (package -;; (name "xorg-docs") -;; (version "1.7") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/xorg-docs-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) -;; (build-system gnu-build-system) -;; (inputs `(("pkg-config" ,pkg-config))) -;; (home-page "http://www.x.org/wiki/") -;; (synopsis "xorg implementation of the X Window System") -;; (description "X.org provides an implementation of the X Window System") -;; (license none))) +;; packages of height 1 in the propagated-inputs tree -(define-public xorg-server +(define-public fixesproto (package - (name "xorg-server") - (version "1.12.2") + (name "fixesproto") + (version "5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xorg-server-" + "mirror://xorg/X11R7.7/src/everything/fixesproto-" version ".tar.bz2")) (sha256 (base32 - "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) + "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) (build-system gnu-build-system) + (propagated-inputs + `(("xextproto" ,xextproto))) (inputs - `(("bigreqsproto" ,bigreqsproto) - ("compositeproto" ,compositeproto) - ("damageproto" ,damageproto) - ("dbus" ,dbus) - ("dmxproto" ,dmxproto) - ("dri2proto" ,dri2proto) - ("glproto" ,glproto) - ("inputproto" ,inputproto) - ("kbproto" ,kbproto) - ("libdmx" ,libdmx) -;; ("libdrm" ,libdrm) - ("libpciaccess" ,libpciaccess) - ("libx11" ,libx11) - ("libxau" ,libxau) - ("libxaw" ,libxaw) - ("libxdmcp" ,libxdmcp) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxfont" ,libxfont) - ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) - ("libxrender" ,libxrender) - ("libxres" ,libxres) - ("libxt" ,libxt) - ("libxv" ,libxv) -;; ("mesa" ,mesa) - ("openssl" ,openssl) -;; ("pixman" ,pixman) - ("pkg-config" ,pkg-config) - ("recordproto" ,recordproto) - ("randrproto" ,randrproto) - ("renderproto" ,renderproto) - ("resourceproto" ,resourceproto) - ("scrnsaverproto" ,scrnsaverproto) -;; ("systemd" ,systemd) - ("xcmiscproto" ,xcmiscproto) - ("xextproto" ,xextproto) - ("xf86bigfontproto" ,xf86bigfontproto) - ("xf86dgaproto" ,xf86dgaproto) - ("xf86driproto" ,xf86driproto) - ("xf86vidmodeproto" ,xf86vidmodeproto) - ("xineramaproto" ,xineramaproto) - ("xtrans" ,xtrans) - ("zlib" ,zlib))) + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxext + (package + (name "libxext") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXext-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + (build-system gnu-build-system) + (propagated-inputs + `(("xextproto" ,xextproto))) + (inputs + `(("libxau" ,libxau) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xorg-sgml-doctools +(define-public libxinerama (package - (name "xorg-sgml-doctools") - (version "1.11") + (name "libxinerama") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-" + "mirror://xorg/X11R7.7/src/everything/libXinerama-" version ".tar.bz2")) (sha256 (base32 - "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) + "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("xineramaproto" ,xineramaproto))) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xpr +(define-public libxrender (package - (name "xpr") - (version "1.0.4") + (name "libxrender") + (version "0.9.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xpr-" + "mirror://xorg/X11R7.7/src/everything/libXrender-" version ".tar.bz2")) (sha256 (base32 - "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy")))) + "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) (build-system gnu-build-system) + (propagated-inputs + `(("renderproto" ,renderproto))) (inputs `(("xproto" ,xproto) - ("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4139,24 +4180,29 @@ (license license:x11))) -(define-public xprop +(define-public libxtst (package - (name "xprop") + (name "libxtst") (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xprop-" + "mirror://xorg/X11R7.7/src/everything/libXtst-" version ".tar.bz2")) (sha256 (base32 - "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407")))) + "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) (build-system gnu-build-system) + (propagated-inputs + `(("recordproto" ,recordproto))) (inputs - `(("xproto" ,xproto) + `(("libxi" ,libxi) + ("xextproto" ,xextproto) + ("libxext" ,libxext) ("libx11" ,libx11) + ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4164,6 +4210,31 @@ (license license:x11))) +(define-public mkfontdir + (package + (name "mkfontdir") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + (build-system gnu-build-system) + (propagated-inputs + `(("mkfontscale" ,mkfontscale))) + (inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xproto (package (name "xproto") @@ -4179,33 +4250,38 @@ (base32 "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("util-macros" ,util-macros))) ; to get util-macros in (almost?) all package inputs + (inputs + `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xrandr + +;; packages of height 2 in the propagated-inputs tree + +(define-public libice (package - (name "xrandr") - (version "1.3.5") + (name "libice") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xrandr-" + "mirror://xorg/X11R7.7/src/everything/libICE-" version ".tar.bz2")) (sha256 (base32 - "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h")))) + "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) (build-system gnu-build-system) + (propagated-inputs + `(("xproto" ,xproto))) (inputs - `(("libxrender" ,libxrender) - ("libxrandr" ,libxrandr) - ("xproto" ,xproto) - ("libx11" ,libx11) + `(("xtrans" ,xtrans) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4213,48 +4289,55 @@ (license license:x11))) -(define-public xrdb +(define-public libxau (package - (name "xrdb") - (version "1.0.9") + (name "libxau") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xrdb-" + "mirror://xorg/X11R7.7/src/everything/libXau-" version ".tar.bz2")) (sha256 (base32 - "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934")))) + "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) (build-system gnu-build-system) + (propagated-inputs + `(("xproto" ,xproto))) (inputs - `(("libxmu" ,libxmu) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xrefresh +(define-public libxaw (package - (name "xrefresh") - (version "1.0.4") + (name "libxaw") + (version "1.0.11") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xrefresh-" + "mirror://xorg/X11R7.7/src/everything/libXaw-" version ".tar.bz2")) (sha256 (base32 - "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586")))) + "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm))) (inputs - `(("libx11" ,libx11) + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4262,26 +4345,26 @@ (license license:x11))) -(define-public xset +(define-public libxfixes (package - (name "xset") - (version "1.2.2") + (name "libxfixes") + (version "5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xset-" + "mirror://xorg/X11R7.7/src/everything/libXfixes-" version ".tar.bz2")) (sha256 (base32 - "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) + "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) (build-system gnu-build-system) + (propagated-inputs + `(("fixesproto" ,fixesproto))) (inputs - `(;("libxxf86misc" ,libxxf86misc) - ("xproto" ,xproto) - ("libxmu" ,libxmu) - ("libxext" ,libxext) + `(("xproto" ,xproto) + ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4290,26 +4373,29 @@ (license license:x11))) -(define-public xsetroot +(define-public libxfont (package - (name "xsetroot") - (version "1.1.0") + (name "libxfont") + (version "1.4.5") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xsetroot-" + "mirror://xorg/X11R7.7/src/everything/libXfont-" version ".tar.bz2")) (sha256 (base32 - "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8")))) + "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) (build-system gnu-build-system) + (propagated-inputs + `(("fontsproto" ,fontsproto) + ("freetype" ,freetype) + ("libfontenc" ,libfontenc) + ("xproto" ,xproto))) (inputs - `(("libxmu" ,libxmu) - ("libxcursor" ,libxcursor) - ("xbitmaps" ,xbitmaps) - ("libx11" ,libx11) + `(("zlib" ,zlib) + ("xtrans" ,xtrans) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4317,99 +4403,127 @@ (license license:x11))) -(define-public xtrans +(define-public libxrandr (package - (name "xtrans") - (version "1.2.7") + (name "libxrandr") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xtrans-" + "mirror://xorg/XqqR7.7/src/everything/libXrandr-" version ".tar.bz2")) (sha256 (base32 - "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz")))) + "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxext" ,libxext) + ("randrproto" ,randrproto))) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xvinfo + +;; packages of height 3 in the propagated-inputs tree + +(define-public libxcb (package - (name "xvinfo") - (version "1.1.1") + (name "libxcb") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xvinfo-" + "mirror://xorg/X11R7.7/src/everything/libxcb-" version ".tar.bz2")) (sha256 (base32 - "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0")))) + "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) (build-system gnu-build-system) + (propagated-inputs + `(("libpthread-stubs" ,libpthread-stubs) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp))) (inputs - `(("libxext" ,libxext) - ("libxv" ,libxv) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("xcb-proto" ,xcb-proto) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("xproto" ,xproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xwd +;; packages of height 4 in the propagated-inputs tree + +(define-public libx11 (package - (name "xwd") - (version "1.0.5") + (name "libx11") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xwd-" + "mirror://xorg/X11R7.7/src/everything/libX11-" version ".tar.bz2")) (sha256 (base32 - "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82")))) + "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) (build-system gnu-build-system) + (propagated-inputs + `(("kbproto" ,kbproto) + ("libxcb" ,libxcb))) (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("inputproto" ,inputproto) + ("libxcb" ,libxcb) + ("pkg-config" ,pkg-config) + ("xextproto" ,xextproto) + ("xtrans" ,xtrans))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) -(define-public xwininfo +;; packages of height 5 in the propagated-inputs tree + +(define-public libxcursor (package - (name "xwininfo") - (version "1.1.2") + (name "libxcursor") + (version "1.1.13") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xwininfo-" + "mirror://xorg/X11R7.7/src/everything/libXcursor-" version ".tar.bz2")) (sha256 (base32 - "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg")))) + "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) (build-system gnu-build-system) + (propagated-inputs + `(("libx11" ,libx11) + ("libxrender" ,libxrender) + ("libxfixes" ,libxfixes) + ("xproto" ,xproto))) (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("libx11" ,libx11) + `(("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4417,26 +4531,33 @@ (license license:x11))) -(define-public xwud +(define-public libxt (package - (name "xwud") - (version "1.0.4") + (name "libxt") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xwud-" + "mirror://xorg/X11R7.7/src/everything/libXt-" version ".tar.bz2")) (sha256 (base32 - "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn")))) + "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) (build-system gnu-build-system) + (propagated-inputs + `(("libx11" ,libx11) + ("libice" ,libice) + ("libsm" ,libsm))) (inputs `(("xproto" ,xproto) ("libx11" ,libx11) + ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) + + -- cgit v1.2.3 From d92083ad99e0d5f43fa9ded5ef0d023815ea4ff3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 22:24:08 +0100 Subject: gnu: xorg: Comment applewmproto and libapplewm, compile only on macos. * gnu/packages/xorg.scm (applewmproto,libapplewm): Remove variables. --- gnu/packages/xorg.scm | 92 ++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 45 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d6439ec4d4..248d4efa73 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -47,26 +47,27 @@ ;; be defined first, the split makes book-keeping easier.) -(define-public applewmproto - (package - (name "applewmproto") - (version "1.4.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/applewmproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; compiles only on macos +;; (define-public applewmproto +;; (package +;; (name "applewmproto") +;; (version "1.4.2") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/applewmproto-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) (define-public bdftopcf @@ -1178,31 +1179,32 @@ (license license:x11))) -(define-public libapplewm - (package - (name "libapplewm") - (version "1.4.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libAppleWM-" - version - ".tar.bz2")) - (sha256 - (base32 - "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("applewmproto" ,applewmproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; requires applewmproto, which compiles only on macos +;; (define-public libapplewm +;; (package +;; (name "libapplewm") +;; (version "1.4.1") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/libAppleWM-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("xextproto" ,xextproto) +;; ("libxext" ,libxext) +;; ("libx11" ,libx11) +;; ("applewmproto" ,applewmproto) +;; ("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) (define-public libdmx -- cgit v1.2.3 From 5acf2910b8055b8baf9fc4187943095370f1764c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 22:40:03 +0100 Subject: gnu: xorg: Add pixman. * gnu/packages/xorg.scm (pixman): New variable. * gnu/packages/xorg.scm (xorg-server): Enable input pixman. --- gnu/packages/xorg.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 248d4efa73..0735f950a4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -42,6 +42,37 @@ +;; packages outside the x.org system proper + +(define-public pixman + (package + (name "pixman") + (version "0.28.2") + (source + (origin + (method url-fetch) + (uri (string-append + "http://cairographics.org/releases/pixman-" + version + ".tar.gz")) + (sha256 + (base32 + "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia")))) + (build-system gnu-build-system) + (inputs + `(("libpng" ,libpng) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) + (home-page "http://www.pixman.org/") + (synopsis "pixman, a low-level pixel manipulation library") + (description "Pixman is a low-level software library for pixel +manipulation, providing features such as image compositing and trapezoid +rasterisation.") + (license license:x11))) + + + + ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to ;; be defined first, the split makes book-keeping easier.) @@ -3719,7 +3750,7 @@ ("libxv" ,libxv) ;; ("mesa" ,mesa) ("openssl" ,openssl) -;; ("pixman" ,pixman) + ("pixman" ,pixman) ("pkg-config" ,pkg-config) ("recordproto" ,recordproto) ("randrproto" ,randrproto) -- cgit v1.2.3 From f8d3c99ba1f1cd0493e2cbdfdf022d5664958511 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 23:20:34 +0100 Subject: gnu: xorg: Add libdrm. * gnu/packages/xorg.scm (libdrm): New variable. --- gnu/packages/xorg.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0735f950a4..51522b4bc4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -71,6 +71,38 @@ rasterisation.") (license license:x11))) +(define-public libdrm + (package + (name "libdrm") + (version "2.4.42") + (source + (origin + (method url-fetch) + (uri (string-append + "http://dri.freedesktop.org/libdrm/libdrm-" + version + ".tar.bz2")) + (sha256 + (base32 + "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0")))) + (build-system gnu-build-system) + (inputs + `(("libpciaccess" ,libpciaccess) + ("libpthread-stubs" ,libpthread-stubs) + ("pkg-config" ,pkg-config))) + (home-page "http://dri.freedesktop.org/wiki/") + (synopsis "libdrm, direct rendering userspace library") + (description "The Direct Rendering Infrastructure, also known as the DRI, +is a framework for allowing direct access to graphics hardware under the +X Window System in a safe and efficient manner. It includes changes to the +X server, to several client libraries, and to the kernel (DRM, Direct +Rendering Manager). The most important use for the DRI is to create fast +OpenGL implementations providing hardware acceleration for Mesa. +Several 3D accelerated drivers have been written to the DRI specification, +including drivers for chipsets produced by 3DFX, AMD (formerly ATI), Intel +and Matrox.") + (license license:x11))) + ;; packages without propagated input -- cgit v1.2.3 From 322cbda7c5e89e9393310555e3158b83b24c713c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 8 Mar 2013 22:47:01 +0100 Subject: gnu: libxml2: Add python support. * gnu/packages/xml.scm (libxml2): Compile and install python module. --- gnu/packages/xml.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b3c5f7d512..ab9fd4bffc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -19,6 +19,7 @@ (define-module (gnu packages xml) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -64,7 +65,21 @@ things the parser might find in the XML document (like start tags).") (home-page "http://www.xmlsoft.org/") (synopsis "libxml2, a C parser for XML") (inputs `(("perl" ,perl) - ("python" ,python))) + ("python" ,python) + ("zlib" ,zlib))) + (arguments + `(#:phases + (alist-replace + 'install + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let ((install (assoc-ref %standard-phases 'install)) + (glibc (assoc-ref inputs "libc")) + (out (assoc-ref outputs "out"))) + (apply install args) + (chdir "python") + (substitute* "setup.py" (("/opt/include") (string-append glibc "/include"))) + (system* "python" "setup.py" "install" (string-append "--prefix=" out)))) + %standard-phases))) (description "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but it is usable outside of the Gnome platform).") -- cgit v1.2.3 From 11e3f107884d5f8139ff82c9de5a7ac7ac43727f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 8 Mar 2013 23:01:39 +0100 Subject: gnu: libxslt: Add zlib and libxml2 python module to inputs. * gnu/packages/xml.scm (libxslt): Add input zlib and add libxml2 to PYTHONPATH. --- gnu/packages/xml.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ab9fd4bffc..7b3d222cb0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -101,7 +101,19 @@ things the parser might find in the XML document (like start tags).") (synopsis "libxslt, a C library for applying XSLT stylesheets to XML documents") (inputs `(("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2) - ("python" ,python))) + ("python" ,python) + ("zlib" ,zlib))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases))) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.") -- cgit v1.2.3 From 6f52fb63ae5792b1d75a56810eaf65a373a0a388 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 9 Mar 2013 00:18:34 +0100 Subject: gnu: xorg: Propagate input. * gnu/packages/xorg.scm (libxdamage): Propagate input damageproto. --- gnu/packages/xorg.scm | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 51522b4bc4..14f19938dc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -24,7 +24,6 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages bison) #:use-module (gnu packages compression) - #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module ((gnu packages gettext) @@ -1474,35 +1473,6 @@ and Matrox.") (license license:x11))) -(define-public libxdamage - (package - (name "libxdamage") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXdamage-" - version - ".tar.bz2")) - (sha256 - (base32 - "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("xextproto" ,xextproto) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) - ("damageproto" ,damageproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxdmcp (package (name "libxdmcp") @@ -4162,6 +4132,36 @@ and Matrox.") (license license:x11))) +(define-public libxdamage + (package + (name "libxdamage") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXdamage-" + version + ".tar.bz2")) + (sha256 + (base32 + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + (build-system gnu-build-system) + (propagated-inputs + `(("damageproto" ,damageproto))) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public libxext (package (name "libxext") -- cgit v1.2.3 From 68a3d0e8cd9b0998abbe1c7e15d0de3107dda0f5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 9 Mar 2013 22:28:05 +0100 Subject: gnu: xorg: Add old versions of mesa and libdrm. * gnu/packages/xorg.scm (mesa): New variable, only version 8.0.5 compiles. * gnu/packages/xorg.scm (libdrm-2.4.33): New variable, required by mesa 8.0.5. --- gnu/packages/xorg.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14f19938dc..2998b67c42 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -103,6 +103,90 @@ and Matrox.") (license license:x11))) +;; old version, required by old mesa, see +;; http://www.mail-archive.com/nouveau@lists.freedesktop.org/msg10098.html +(define-public libdrm-2.4.33 + (package (inherit libdrm) + (version "2.4.33") + (source + (origin + (method url-fetch) + (uri (string-append + "http://dri.freedesktop.org/libdrm/libdrm-" + version + ".tar.bz2")) + (sha256 + (base32 + "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd")))) + (arguments + `(#:configure-flags + ;; create libdrm_nouveau.so, needed by mesa, see + ;; http://comments.gmane.org/gmane.linux.lfs.beyond.support/43261 + `("--enable-nouveau-experimental-api"))))) + + +(define-public mesa + (package + (name "mesa") + ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an + ;; infinite configure loop, see + ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 + (version "8.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.freedesktop.org/pub/mesa/" version + "/MesaLib-" version + ".tar.bz2")) + (sha256 + (base32 + "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) + (build-system gnu-build-system) + (inputs + `(("bison" ,bison) + ("dri2proto" ,dri2proto) + ("expat" ,expat) + ("glproto" ,glproto) + ("flex" ,flex) + ("libdrm" ,libdrm-2.4.33) + ("libx11" ,libx11) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxml2" ,libxml2) + ("libxxf86vm" ,libxxf86vm) + ("makedepend" ,makedepend) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (arguments + `(#:configure-flags + `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm + #:phases + (alist-cons-after + 'unpack 'remove-symlink + (lambda* (#:key #:allow-other-keys) + ;; remove dangling symlink to /usr/include/wine/windows + (delete-file "src/gallium/state_trackers/d3d1x/w32api")) + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases)))) + (home-page "http://mesa3d.org/") + (synopsis "Mesa, an OpenGL implementation") + (description "Mesa is a free implementation of the OpenGL specification - +a system for rendering interactive 3D graphics. A variety of device drivers +allows Mesa to be used in many different environments ranging from software +emulation to complete hardware acceleration for modern GPUs.") + (license license:x11))) + + + ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to -- cgit v1.2.3 From 2b8c5f547ac98b210d855e7ccb67e23cd344e3eb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 12:46:24 +0100 Subject: gnu: Add intltool. * gnu/packages/xml.scm (intltool): New variable. * gnu/packages/xml.scm (perl-xml-parser): Fix download location. --- gnu/packages/xml.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7b3d222cb0..2c4cda54a3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -126,7 +126,7 @@ based on libxml for XML parsing, tree manipulation and XPath support.") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-" + "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-" version ".tar.gz")) (sha256 (base32 @@ -149,3 +149,41 @@ then passed on to the Expat object on each parse call. They can also be given as extra arguments to the parse methods, in which case they override options given at XML::Parser creation time.") (home-page "http://search.cpan.org/~toddr/XML-Parser-2.41/Parser.pm"))) + +(define-public intltool + (package + (name "intltool") + (version "0.50.2") + (source (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/intltool/trunk/" + version "/+download/intltool-" + version ".tar.gz")) + (sha256 + (base32 + "01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7")))) + (build-system gnu-build-system) + (propagated-inputs + `(("perl" ,perl) + ("perl-xml-parser" ,perl-xml-parser))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (perl-xml-parser (assoc-ref inputs "perl-xml-parser"))) + ;; FIXME: This should be done more centrally. + (setenv "PERL5LIB" (string-append perl-xml-parser "/lib/perl5/site_perl")) + (apply configure args))) + %standard-phases))) + (home-page "https://launchpad.net/intltool/+download") + (synopsis "Utility scripts for internationalising xml") + (description + "intltool automatically extracts translatable strings from oaf, glade, +bonobo ui, nautilus theme and other XML files into the po files. +It automatically merges translations from po files back into .oaf files +(encoding to be 7-bit clean). The merging mechanism can also be extended to +support other types of XML files.") + (license license:gpl2+))) + -- cgit v1.2.3 From 42ed9985b10c08dee53ca58b7d95b4608eb53161 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 13:00:57 +0100 Subject: gnu: xorg: Make xkeyboard-config compile. * gnu/packages/xorg.scm (xkeyboard-config): Add inputs gettext, intltool, perl-xml-parser. --- gnu/packages/xorg.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2998b67c42..13c5c4d0c8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3663,9 +3663,24 @@ emulation to complete hardware acceleration for modern GPUs.") "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) + `(("gettext" ,gnu:gettext) + ("intltool" ,intltool) + ("libx11" ,libx11) + ;; required to set PERL5LIB, although it is propagated by intltool + ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config) ("xkbcomp" ,xkbcomp))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (perl-xml-parser (assoc-ref inputs "perl-xml-parser"))) + ;; FIXME: This should be done more centrally. + (setenv "PERL5LIB" (string-append perl-xml-parser "/lib/perl5/site_perl")) + (apply configure args))) + %standard-phases))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") -- cgit v1.2.3 From 08dccdfd12a176cf8a689aa8ca5e19fb280a137c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 13:31:03 +0100 Subject: gnu: xorg: Make xorg-server compilable (tests still fail). * gnu/packages/xorg.scm (mesa): Propagate inputs libdrm and libxdamage. * gnu/packages/xorg.scm (xorg-server): Add input videoproto. --- gnu/packages/xorg.scm | 139 ++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 67 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 13c5c4d0c8..e5c0eff097 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -125,69 +125,6 @@ and Matrox.") `("--enable-nouveau-experimental-api"))))) -(define-public mesa - (package - (name "mesa") - ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an - ;; infinite configure loop, see - ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 - (version "8.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "ftp://ftp.freedesktop.org/pub/mesa/" version - "/MesaLib-" version - ".tar.bz2")) - (sha256 - (base32 - "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) - (build-system gnu-build-system) - (inputs - `(("bison" ,bison) - ("dri2proto" ,dri2proto) - ("expat" ,expat) - ("glproto" ,glproto) - ("flex" ,flex) - ("libdrm" ,libdrm-2.4.33) - ("libx11" ,libx11) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxml2" ,libxml2) - ("libxxf86vm" ,libxxf86vm) - ("makedepend" ,makedepend) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (arguments - `(#:configure-flags - `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm - #:phases - (alist-cons-after - 'unpack 'remove-symlink - (lambda* (#:key #:allow-other-keys) - ;; remove dangling symlink to /usr/include/wine/windows - (delete-file "src/gallium/state_trackers/d3d1x/w32api")) - (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (let ((configure (assoc-ref %standard-phases 'configure)) - (libxml2 (assoc-ref inputs "libxml2"))) - ;; FIXME: This should be done more centrally. - (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) - (apply configure args))) - %standard-phases)))) - (home-page "http://mesa3d.org/") - (synopsis "Mesa, an OpenGL implementation") - (description "Mesa is a free implementation of the OpenGL specification - -a system for rendering interactive 3D graphics. A variety of device drivers -allows Mesa to be used in many different environments ranging from software -emulation to complete hardware acceleration for modern GPUs.") - (license license:x11))) - - - - ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to ;; be defined first, the split makes book-keeping easier.) @@ -3833,7 +3770,6 @@ emulation to complete hardware acceleration for modern GPUs.") ("inputproto" ,inputproto) ("kbproto" ,kbproto) ("libdmx" ,libdmx) -;; ("libdrm" ,libdrm) ("libpciaccess" ,libpciaccess) ("libx11" ,libx11) ("libxau" ,libxau) @@ -3849,16 +3785,17 @@ emulation to complete hardware acceleration for modern GPUs.") ("libxres" ,libxres) ("libxt" ,libxt) ("libxv" ,libxv) -;; ("mesa" ,mesa) + ("mesa" ,mesa) ("openssl" ,openssl) ("pixman" ,pixman) ("pkg-config" ,pkg-config) - ("recordproto" ,recordproto) + ("python" ,python) ("randrproto" ,randrproto) + ("recordproto" ,recordproto) ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) -;; ("systemd" ,systemd) + ("videoproto" ,videoproto) ("xcmiscproto" ,xcmiscproto) ("xextproto" ,xextproto) ("xf86bigfontproto" ,xf86bigfontproto) @@ -3866,6 +3803,9 @@ emulation to complete hardware acceleration for modern GPUs.") ("xf86driproto" ,xf86driproto) ("xf86vidmodeproto" ,xf86vidmodeproto) ("xineramaproto" ,xineramaproto) +;; ("xkbcomp" ,xkbcomp) +;; ("xkbutils" ,xkbutils) +;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) ("zlib" ,zlib))) (home-page "http://www.x.org/wiki/") @@ -4425,6 +4365,71 @@ emulation to complete hardware acceleration for modern GPUs.") +;; package outside the x.org system proper of height 2 + +(define-public mesa + (package + (name "mesa") + ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an + ;; infinite configure loop, see + ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 + (version "8.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.freedesktop.org/pub/mesa/" version + "/MesaLib-" version + ".tar.bz2")) + (sha256 + (base32 + "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libdrm" ,libdrm-2.4.33) + ("libxdamage" ,libxdamage))) + (inputs + `(("bison" ,bison) + ("dri2proto" ,dri2proto) + ("expat" ,expat) + ("glproto" ,glproto) + ("flex" ,flex) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxml2" ,libxml2) + ("libxxf86vm" ,libxxf86vm) + ("makedepend" ,makedepend) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (arguments + `(#:configure-flags + `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm + #:phases + (alist-cons-after + 'unpack 'remove-symlink + (lambda* (#:key #:allow-other-keys) + ;; remove dangling symlink to /usr/include/wine/windows + (delete-file "src/gallium/state_trackers/d3d1x/w32api")) + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases)))) + (home-page "http://mesa3d.org/") + (synopsis "Mesa, an OpenGL implementation") + (description "Mesa is a free implementation of the OpenGL specification - +a system for rendering interactive 3D graphics. A variety of device drivers +allows Mesa to be used in many different environments ranging from software +emulation to complete hardware acceleration for modern GPUs.") + (license license:x11))) + + + ;; packages of height 2 in the propagated-inputs tree (define-public libice -- cgit v1.2.3 From e45a6082455d54dbf0eed939df83edcc718a80f5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 13:42:40 +0100 Subject: gnu: xorg: Add xeyes (for testing purposes). * gnu/packages/xorg.scm (xeyes): New variable. --- gnu/packages/xorg.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e5c0eff097..6f0d7b5b43 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -43,6 +43,33 @@ ;; packages outside the x.org system proper +(define-public xeyes + (package + (name "xeyes") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://xeyes.sourcearchive.com/downloads/1.0.1/xeyes_" + version + ".orig.tar.gz")) + (sha256 + (base32 + "04c3md570j67g55h3bix1qbngcslnq91skli51k3g1avki88zkm9")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxmu" ,libxmu) + ("libxt" ,libxt) + ("pkg-config" ,pkg-config))) + (home-page "http://xeyes.sourcearchive.com/") + (synopsis "") + (description "") + (license license:x11))) + + (define-public pixman (package (name "pixman") -- cgit v1.2.3 From 444c64b04e84af4e6b2137b12c205f194f312d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2013 18:37:40 +0100 Subject: gnu: binutils: Update to 2.23.1. * gnu/packages/base.scm (binutils): Update to 2.23.1. Add `--disable-werror'. (binutils-boot0): Augment BINUTILS's configure flags. --- gnu/packages/base.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 537bd5af6d..e1b84b73dc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -342,14 +342,14 @@ that it is possible to use Make to build and install the program.") (define-public binutils (package (name "binutils") - (version "2.22") + (version "2.23.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "1a9w66v5dwvbnawshjwqcgz7km6kw6ihkzp6sswv9ycc3knzhykc")))) + "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia")))) (build-system gnu-build-system) ;; Split Binutils in several outputs, mostly to avoid collisions in @@ -367,7 +367,11 @@ that it is possible to use Make to build and install the program.") "LDFLAGS=-static-libgcc" ;; Don't search under /usr/lib & co. - "--with-lib-path=/no-ld-lib-path"))) + "--with-lib-path=/no-ld-lib-path" + + ;; Glibc 2.17 has a "comparison of unsigned + ;; expression >= 0 is always true" in wchar.h. + "--disable-werror"))) (synopsis "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)") @@ -703,7 +707,8 @@ identifier SYSTEM." #:implicit-inputs? #f ,@(substitute-keyword-arguments (package-arguments binutils) ((#:configure-flags cf) - `(list ,(string-append "--target=" (boot-triplet))))))) + `(cons ,(string-append "--target=" (boot-triplet)) + ,cf))))) (inputs %boot0-inputs)))) (define gcc-boot0 -- cgit v1.2.3 From 847e7725e9d4033c25e9d802f702d5bd08f9568d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Mar 2013 18:38:47 +0100 Subject: gnu: coreutils, sed: Update. * gnu/packages/base.scm (sed): Update to 4.2.2. (coreutils): Update to 8.21. --- gnu/packages/base.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e1b84b73dc..cba1f40c76 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -88,14 +88,14 @@ lines.") (define-public sed (package (name "sed") - (version "4.2.1") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/sed/sed-" version ".tar.bz2")) (sha256 (base32 - "13wlsb4sf5d5a82xjhxqmdvrrn36rmw5f0pl9qyb9zkvldnb7hra")))) + "1myvrmh99jsvk7v3d7crm0gcrq51hmmm1r2kjyyci152in1x2j7h")))) (build-system gnu-build-system) (synopsis "GNU sed, a batch stream editor") (arguments @@ -263,14 +263,14 @@ The tools supplied with this package are: (define-public coreutils (package (name "coreutils") - (version "8.20") + (version "8.21") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv")))) + "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ("gmp" ,gmp) -- cgit v1.2.3 From 5ee12e217c8ac59dc4515ef12416242d112d938c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 15 Mar 2013 20:52:48 +0100 Subject: gnu: xorg: Change download location for xcb related packages. * gnu/packages/xorg.sm (libpthread-stubs, libxcb, xcb-proto): Replace broken xorg mirrors by url of the xcb project. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6f0d7b5b43..0706a943be 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1426,7 +1426,7 @@ and Matrox.") (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + "http://xcb.freedesktop.org/dist/libpthread-stubs-" version ".tar.bz2")) (sha256 @@ -2285,7 +2285,7 @@ and Matrox.") (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcb-proto-" + "http://xcb.freedesktop.org/dist/xcb-proto-" version ".tar.bz2")) (sha256 @@ -4641,7 +4641,7 @@ emulation to complete hardware acceleration for modern GPUs.") (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcb-" + "http://xcb.freedesktop.org/dist/libxcb-" version ".tar.bz2")) (sha256 -- cgit v1.2.3 From c0589f7591e40517b0cc5387cbc13e29567cdbd5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Mar 2013 00:57:02 +0100 Subject: gnu: Add X.org as input to Texlive. * gnu/packages/texlive.scm (texlive): Add x.org inputs. --- gnu/packages/texlive.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm index 8ea78de873..090d342054 100644 --- a/gnu/packages/texlive.scm +++ b/gnu/packages/texlive.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tcsh) + #:use-module (gnu packages xorg) #:use-module (gnu packages zip)) (define texlive-extra-src @@ -66,6 +67,8 @@ ("icu4c" ,icu4c) ("ghostscript" ,ghostscript) ("libpng" ,libpng) + ("libxaw" ,libxaw) + ("libxt" ,libxt) ("perl" ,perl) ("poppler" ,poppler) ("pkg-config" ,pkg-config) @@ -88,7 +91,6 @@ ,(string-append "--datarootdir=" (assoc-ref %outputs "data")) ,(string-append "--infodir=" (assoc-ref %outputs "out") "/share/info") ,(string-append "--mandir=" (assoc-ref %outputs "out") "/share/man") - "--without-x" ; FIXME: Drop as soon as X is available. "--with-system-freetype2" ;; "--with-system-gd" ;; "--with-system-graphite" -- cgit v1.2.3 From b04ac5a1e29dfa563bd9835c75b006514d19f081 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Mar 2013 18:59:21 +0100 Subject: gnu: xorg: Arrange more inputs for x server related packages. * gnu/packages/xorg.scm (xf86-input-evdev): Add input xorg-server. * gnu/packages/xorg.scm (xorg-server): Propagate inputs and add normal and propagated inputs. --- gnu/packages/xorg.scm | 155 ++++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 74 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0706a943be..f6b66a0568 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -65,8 +65,9 @@ ("libxt" ,libxt) ("pkg-config" ,pkg-config))) (home-page "http://xeyes.sourcearchive.com/") - (synopsis "") - (description "") + (synopsis "A follow the mouse X demo") + (description "Xeyes is a demo program for x.org. It shows eyes +following the mouse.") (license license:x11))) @@ -2524,7 +2525,8 @@ and Matrox.") (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("xorg-server" ,xorg-server) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3771,76 +3773,6 @@ and Matrox.") ;; (license none))) -(define-public xorg-server - (package - (name "xorg-server") - (version "1.12.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xorg-server-" - version - ".tar.bz2")) - (sha256 - (base32 - "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) - (build-system gnu-build-system) - (inputs - `(("bigreqsproto" ,bigreqsproto) - ("compositeproto" ,compositeproto) - ("damageproto" ,damageproto) - ("dbus" ,dbus) - ("dmxproto" ,dmxproto) - ("dri2proto" ,dri2proto) - ("glproto" ,glproto) - ("inputproto" ,inputproto) - ("kbproto" ,kbproto) - ("libdmx" ,libdmx) - ("libpciaccess" ,libpciaccess) - ("libx11" ,libx11) - ("libxau" ,libxau) - ("libxaw" ,libxaw) - ("libxdmcp" ,libxdmcp) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxfont" ,libxfont) - ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) - ("libxrender" ,libxrender) - ("libxres" ,libxres) - ("libxt" ,libxt) - ("libxv" ,libxv) - ("mesa" ,mesa) - ("openssl" ,openssl) - ("pixman" ,pixman) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("randrproto" ,randrproto) - ("recordproto" ,recordproto) - ("renderproto" ,renderproto) - ("resourceproto" ,resourceproto) - ("scrnsaverproto" ,scrnsaverproto) - ("videoproto" ,videoproto) - ("xcmiscproto" ,xcmiscproto) - ("xextproto" ,xextproto) - ("xf86bigfontproto" ,xf86bigfontproto) - ("xf86dgaproto" ,xf86dgaproto) - ("xf86driproto" ,xf86driproto) - ("xf86vidmodeproto" ,xf86vidmodeproto) - ("xineramaproto" ,xineramaproto) -;; ("xkbcomp" ,xkbcomp) -;; ("xkbutils" ,xkbutils) -;; ("xkeyboard-config" ,xkeyboard-config) - ("xtrans" ,xtrans) - ("zlib" ,zlib))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public xorg-sgml-doctools (package (name "xorg-sgml-doctools") @@ -4607,7 +4539,7 @@ emulation to complete hardware acceleration for modern GPUs.") (origin (method url-fetch) (uri (string-append - "mirror://xorg/XqqR7.7/src/everything/libXrandr-" + "mirror://xorg/X11R7.7/src/everything/libXrandr-" version ".tar.bz2")) (sha256 @@ -4630,6 +4562,81 @@ emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +(define-public xorg-server + (package + (name "xorg-server") + (version "1.12.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xorg-server-" + version + ".tar.bz2")) + (sha256 + (base32 + "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) + (build-system gnu-build-system) + (propagated-inputs + `(("dri2proto" ,dri2proto) + ("fontsproto" ,fontsproto) + ("inputproto" ,inputproto) + ("kbproto" ,kbproto) + ("libpciaccess" ,libpciaccess) + ("pixman" ,pixman) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("videoproto" ,videoproto) + ("xextproto" ,xextproto) + ("xineramaproto" ,xineramaproto) + ("xproto" ,xproto))) + (inputs + `(("bigreqsproto" ,bigreqsproto) + ("compositeproto" ,compositeproto) + ("damageproto" ,damageproto) + ("dbus" ,dbus) + ("dmxproto" ,dmxproto) + ("glproto" ,glproto) + ("libdmx" ,libdmx) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("libxaw" ,libxaw) + ("libxdmcp" ,libxdmcp) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxfont" ,libxfont) + ("libxkbfile" ,libxkbfile) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxrender" ,libxrender) + ("libxres" ,libxres) + ("libxt" ,libxt) + ("libxv" ,libxv) + ("mesa" ,mesa) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("recordproto" ,recordproto) + ("resourceproto" ,resourceproto) + ("scrnsaverproto" ,scrnsaverproto) + ("xcmiscproto" ,xcmiscproto) + ("xf86bigfontproto" ,xf86bigfontproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) +;; ("xkbcomp" ,xkbcomp) +;; ("xkbutils" ,xkbutils) +;; ("xkeyboard-config" ,xkeyboard-config) + ("xtrans" ,xtrans) + ("zlib" ,zlib))) +;; (arguments +;; `(#:tests? #f)) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + ;; packages of height 3 in the propagated-inputs tree -- cgit v1.2.3 From d539646af4bdb07abcea2e0f57eb9c50131197ab Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Mar 2013 19:02:56 +0100 Subject: gnu: xorg: Enable xdriinfo. * gnu/packages/xorg.scm (xdriinfo): Enable input mesa. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f6b66a0568..181aa6466f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2450,7 +2450,7 @@ and Matrox.") "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) (build-system gnu-build-system) (inputs - `(;;("mesa" ,mesa) + `(("mesa" ,mesa) ("glproto" ,glproto) ("libx11" ,libx11) ("glproto" ,glproto) -- cgit v1.2.3 From 14a3a67364f46b24d7e39d64ac92879c3eb7f8eb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 22 Mar 2013 13:04:41 +0100 Subject: gnu: Update mpfr to 3.1.2. * gnu/packages/multiprecision.scm (mpfr): Update to 3.1.2. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 5e0dee0620..acff875db1 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -70,13 +70,13 @@ faster algorithms.") (define-public mpfr (package (name "mpfr") - (version "3.1.1") + (version "3.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 - "0ym1ylcq803n52qrggxqmkz66gbn8ncc3ybawal31v5y5p1srma9")))) + "0fs501qi8l523gs3cpy4jjcnvwxggyfbklcys80wq236xx3hz79r")))) (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp))) ; refers to (synopsis "GNU MPFR, a library for multiple-precision floating-point -- cgit v1.2.3 From a25fe6d62069ffaff276bf1747ab178441654f9d Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 24 Mar 2013 20:23:15 +0100 Subject: gnu: add dependencies to poppler. Add libpng and zlib to the inputs. --- gnu/packages/pdf.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 5a9d513336..a172414553 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages libjpeg) + #:use-module (gnu packages libpng) #:use-module (gnu packages libtiff) #:use-module (gnu packages pkg-config)) @@ -40,15 +41,25 @@ "1rmrspavldlpqi6g76fijcmshy80m0kxd01nc1dmy4id3h4las44")))) (build-system gnu-build-system) ;; FIXME: more dependencies could be added + ;; cairo output: no (requires cairo >= 1.10.0) + ;; qt4 wrapper: no + ;; glib wrapper: no (requires cairo output) + ;; introspection: no + ;; use gtk-doc: no + ;; use libcurl: no + ;; use libopenjpeg: no (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("libjpeg-8" ,libjpeg-8) + ("libpng" ,libpng) ("libtiff" ,libtiff) ("pkg-config" ,pkg-config) ("zlib" ,zlib))) (arguments `(#:tests? #f ; no test data provided with the tarball - #:configure-flags '("--enable-xpdf-headers"))) ; to install header files + #:configure-flags + '("--enable-xpdf-headers" ; to install header files + "--enable-zlib"))) (synopsis "Poppler, a pdf rendering library") (description "Poppler is a PDF rendering library based on the xpdf-3.0 code base.") -- cgit v1.2.3 From 917748dd6d6237f7539e7d4a5bebb48551d91179 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Mar 2013 23:54:58 +0100 Subject: gnu: xorg: Make most xserver related packages compile. * gnu/packages/xorg.scm (xf86-*): Add input xorg-server. * gnu/packages/xorg.scm (xf86-video-glint, xf86-video-neomagic, xf86-video-tga, xf86-video-trident, xf86-video-voodoo): Add input xf86dgaproto. * gnu/packages/xorg.scm (xf86-video-ati, xf86-video-mach64, xf86-video-mga, xf86-video-r128, xf86-video-savage, xf86-video-tdfx): Add inputs mesa and xf86driproto. * gnu/packages/xorg.scm (xf86-video-i128): Add inputs libdrm and libx11. * gnu/packages/xorg.scm (xf86-video-openchrome): Add inputs libx11, libxext, libxvmc, mesa and xf86driproto. * gnu/packages/xorg.scm (xf86-video-siliconmotion): Add inputs mesa, xf86dgaproto and xf86driproto. * gnu/packages/xorg.scm (xf86-video-vmware): Add inputs libx11 and libxext. * gnu/packages/xorg.scm (libxvmc): Propagate input libxv. * gnu/packages/xorg.scm (mesa): Propagate input glproto. * gnu/packages/xorg.scm (xf86-video-geode): Correct source hash. --- gnu/packages/xorg.scm | 214 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 143 insertions(+), 71 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 181aa6466f..bc5da3b7d5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1769,35 +1769,6 @@ and Matrox.") (license license:x11))) -(define-public libxvmc - (package - (name "libxvmc") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXvMC-" - version - ".tar.bz2")) - (sha256 - (base32 - "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) - (build-system gnu-build-system) - (inputs - `(("libxv" ,libxv) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("videoproto" ,videoproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxxf86dga (package (name "libxxf86dga") @@ -2525,14 +2496,16 @@ and Matrox.") (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) - (inputs `(("xorg-server" ,xorg-server) - ("pkg-config" ,pkg-config))) + ;; FIXME: Add required input udev once it is available. + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Tries to install file joystick-properties.h into ...--xorg-server-1.12.2/include/xorg (define-public xf86-input-joystick (package (name "xf86-input-joystick") @@ -2548,7 +2521,8 @@ and Matrox.") (base32 "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2570,7 +2544,8 @@ and Matrox.") (base32 "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2592,7 +2567,8 @@ and Matrox.") (base32 "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2614,13 +2590,16 @@ and Matrox.") (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + ;; FIXME: Add required input mtdev. + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Installation tries to create ...-xorg-server-1.12.2/share/X11/xorg.conf.d (define-public xf86-input-vmmouse (package (name "xf86-input-vmmouse") @@ -2636,7 +2615,8 @@ and Matrox.") (base32 "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2658,7 +2638,8 @@ and Matrox.") (base32 "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2680,7 +2661,8 @@ and Matrox.") (base32 "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2702,7 +2684,8 @@ and Matrox.") (base32 "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2724,7 +2707,10 @@ and Matrox.") (base32 "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xxf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2746,7 +2732,8 @@ and Matrox.") (base32 "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2790,13 +2777,15 @@ and Matrox.") (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Compilation errors (define-public xf86-video-geode (package (name "xf86-video-geode") @@ -2810,15 +2799,17 @@ and Matrox.") ".tar.bz2")) (sha256 (base32 - "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) + "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Add required input "glide" (define-public xf86-video-glide (package (name "xf86-video-glide") @@ -2834,7 +2825,8 @@ and Matrox.") (base32 "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2856,7 +2848,9 @@ and Matrox.") (base32 "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2878,7 +2872,8 @@ and Matrox.") (base32 "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2900,7 +2895,10 @@ and Matrox.") (base32 "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2922,7 +2920,10 @@ and Matrox.") (base32 "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2944,7 +2945,10 @@ and Matrox.") (base32 "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2966,7 +2970,9 @@ and Matrox.") (base32 "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2988,7 +2994,8 @@ and Matrox.") (base32 "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3010,7 +3017,8 @@ and Matrox.") (base32 "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3032,7 +3040,13 @@ and Matrox.") (base32 "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxvmc" ,libxvmc) + ("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3054,7 +3068,10 @@ and Matrox.") (base32 "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3076,7 +3093,10 @@ and Matrox.") (base32 "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3098,7 +3118,8 @@ and Matrox.") (base32 "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3120,7 +3141,11 @@ and Matrox.") (base32 "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3142,7 +3167,8 @@ and Matrox.") (base32 "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3164,7 +3190,8 @@ and Matrox.") (base32 "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3186,7 +3213,10 @@ and Matrox.") (base32 "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3208,7 +3238,9 @@ and Matrox.") (base32 "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3230,7 +3262,9 @@ and Matrox.") (base32 "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3274,7 +3308,8 @@ and Matrox.") (base32 "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3296,7 +3331,10 @@ and Matrox.") (base32 "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3318,13 +3356,16 @@ and Matrox.") (base32 "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Add input providing dev/wscons/wsconsio.h; only relevant for BSD? (define-public xf86-video-wsfb (package (name "xf86-video-wsfb") @@ -3340,7 +3381,8 @@ and Matrox.") (base32 "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4273,6 +4315,36 @@ and Matrox.") (license license:x11))) +(define-public libxvmc + (package + (name "libxvmc") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxv" ,libxv))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public mkfontdir (package (name "mkfontdir") @@ -4345,13 +4417,13 @@ and Matrox.") "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) (build-system gnu-build-system) (propagated-inputs - `(("libdrm" ,libdrm-2.4.33) + `(("glproto" ,glproto) + ("libdrm" ,libdrm-2.4.33) ("libxdamage" ,libxdamage))) (inputs `(("bison" ,bison) ("dri2proto" ,dri2proto) ("expat" ,expat) - ("glproto" ,glproto) ("flex" ,flex) ("libx11" ,libx11) ("libxext" ,libxext) @@ -4629,8 +4701,8 @@ emulation to complete hardware acceleration for modern GPUs.") ;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) ("zlib" ,zlib))) -;; (arguments -;; `(#:tests? #f)) + (arguments + `(#:tests? #f)) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") -- cgit v1.2.3 From 13f5ea6f4630068c248c9fd50a16d3dfb8fa0637 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 29 Mar 2013 10:49:30 +0100 Subject: gnu: Add lesstif. * gnu/packages/lesstif.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/lesstif.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 gnu/packages/lesstif.scm (limited to 'gnu') diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm new file mode 100644 index 0000000000..3d89258399 --- /dev/null +++ b/gnu/packages/lesstif.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages lesstif) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages xorg)) + + +(define-public lesstif + (package + (name "lesstif") + (version "0.95.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/lesstif/lesstif/" version + "/lesstif-" version ".tar.bz2")) + (sha256 + (base32 + "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb")))) + (build-system gnu-build-system) + (inputs + `(("libxext" ,libxext) + ("libxt" ,libxt))); + (home-page "http://lesstif.sourceforge.net/") + (synopsis "Clone of the Motif toolkit for the X window system") + (description "Clone of the Motif toolkit for the X window system") + (license license:gpl2+))) ; some files are lgpl2.1+ or x11 -- cgit v1.2.3 From 979bc0f49b1de09239b2bd70a079d38ca69cf516 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 08:43:47 +0100 Subject: gnu: xorg: Make xvinfo compile. * gnu/packages/xorg.scm (libxv): Propagate input videoproto. --- gnu/packages/xorg.scm | 69 ++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bc5da3b7d5..9a4394bf81 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1741,34 +1741,6 @@ and Matrox.") (license license:x11))) -(define-public libxv - (package - (name "libxv") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXv-" - version - ".tar.bz2")) - (sha256 - (base32 - "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("videoproto" ,videoproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxxf86dga (package (name "libxxf86dga") @@ -4315,29 +4287,28 @@ and Matrox.") (license license:x11))) -(define-public libxvmc +(define-public libxv (package - (name "libxvmc") + (name "libxv") (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXvMC-" + "mirror://xorg/X11R7.7/src/everything/libXv-" version ".tar.bz2")) (sha256 (base32 - "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) (build-system gnu-build-system) (propagated-inputs - `(("libxv" ,libxv))) + `(("videoproto" ,videoproto))) (inputs `(("xproto" ,xproto) ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) - ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4634,6 +4605,36 @@ emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +(define-public libxvmc + (package + (name "libxvmc") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxv" ,libxv))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xorg-server (package (name "xorg-server") -- cgit v1.2.3 From 47038b76b23ef69f3ed78ded2a03ef0c49408286 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 08:50:39 +0100 Subject: gnu: xorg: Make xgamma compile. * gnu/packages/xorg.scm (libxxf86vm): Propagate inputs libxext and xf86vidmodeproto. --- gnu/packages/xorg.scm | 54 ++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9a4394bf81..dfd5500198 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1767,32 +1767,6 @@ and Matrox.") (license license:x11))) -(define-public libxxf86vm - (package - (name "libxxf86vm") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" - version - ".tar.bz2")) - (sha256 - (base32 - "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) - (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) - ("pkg-config" ,pkg-config) - ("xf86vidmodeproto" ,xf86vidmodeproto))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public luit (package (name "luit") @@ -4635,6 +4609,34 @@ emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +(define-public libxxf86vm + (package + (name "libxxf86vm") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" + version + ".tar.bz2")) + (sha256 + (base32 + "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext) + ("xf86vidmodeproto" ,xf86vidmodeproto))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xorg-server (package (name "xorg-server") -- cgit v1.2.3 From 6706269ed434217c43328531084c525414281dd2 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 08:53:20 +0100 Subject: gnu: xorg: Disable xf86-video-wsfb. * gnu/packages/xorg.scm (xf86-video-wsfb): Comment variable, only relevant for the frame buffer on BSD systems. --- gnu/packages/xorg.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index dfd5500198..251b3b54ea 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3311,28 +3311,28 @@ and Matrox.") (license license:x11))) -;; FIXME: Add input providing dev/wscons/wsconsio.h; only relevant for BSD? -(define-public xf86-video-wsfb - (package - (name "xf86-video-wsfb") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" - version - ".tar.bz2")) - (sha256 - (base32 - "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:bsd-2))) +;; Only relevant for the frame buffer on BSD systems. +;; (define-public xf86-video-wsfb +;; (package +;; (name "xf86-video-wsfb") +;; (version "0.4.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config) +;; ("xorg-server" ,xorg-server))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:bsd-2))) (define-public xf86bigfontproto -- cgit v1.2.3 From 1f44111f8378fab19620a846e73592ac6861f572 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 09:00:25 +0100 Subject: gnu: xorg: Disable xf86-video-glide. * gnu/packages/xorg.scm (xf86-video-glide): Comment variable; driver for obsolete graphics cards, depends on libglide, last updated in 2003, and which does not compile out of the box any more. --- gnu/packages/xorg.scm | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 251b3b54ea..d83893213d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2755,28 +2755,30 @@ and Matrox.") (license license:x11))) -;; FIXME: Add required input "glide" -(define-public xf86-video-glide - (package - (name "xf86-video-glide") - (version "1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" - version - ".tar.bz2")) - (sha256 - (base32 - "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; Driver for obsolete graphics cards, depends on libglide: +;; http://sourceforge.net/projects/glide/ , +;; last updated in 2003, and which does not compile out of the box any more. +;; (define-public xf86-video-glide +;; (package +;; (name "xf86-video-glide") +;; (version "1.2.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config) +;; ("xorg-server" ,xorg-server))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) (define-public xf86-video-glint -- cgit v1.2.3 From 3a5d958570d9041d7eab509cbbc6e85956ad8858 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 09:19:24 +0100 Subject: gnu: xorg: Fix compilation of xorg-server. * gnu/packages/xorg.scm (mesa): Propagate input libxxf86vm. --- gnu/packages/xorg.scm | 196 +++++++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 98 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d83893213d..eb2b5e9a5c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4343,71 +4343,6 @@ and Matrox.") -;; package outside the x.org system proper of height 2 - -(define-public mesa - (package - (name "mesa") - ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an - ;; infinite configure loop, see - ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 - (version "8.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "ftp://ftp.freedesktop.org/pub/mesa/" version - "/MesaLib-" version - ".tar.bz2")) - (sha256 - (base32 - "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) - (build-system gnu-build-system) - (propagated-inputs - `(("glproto" ,glproto) - ("libdrm" ,libdrm-2.4.33) - ("libxdamage" ,libxdamage))) - (inputs - `(("bison" ,bison) - ("dri2proto" ,dri2proto) - ("expat" ,expat) - ("flex" ,flex) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxml2" ,libxml2) - ("libxxf86vm" ,libxxf86vm) - ("makedepend" ,makedepend) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (arguments - `(#:configure-flags - `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm - #:phases - (alist-cons-after - 'unpack 'remove-symlink - (lambda* (#:key #:allow-other-keys) - ;; remove dangling symlink to /usr/include/wine/windows - (delete-file "src/gallium/state_trackers/d3d1x/w32api")) - (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (let ((configure (assoc-ref %standard-phases 'configure)) - (libxml2 (assoc-ref inputs "libxml2"))) - ;; FIXME: This should be done more centrally. - (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) - (apply configure args))) - %standard-phases)))) - (home-page "http://mesa3d.org/") - (synopsis "Mesa, an OpenGL implementation") - (description "Mesa is a free implementation of the OpenGL specification - -a system for rendering interactive 3D graphics. A variety of device drivers -allows Mesa to be used in many different environments ranging from software -emulation to complete hardware acceleration for modern GPUs.") - (license license:x11))) - - - ;; packages of height 2 in the propagated-inputs tree (define-public libice @@ -4639,6 +4574,104 @@ emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +;; package outside the x.org system proper of height 3 + +(define-public mesa + (package + (name "mesa") + ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an + ;; infinite configure loop, see + ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 + (version "8.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.freedesktop.org/pub/mesa/" version + "/MesaLib-" version + ".tar.bz2")) + (sha256 + (base32 + "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) + (build-system gnu-build-system) + (propagated-inputs + `(("glproto" ,glproto) + ("libdrm" ,libdrm-2.4.33) + ("libxdamage" ,libxdamage) + ("libxxf86vm" ,libxxf86vm))) + (inputs + `(("bison" ,bison) + ("dri2proto" ,dri2proto) + ("expat" ,expat) + ("flex" ,flex) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxml2" ,libxml2) + ("makedepend" ,makedepend) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (arguments + `(#:configure-flags + `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm + #:phases + (alist-cons-after + 'unpack 'remove-symlink + (lambda* (#:key #:allow-other-keys) + ;; remove dangling symlink to /usr/include/wine/windows + (delete-file "src/gallium/state_trackers/d3d1x/w32api")) + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases)))) + (home-page "http://mesa3d.org/") + (synopsis "Mesa, an OpenGL implementation") + (description "Mesa is a free implementation of the OpenGL specification - +a system for rendering interactive 3D graphics. A variety of device drivers +allows Mesa to be used in many different environments ranging from software +emulation to complete hardware acceleration for modern GPUs.") + (license license:x11))) + + + +;; packages of height 3 in the propagated-inputs tree + +(define-public libxcb + (package + (name "libxcb") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://xcb.freedesktop.org/dist/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libpthread-stubs" ,libpthread-stubs) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp))) + (inputs + `(("xcb-proto" ,xcb-proto) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("xproto" ,xproto))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xorg-server (package (name "xorg-server") @@ -4715,39 +4748,6 @@ emulation to complete hardware acceleration for modern GPUs.") -;; packages of height 3 in the propagated-inputs tree - -(define-public libxcb - (package - (name "libxcb") - (version "1.8.1") - (source - (origin - (method url-fetch) - (uri (string-append - "http://xcb.freedesktop.org/dist/libxcb-" - version - ".tar.bz2")) - (sha256 - (base32 - "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) - (build-system gnu-build-system) - (propagated-inputs - `(("libpthread-stubs" ,libpthread-stubs) - ("libxau" ,libxau) - ("libxdmcp" ,libxdmcp))) - (inputs - `(("xcb-proto" ,xcb-proto) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("xproto" ,xproto))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - ;; packages of height 4 in the propagated-inputs tree (define-public libx11 -- cgit v1.2.3 From 7e2ec42b1a110b71e6c6d9ccd2c51f6b574998c8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 09:42:11 +0100 Subject: gnu: xorg: Disable not compiling xf86-video-geode. * gnu/packages/xorg.scm (xf86-video-geode): Comment out since not compiling (assembler errors). --- gnu/packages/xorg.scm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index eb2b5e9a5c..91d480d23b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2731,28 +2731,28 @@ and Matrox.") (license license:x11))) -;; FIXME: Compilation errors -(define-public xf86-video-geode - (package - (name "xf86-video-geode") - (version "2.11.13") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" - version - ".tar.bz2")) - (sha256 - (base32 - "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; Compilation errors: Assembler messages operand size mismatch etc. +;; (define-public xf86-video-geode +;; (package +;; (name "xf86-video-geode") +;; (version "2.11.13") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config) +;; ("xorg-server" ,xorg-server))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) ;; Driver for obsolete graphics cards, depends on libglide: -- cgit v1.2.3 From 84419dfd2557c2cc05f1bc0158e28de7857bf256 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 10:00:36 +0100 Subject: gnu: xorg: Add mtdev and make xf86-input-synaptics compile (not install). * gnu/packages/xorg.scm (mtdev): New variable. * gnu/packages/xorg.scm (xf86-input-synaptics): Add inputs libx11, libxi and mtdev. * gnu/packages/xorg.scm (libxi): Propagate input libxext. --- gnu/packages/xorg.scm | 90 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 91d480d23b..34553861d7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -153,7 +153,32 @@ and Matrox.") `("--enable-nouveau-experimental-api"))))) -;; packages without propagated input +(define-public mtdev + (package + (name "mtdev") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "http://bitmath.org/code/mtdev/mtdev-" + version ".tar.bz2")) + (sha256 + (base32 + "159ndzwfpw0xr8mw4lhl47w9c2krshlfrscs7k6n186vknv2hk3d")))) + (build-system gnu-build-system) + (home-page "http://bitmath.org/code/mtdev/") + (synopsis "Multitouch protocol translation library") + (description "Mtdev is a stand-alone library which transforms all +variants of kernel MT events to the slotted type B protocol. The events +put into mtdev may be from any MT device, specifically type A without +contact tracking, type A with contact tracking, or type B with contact +tracking.") + (license license:x11))) + + + + ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to ;; be defined first, the split makes book-keeping easier.) @@ -1576,34 +1601,6 @@ and Matrox.") (license license:x11))) -(define-public libxi - (package - (name "libxi") - (version "1.6.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXi-" - version - ".tar.bz2")) - (sha256 - (base32 - "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("inputproto" ,inputproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxkbfile (package (name "libxkbfile") @@ -2536,8 +2533,10 @@ and Matrox.") (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) - ;; FIXME: Add required input mtdev. - (inputs `(("pkg-config" ,pkg-config) + (inputs `(("libx11" ,libx11) + ("libxi" ,libxi) + ("mtdev" ,mtdev) + ("pkg-config" ,pkg-config) ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4485,6 +4484,35 @@ and Matrox.") (license license:x11))) +(define-public libxi + (package + (name "libxi") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXi-" + version + ".tar.bz2")) + (sha256 + (base32 + "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public libxrandr (package (name "libxrandr") -- cgit v1.2.3 From bc3073c8e3768f8fcad0b745f8dfd4269a68b7f3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 10:13:23 +0100 Subject: gnu: xorg: Make font-adobe75dpi and font-adobe100dpi compile (not install). * gnu/packages/xorg/scm (font-adobe75dpi, font-adobe100dpi): Add inputs bdftopcf, font-util and mkfontdir. --- gnu/packages/xorg.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 34553861d7..8376a4230f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -380,6 +380,11 @@ tracking.") (base32 "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) (build-system gnu-build-system) + (inputs + `(("bdftopcf" ,bdftopcf) + ("font-util", font-util) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -401,6 +406,11 @@ tracking.") (base32 "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) (build-system gnu-build-system) + (inputs + `(("bdftopcf" ,bdftopcf) + ("font-util", font-util) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") -- cgit v1.2.3 From a18eda2747fa2eb962e3288066d2b1a679589ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 30 Mar 2013 22:56:38 +0100 Subject: packages: Add `native-search-paths' field and honor it. * guix/packages.scm (): New record type. (search-path-specification->sexp): New procedure. ()[native-search-paths]: New field. (package-derivation): Accumulate the search paths, and pass them as #:search-paths toe BUILDER. * guix/build-system/gnu.scm (gnu-build): Add #:search-paths. Compute `implicit-search-paths'. Pass #:search-paths in BUILDER. * guix/build-system/perl.scm (perl-build): Add #:search-paths, pass it to BUILDER with the search paths of PERL. * guix/build-system/cmake.scm (cmake-build): Add #:search-paths, pass it to BUILDER. * guix/build-system/trivial.scm (trivial-build): Add #:search-paths, ignore it. * guix/build/gnu-build-system.scm (set-paths): Add #:search-paths. Remove explicit settings of CPATH, LIBRARY_PATH, and PKG_CONFIG_PATH. Instead, walk SEARCH-PATHS and call `set-path-environment-variable' for them. * guix/build/perl-build-system.scm (perl-build): Remove PERL5LIB setting. * tests/packages.scm ("search paths"): New test. * gnu/packages/bootstrap.scm (%bootstrap-guile)[raw]: Add #:search-paths. (%bootstrap-gcc): Add `native-search-paths' field. * gnu/packages/perl.scm (perl): Likewise. * gnu/packages/pkg-config.scm (pkg-config): Likewise. * gnu/packages/glib.scm (intltool): Remove `arguments'. * gnu/packages/avahi.scm (avahi): Remove #:phases. --- gnu/packages/avahi.scm | 14 +------------- gnu/packages/bootstrap.scm | 10 +++++++++- gnu/packages/gcc.scm | 8 ++++++++ gnu/packages/glib.scm | 12 ------------ gnu/packages/perl.scm | 3 +++ gnu/packages/pkg-config.scm | 5 +++++ 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index f7ce908351..fbdc0e2834 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -48,19 +48,7 @@ "--disable-xmltoman" "--enable-tests" "--disable-qt3" "--disable-qt4" - "--disable-gtk" "--disable-gtk3") - #:phases (alist-cons-before - 'configure 'set-perl-path - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: Remove this phase when proper support for search - ;; paths is available. - (let ((xml-parser (assoc-ref inputs - "intltool/perl-xml-parser"))) - (setenv "PERL5LIB" - (string-append xml-parser - "/lib/perl5/site_perl")) - #t)) - %standard-phases))) + "--disable-gtk" "--disable-gtk3"))) (inputs `(("expat" ,expat) ("glib" ,glib) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 82a8db614f..eaad45a741 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -154,7 +154,8 @@ check whether everything is alright." (let ((raw (build-system (name "raw") (description "Raw build system with direct store access") - (build (lambda* (store name source inputs #:key outputs system) + (build (lambda* (store name source inputs + #:key outputs system search-paths) (define (->store file) (add-to-store store file #t "sha256" (or (search-bootstrap-binary file @@ -352,6 +353,13 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("i686-linux" (base32 "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2"))))))))) + (native-search-paths + (list (search-path-specification + (variable "CPATH") + (directories '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (directories '("lib" "lib64"))))) (synopsis "Bootstrap binaries of the GNU Compiler Collection") (description #f) (home-page #f) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index a26dc24a4f..878d246c36 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -131,6 +131,14 @@ "install")))) %standard-phases))))) + (native-search-paths + (list (search-path-specification + (variable "CPATH") + (directories '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (directories '("lib" "lib64"))))) + (properties `((gcc-libc . ,(assoc-ref inputs "libc")))) (synopsis "The GNU Compiler Collection") (description diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index fdcc9bdc31..7ff9ede22b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -142,18 +142,6 @@ dynamic loading, and an object system.") (base32 "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd")))) (build-system gnu-build-system) - (arguments - '(#:phases (alist-cons-before - 'configure 'set-perl-path - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: Remove this phase when proper support for search - ;; paths is available. - (let ((xml-parser (assoc-ref inputs "perl-xml-parser"))) - (setenv "PERL5LIB" - (string-append xml-parser - "/lib/perl5/site_perl")) - #t)) - %standard-phases))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("gettext" ,guix:gettext) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 624d228059..c677a1b7e2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -63,6 +63,9 @@ (string-append "-Dloclibpth=" libc "/lib"))))) %standard-phases))) (inputs `(("patch/no-sys-dirs" ,(search-patch "perl-no-sys-dirs.patch")))) + (native-search-paths (list (search-path-specification + (variable "PERL5LIB") + (directories '("lib/perl5/site_perl"))))) (synopsis "Implementation of the Perl programming language") (description "Perl 5 is a highly capable, feature-rich programming language with over diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 0910a410ee..294163b474 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -36,6 +36,11 @@ "05wc5nwkqz7saj2v33ydmz1y6jdg659dll4jjh91n41m63gx0qsg")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-internal-glib"))) + (native-search-paths + (list (search-path-specification + (variable "PKG_CONFIG_PATH") + (directories '("lib/pkgconfig" "lib64/pkgconfig" + "share/pkgconfig"))))) (home-page "http://www.freedesktop.org/wiki/Software/pkg-config") (license gpl2+) (synopsis "a helper tool used when compiling applications and -- cgit v1.2.3 From 9be8d7c8cb1b1ee4d1f3ba7360320527199b4a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 30 Mar 2013 22:50:45 +0100 Subject: gnu: Define `native-search-paths' for Automake, Guile, and Python. * gnu/packages/autotools.scm (automake)[native-search-paths]: New field. * gnu/packages/guile.scm (guile-1.8)[native-search-paths]: New field. (guile-2.0)[native-search-paths]: New field. * gnu/packages/python.scm (python)[native-search-paths]: New field. --- gnu/packages/autotools.scm | 5 +++++ gnu/packages/guile.scm | 13 +++++++++++++ gnu/packages/python.scm | 4 ++++ 3 files changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index bc4dddc01f..114e98f606 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -164,6 +164,11 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (setenv "SHELL" sh) (setenv "CONFIG_SHELL" sh))) %standard-phases))) + (native-search-paths + (list (search-path-specification + (variable "ACLOCAL_PATH") + (directories '("share/aclocal"))))) + (home-page "http://www.gnu.org/software/automake/") (synopsis "GNU Automake, a GNU standard-compliant makefile generator") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 58e7c2910c..c74d0512c6 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -88,6 +88,11 @@ ;; When cross-compiling, a native version of Guile itself is needed. (self-native-input? #t) + (native-search-paths + (list (search-path-specification + (variable "GUILE_LOAD_PATH") + (directories '("share/guile/site"))))) + (synopsis "GNU Guile 1.8, an embeddable Scheme interpreter") (description "GNU Guile 1.8 is an interpreter for the Scheme programming language, @@ -137,6 +142,14 @@ extensible. It supports many SRFIs.") (string-append bash "/bin/bash"))))) %standard-phases))) + (native-search-paths + (list (search-path-specification + (variable "GUILE_LOAD_PATH") + (directories '("share/guile/site/2.0"))) + (search-path-specification + (variable "GUILE_LOAD_COMPILED_PATH") + (directories '("share/guile/site/2.0"))))) + (synopsis "GNU Guile 2.0, an embeddable Scheme implementation") (description "GNU Guile is an implementation of the Scheme programming language, with diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 52b11e4197..26b76864ce 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -43,6 +43,10 @@ `(("zlib" ,zlib) ("openssl" ,openssl) ("bzip2" ,bzip2))) + (native-search-paths + (list (search-path-specification + (variable "PYTHONPATH") + (directories '("lib/python2.7/site-packages"))))) (home-page "http://python.org") (synopsis "Python, a high-level dynamically-typed programming language") -- cgit v1.2.3 From bd8c5d5b02d33ed5952a7d093298611cadfa5818 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 14:33:33 +0200 Subject: gnu: xorg: Add libxp and printproto, not included in X11R7.7. * gnu/packages/xorg.scm (libxp, printproto): New variables. --- gnu/packages/xorg.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8376a4230f..d770531f5d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1848,6 +1848,29 @@ tracking.") (license license:x11))) +;; The package is missing from X11R7.7. +(define-public printproto + (package + (name "printproto") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/printproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public randrproto (package (name "randrproto") @@ -4215,6 +4238,34 @@ tracking.") (license license:x11))) +;; The package is missing from X11R7.7. +(define-public libxp + (package + (name "libxp") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libXp-" + version + ".tar.bz2")) + (sha256 + (base32 + "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y")))) + (build-system gnu-build-system) + (propagated-inputs + `(("printproto" ,printproto))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public libxrender (package (name "libxrender") -- cgit v1.2.3 From 0a92b5b30a1701ca6e96e729041b305c057dac37 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 14:50:10 +0200 Subject: gnu: freetype: Make include file ft2build.h work without changing the CPATH of dependent packages. * gnu/packages/fontutils.scm (freetype): Add link include/freetype to include/freetype2/freetype. --- gnu/packages/fontutils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 551d4ac167..14f8250357 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -38,6 +38,20 @@ (sha256 (base32 "0gpcz6swir64kp0dk3rwgqqkmf48b90dqgczdmznjjryhrahx9r9")))) (build-system gnu-build-system) + (arguments + `(#:phases + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((install (assoc-ref %standard-phases 'install)) + (include (string-append (assoc-ref outputs "out") "/include"))) + (apply install args) + ;; Unravel one directory, since ft2build.h includes directly from + ;; freetype/, not freetype2/freetype; this is announced in the file + ;; to be changed in a future release. + (symlink (string-append include "/freetype2/freetype") + (string-append include "/freetype")))) + %standard-phases))) (synopsis "Freetype, a library to render fonts") (description "Freetype is a library that can be used by applications to access the -- cgit v1.2.3 From 141ccae8a737ba89eeb3d7f749270c5eda73d8b7 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 14:58:01 +0200 Subject: gnu: lesstif: Make package usable by adding propagated input. * gnu/packages/lesstif.scm (lesstif): Add propagated input printproto; include/Xm/Print.h from lesstif includes X11/extensions/Print.h from printproto. --- gnu/packages/lesstif.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index 3d89258399..d15549454f 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -39,9 +39,11 @@ (base32 "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb")))) (build-system gnu-build-system) + (propagated-inputs + `(("printproto" ,printproto))) (inputs `(("libxext" ,libxext) - ("libxt" ,libxt))); + ("libxt" ,libxt))) (home-page "http://lesstif.sourceforge.net/") (synopsis "Clone of the Motif toolkit for the X window system") (description "Clone of the Motif toolkit for the X window system") -- cgit v1.2.3 From 14ecc0effca4d7447510bc67a774f897ac03ab87 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 17:25:11 +0200 Subject: gnu: Add xpdf. * gnu/packages/pdf.scm (xpdf): New variable. * gnu/packages/patches/xpdf-constchar.patch: New file. * Makefile.am (dist_patch_DATA): Add it. --- gnu/packages/patches/xpdf-constchar.patch | 15 +++++++++++ gnu/packages/pdf.scm | 42 ++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/xpdf-constchar.patch (limited to 'gnu') diff --git a/gnu/packages/patches/xpdf-constchar.patch b/gnu/packages/patches/xpdf-constchar.patch new file mode 100644 index 0000000000..95dbe73c71 --- /dev/null +++ b/gnu/packages/patches/xpdf-constchar.patch @@ -0,0 +1,15 @@ +This patch circumvents an error with 'const char *' to 'char *' conversion, +see http://gnats.netbsd.org/45562 . + +diff -u a/xpdf/XPDFViewer.cc b/xpdf/XPDFViewer.cc +--- a/xpdf/XPDFViewer.cc 2011-08-15 23:08:53.000000000 +0200 ++++ b/xpdf/XPDFViewer.cc 2013-03-31 15:13:21.000000000 +0200 +@@ -1803,7 +1803,7 @@ + menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); + for (i = 0; i < nZoomMenuItems; ++i) { + n = 0; +- s = XmStringCreateLocalized(zoomMenuInfo[i].label); ++ s = XmStringCreateLocalized((char *) zoomMenuInfo[i].label); + XtSetArg(args[n], XmNlabelString, s); ++n; + XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; + sprintf(buf, "zoom%d", i); diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a172414553..b2f1ade143 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,17 +17,21 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages pdf) - #:use-module ((guix licenses) #:select (gpl2+)) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages lesstif) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libpng) #:use-module (gnu packages libtiff) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xorg)) (define-public poppler (package @@ -63,5 +67,37 @@ (synopsis "Poppler, a pdf rendering library") (description "Poppler is a PDF rendering library based on the xpdf-3.0 code base.") - (license gpl2+) + (license license:gpl2+) (home-page "http://poppler.freedesktop.org/"))) + +(define-public xpdf + (package + (name "xpdf") + (version "3.03") + (source (origin + (method url-fetch) + (uri (string-append "ftp://ftp.foolabs.com/pub/xpdf/xpdf-" + version ".tar.gz")) + (sha256 (base32 + "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2")))) + (build-system gnu-build-system) + (inputs `(("freetype" ,freetype) + ("lesstif" ,lesstif) + ("libpaper" ,libpaper) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxp" ,libxp) + ("libxpm" ,libxpm) + ("libxt" ,libxt) + ("zlib" ,zlib) + ("patch/constchar" + ,(search-patch "xpdf-constchar.patch")))) + (arguments + `(#:tests? #f ; there is no check target + #:patches (list (assoc-ref %build-inputs + "patch/constchar")))) + (synopsis "Viewer for pdf files based on the Motif toolkit.") + (description + "Xpdf is a viewer for Portable Document Format (PDF) files") + (license license:gpl3) ; or gpl2, but not gpl2+ + (home-page "http://www.foolabs.com/xpdf/"))) -- cgit v1.2.3 From c7f9993146a12c579098959b3b0dcfdb46151fee Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 21:16:50 +0200 Subject: gnu: xorg: Remove inputs already available through propagation. * gnu/packages/xorg.scm: Remove inputs that are available through propagation. --- gnu/packages/xorg.scm | 92 ++++++++++----------------------------------------- 1 file changed, 17 insertions(+), 75 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d770531f5d..0059effa95 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -59,8 +59,7 @@ "04c3md570j67g55h3bix1qbngcslnq91skli51k3g1avki88zkm9")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libxmu" ,libxmu) ("libxt" ,libxt) ("pkg-config" ,pkg-config))) @@ -702,8 +701,7 @@ tracking.") "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -953,8 +951,7 @@ tracking.") "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1003,8 +1000,7 @@ tracking.") "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) @@ -1055,8 +1051,7 @@ tracking.") "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) @@ -1272,8 +1267,7 @@ tracking.") "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libice" ,libice) + `(("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1493,7 +1487,6 @@ tracking.") (build-system gnu-build-system) (inputs `(("xtrans" ,xtrans) - ("xproto" ,xproto) ("util-linux" ,util-linux) ("libice" ,libice) ("pkg-config" ,pkg-config))) @@ -1596,8 +1589,7 @@ tracking.") "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) (build-system gnu-build-system) (inputs - `(("renderproto" ,renderproto) - ("libx11" ,libx11) + `(("libx11" ,libx11) ("xproto" ,xproto) ("libxrender" ,libxrender) ("xproto" ,xproto) @@ -1628,7 +1620,6 @@ tracking.") (build-system gnu-build-system) (inputs `(("libx11" ,libx11) - ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1654,9 +1645,7 @@ tracking.") (inputs `(("libxt" ,libxt) ("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1683,9 +1672,7 @@ tracking.") `(("gettext" ,gnu:gettext) ("libxt" ,libxt) ("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1710,7 +1697,6 @@ tracking.") (build-system gnu-build-system) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) ("resourceproto" ,resourceproto) @@ -1737,8 +1723,7 @@ tracking.") "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libx11" ,libx11) ("scrnsaverproto" ,scrnsaverproto) ("pkg-config" ,pkg-config))) @@ -2047,8 +2032,6 @@ tracking.") (inputs `(("libxt" ,libxt) ("libxmu" ,libxmu) - ("libsm" ,libsm) - ("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2195,7 +2178,6 @@ tracking.") `(("libx11" ,libx11) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) - ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2336,7 +2318,6 @@ tracking.") (build-system gnu-build-system) (inputs `(("libxcursor" ,libxcursor) - ("libx11" ,libx11) ("libpng" ,libpng) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2362,17 +2343,14 @@ tracking.") (build-system gnu-build-system) (inputs `(("inputproto" ,inputproto) + ("libx11" ,libx11) ("libxxf86vm" ,libxxf86vm) -;; ("libxxf86misc" ,libxxf86misc) ("libxxf86dga" ,libxxf86dga) ("libxtst" ,libxtst) ("libxrender" ,libxrender) ("libxinerama" ,libxinerama) ("libxi" ,libxi) - ("libxext" ,libxext) ("libxcomposite" ,libxcomposite) - ("libxcb" ,libxcb) - ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2398,9 +2376,7 @@ tracking.") (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("glproto" ,glproto) ("libx11" ,libx11) - ("glproto" ,glproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3546,7 +3522,6 @@ tracking.") ("libxrandr" ,libxrandr) ("libxinerama" ,libxinerama) ("libxi" ,libxi) - ("libxext" ,libxext) ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) @@ -3626,7 +3601,6 @@ tracking.") `(("libxt" ,libxt) ("xproto" ,xproto) ("libxaw" ,libxaw) - ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3960,8 +3934,7 @@ tracking.") "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(;("libxxf86misc" ,libxxf86misc) - ("xproto" ,xproto) + `(("xproto" ,xproto) ("libxmu" ,libxmu) ("libxext" ,libxext) ("libx11" ,libx11) @@ -3991,7 +3964,6 @@ tracking.") `(("libxmu" ,libxmu) ("libxcursor" ,libxcursor) ("xbitmaps" ,xbitmaps) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4065,7 +4037,6 @@ tracking.") (inputs `(("libxt" ,libxt) ("xproto" ,xproto) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4089,10 +4060,9 @@ tracking.") "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config) + ("xproto" ,xproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4172,9 +4142,7 @@ tracking.") (inputs `(("xproto" ,xproto) ("libxfixes" ,libxfixes) - ("xextproto" ,xextproto) ("libx11" ,libx11) - ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4201,7 +4169,6 @@ tracking.") `(("xextproto" ,xextproto))) (inputs `(("libxau" ,libxau) - ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4228,8 +4195,7 @@ tracking.") (propagated-inputs `(("xineramaproto" ,xineramaproto))) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4312,8 +4278,6 @@ tracking.") `(("recordproto" ,recordproto))) (inputs `(("libxi" ,libxi) - ("xextproto" ,xextproto) - ("libxext" ,libxext) ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) @@ -4342,7 +4306,6 @@ tracking.") `(("videoproto" ,videoproto))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) @@ -4478,8 +4441,6 @@ tracking.") (inputs `(("libxt" ,libxt) ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4506,7 +4467,6 @@ tracking.") `(("fixesproto" ,fixesproto))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4564,7 +4524,6 @@ tracking.") `(("libxext" ,libxext))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) @@ -4595,9 +4554,7 @@ tracking.") (inputs `(("libxrender" ,libxrender) ("xproto" ,xproto) - ("xextproto" ,xextproto) ("libx11" ,libx11) - ("renderproto" ,renderproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4624,10 +4581,8 @@ tracking.") `(("libxv" ,libxv))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) - ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4655,7 +4610,6 @@ tracking.") ("xf86vidmodeproto" ,xf86vidmodeproto))) (inputs `(("libx11" ,libx11) - ("libxext" ,libxext) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4694,7 +4648,6 @@ tracking.") ("expat" ,expat) ("flex" ,flex) ("libx11" ,libx11) - ("libxext" ,libxext) ("libxfixes" ,libxfixes) ("libxml2" ,libxml2) ("makedepend" ,makedepend) @@ -4753,8 +4706,7 @@ emulation to complete hardware acceleration for modern GPUs.") `(("xcb-proto" ,xcb-proto) ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) - ("python" ,python) - ("xproto" ,xproto))) + ("python" ,python))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4795,18 +4747,13 @@ emulation to complete hardware acceleration for modern GPUs.") ("damageproto" ,damageproto) ("dbus" ,dbus) ("dmxproto" ,dmxproto) - ("glproto" ,glproto) ("libdmx" ,libdmx) - ("libx11" ,libx11) ("libxau" ,libxau) ("libxaw" ,libxaw) ("libxdmcp" ,libxdmcp) - ("libxext" ,libxext) ("libxfixes" ,libxfixes) ("libxfont" ,libxfont) ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) ("libxrender" ,libxrender) ("libxres" ,libxres) ("libxt" ,libxt) @@ -4823,7 +4770,6 @@ emulation to complete hardware acceleration for modern GPUs.") ("xf86dgaproto" ,xf86dgaproto) ("xf86driproto" ,xf86driproto) ("xf86vidmodeproto" ,xf86vidmodeproto) -;; ("xkbcomp" ,xkbcomp) ;; ("xkbutils" ,xkbutils) ;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) @@ -4859,7 +4805,6 @@ emulation to complete hardware acceleration for modern GPUs.") ("libxcb" ,libxcb))) (inputs `(("inputproto" ,inputproto) - ("libxcb" ,libxcb) ("pkg-config" ,pkg-config) ("xextproto" ,xextproto) ("xtrans" ,xtrans))) @@ -4892,8 +4837,7 @@ emulation to complete hardware acceleration for modern GPUs.") ("libxfixes" ,libxfixes) ("xproto" ,xproto))) (inputs - `(("fixesproto" ,fixesproto) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4920,9 +4864,7 @@ emulation to complete hardware acceleration for modern GPUs.") ("libice" ,libice) ("libsm" ,libsm))) (inputs - `(("xproto" ,xproto) - ("libx11" ,libx11) - ("kbproto" ,kbproto) + `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") -- cgit v1.2.3 From 8dc5d0cf7e18ee423c73087570c6b50d215ae216 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 2 Apr 2013 12:47:39 +0200 Subject: gnu: xorg: Re-enable tests for xorg-server. * gnu/packages/xorg.scm (xorg-server): Re-enable (failing) tests. --- gnu/packages/xorg.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0059effa95..7c08e4471e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4774,8 +4774,6 @@ emulation to complete hardware acceleration for modern GPUs.") ;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) ("zlib" ,zlib))) - (arguments - `(#:tests? #f)) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") -- cgit v1.2.3 From 1010e530d38af0b87fced74267bb7864a213b158 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 1 Apr 2013 00:23:42 +0200 Subject: gnu: Add dwm. * gnu/packages/dwm.scm: New file. * Makefile.am: Add it. --- gnu/packages/dwm.scm | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 gnu/packages/dwm.scm (limited to 'gnu') diff --git a/gnu/packages/dwm.scm b/gnu/packages/dwm.scm new file mode 100644 index 0000000000..ce87b14e5f --- /dev/null +++ b/gnu/packages/dwm.scm @@ -0,0 +1,86 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Cyril Roelandt +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages dwm) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages xorg)) + +(define-public dwm + (package + (name "dwm") + (version "6.0") + (source (origin + (method url-fetch) + (uri (string-append "http://dl.suckless.org/dwm/dwm-" + version ".tar.gz")) + (sha256 + (base32 "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (alist-replace + 'configure + (lambda _ + (substitute* "Makefile" (("\\$\\{CC\\}") "gcc")) + #t) + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (zero? + (system* "make" "install" + (string-append "DESTDIR=" out) "PREFIX=")))) + %standard-phases)))) + (inputs + `(("libx11" ,libx11) + ("libxinerama" ,libxinerama))) + (home-page "http://dwm.suckless.org/") + (synopsis "Dynamic window manager") + (description + "dwm is a dynamic window manager for X. It manages windows in tiled, +monocle and floating layouts. All of the layouts can be applied dynamically, +optimising the environment for the application in use and the task performed. + +In tiled layout windows are managed in a master and stacking area. The master +area contains the window which currently needs most attention, whereas the +stacking area contains all other windows. In monocle layout all windows are +maximised to the screen size. In floating layout windows can be resized and +moved freely. Dialog windows are always managed floating, regardless of the +layout applied. + +Windows are grouped by tags. Each window can be tagged with one or multiple +tags. Selecting certain tags displays all windows with these tags. + +Each screen contains a small status bar which displays all available tags, the +layout, the number of visible windows, the title of the focused window, and the +text read from the root window name property, if the screen is focused. A +floating window is indicated with an empty square and a maximised floating +window is indicated with a filled square before the windows title. The selected +tags are indicated with a different color. The tags of the focused window are +indicated with a filled square in the top left corner. The tags which are +applied to one or more windows are indicated with an empty square in the top +left corner. + +dwm draws a small customizable border around windows to indicate the focus +state.") + (license x11))) -- cgit v1.2.3 From f14d6b697e31b04e5657f27388b777ccee3aa5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 2 Apr 2013 10:59:27 +0200 Subject: gnu: Add libphidget. * gnu/packages/libphidget.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/libphidget.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 gnu/packages/libphidget.scm (limited to 'gnu') diff --git a/gnu/packages/libphidget.scm b/gnu/packages/libphidget.scm new file mode 100644 index 0000000000..0f4ae5f965 --- /dev/null +++ b/gnu/packages/libphidget.scm @@ -0,0 +1,42 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages libphidget) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses) + #:use-module (gnu packages libusb)) + +(define-public libphidget + (package + (name "libphidget") + (version "2.1.8.20130320") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.phidgets.com/downloads/libraries/libphidget_" + version ".tar.gz")) + (sha256 + (base32 "09ibrz1df5ajqcm9vmx6zw8qama2rzf0961yhmmfsy629qfhyrk0")))) + (build-system gnu-build-system) + (inputs `(("libusb" ,libusb))) + (home-page "http://www.phidgets.com/") + (license lgpl3+) + (synopsis "C library to manipulate Phidgets") + (description synopsis))) -- cgit v1.2.3 From 04151253e3de87059f9e1a0794a8667b49095917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 3 Apr 2013 14:44:40 +0200 Subject: gnu: bigloo: Add dependencies on Avahi and libphidget. * gnu/packages/scheme.scm (bigloo): Add Avahi and libphidget as inputs, and pkg-config as a native input. --- gnu/packages/scheme.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 59e1da22ac..4b42f8c53c 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -28,6 +28,9 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages patchelf) #:use-module (gnu packages which) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages avahi) + #:use-module (gnu packages libphidget) #:use-module (ice-9 match)) (define-public mit-scheme @@ -161,7 +164,13 @@ development cycle.") %standard-phases))))) (inputs `(("emacs" ,emacs) - ("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch")))) + ("patch/shebangs" ,(search-patch "bigloo-gc-shebangs.patch")) + + ;; Optional APIs for which Bigloo has bindings. + ("avahi" ,avahi) + ("libphidget" ,libphidget))) + (native-inputs + `(("pkg-config" ,pkg-config))) (propagated-inputs `(("gmp" ,gmp))) ; bigloo.h refers to gmp.h (home-page "http://www-sop.inria.fr/indes/fp/Bigloo/") -- cgit v1.2.3 From 3fdc99da1933e07985b6ca04d3b9412d5df05ade Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sat, 6 Apr 2013 00:28:39 +0200 Subject: gnu: Python: fix the compilation of some modules from the standard library. This commit enables the bz2, dbm, readline, ssl and zlib modules. * gnu/packages/gdbm.scm: Enable the compatibility mode. * gnu/packages/python.scm: Enable a few modules from the standard library. * gnu/packages/patches/python-fix-dbm.patch: New file. * Makefile.am: Add it. --- gnu/packages/gdbm.scm | 1 + gnu/packages/patches/python-fix-dbm.patch | 20 +++++++++++++++++++ gnu/packages/python.scm | 33 ++++++++++++++++++++++++++++--- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/python-fix-dbm.patch (limited to 'gnu') diff --git a/gnu/packages/gdbm.scm b/gnu/packages/gdbm.scm index 588b732b02..76733dba65 100644 --- a/gnu/packages/gdbm.scm +++ b/gnu/packages/gdbm.scm @@ -34,6 +34,7 @@ (sha256 (base32 "0h9lfzdjc2yl849y0byg51h6xfjg0y7vg9jnsw3gpfwlbd617y13")))) + (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/gdbm/") (synopsis "GNU dbm key/value database library") diff --git a/gnu/packages/patches/python-fix-dbm.patch b/gnu/packages/patches/python-fix-dbm.patch new file mode 100644 index 0000000000..29e4521f3f --- /dev/null +++ b/gnu/packages/patches/python-fix-dbm.patch @@ -0,0 +1,20 @@ +This patch allows the dbm module to be built using the compatibility mode of +gdbm. It will not be needed any more with Python 2.7.4. +--- setup.py 2013-04-06 00:53:37.000000000 +0200 ++++ setup.py.new 2013-04-06 19:55:05.000000000 +0200 +@@ -1158,10 +1158,14 @@ + for cand in dbm_order: + if cand == "ndbm": + if find_file("ndbm.h", inc_dirs, []) is not None: +- # Some systems have -lndbm, others don't ++ # Some systems have -lndbm, some have -lgdbm_compat, ++ # others have no particular linker flags. + if self.compiler.find_library_file(lib_dirs, + 'ndbm'): + ndbm_libs = ['ndbm'] ++ elif self.compiler.find_library_file(lib_dirs, ++ 'gdbm_compat'): ++ ndbm_libs = ['gdbm_compat'] + else: + ndbm_libs = [] + print "building dbm using ndbm" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 26b76864ce..30bb8e22f7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -19,7 +19,10 @@ (define-module (gnu packages python) #:use-module ((guix licenses) #:select (psfl)) + #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages gdbm) + #:use-module (gnu packages readline) #:use-module (gnu packages openssl) #:use-module (guix packages) #:use-module (guix download) @@ -38,11 +41,35 @@ (base32 "11f9aw855lrmknr6c82gm1ijr3n0smc6idyp94y7774yivjnplv1")))) (build-system gnu-build-system) - (arguments `(#:tests? #f)) ; XXX: some tests fail + (arguments + `(#:tests? #f ; XXX: some tests fail + #:patches (list (assoc-ref %build-inputs "patch-dbm")) + #:patch-flags '("-p0") + #:configure-flags + (let ((bz2 (assoc-ref %build-inputs "bzip2")) + (gdbm (assoc-ref %build-inputs "gdbm")) + (openssl (assoc-ref %build-inputs "openssl")) + (readline (assoc-ref %build-inputs "readline")) + (zlib (assoc-ref %build-inputs "zlib"))) + (list (string-append "CPPFLAGS=" + "-I" bz2 "/include " + "-I" gdbm "/include " + "-I" openssl "/include " + "-I" readline "/include " + "-I" zlib "/include") + (string-append "LDFLAGS=" + "-L" bz2 "/lib " + "-L" gdbm "/lib " + "-L" openssl "/lib " + "-L" readline "/lib " + "-L" zlib "/lib"))))) (inputs - `(("zlib" ,zlib) + `(("bzip2" ,bzip2) + ("gdbm" ,gdbm) ("openssl" ,openssl) - ("bzip2" ,bzip2))) + ("readline" ,readline) + ("zlib" ,zlib) + ("patch-dbm" ,(search-patch "python-fix-dbm.patch")))) (native-search-paths (list (search-path-specification (variable "PYTHONPATH") -- cgit v1.2.3 From 865c4ef33ce65ca87002a268230edae504c87166 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Fri, 5 Apr 2013 23:08:44 +0000 Subject: gnu: shishi: Update to 1.0.2. * gnu/packages/shishi.scm (shishi): Update to 1.0.2. * gnu/packages/patches/shishi-gets-undeclared.patch: Remove it. * Makefile.am (dist_patch_DATA): Adjust accordingly. --- gnu/packages/patches/shishi-gets-undeclared.patch | 71 ----------------------- gnu/packages/shishi.scm | 46 +++++---------- 2 files changed, 16 insertions(+), 101 deletions(-) delete mode 100644 gnu/packages/patches/shishi-gets-undeclared.patch (limited to 'gnu') diff --git a/gnu/packages/patches/shishi-gets-undeclared.patch b/gnu/packages/patches/shishi-gets-undeclared.patch deleted file mode 100644 index a3d6d0cca2..0000000000 --- a/gnu/packages/patches/shishi-gets-undeclared.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - - Gnulib intentionally does not have a gets module, and now that C11 - and glibc have dropped it, we should be more proactive about warning - any user on a platform that still has a declaration of this dangerous - interface. - - * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets - support. - * modules/stdio (Makefile.am): Likewise. - * lib/stdio-read.c (gets): Likewise. - * tests/test-stdio-c++.cc: Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment. - * lib/stdio.in.h (gets): Make warning occur in more places. - * doc/posix-functions/gets.texi (gets): Update documentation. - Reported by Christer Solskogen. - - Signed-off-by: Eric Blake - -diff --git a/gl/stdio.in.h b/gl/stdio.in.h -index aa7b599..c377b6e 100644 ---- a/gl/stdio.in.h -+++ b/gl/stdio.in.h -@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm index 1590221496..767037a580 100644 --- a/gnu/packages/shishi.scm +++ b/gnu/packages/shishi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2012 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. @@ -18,12 +18,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages shishi) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (gnu packages) #:use-module (gnu packages gnutls) #:use-module (gnu packages gnupg) - #:use-module ((gnu packages compression) - #:renamer (symbol-prefix-proc 'guix:)) + #:use-module (gnu packages compression) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -31,41 +30,28 @@ (define-public shishi (package (name "shishi") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) - (uri (string-append - "mirror://gnu/shishi/shishi-" - version - ".tar.gz")) + (uri (string-append "mirror://gnu/shishi/shishi-" + version ".tar.gz")) (sha256 (base32 - "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx")))) + "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d")))) (build-system gnu-build-system) - (arguments - `(#:make-flags - '("CPPFLAGS=-DMAX_ERROR_DESCRIPTION_SIZE=ASN1_MAX_ERROR_DESCRIPTION_SIZE") - #:patches (list (assoc-ref %build-inputs - "patch/gets")))) (inputs `(("gnutls" ,gnutls) - ("zlib" ,guix:zlib) + ("zlib" ,zlib) ("libgcrypt" ,libgcrypt) - ("libtasn1" ,libtasn1) - ("patch/gets" ,(search-patch "shishi-gets-undeclared.patch")))) + ("libtasn1" ,libtasn1))) (home-page "http://www.gnu.org/software/shishi/") (synopsis - "GNU Shishi, free implementation of the Kerberos 5 network security system") + "GNU Shishi, an implementation of the Kerberos 5 network security system") (description - " GNU Shishi is an implementation of the Kerberos 5 network - authentication system, as specified in RFC 4120. Shishi can be - used to authenticate users in distributed systems. - - Shishi contains a library (`libshishi') that can be used by - application developers to add support for Kerberos 5. Shishi - contains a command line utility (1shishi') that is used by - users to acquire and manage tickets (and more). The server - side, a Key Distribution Center, is implemented by `shishid'. -") - (license gpl3+))) ; some files are under GPLv2+ + "Shishi contains a library ('libshishi') that can be used by application +developers to add support for Kerberos 5. Shishi contains a command line +utility ('shishi') that is used by users to acquire and manage tickets (and +more). The server side, a Key Distribution Center (KDC), is implemented by +'shishid', and support X.509 authenticated TLS via GnuTLS.") + (license gpl3+))) -- cgit v1.2.3 From c5c555b186a894e6bd3d5709c5199fcab1f0b7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Apr 2013 21:26:41 +0200 Subject: gnu: Add Ratpoison. * gnu/packages/ratpoison.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/ratpoison.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 gnu/packages/ratpoison.scm (limited to 'gnu') diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm new file mode 100644 index 0000000000..30e6c224d6 --- /dev/null +++ b/gnu/packages/ratpoison.scm @@ -0,0 +1,71 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages ratpoison) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:select (gpl2+)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages perl) + #:use-module (gnu packages readline) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages fontutils)) + +(define-public ratpoison + (package + (name "ratpoison") + (version "1.4.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/ratpoison/ratpoison-" + version ".tar.xz")) + (sha256 + (base32 + "0v4mh8d3vsh5xbbycfdl3g8zfygi1rkslh1x7k5hi1d05bfq3cdr")))) + (build-system gnu-build-system) + (inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("libXi" ,libxi) + ("readline" ,readline) + ("xextproto" ,xextproto) + ("libXtst" ,libxtst) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("libXft" ,libxft) + ("libXpm" ,libxpm) + ("libXt" ,libxt) + ("inputproto" ,inputproto) + ("libX11" ,libx11))) + (home-page "http://www.nongnu.org/ratpoison/") + (synopsis "A simple mouse-free tiling window manager") + (description + "Ratpoison is a simple window manager with no fat library +dependencies, no fancy graphics, no window decorations, and no +rodent dependence. It is largely modelled after GNU Screen which +has done wonders in the virtual terminal market. + +The screen can be split into non-overlapping frames. All windows +are kept maximized inside their frames to take full advantage of +your precious screen real estate. + +All interaction with the window manager is done through keystrokes. +Ratpoison has a prefix map to minimize the key clobbering that +cripples Emacs and other quality pieces of software.") + (license gpl2+))) -- cgit v1.2.3 From baa0d82a8a766ed5b86a1e4f6b1a4bb6b5b64f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Apr 2013 22:06:47 +0200 Subject: gnu: libXaw: Propagate libXt. * gnu/packages/xorg.scm (libxaw): Propagate libXt. --- gnu/packages/xorg.scm | 57 ++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7c08e4471e..93e2da5d48 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4418,36 +4418,6 @@ tracking.") (description "X.org provides an implementation of the X Window System") (license license:x11))) - -(define-public libxaw - (package - (name "libxaw") - (version "1.0.11") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXaw-" - version - ".tar.bz2")) - (sha256 - (base32 - "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) - (build-system gnu-build-system) - (propagated-inputs - `(("libxext" ,libxext) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm))) - (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxfixes (package (name "libxfixes") @@ -4870,3 +4840,30 @@ emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +(define-public libxaw + (package + (name "libxaw") + (version "1.0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXaw-" + version + ".tar.bz2")) + (sha256 + (base32 + "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxt" ,libxt))) + (inputs + `(("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) -- cgit v1.2.3 From 50efa797742af747f8d544a4fac52116993d9da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 13 Apr 2013 22:08:09 +0200 Subject: gnu: emacs: Build the GUI with libXaw. * gnu/packages/emacs.scm (emacs): Add inputs: libX11, libXaw, libXt, libtiff, libjpeg, libpng, zlib, libXpm, libxml2, and D-Bus. --- gnu/packages/emacs.scm | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9a107967a3..9e1e6aa7ca 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -26,7 +26,16 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages gnutls) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages guile)) + #:use-module (gnu packages guile) + #:use-module (gnu packages xorg) + #:use-module (gnu packages lesstif) + #:use-module (gnu packages libjpeg) + #:use-module (gnu packages libtiff) + #:use-module (gnu packages libpng) + #:use-module ((gnu packages compression) + #:renamer (symbol-prefix-proc 'compression:)) + #:use-module (gnu packages xml) + #:use-module (gnu packages glib)) (define-public emacs (package @@ -43,7 +52,8 @@ (arguments '(#:configure-flags (list (string-append "--with-crt-dir=" (assoc-ref %build-inputs "libc") - "/lib")) + "/lib") + "--with-gif=no") ; XXX: add libungif #:patches (list (assoc-ref %build-inputs "patch/epaths")) #:phases (alist-cons-before 'configure 'fix-/bin/pwd @@ -60,16 +70,22 @@ ("ncurses" ,ncurses) ;; TODO: Add the optional dependencies. - ;; ("xlibs" ,xlibs) + ("xlibs" ,libx11) + ("libXaw" ,libxaw) ; XXX: eventually replace by GTK+ ;; ("gtk+" ,gtk+) - ;; ("libXft" ,libXft) - ;; ("libtiff" ,libtiff) + ("libXft" ,libxft) + ("libtiff" ,libtiff) ;; ("libungif" ,libungif) - ;; ("libjpeg" ,libjpeg) - ;; ("libpng" ,libpng) - ;; ("libXpm" ,libXpm) - ;; ("libxml2" ,libxml2) - ;; ("dbus-library" ,dbus-library) + ("libjpeg" ,libjpeg-8) + + ;; When looking for libpng `configure' links with `-lpng -lz', so we + ;; must also provide zlib as an input. + ("libpng" ,libpng) + ("zlib" ,compression:zlib) + + ("libXpm" ,libxpm) + ("libxml2" ,libxml2) + ("dbus" ,dbus) ("patch/epaths" ,(search-patch "emacs-configure-sh.patch")) )) -- cgit v1.2.3 From f594028a9ca1908a864fecf6d9e345a83f7ee9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Apr 2013 14:59:19 +0200 Subject: gnu: Add missing import in (gnu packages cross-base). * gnu/packages/cross-base.scm: Use (gnu packages gcc). Reported by Nikita Karetnikov . --- gnu/packages/cross-base.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 69dc9f5b0b..55670fad96 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -19,6 +19,7 @@ (define-module (gnu packages cross-base) #:use-module (guix licenses) #:use-module (gnu packages) + #:use-module (gnu packages gcc) #:use-module (gnu packages base) #:use-module (gnu packages linux) #:use-module (guix packages) -- cgit v1.2.3 From d6b8cb5c4a54c35b31304b2c96c7ab0082434d2a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 19 Apr 2013 19:41:05 +0200 Subject: gnu: Unify the two intltool packages. * gnu/packages/xml.scm (intltool): Delete variable. * gnu/packages/glib.scm (intltool): Update to version 0.50.2. --- gnu/packages/glib.scm | 42 ++++++++++++++++++++---------------------- gnu/packages/xml.scm | 38 -------------------------------------- 2 files changed, 20 insertions(+), 60 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 7ff9ede22b..e7de0e490c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages glib) - #:use-module ((guix licenses) #:select (lgpl2.0+ gpl2+ gpl2)) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -28,11 +30,10 @@ #:use-module ((gnu packages gettext) #:renamer (symbol-prefix-proc 'guix:)) #:use-module (gnu packages libffi) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages perl) - #:use-module ((gnu packages xml) - #:renamer (symbol-prefix-proc 'xml:))) + #:use-module (gnu packages xml)) (define-public dbus (package @@ -48,7 +49,7 @@ "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz")))) (build-system gnu-build-system) (inputs - `(("expat" ,xml:expat) + `(("expat" ,expat) ("pkg-config" ,pkg-config))) (home-page "http://dbus.freedesktop.org/") (synopsis "Message bus for inter-process communication (IPC)") @@ -68,7 +69,7 @@ to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") - (license gpl2+))) ; or Academic Free License 2.1 + (license license:gpl2+))) ; or Academic Free License 2.1 (define-public glib (package @@ -126,31 +127,28 @@ shared NFS home directories.") and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system.") (home-page "http://developer.gnome.org/glib/") - (license lgpl2.0+))) ; some files are under lgpl2.1+ + (license license:lgpl2.0+))) ; some files are under lgpl2.1+ (define-public intltool (package (name "intltool") - (version "0.40.6") + (version "0.50.2") (source (origin (method url-fetch) - (uri (string-append - "mirror://gnome/sources/intltool/0.40/intltool-" - version - ".tar.bz2")) + (uri (string-append "https://launchpad.net/intltool/trunk/" + version "/+download/intltool-" + version ".tar.gz")) (sha256 (base32 - "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd")))) + "01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("gettext" ,guix:gettext) - ("perl-xml-parser" ,xml:perl-xml-parser) - ("perl" ,perl))) - (home-page "http://freedesktop.org/wiki/Software/intltool") - (synopsis "Tools to centralize translation of many different file formats") + `(("perl" ,perl) + ("perl-xml-parser" ,perl-xml-parser))) + (home-page "https://launchpad.net/intltool/+download") + (synopsis "Tools to centralise translations of different file formats") (description - "intltool is a set of tools to centralize translation of many different + "intltool is a set of tools to centralise translations of many different file formats using GNU gettext-compatible PO files. The intltool collection can be used to do these things: @@ -163,4 +161,4 @@ The intltool collection can be used to do these things: Merge back the translations from .po files into .xml, .desktop and oaf files. This merge step will happen at build resp. installation time.") - (license gpl2))) + (license license:gpl2+))) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2c4cda54a3..524614b23f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -149,41 +149,3 @@ then passed on to the Expat object on each parse call. They can also be given as extra arguments to the parse methods, in which case they override options given at XML::Parser creation time.") (home-page "http://search.cpan.org/~toddr/XML-Parser-2.41/Parser.pm"))) - -(define-public intltool - (package - (name "intltool") - (version "0.50.2") - (source (origin - (method url-fetch) - (uri (string-append "https://launchpad.net/intltool/trunk/" - version "/+download/intltool-" - version ".tar.gz")) - (sha256 - (base32 - "01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7")))) - (build-system gnu-build-system) - (propagated-inputs - `(("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) - (arguments - `(#:phases - (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (let ((configure (assoc-ref %standard-phases 'configure)) - (perl-xml-parser (assoc-ref inputs "perl-xml-parser"))) - ;; FIXME: This should be done more centrally. - (setenv "PERL5LIB" (string-append perl-xml-parser "/lib/perl5/site_perl")) - (apply configure args))) - %standard-phases))) - (home-page "https://launchpad.net/intltool/+download") - (synopsis "Utility scripts for internationalising xml") - (description - "intltool automatically extracts translatable strings from oaf, glade, -bonobo ui, nautilus theme and other XML files into the po files. -It automatically merges translations from po files back into .oaf files -(encoding to be 7-bit clean). The merging mechanism can also be extended to -support other types of XML files.") - (license license:gpl2+))) - -- cgit v1.2.3 From 107b415e4381150a323b94da48b102cab74398c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 21 Apr 2013 11:27:37 +0200 Subject: gnu: intltool: Propagate gettext. * gnu/packages/glib.scm (intltool): Propagate gettext. --- gnu/packages/glib.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e7de0e490c..8219196adf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -143,8 +143,12 @@ dynamic loading, and an object system.") "01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7")))) (build-system gnu-build-system) (propagated-inputs - `(("perl" ,perl) - ("perl-xml-parser" ,perl-xml-parser))) + `(;; Propagate gettext because users expect it to be there, and so does + ;; the `intltool-update' script. + ("gettext" ,guix:gettext) + + ("perl-xml-parser" ,xml:perl-xml-parser) + ("perl" ,perl))) (home-page "https://launchpad.net/intltool/+download") (synopsis "Tools to centralise translations of different file formats") (description -- cgit v1.2.3 From e33d9d6f09874f83bb5a03f49cb969a84588e10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 21 Apr 2013 21:09:49 +0200 Subject: gnu: intltool: Fix typo. * gnu/packages/glib.scm (intltool): Fix typo. --- gnu/packages/glib.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8219196adf..135c672818 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -147,7 +147,7 @@ dynamic loading, and an object system.") ;; the `intltool-update' script. ("gettext" ,guix:gettext) - ("perl-xml-parser" ,xml:perl-xml-parser) + ("perl-xml-parser" ,perl-xml-parser) ("perl" ,perl))) (home-page "https://launchpad.net/intltool/+download") (synopsis "Tools to centralise translations of different file formats") -- cgit v1.2.3 From d83ae7240171bba5a3a47870832562aab53552c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 26 Apr 2013 22:13:14 +0200 Subject: gnu: diffutils: Update to 3.3. * gnu/packages/base.scm (diffutils): Update to 3.3. --- gnu/packages/base.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fadc2463d0..2afb64ab9e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -179,18 +179,15 @@ producing patched versions.") (define-public diffutils (package (name "diffutils") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/diffutils/diffutils-" version ".tar.xz")) (sha256 (base32 - "0jci0wv68025xd0s0rq4s5qxpx56dd9d730lka63qpzk1rfvfkxb")))) + "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2")))) (build-system gnu-build-system) - (inputs `(("patch/gets" - ,(search-patch "diffutils-gets-undeclared.patch")))) - (arguments `(#:patches (list (assoc-ref %build-inputs "patch/gets")))) (synopsis "Comparing and merging files") (description "GNU Diffutils is a package of several programs related to finding -- cgit v1.2.3 From 6aded2dd3fdeb349f18e9085bf700ea1bb926c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 26 Apr 2013 22:48:17 +0200 Subject: gnu: guile: Default to 2.0.9. * gnu/packages/guile.scm (guile-2.0/fixed): Switch to `guile-2.0'. --- gnu/packages/guile.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 0b50530b22..c8604f88f4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -164,15 +164,7 @@ call interface, and powerful string processing.") (define-public guile-2.0/fixed ;; A package of Guile 2.0 that's rarely changed. It is the one used ;; in the `base' module, and thus changing it entails a full rebuild. - (package (inherit guile-2.0) - (version "2.0.7") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg")))))) + guile-2.0) ;;; -- cgit v1.2.3 From 3b401612d9ea23cf20f5377594251a82c28e03e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 26 Apr 2013 22:51:07 +0200 Subject: gnu: Binutils 2.23.2 and GCC 4.7.3. * gnu/packages/base.scm (binutils): Update to 2.23.2. (binutils-2.23, ld-wrapper-2.23): Remove. (gcc-4.8): Move to... * gnu/packages/gcc.scm (gcc-4.8): ... here. (gcc-4.7): Update to 4.7.3. Add dependencies on ISL, CLooG, libelf, and zlib. --- gnu/packages/base.scm | 44 ++------------------------------------------ gnu/packages/gcc.scm | 26 +++++++++++++++++++++----- 2 files changed, 23 insertions(+), 47 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2afb64ab9e..fae0c8151f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -337,14 +337,14 @@ that it is possible to use Make to build and install the program.") (define-public binutils (package (name "binutils") - (version "2.23.1") + (version "2.23.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia")))) + "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy")))) (build-system gnu-build-system) ;; Split Binutils in several outputs, mostly to avoid collisions in @@ -376,17 +376,6 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.") (license gpl3+) (home-page "http://www.gnu.org/software/binutils/"))) -(define-public binutils-2.23 - (package (inherit binutils) - (version "2.23.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/binutils/binutils-" - version ".tar.bz2")) - (sha256 - (base32 - "15qhbkz3r266xaa52slh857qn3abw7rb2x2jnhpfrafpzrb4x4gy")))))) - (define-public glibc (package (name "glibc") @@ -962,35 +951,6 @@ store.") ,@(fold alist-delete (package-inputs ld-wrapper-boot3) '("guile" "bash")))))) -(define-public ld-wrapper-2.23 ; TODO: remove when Binutils is updated - (package (inherit ld-wrapper) - (inputs `(("binutils" ,binutils-2.23) - ,@(alist-delete "binutils" (package-inputs ld-wrapper)))))) - -(define-public gcc-4.8 - ;; FIXME: Move to gcc.scm when Binutils is updated. - (package (inherit gcc-4.7) - (version "4.8.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gcc/gcc-" - version "/gcc-" version ".tar.bz2")) - (sha256 - (base32 - "0b6cp9d1sas3vq6dj3zrgd134p9b569fqhbixb9cl7mp698zwdxh")))) - (inputs `(("gmp" ,gmp) - ("mpfr" ,mpfr) - ("mpc" ,mpc) - ("isl" ,isl) - ("cloog" ,cloog) - ("zlib" ,(@ (gnu packages compression) zlib)) - - ;; With ld from Binutils 2.22, we get the following error while - ;; linking gcov: - ;; ld: gcov: hidden symbol `__deregister_frame_info' in /nix/store/47myfniw4x7kfc601d7q1yvz5mixlr00-gcc-4.7.2/lib/gcc/x86_64-unknown-linux-gnu/4.7.2/libgcc_eh.a(unwind-dw2-fde-dip.o) is referenced by DSO - ;; See . - ("ld-wrapper" ,ld-wrapper-2.23))))) - (define-public %final-inputs ;; Final derivations used as implicit inputs by `gnu-build-system'. (let ((finalize (cut package-with-explicit-inputs <> %boot4-inputs diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 96b82d5af7..d239b5a9ab 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -35,18 +35,22 @@ (let ((stripped? #t)) ; TODO: make this a parameter (package (name "gcc") - (version "4.7.2") + (version "4.7.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.bz2")) (sha256 (base32 - "115h03hil99ljig8lkrq4qk426awmzh0g99wrrggxf8g07bq74la")))) + "1hx9h64ivarlzi4hxvq42as5m9vlr5cyzaaq4gzj4i619zmkfz1g")))) (build-system gnu-build-system) - (inputs `(("gmp" ,gmp) - ("mpfr" ,mpfr) - ("mpc" ,mpc))) ; TODO: libelf, ppl, cloog, zlib, etc. + (inputs `(("gmp" ,gmp) + ("mpfr" ,mpfr) + ("mpc" ,mpc) + ("isl" ,isl) + ("cloog" ,cloog) + ("libelf" ,libelf) + ("zlib" ,zlib))) (arguments `(#:out-of-source? #t #:strip-binaries? ,stripped? @@ -152,6 +156,18 @@ used in the GNU system including the GNU/Linux variant.") (license gpl3+) (home-page "http://gcc.gnu.org/")))) +(define-public gcc-4.8 + ;; FIXME: Move to gcc.scm when Binutils is updated. + (package (inherit gcc-4.7) + (version "4.8.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-" version ".tar.bz2")) + (sha256 + (base32 + "0b6cp9d1sas3vq6dj3zrgd134p9b569fqhbixb9cl7mp698zwdxh")))))) + (define-public isl (package (name "isl") -- cgit v1.2.3 From 9369a02bfc3f11626fba09dd6cf0cae411d57f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Apr 2013 00:23:19 +0200 Subject: gnu: patch: Update to 2.7.1. * gnu/packages/base.scm (patch): Update to 2.7.1. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fae0c8151f..34c4db98f9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -153,14 +153,14 @@ files (as archives).") (define-public patch (package (name "patch") - (version "2.6.1") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/patch/patch-" version ".tar.xz")) (sha256 (base32 - "18012gxs9wc96izskp1q7bclrwns6rdmkn4jj31c8jbyfz6l5npq")))) + "1sqckf560pzwgniy00vcpdv2c9c11s4cmhlm14yqgg8avd3bl94i")))) (build-system gnu-build-system) (native-inputs '()) ; FIXME: needs `ed' for the tests (arguments -- cgit v1.2.3 From cecb712cce32467b8dd4eb3ececc522c209c93a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 27 Apr 2013 00:23:45 +0200 Subject: gnu: gawk: Update to 4.0.2. * gnu/packages/gawk.scm (gawk): Update to 4.0.2. --- gnu/packages/gawk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 15ff2a4401..bba2ea1af0 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -26,13 +26,13 @@ (define-public gawk (package (name "gawk") - (version "4.0.0") + (version "4.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gawk/gawk-" version - ".tar.bz2")) + ".tar.xz")) (sha256 - (base32 "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0")))) + (base32 "04vd0axif762mf781pj3days6ilv2333b9zi9c50y5mma66g5q91")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f ; test suite fails in parallel -- cgit v1.2.3 From 1f7c6a1f53d0a752af70de123f2ce9d138e0db0a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 28 Apr 2013 21:12:55 +0200 Subject: gnu: Add gs-fonts. * gnu/packages/ghostscript.scm (gs-fonts): New variable. --- gnu/packages/ghostscript.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 2c58bca0bd..1f4aa2f77a 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -171,3 +171,45 @@ It consists of a PostScript interpreter layer, and a graphics library.") (license license:gpl3+) (home-page "http://www.gnu.org/software/ghostscript/"))) + +(define-public gs-fonts + (package + (name "gs-fonts") + (version "8.11") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gs-fonts/gs-fonts/" + version + "%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-" + version + ".tar.gz")) + (sha256 (base32 + "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; nothing to check, just files to copy + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) ; for alist-delete + #:phases + (alist-delete + 'configure + (alist-delete + 'build + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/share/fonts/type1/ghostscript"))) + (mkdir-p dir) + (for-each + (lambda (file) + (copy-file file (string-append dir "/" file))) + (find-files "." "pfb|afm")))) + %standard-phases))))) + (synopsis "free replacements for the PostScript fonts") + (description + "gs-fonts provides fonts and font metrics customarily distributed with +Ghostscript. It currently includes the 35 standard PostScript fonts.") + (license license:gpl2) + (home-page "http://sourceforge.net/projects/gs-fonts/"))) -- cgit v1.2.3 From 19cb51701266404e023eda5a50c026bccb0dc6a0 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 28 Apr 2013 22:05:27 +0200 Subject: gnu: xpdf: Use gs-fonts to provide standard postscript fonts. * gnu/packages/pdf (xpdf): Add path to gs-fonts in xpdfrc. --- gnu/packages/pdf.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index b2f1ade143..820a879288 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -82,6 +82,7 @@ "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2")))) (build-system gnu-build-system) (inputs `(("freetype" ,freetype) + ("gs-fonts" ,gs-fonts) ("lesstif" ,lesstif) ("libpaper" ,libpaper) ("libx11" ,libx11) @@ -95,7 +96,21 @@ (arguments `(#:tests? #f ; there is no check target #:patches (list (assoc-ref %build-inputs - "patch/constchar")))) + "patch/constchar")) + #:phases + (alist-replace + 'install + (lambda* (#:key outputs inputs #:allow-other-keys #:rest args) + (let* ((install (assoc-ref %standard-phases 'install)) + (out (assoc-ref outputs "out")) + (xpdfrc (string-append out "/etc/xpdfrc")) + (gs-fonts (assoc-ref inputs "gs-fonts"))) + (apply install args) + (substitute* xpdfrc + (("/usr/local/share/ghostscript/fonts") + (string-append gs-fonts "/share/fonts/type1/ghostscript")) + (("#fontFile") "fontFile")))) + %standard-phases))) (synopsis "Viewer for pdf files based on the Motif toolkit.") (description "Xpdf is a viewer for Portable Document Format (PDF) files") -- cgit v1.2.3 From 867df0eeb61b029e33e3298c91890083f0d6a17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 29 Apr 2013 00:28:36 +0200 Subject: gnu: make-bootstrap: Fix %glibc-stripped. * gnu/packages/make-bootstrap.scm (%glibc-stripped): Add `outputs' field. --- gnu/packages/make-bootstrap.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 40e3e21210..de4e0dcbeb 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -324,7 +324,10 @@ (string-append incdir "/asm-generic")) #t)))) (inputs `(("libc" ,glibc) - ("linux-headers" ,linux-libre-headers)))))) + ("linux-headers" ,linux-libre-headers))) + + ;; Only one output. + (outputs '("out"))))) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. -- cgit v1.2.3