From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH] gnu: Move pspp from maths.scm to statistics.scm Date: Sat, 2 Apr 2016 15:26:23 +0200 Message-ID: <1459603583-27005-1-git-send-email-jmd@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amLZl-00056t-1N for guix-devel@gnu.org; Sat, 02 Apr 2016 09:26:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amLZg-0008Ql-7G for guix-devel@gnu.org; Sat, 02 Apr 2016 09:26:52 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: John Darrington * gnu/packages/maths.scm (pspp): Deleted. * gnu/packages/statistics.scm (pspp): New variable. --- gnu/packages/maths.scm | 41 ----------------------------------------- gnu/packages/statistics.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fddcd4b..d6b371e 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.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/pspp/pspp-" - version ".tar.gz")) - (sha256 - (base32 - "1nwnxr8mvf8y4lc8h8sd2xn2njwjk42x8mzj91zzv92m2z3vyggg")))) - (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 0c6c017..57d7862 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,47 @@ #:use-module (gnu packages zip) #:use-module (srfi srfi-1)) + +(define-public pspp + (package + (name "pspp") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/pspp/pspp-" + version ".tar.gz")) + (sha256 + (base32 + "1nwnxr8mvf8y4lc8h8sd2xn2njwjk42x8mzj91zzv92m2z3vyggg")))) + (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 r (package (name "r") -- 2.1.4