diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
| commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
| tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/packages/maths.scm | |
| parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
| parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
| download | patches-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar patches-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'gnu/packages/maths.scm')
| -rw-r--r-- | gnu/packages/maths.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 813480616e..774686310f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -123,7 +123,7 @@ numbers.") (define-public glpk (package (name "glpk") - (version "4.54") + (version "4.55") (source (origin (method url-fetch) @@ -131,7 +131,7 @@ numbers.") version ".tar.gz")) (sha256 (base32 - "18gr2anv8gyps6j9f22k7li6w07glvww666sdqblvlq2hh3whwmb")))) + "1rqx5fzj1mhkifilip5mkxybpj2wkniq5qcn8h1w2vkr2rzhs29p")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp))) |