diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-13 19:48:47 -0400 |
commit | 9fac9e3be3925713c20f1d5ff8b35353af10baa2 (patch) | |
tree | 9add6e882007184cc420b2e26d620de0982d934a /gnu/packages/maths.scm | |
parent | 9d77da2a47ddb707edcbd1ca17f5c0ac3c068b04 (diff) | |
parent | d7ab698a620873c11103fa2bd082884f0198723a (diff) | |
download | guix-patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar guix-patches-9fac9e3be3925713c20f1d5ff8b35353af10baa2.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
Diffstat (limited to 'gnu/packages/maths.scm')
-rw-r--r-- | gnu/packages/maths.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 774686310f..5f30afe433 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -179,11 +179,11 @@ LP/MIP solver is included in the package.") (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.") +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 lapack @@ -472,6 +472,7 @@ scientific applications modeled by partial differential equations.") (define-public petsc-complex (package (inherit petsc) + (location (source-properties->location (current-source-location))) (name "petsc-complex") (arguments (substitute-keyword-arguments (package-arguments petsc) |