[PATCH] gnu: Add xclip.

[PATCH] gnu: Add xclip.

[John Darrington]

* gnu/packages/xorg.scm (xclip): New variable.
---
 gnu/packages/xorg.scm |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 292845c..b3db8cf 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -47,6 +47,30 @@
 
 ;; packages outside the x.org system proper
 
+(define-public xclip
+  (package
+    (name "xclip")
+    (version "0.12")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+              "mirror://sourceforge/" name "/" name "-" version ".tar.gz"))
+        (sha256
+          (base32
+           "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f))   ; There is no test suite
+    (inputs `(("libxmu" ,libxmu)
+              ("libxt" ,libxt)))
+    (home-page "http://xclip.sourceforge.net/")
+    (synopsis "Command line interface to X11 clipboard")
+    (description "Xclip is a command line interface to the X11 clipboard. It
+can also be used for copying files, as an alternative to sftp/scp, thus
+avoiding password prompts when X11 forwarding has already been setup.")
+    (license license:gpl2+)))
+
 (define-public xeyes
   (package
     (name "xeyes")
-- 
1.7.10.4

Re: [PATCH] gnu: Add xclip.

[Eric Bavier]

John Darrington writes:

> * gnu/packages/xorg.scm (xclip): New variable.
> ---
>  gnu/packages/xorg.scm |   24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>
[...]
> +    (description "Xclip is a command line interface to the X11 clipboard. It

Two spaces here ------------------------------------------------------------^

Otherise LGTM! Thanks.

-- 
Eric Bavier

Please avoid sending me Word or PowerPoint attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html

Re: [PATCH] gnu: Add xclip.

[Andreas Enge]

Hi John,

On Sun, Nov 30, 2014 at 04:06:00PM +0100, John Darrington wrote:
> * gnu/packages/xorg.scm (xclip): New variable.

the xorg module is supposed to contain only packages from x.org (plus a few
dependencies, plus a few extra ones, as with many modules, the boundaries
are not 100% clear). So I think this package should go somewhere else.

Andreas

Re: [PATCH] gnu: Add xclip.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On Sun, Nov 30, 2014 at 06:45:11PM +0100, Andreas Enge wrote:
     Hi John,
     
     I think this package should go somewhere else.

Any suggestions where ?

J'
     
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] gnu: Add xclip.

[Andreas Enge]

On Sun, Nov 30, 2014 at 06:56:18PM +0100, John Darrington wrote:
> Any suggestions where ?

No idea. Does it make sense to create a new module for packages "close"
to x.org? In doubt, you can always add a module for just one package, but
this is a bit of a waste.

Andreas

Re: [PATCH] gnu: Add xclip.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

On Sun, Nov 30, 2014 at 07:05:08PM +0100, Andreas Enge wrote:
     On Sun, Nov 30, 2014 at 06:56:18PM +0100, John Darrington wrote:
     > Any suggestions where ?
     
     No idea. Does it make sense to create a new module for packages "close"
     to x.org? In doubt, you can always add a module for just one package, but
     this is a bit of a waste.
     
OK.  How about I start a new module "xdisorg" for X related stuff not part of x.org ?

J'

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] gnu: Add xclip.

[Ian Denhardt]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

Quoting John Darrington (2014-11-30 13:58:15)
> OK.  How about I start a new module "xdisorg" for X related stuff not 
> part of x.org ?

Hah.

How about "xorg-contrib" ?

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABAgAGBQJUe2szAAoJEPZUuMfUyjy4P8UP/A2cxRhsjZshXXVA5TeD8nOa
pveaQtsNSSJDE7Us4AtanTrGQxL137dfl04+aAqI5vXGbR170sB3XfuLmZfe0TWR
MC6/cxuldE1p5fibDIXJK0vhpEttv72ItYvJ8rLikt53DIJVkru5NpjzrHuRcZ+p
PZ22RWdJ5fxBeJCB3X1SGnuJSvr6/LEVvD/aLbbH4ie/SOTVTwFa6UxAoN7hGi+P
7c0knS7ehWA0eFZvB6EfBLIxaDgjYLV5yKNDu6jjnipuOk7uCNemq0YNilHb0Zs9
PTcuond5ZU5ACzKSoTrB30gkkvNluP6vBx87gd3iPWSFQQykbHfRnNKQCD932tBM
vyk7W0X3E4fojRDqPYGrjzxMFsvH8KgstnOJpUzCoQLgy3cHkBJUBMF489djCHpf
i4da8QPsRnsgpR7jObgVkWd1yfPc7PwlDqHMZUxnUGV93m/THgNGf0Q169LaK+/a
v44fQt3vMKAqt08JYqlsjrYa+1CylzQQ/4I0fVR0MZGkxen8f16+Q+aut0uB57X3
q95PcwycyToJtXauKCwWGcIHmcaZW0aF3P7s7mSHOmUWQTnwMD5pC+q332gTB/Jc
sQ/AyiOPsV1fVddPCUZfT8z0fjMOhgmIZVXSaE9Q6etS2GX6KZVXLSyd5ECQIO4U
1jx0bSyzCHU1Pz7lr4DO
=TYJV
-----END PGP SIGNATURE-----

Re: [PATCH] gnu: Add xclip.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

On Sun, Nov 30, 2014 at 02:08:35PM -0500, Ian Denhardt wrote:
     Quoting John Darrington (2014-11-30 13:58:15)
     > OK.  How about I start a new module "xdisorg" for X related stuff not 
     > part of x.org ?
     
     Hah.
     
     How about "xorg-contrib" ?


Hmm.  Normally the -contrib suffix would indicate that it is stuff which x.org
have decided to distribute, but do not consider as part of their canonical package.

This is not quite the same.  

J'



-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] gnu: Add xclip.

[Andreas Enge]

On Sun, Nov 30, 2014 at 07:58:15PM +0100, John Darrington wrote:
> OK.  How about I start a new module "xdisorg" for X related stuff not part of x.org ?

I like the joke!

Andreas

[PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[John Darrington]

* gnu/packages/xdisorg.scm: New file.
* gnu/packages/xorg.scm (xeyes, pixman, libdrm, mtdev): deleted.
* gnu-system.am (GNU_SYSTEM_MODULES): Add xdisorg.scm
---
 gnu-system.am            |    1 +
 gnu/packages/xdisorg.scm |  184 ++++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/xorg.scm    |  164 -----------------------------------------
 3 files changed, 185 insertions(+), 164 deletions(-)
 create mode 100644 gnu/packages/xdisorg.scm

diff --git a/gnu-system.am b/gnu-system.am
index ac0bfa1..55eea07 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -269,6 +269,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/wine.scm				\
   gnu/packages/wordnet.scm			\
   gnu/packages/wv.scm				\
+  gnu/packages/xdisorg.scm				\
   gnu/packages/xfig.scm				\
   gnu/packages/xiph.scm				\
   gnu/packages/xlockmore.scm			\
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
new file mode 100644
index 0000000..4632d68
--- /dev/null
+++ b/gnu/packages/xdisorg.scm
@@ -0,0 +1,184 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages xorg)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system perl)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gperf)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages ncurses))
+
+
+
+;; 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
+      `(("libxext" ,libxext)
+        ("libxmu" ,libxmu)
+        ("libxt" ,libxt)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://xeyes.sourcearchive.com/")
+    (synopsis "Follow-the-mouse X demo")
+    (description "Xeyes is a demo program for x.org.  It shows eyes
+following the mouse.")
+    (license license:x11)))
+
+
+(define-public pixman
+  (package
+    (name "pixman")
+    (version "0.32.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "http://cairographics.org/releases/pixman-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+           "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libpng" ,libpng)
+        ("zlib" ,zlib)))
+    (native-inputs
+      `(("pkg-config" ,pkg-config)))
+    (home-page "http://www.pixman.org/")
+    (synopsis "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)))
+
+
+(define-public libdrm
+  (package
+    (name "libdrm")
+    (version "2.4.46")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "http://dri.freedesktop.org/libdrm/libdrm-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1wah4qmrrcv0gnx65lhrlxb6gprxch92wy8lhxv6102fml6k5krk"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("libpciaccess" ,libpciaccess)
+        ("libpthread-stubs" ,libpthread-stubs)))
+    (native-inputs
+       `(("pkg-config" ,pkg-config)))
+    (home-page "http://dri.freedesktop.org/wiki/")
+    (synopsis "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)))
+
+
+;; 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 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)))
+
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b3db8cf..b09ee92 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -44,170 +44,6 @@
   #:use-module (gnu packages ncurses))
 
 
-
-;; packages outside the x.org system proper
-
-(define-public xclip
-  (package
-    (name "xclip")
-    (version "0.12")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-              "mirror://sourceforge/" name "/" name "-" version ".tar.gz"))
-        (sha256
-          (base32
-           "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:tests? #f))   ; There is no test suite
-    (inputs `(("libxmu" ,libxmu)
-              ("libxt" ,libxt)))
-    (home-page "http://xclip.sourceforge.net/")
-    (synopsis "Command line interface to X11 clipboard")
-    (description "Xclip is a command line interface to the X11 clipboard. It
-can also be used for copying files, as an alternative to sftp/scp, thus
-avoiding password prompts when X11 forwarding has already been setup.")
-    (license license:gpl2+)))
-
-(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
-      `(("libxext" ,libxext)
-        ("libxmu" ,libxmu)
-        ("libxt" ,libxt)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://xeyes.sourcearchive.com/")
-    (synopsis "Follow-the-mouse X demo")
-    (description "Xeyes is a demo program for x.org.  It shows eyes
-following the mouse.")
-    (license license:x11)))
-
-
-(define-public pixman
-  (package
-    (name "pixman")
-    (version "0.32.4")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "http://cairographics.org/releases/pixman-"
-               version
-               ".tar.gz"))
-        (sha256
-          (base32
-           "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libpng" ,libpng)
-        ("zlib" ,zlib)))
-    (native-inputs
-      `(("pkg-config" ,pkg-config)))
-    (home-page "http://www.pixman.org/")
-    (synopsis "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)))
-
-
-(define-public libdrm
-  (package
-    (name "libdrm")
-    (version "2.4.46")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "http://dri.freedesktop.org/libdrm/libdrm-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "1wah4qmrrcv0gnx65lhrlxb6gprxch92wy8lhxv6102fml6k5krk"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libpciaccess" ,libpciaccess)
-        ("libpthread-stubs" ,libpthread-stubs)))
-    (native-inputs
-       `(("pkg-config" ,pkg-config)))
-    (home-page "http://dri.freedesktop.org/wiki/")
-    (synopsis "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)))
-
-
-;; 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 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.)
-- 
1.7.10.4

[PATCH 2/2] gnu: Add xclip.

[John Darrington]

* gnu/packages/xdisorg.scm (xclip): New variable.
---
 gnu/packages/xdisorg.scm |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 4632d68..dc57b03 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -47,6 +47,30 @@
 
 ;; packages outside the x.org system proper
 
+(define-public xclip
+  (package
+    (name "xclip")
+    (version "0.12")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+              "mirror://sourceforge/" name "/" name "-" version ".tar.gz"))
+        (sha256
+          (base32
+           "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f))   ; There is no test suite
+    (inputs `(("libxmu" ,libxmu)
+              ("libxt" ,libxt)))
+    (home-page "http://xclip.sourceforge.net/")
+    (synopsis "Command line interface to X11 clipboard")
+    (description "Xclip is a command line interface to the X11 clipboard.  It
+can also be used for copying files, as an alternative to sftp/scp, thus
+avoiding password prompts when X11 forwarding has already been setup.")
+    (license license:gpl2+)))
+
 (define-public xeyes
   (package
     (name "xeyes")
-- 
1.7.10.4

Re: [PATCH 2/2] gnu: Add xclip.

[Ludovic Courtès]

LGTM.

Ludo'.

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/xdisorg.scm: New file.
> * gnu/packages/xorg.scm (xeyes, pixman, libdrm, mtdev): deleted.

Swap these two lines, and write “Move to...” instead of “deleted” (see
git log for examples.)

> +++ b/gnu/packages/xdisorg.scm
> @@ -0,0 +1,184 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
> +;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
> +;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
> +;;;
> +;;; 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 <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages xorg)
                                ^
Should be “xdisorg”.

Otherwise looks good to me.

Thanks for taking care of it!

Ludo’.

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Andreas Enge]

On Tue, Dec 02, 2014 at 07:01:52AM +0100, John Darrington wrote:
> +++ b/gnu/packages/xdisorg.scm
> +(define-module (gnu packages xorg)

There is a copy-paste error here.

> -;; packages outside the x.org system proper
> -
> -(define-public xclip
> -  (package

This apparently refers to your modified xorg.scm, since the one on master
does not include xclip.

Now, xorg needs to include xdisorg, I think; and vice versa. Hopefully,
this does not introduce circular dependencies. Did you try to build a few
packages?

Andreas

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Now, xorg needs to include xdisorg, I think; and vice versa.

Why?  I thought xdisorg would only contain third-party packages that
Xorg does not depend on, no?

Ludo’.

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Andreas Enge]

On Tue, Dec 02, 2014 at 01:49:26PM +0100, Ludovic Courtès wrote:
> Andreas Enge <andreas@enge.fr> skribis:
> > Now, xorg needs to include xdisorg, I think; and vice versa.
> Why?  I thought xdisorg would only contain third-party packages that
> Xorg does not depend on, no?

Maybe I was mistaken. I was thinking of mesa, but it is defined in gl and
not xorg. At the same time it has inputs from xorg (currently, libdrm, but
also libx11 and others); and it is an input to xorg, for xf86-video-....

So there is already a circle between the gl and xorg modules now, which is
not a circular dependency; and I assume things should still work after part
of xorg is moved to xdisorg.

Andreas

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Maybe I was mistaken. I was thinking of mesa, but it is defined in gl and
> not xorg. At the same time it has inputs from xorg (currently, libdrm, but
> also libx11 and others); and it is an input to xorg, for xf86-video-....

OK.

> So there is already a circle between the gl and xorg modules now, which is
> not a circular dependency; and I assume things should still work after part
> of xorg is moved to xdisorg.

Yeah, I think this won’t make any difference.

Ludo’.

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Eric Bavier]

[-- Attachment #1: Type: text/plain, Size: 953 bytes --]

On Tue, Dec 2, 2014 at 7:30 AM, Ludovic Courtès <ludo@gnu.org> wrote:

> Andreas Enge <andreas@enge.fr> skribis:
>
> > Maybe I was mistaken. I was thinking of mesa, but it is defined in gl and
> > not xorg. At the same time it has inputs from xorg (currently, libdrm,
> but
> > also libx11 and others); and it is an input to xorg, for xf86-video-....
>
> OK.
>
> > So there is already a circle between the gl and xorg modules now, which
> is
> > not a circular dependency; and I assume things should still work after
> part
> > of xorg is moved to xdisorg.
>
> Yeah, I think this won’t make any difference.
>

This patch moved pixman to xdisorg.scm, but pixman is a propagated input to
xorg-server in xorg.scm.  `make` works fine, but I get errors from `guix
refresh -l ...` after this patch.

`~Eric

-- 
Please avoid sending me Word or PowerPoint attachments.
See http://www.gnu.org/philosophy/no-word-attachments.html

[-- Attachment #2: Type: text/html, Size: 1571 bytes --]

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> This patch moved pixman to xdisorg.scm, but pixman is a propagated input to
> xorg-server in xorg.scm.

Indeed, there’s a number of “unbound variable” warnings:

--8<---------------cut here---------------start------------->8---
gnu/packages/gtk.scm:83:4: warning: possibly unbound variable `pixman'
gnu/packages/xorg.scm:2258:12: warning: possibly unbound variable `mtdev'
gnu/packages/xorg.scm:2610:12: warning: possibly unbound variable `libdrm'
gnu/packages/xorg.scm:4336:6: warning: possibly unbound variable `pixman'
--8<---------------cut here---------------end--------------->8---

John: could you adjust the #:use-module clauses of the affected modules?

Thanks,
Ludo’.

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[Ludovic Courtès]

Seeing you were not on IRC, I went ahead and fixed it in commit 6c0e878.

Ludo’.

Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

On Tue, Dec 02, 2014 at 05:18:06PM +0100, Ludovic Court??s wrote:
     Seeing you were not on IRC, I went ahead and fixed it in commit 6c0e878.
     
OK.  Thanks.  Sorry for not noticing this beforehand.
     

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]