[PATCH] pspp

[PATCH] pspp

[John Darrington]

[-- Attachment #1.1: Type: text/plain, Size: 438 bytes --]

Two patches attached.  The first adds the package gtksourceview.  Thanks to Mark Weaver,
Andraes Enge et al for their help jumping through the hoops that the upstream maintainers
placed for me.

The other removes the --without-gui flag from pspp


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 #1.2: 0001-gnu-Added-gtksourceview.patch --]
[-- Type: text/x-diff, Size: 3549 bytes --]

From 69c6338775161fcba20f4ce9452b33fee90dc2d1 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 30 Nov 2013 11:11:54 +0100
Subject: [PATCH 1/2] gnu: Added gtksourceview

* gnu/packages/gtk.scm: New package gtksourceview
---
 gnu/packages/gtk.scm |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index dff98b9..ee4679f 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages libjpeg)
   #:use-module (gnu packages libpng)
@@ -162,6 +163,65 @@ used throughout the world.")
    (license license:lgpl2.0+)
    (home-page "https://developer.gnome.org/pango/")))
 
+
+(define-public gtksourceview
+  (package
+   (name "gtksourceview")
+   (version "2.10.5") ; This is the last version which builds against gtk+2
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnome/sources/gtksourceview/" (string-take version 4) "/gtksourceview-"
+                                version ".tar.bz2"))
+            (sha256
+             (base32
+              "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(
+      ("intltool" ,intltool)
+      ("pkg-config" ,pkg-config)
+      ("gtk" ,gtk+-2)
+      ("libxml2" ,libxml2)
+
+      ; These two are needed only to allow the tests to run successfully
+      ("xorg-server" ,xorg-server)
+      ("shared-mime-info" ,shared-mime-info)
+    ))
+   (arguments
+    `(#:phases 
+      ; Unfortunately, some of the tests in "make check" are highly dependent on the environment
+      ; therefore, some black magic is required
+       (alist-cons-before 'check 'start-xserver
+         (lambda* (#:key inputs #:allow-other-keys)
+           (let (
+                 (xorg-server (assoc-ref inputs "xorg-server"))
+                 (mime (assoc-ref inputs "shared-mime-info"))
+                 )
+
+             ; There must be a running X server and make check doesn't start one.
+             ; Therefore we must do it.
+             (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
+             (setenv "DISPLAY" ":1")
+
+             ; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0
+             (system "ln -s gtksourceview gtksourceview-2.0")
+             (setenv "XDG_DATA_HOME"   (string-append (getenv "NIX_BUILD_TOP") "/gtksourceview-2.10.5"))
+
+             ; Finally, the mimetypes must be available
+             (setenv "XDG_DATA_DIRS"   (string-append mime "/share/") )
+             ))
+         %standard-phases)))
+   (synopsis "A text widget that extends the standard gtk+ 2.x
+text widget GtkTextView.")
+   (description
+    "GtkSourceView is a portable C library that extends the standard GTK+
+framework for multiline text editing with support for configurable syntax
+highlighting, unlimited undo/redo, search and replace, a completion framework,
+printing and other features typical of a source code editor.") 
+   (license license:lgpl2.0+)
+   (home-page "https://developer.gnome.org/gtksourceview/")))
+
+
 (define-public gdk-pixbuf
   (package
    (name "gdk-pixbuf")
-- 
1.7.10.4


[-- Attachment #1.3: 0002-gnu-pspp-Enabled-build-of-the-gui.patch --]
[-- Type: text/x-diff, Size: 1157 bytes --]

From 39f8989a6e9067002911257701f90776f5b5b608 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 30 Nov 2013 13:54:46 +0100
Subject: [PATCH 2/2] gnu: pspp: Enabled build of the gui

* gnu/packages/math.scm (<pspp>): Removed the --without-gui flag
and added the necessary inputs to build it.
---
 gnu/packages/maths.scm |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c1c78d5..69f931b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -144,13 +144,12 @@ LP/MIP solver is included in the package.")
        ("libxml2" ,libxml2)
        ("pango" ,pango)
        ("readline" ,readline)
+       ("gtk" ,gtk+-2)
+       ("gtksourceview" ,gtksourceview)
        ("zlib" ,zlib)))
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)))
-    (arguments
-     `(#:configure-flags
-       `("--without-gui"))) ; FIXME: package missing dependencies
     (home-page "http://www.gnu.org/software/pspp/")
     (synopsis "Statistical analysis")
     (description
-- 
1.7.10.4


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

Re: [PATCH] pspp

[Ludovic Courtès]

Hi John,

This looks great!  I just have minor stylistic notes:

John Darrington <john@darrington.wattle.id.au> skribis:

> From 69c6338775161fcba20f4ce9452b33fee90dc2d1 Mon Sep 17 00:00:00 2001
> From: John Darrington <john@darrington.wattle.id.au>
> Date: Sat, 30 Nov 2013 11:11:54 +0100
> Subject: [PATCH 1/2] gnu: Added gtksourceview
>
> * gnu/packages/gtk.scm: New package gtksourceview

Rather:

* gnu/packages/gtk.scm (gtksourceview): New variable.

> +            (uri (string-append "mirror://gnome/sources/gtksourceview/" (string-take version 4) "/gtksourceview-"
> +                                version ".tar.bz2"))

Please try to keep lines below 80 chars.

> +   (inputs
> +    `(
> +      ("intltool" ,intltool)
> +      ("pkg-config" ,pkg-config)
> +      ("gtk" ,gtk+-2)
> +      ("libxml2" ,libxml2)
> +
> +      ; These two are needed only to allow the tests to run successfully
> +      ("xorg-server" ,xorg-server)
> +      ("shared-mime-info" ,shared-mime-info)
> +    ))

[...]

> +   (arguments
> +    `(#:phases 
> +      ; Unfortunately, some of the tests in "make check" are highly dependent on the environment
> +      ; therefore, some black magic is required

Please use the same style as the rest; in particular, no line break
after an opening paren, no hanging closing parens, and two semicolons to
introduce comments that are on line of their own (see ‘HACKING’.)

(Nice that you managed to get the X tests running, BTW!)

> +   (synopsis "A text widget that extends the standard gtk+ 2.x
> +text widget GtkTextView.")

Rather like “Widget that extends GtkTextView from GTK+ 2.x” (no final
period, no “A”.)

> From 39f8989a6e9067002911257701f90776f5b5b608 Mon Sep 17 00:00:00 2001
> From: John Darrington <john@darrington.wattle.id.au>
> Date: Sat, 30 Nov 2013 13:54:46 +0100
> Subject: [PATCH 2/2] gnu: pspp: Enabled build of the gui
>
> * gnu/packages/math.scm (<pspp>): Removed the --without-gui flag
> and added the necessary inputs to build it.

Should be ‘pspp’, not ‘<pspp>’.

OK to apply modulo these cosmetic changes.  Could you post updated
patches?

Thanks!

Ludo’.

Re: [PATCH] pspp

[John Darrington]

[-- Attachment #1.1: Type: text/plain, Size: 2827 bytes --]

New patches attached.


J'

On Sat, Nov 30, 2013 at 11:15:31PM +0100, Ludovic Courtès wrote:
     Hi John,
     
     This looks great!  I just have minor stylistic notes:
     
     John Darrington <john@darrington.wattle.id.au> skribis:
     
     > From 69c6338775161fcba20f4ce9452b33fee90dc2d1 Mon Sep 17 00:00:00 2001
     > From: John Darrington <john@darrington.wattle.id.au>
     > Date: Sat, 30 Nov 2013 11:11:54 +0100
     > Subject: [PATCH 1/2] gnu: Added gtksourceview
     >
     > * gnu/packages/gtk.scm: New package gtksourceview
     
     Rather:
     
     * gnu/packages/gtk.scm (gtksourceview): New variable.
     
     > +            (uri (string-append "mirror://gnome/sources/gtksourceview/" (string-take version 4) "/gtksourceview-"
     > +                                version ".tar.bz2"))
     
     Please try to keep lines below 80 chars.
     
     > +   (inputs
     > +    `(
     > +      ("intltool" ,intltool)
     > +      ("pkg-config" ,pkg-config)
     > +      ("gtk" ,gtk+-2)
     > +      ("libxml2" ,libxml2)
     > +
     > +      ; These two are needed only to allow the tests to run successfully
     > +      ("xorg-server" ,xorg-server)
     > +      ("shared-mime-info" ,shared-mime-info)
     > +    ))
     
     [...]
     
     > +   (arguments
     > +    `(#:phases 
     > +      ; Unfortunately, some of the tests in "make check" are highly dependent on the environment
     > +      ; therefore, some black magic is required
     
     Please use the same style as the rest; in particular, no line break
     after an opening paren, no hanging closing parens, and two semicolons to
     introduce comments that are on line of their own (see ‘HACKING’.)
     
     (Nice that you managed to get the X tests running, BTW!)
     
     > +   (synopsis "A text widget that extends the standard gtk+ 2.x
     > +text widget GtkTextView.")
     
     Rather like “Widget that extends GtkTextView from GTK+ 2.x” (no final
     period, no “A”.)
     
     > From 39f8989a6e9067002911257701f90776f5b5b608 Mon Sep 17 00:00:00 2001
     > From: John Darrington <john@darrington.wattle.id.au>
     > Date: Sat, 30 Nov 2013 13:54:46 +0100
     > Subject: [PATCH 2/2] gnu: pspp: Enabled build of the gui
     >
     > * gnu/packages/math.scm (<pspp>): Removed the --without-gui flag
     > and added the necessary inputs to build it.
     
     Should be ‘pspp’, not ‘<pspp>’.
     
     OK to apply modulo these cosmetic changes.  Could you post updated
     patches?
     
     Thanks!
     
     Ludo’.

-- 
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 #1.2: 0001-gnu-Added-gtksourceview.patch --]
[-- Type: text/x-diff, Size: 3588 bytes --]

From 1e5f4146bbe1d1ba4d73a5ff52b9e80e461bbe8c Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 30 Nov 2013 11:11:54 +0100
Subject: [PATCH 1/2] gnu: Added gtksourceview

* gnu/packages/gtk.scm (gtksourceview): New variable.
---
 gnu/packages/gtk.scm |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index dff98b9..f55b5f1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages libjpeg)
   #:use-module (gnu packages libpng)
@@ -162,6 +163,63 @@ used throughout the world.")
    (license license:lgpl2.0+)
    (home-page "https://developer.gnome.org/pango/")))
 
+
+(define-public gtksourceview
+  (package
+   (name "gtksourceview")
+   (version "2.10.5") ; This is the last version which builds against gtk+2
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnome/sources/gtksourceview/" 
+                                (string-take version 4) "/gtksourceview-"
+                                version ".tar.bz2"))
+            (sha256
+             (base32
+              "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(
+      ("intltool" ,intltool)
+      ("pkg-config" ,pkg-config)
+      ("gtk" ,gtk+-2)
+      ("libxml2" ,libxml2)
+
+      ; These two are needed only to allow the tests to run successfully
+      ("xorg-server" ,xorg-server)
+      ("shared-mime-info" ,shared-mime-info)
+    ))
+   (arguments
+    `(#:phases 
+      ;; Unfortunately, some of the tests in "make check" are highly dependent
+      ;; on the environment therefore, some black magic is required.
+       (alist-cons-before 'check 'start-xserver
+         (lambda* (#:key inputs #:allow-other-keys)
+           (let ((xorg-server (assoc-ref inputs "xorg-server"))
+                 (mime (assoc-ref inputs "shared-mime-info")))
+
+             ;; There must be a running X server and make check doesn't start one.
+             ;; Therefore we must do it.
+             (system (format #f "~a/bin/Xvfb :1 &" xorg-server))
+             (setenv "DISPLAY" ":1")
+
+             ;; The .lang files must be found in $XDG_DATA_HOME/gtksourceview-2.0
+             (system "ln -s gtksourceview gtksourceview-2.0")
+             (setenv "XDG_DATA_HOME"   (string-append (getenv "NIX_BUILD_TOP") 
+                                                      "/gtksourceview-2.10.5"))
+
+             ;; Finally, the mimetypes must be available.
+             (setenv "XDG_DATA_DIRS"   (string-append mime "/share/")) ))
+         %standard-phases)))
+   (synopsis "Widget that extends the standard gtk+ 2.x text widget GtkTextView.")
+   (description
+    "GtkSourceView is a portable C library that extends the standard GTK+
+framework for multiline text editing with support for configurable syntax
+highlighting, unlimited undo/redo, search and replace, a completion framework,
+printing and other features typical of a source code editor.") 
+   (license license:lgpl2.0+)
+   (home-page "https://developer.gnome.org/gtksourceview/")))
+
+
 (define-public gdk-pixbuf
   (package
    (name "gdk-pixbuf")
-- 
1.7.10.4


[-- Attachment #1.3: 0002-gnu-pspp-Enabled-build-of-the-gui.patch --]
[-- Type: text/x-diff, Size: 1155 bytes --]

From 77393a25d625be57a0f0fa7e573e72a7338d6b10 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 30 Nov 2013 13:54:46 +0100
Subject: [PATCH 2/2] gnu: pspp: Enabled build of the gui

* gnu/packages/math.scm (pspp): Removed the --without-gui flag
and added the necessary inputs to build it.
---
 gnu/packages/maths.scm |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c1c78d5..69f931b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -144,13 +144,12 @@ LP/MIP solver is included in the package.")
        ("libxml2" ,libxml2)
        ("pango" ,pango)
        ("readline" ,readline)
+       ("gtk" ,gtk+-2)
+       ("gtksourceview" ,gtksourceview)
        ("zlib" ,zlib)))
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)))
-    (arguments
-     `(#:configure-flags
-       `("--without-gui"))) ; FIXME: package missing dependencies
     (home-page "http://www.gnu.org/software/pspp/")
     (synopsis "Statistical analysis")
     (description
-- 
1.7.10.4


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

Re: [PATCH] pspp

[Ludovic Courtès]

John Darrington <john@darrington.wattle.id.au> skribis:

> From 1e5f4146bbe1d1ba4d73a5ff52b9e80e461bbe8c Mon Sep 17 00:00:00 2001
> From: John Darrington <john@darrington.wattle.id.au>
> Date: Sat, 30 Nov 2013 11:11:54 +0100
> Subject: [PATCH 1/2] gnu: Added gtksourceview
>
> * gnu/packages/gtk.scm (gtksourceview): New variable.

Pushed.  The formatting still wasn’t as expected, so I just changed
that as suggested.

> +             (setenv "XDG_DATA_HOME"   (string-append (getenv "NIX_BUILD_TOP") 
> +                                                      "/gtksourceview-2.10.5"))

Here I replaced the right-hand side with (getcwd).  (Sorry for not
noticing earlier.)

> From 77393a25d625be57a0f0fa7e573e72a7338d6b10 Mon Sep 17 00:00:00 2001
> From: John Darrington <john@darrington.wattle.id.au>
> Date: Sat, 30 Nov 2013 13:54:46 +0100
> Subject: [PATCH 2/2] gnu: pspp: Enabled build of the gui
>
> * gnu/packages/math.scm (pspp): Removed the --without-gui flag
> and added the necessary inputs to build it.

Pushed.

Thanks!

Ludo’.

Re: [PATCH] pspp

[John Darrington]

On Mon, Dec 02, 2013 at 01:53:46PM +0100, Ludovic Court??s wrote:
     John Darrington <john@darrington.wattle.id.au> skribis:
     
     > From 1e5f4146bbe1d1ba4d73a5ff52b9e80e461bbe8c Mon Sep 17 00:00:00 2001
     > From: John Darrington <john@darrington.wattle.id.au>
     > Date: Sat, 30 Nov 2013 11:11:54 +0100
     > Subject: [PATCH 1/2] gnu: Added gtksourceview
     >
     > * gnu/packages/gtk.scm (gtksourceview): New variable.
     
     Pushed.  The formatting still wasn???t as expected, so I just changed
     that as suggested.

Sorry.  I thought I had changed everything that you asked.  I'll check harder 
next time.

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.