From 5894b60491d76c3d8208d64c445684d5d8b1d756 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 01:01:00 +0200 Subject: gnu: algebra: Re-order imports. * gnu/packages/algebra.scm: Order imports alphabetically. --- gnu/packages/algebra.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 98bb2aeb71..d7f3203d23 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -25,26 +25,26 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) #:use-module (gnu packages graphviz) #:use-module (gnu packages image) - #:use-module (gnu packages multiprecision) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) - #:use-module (gnu packages readline) - #:use-module (gnu packages flex) #:use-module (gnu packages python) + #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) #:use-module (guix utils)) -- cgit v1.2.3 From f0bacad682734371fc5b5ed732625ae2c629973b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 03:10:24 +0200 Subject: gnu: bc: Actually use readline. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/algebra.scm (bc)[arguments]: Add ‘--with-readline’ to #:configure-flags. --- gnu/packages/algebra.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d7f3203d23..ab73a6e2e5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -494,7 +495,9 @@ binary.") ;; PREFIX/share/{man,info}. (string-append "--mandir=" out "/share/man") (string-append "--infodir=" out "/share/info"))))) - %standard-phases))) + %standard-phases) + #:configure-flags + (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") (description -- cgit v1.2.3 From dfee7daedb760f1b1d7506829ca31633f4173356 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 01:14:44 +0200 Subject: gnu: bc: Update to 1.07. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/algebra.scm (bc): Update to 1.07. [native-inputs]: Add ed and texinfo. [arguments]: Use default ‘configure’ phase. --- gnu/packages/algebra.scm | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ab73a6e2e5..96720bd593 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) @@ -39,6 +40,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) @@ -468,35 +470,22 @@ binary.") (define-public bc (package (name "bc") - (version "1.06") + (version "1.07") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf")))) + "1b852b39y43zrbya7d8civ7vmdbfap5v1ivc70ypr3bj7b1izksm")))) (build-system gnu-build-system) - (inputs `(("readline" ,readline))) - (native-inputs `(("flex" ,flex))) + (inputs + `(("readline" ,readline))) + (native-inputs + `(("ed" ,ed) + ("flex" ,flex) + ("texinfo" ,texinfo))) (arguments - '(#:phases - (alist-replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* - "./configure" - (string-append "--prefix=" out) - ;; By default, man and info pages are put in - ;; PREFIX/{man,info}, but we want them in - ;; PREFIX/share/{man,info}. - (string-append "--mandir=" out "/share/man") - (string-append "--infodir=" out "/share/info"))))) - %standard-phases) - #:configure-flags + '(#:configure-flags (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") -- cgit v1.2.3 From b28187cd0ca75a17a12dce9bfb5855d8fbf61eb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 5 Apr 2017 21:23:41 +0200 Subject: Revert "gnu: bc: Update to 1.07." This reverts commit dfee7daedb760f1b1d7506829ca31633f4173356. It causes the linux-libre@4.9 build to hang (command-line usage works fine). --- gnu/packages/algebra.scm | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 96720bd593..ab73a6e2e5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -26,7 +26,6 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) - #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) @@ -40,7 +39,6 @@ #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) - #:use-module (gnu packages texinfo) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) @@ -470,22 +468,35 @@ binary.") (define-public bc (package (name "bc") - (version "1.07") + (version "1.06") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "1b852b39y43zrbya7d8civ7vmdbfap5v1ivc70ypr3bj7b1izksm")))) + "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf")))) (build-system gnu-build-system) - (inputs - `(("readline" ,readline))) - (native-inputs - `(("ed" ,ed) - ("flex" ,flex) - ("texinfo" ,texinfo))) + (inputs `(("readline" ,readline))) + (native-inputs `(("flex" ,flex))) (arguments - '(#:configure-flags + '(#:phases + (alist-replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; This old `configure' script doesn't support + ;; variables passed as arguments. + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (zero? + (system* + "./configure" + (string-append "--prefix=" out) + ;; By default, man and info pages are put in + ;; PREFIX/{man,info}, but we want them in + ;; PREFIX/share/{man,info}. + (string-append "--mandir=" out "/share/man") + (string-append "--infodir=" out "/share/info"))))) + %standard-phases) + #:configure-flags (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") -- cgit v1.2.3 From f71f29cab2b484ea8e63d29a5766f680d0e800c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Apr 2017 12:26:02 +0200 Subject: gnu: bc: Update to 1.07.1. * gnu/packages/algebra.scm (bc): Update to 1.07.1. [native-inputs]: Add ED and TEXINFO. [arguments]<#:phases>: Remove. --- gnu/packages/algebra.scm | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ab73a6e2e5..670a8954a9 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages gl) @@ -39,6 +41,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages shells) #:use-module (gnu packages tex) + #:use-module (gnu packages texinfo) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) @@ -468,35 +471,21 @@ binary.") (define-public bc (package (name "bc") - (version "1.06") + (version "1.07.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf")))) + "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) - (native-inputs `(("flex" ,flex))) + (native-inputs + `(("ed" ,ed) + ("flex" ,flex) + ("texinfo" ,texinfo))) (arguments - '(#:phases - (alist-replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (zero? - (system* - "./configure" - (string-append "--prefix=" out) - ;; By default, man and info pages are put in - ;; PREFIX/{man,info}, but we want them in - ;; PREFIX/share/{man,info}. - (string-append "--mandir=" out "/share/man") - (string-append "--infodir=" out "/share/info"))))) - %standard-phases) - #:configure-flags + '(#:configure-flags (list "--with-readline"))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") -- cgit v1.2.3 From 2f36d90f2d24738bda8dc522645ad8f50bd62207 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 15 Apr 2017 10:28:57 +0200 Subject: gnu: giac-xcas: Update to 1.2.3-37. * gnu/packages/algebra.scm (giac-xcas): Update to 1.2.3-37. Signed-off-by: Marius Bakke --- gnu/packages/algebra.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 670a8954a9..db1344f34b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Andreas Enge ;;; Copyright © 2013, 2015, 2017 Ludovic Courtès -;;; Copyright © 2016 Nicolas Goaziou +;;; Copyright © 2016, 2017 Nicolas Goaziou ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -206,7 +206,7 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.") (define-public giac-xcas (package (name "giac-xcas") - (version "1.2.3-25") + (version "1.2.3-37") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -218,7 +218,7 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.") "source/giac_" version ".tar.gz")) (sha256 (base32 - "0d6a42p8111raf7k16yvjajnpj22abiqndy3yzkrb4b8l071r24d")))) + "180146rm8fxlbd6x25x81yscf6q8qjpzr35k203r25c2xkcb7h2x")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3