aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Darrington <jmd@gnu.org>2016-04-02 15:22:25 +0200
committerJohn Darrington <jmd@gnu.org>2016-04-04 07:15:14 +0200
commit0b65f1a0138819bc12e24984566ad3ee970506ff (patch)
treeba93c58ef8c963e16cc34211e3e6bbf0c28d0c5b
parent16736e023485b4e4fd402f51bc2bc32ae0874c63 (diff)
downloadguix-0b65f1a0138819bc12e24984566ad3ee970506ff.tar
guix-0b65f1a0138819bc12e24984566ad3ee970506ff.tar.gz
gnu: Move pspp from maths.scm to statistics.scm
* gnu/packages/maths.scm (pspp): Deleted. * gnu/packages/statistics.scm (pspp): New variable.
-rw-r--r--gnu/packages/maths.scm41
-rw-r--r--gnu/packages/statistics.scm41
2 files changed, 41 insertions, 41 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e89fb9158e..d6b371ee81 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -52,7 +52,6 @@
#:use-module (gnu packages gcc)
#:use-module (gnu packages gd)
#:use-module (gnu packages ghostscript)
- #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages less)
@@ -201,46 +200,6 @@ translator for the language. In addition to the C library, a stand-alone
LP/MIP solver is included in the package.")
(license license:gpl3+)))
-(define-public pspp
- (package
- (name "pspp")
- (version "0.10.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/pspp/pspp-"
- version ".tar.gz"))
- (sha256
- (base32
- "0xw61kq0hxh7f6a4yjhnqbhc0fj9r3wb3qnpq05qhdp79n30ik24"))))
- (build-system gnu-build-system)
- (inputs
- `(("cairo" ,cairo)
- ("fontconfig" ,fontconfig)
- ("gettext" ,gnu-gettext)
- ("gsl" ,gsl)
- ("libxml2" ,libxml2)
- ("pango" ,pango)
- ("readline" ,readline)
- ("gtk" ,gtk+)
- ("gtksourceview" ,gtksourceview)
- ("zlib" ,zlib)))
- (native-inputs
- `(("glib" ,glib "bin") ;for glib-genmarshal
- ("perl" ,perl)
- ("texinfo" ,texinfo)
- ("pkg-config" ,pkg-config)))
- (home-page "http://www.gnu.org/software/pspp/")
- (synopsis "Statistical analysis")
- (description
- "GNU PSPP is a statistical analysis program. It can perform
-descriptive statistics, T-tests, linear regression and non-parametric tests.
-It features both a graphical interface as well as command-line input. PSPP
-is designed to interoperate with Gnumeric, LibreOffice and OpenOffice. Data
-can be imported from spreadsheets, text files and database sources and it can
-be output in text, PostScript, PDF or HTML.")
- (license license:gpl3+)))
-
(define-public arpack-ng
(package
(name "arpack-ng")
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0c6c0173eb..9c197f4977 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -33,6 +33,8 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages haskell)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
@@ -53,6 +55,45 @@
#:use-module (gnu packages zip)
#:use-module (srfi srfi-1))
+
+(define-public pspp
+ (package
+ (name "pspp")
+ (version "0.10.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/pspp/pspp-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0xw61kq0hxh7f6a4yjhnqbhc0fj9r3wb3qnpq05qhdp79n30ik24"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("cairo" ,cairo)
+ ("gettext" ,gnu-gettext)
+ ("gsl" ,gsl)
+ ("libxml2" ,libxml2)
+ ("pango" ,pango)
+ ("readline" ,readline)
+ ("gtk" ,gtk+)
+ ("gtksourceview" ,gtksourceview)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("glib" ,glib "bin") ;for glib-genmarshal
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)))
+ (home-page "http://www.gnu.org/software/pspp/")
+ (synopsis "Statistical analysis")
+ (description
+ "GNU PSPP is a statistical analysis program. It can perform
+descriptive statistics, T-tests, linear regression and non-parametric tests.
+It features both a graphical interface as well as command-line input. PSPP
+is designed to interoperate with Gnumeric, LibreOffice and OpenOffice. Data
+can be imported from spreadsheets, text files and database sources and it can
+be output in text, PostScript, PDF or HTML.")
+ (license license:gpl3+)))
+
(define-public r
(package
(name "r")