diff options
| author | John Darrington <jmd@gnu.org> | 2016-04-02 15:22:25 +0200 |
|---|---|---|
| committer | John Darrington <jmd@gnu.org> | 2016-04-04 07:15:14 +0200 |
| commit | 0b65f1a0138819bc12e24984566ad3ee970506ff (patch) | |
| tree | ba93c58ef8c963e16cc34211e3e6bbf0c28d0c5b /gnu | |
| parent | 16736e023485b4e4fd402f51bc2bc32ae0874c63 (diff) | |
gnu: Move pspp from maths.scm to statistics.scm
* gnu/packages/maths.scm (pspp): Deleted.
* gnu/packages/statistics.scm (pspp): New variable.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/maths.scm | 41 | ||||
| -rw-r--r-- | gnu/packages/statistics.scm | 41 |
2 files changed, 41 insertions, 41 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e89fb9158ea..d6b371ee817 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #:use-module (gnu packages gcc) | 52 | #:use-module (gnu packages gcc) |
| 53 | #:use-module (gnu packages gd) | 53 | #:use-module (gnu packages gd) |
| 54 | #:use-module (gnu packages ghostscript) | 54 | #:use-module (gnu packages ghostscript) |
| 55 | #:use-module (gnu packages glib) | ||
| 56 | #:use-module (gnu packages gtk) | 55 | #:use-module (gnu packages gtk) |
| 57 | #:use-module (gnu packages image) | 56 | #:use-module (gnu packages image) |
| 58 | #:use-module (gnu packages less) | 57 | #:use-module (gnu packages less) |
| @@ -201,46 +200,6 @@ translator for the language. In addition to the C library, a stand-alone | |||
| 201 | LP/MIP solver is included in the package.") | 200 | LP/MIP solver is included in the package.") |
| 202 | (license license:gpl3+))) | 201 | (license license:gpl3+))) |
| 203 | 202 | ||
| 204 | (define-public pspp | ||
| 205 | (package | ||
| 206 | (name "pspp") | ||
| 207 | (version "0.10.1") | ||
| 208 | (source | ||
| 209 | (origin | ||
| 210 | (method url-fetch) | ||
| 211 | (uri (string-append "mirror://gnu/pspp/pspp-" | ||
| 212 | version ".tar.gz")) | ||
| 213 | (sha256 | ||
| 214 | (base32 | ||
| 215 | "0xw61kq0hxh7f6a4yjhnqbhc0fj9r3wb3qnpq05qhdp79n30ik24")))) | ||
| 216 | (build-system gnu-build-system) | ||
| 217 | (inputs | ||
| 218 | `(("cairo" ,cairo) | ||
| 219 | ("fontconfig" ,fontconfig) | ||
| 220 | ("gettext" ,gnu-gettext) | ||
| 221 | ("gsl" ,gsl) | ||
| 222 | ("libxml2" ,libxml2) | ||
| 223 | ("pango" ,pango) | ||
| 224 | ("readline" ,readline) | ||
| 225 | ("gtk" ,gtk+) | ||
| 226 | ("gtksourceview" ,gtksourceview) | ||
| 227 | ("zlib" ,zlib))) | ||
| 228 | (native-inputs | ||
| 229 | `(("glib" ,glib "bin") ;for glib-genmarshal | ||
| 230 | ("perl" ,perl) | ||
| 231 | ("texinfo" ,texinfo) | ||
| 232 | ("pkg-config" ,pkg-config))) | ||
| 233 | (home-page "http://www.gnu.org/software/pspp/") | ||
| 234 | (synopsis "Statistical analysis") | ||
| 235 | (description | ||
| 236 | "GNU PSPP is a statistical analysis program. It can perform | ||
| 237 | descriptive statistics, T-tests, linear regression and non-parametric tests. | ||
| 238 | It features both a graphical interface as well as command-line input. PSPP | ||
| 239 | is designed to interoperate with Gnumeric, LibreOffice and OpenOffice. Data | ||
| 240 | can be imported from spreadsheets, text files and database sources and it can | ||
| 241 | be output in text, PostScript, PDF or HTML.") | ||
| 242 | (license license:gpl3+))) | ||
| 243 | |||
| 244 | (define-public arpack-ng | 203 | (define-public arpack-ng |
| 245 | (package | 204 | (package |
| 246 | (name "arpack-ng") | 205 | (name "arpack-ng") |
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0c6c0173eb1..9c197f4977a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm | |||
| @@ -33,6 +33,8 @@ | |||
| 33 | #:use-module (gnu packages curl) | 33 | #:use-module (gnu packages curl) |
| 34 | #:use-module (gnu packages gcc) | 34 | #:use-module (gnu packages gcc) |
| 35 | #:use-module (gnu packages gtk) | 35 | #:use-module (gnu packages gtk) |
| 36 | #:use-module (gnu packages gettext) | ||
| 37 | #:use-module (gnu packages glib) | ||
| 36 | #:use-module (gnu packages haskell) | 38 | #:use-module (gnu packages haskell) |
| 37 | #:use-module (gnu packages icu4c) | 39 | #:use-module (gnu packages icu4c) |
| 38 | #:use-module (gnu packages image) | 40 | #:use-module (gnu packages image) |
| @@ -53,6 +55,45 @@ | |||
| 53 | #:use-module (gnu packages zip) | 55 | #:use-module (gnu packages zip) |
| 54 | #:use-module (srfi srfi-1)) | 56 | #:use-module (srfi srfi-1)) |
| 55 | 57 | ||
| 58 | |||
| 59 | (define-public pspp | ||
| 60 | (package | ||
| 61 | (name "pspp") | ||
| 62 | (version "0.10.1") | ||
| 63 | (source | ||
| 64 | (origin | ||
| 65 | (method url-fetch) | ||
| 66 | (uri (string-append "mirror://gnu/pspp/pspp-" | ||
| 67 | version ".tar.gz")) | ||
| 68 | (sha256 | ||
| 69 | (base32 | ||
| 70 | "0xw61kq0hxh7f6a4yjhnqbhc0fj9r3wb3qnpq05qhdp79n30ik24")))) | ||
| 71 | (build-system gnu-build-system) | ||
| 72 | (inputs | ||
| 73 | `(("cairo" ,cairo) | ||
| 74 | ("gettext" ,gnu-gettext) | ||
| 75 | ("gsl" ,gsl) | ||
| 76 | ("libxml2" ,libxml2) | ||
| 77 | ("pango" ,pango) | ||
| 78 | ("readline" ,readline) | ||
| 79 | ("gtk" ,gtk+) | ||
| 80 | ("gtksourceview" ,gtksourceview) | ||
| 81 | ("zlib" ,zlib))) | ||
| 82 | (native-inputs | ||
| 83 | `(("glib" ,glib "bin") ;for glib-genmarshal | ||
| 84 | ("perl" ,perl) | ||
| 85 | ("pkg-config" ,pkg-config))) | ||
| 86 | (home-page "http://www.gnu.org/software/pspp/") | ||
| 87 | (synopsis "Statistical analysis") | ||
| 88 | (description | ||
| 89 | "GNU PSPP is a statistical analysis program. It can perform | ||
| 90 | descriptive statistics, T-tests, linear regression and non-parametric tests. | ||
| 91 | It features both a graphical interface as well as command-line input. PSPP | ||
| 92 | is designed to interoperate with Gnumeric, LibreOffice and OpenOffice. Data | ||
| 93 | can be imported from spreadsheets, text files and database sources and it can | ||
| 94 | be output in text, PostScript, PDF or HTML.") | ||
| 95 | (license license:gpl3+))) | ||
| 96 | |||
| 56 | (define-public r | 97 | (define-public r |
| 57 | (package | 98 | (package |
| 58 | (name "r") | 99 | (name "r") |
