diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-27 22:13:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-27 22:13:02 +0200 |
| commit | 217cf982c754f1e8506e180551c73f57c04aed7f (patch) | |
| tree | b816e2671be3cc3d22f165cbf593bb5cce3c4173 /pkgs/applications/science/math | |
| parent | ab77ea0bf25dd1f193c8dd078ef7e90523366135 (diff) | |
| parent | f9021cc12980370f60cce54ec899b11aebb5ed0b (diff) | |
| download | nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.gz nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.bz2 nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.lz nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.xz nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.tar.zst nixlib-217cf982c754f1e8506e180551c73f57c04aed7f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/ginac/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/nauty/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 197845bfa3c1..541ed548f884 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.7.6"; + name = "ginac-1.7.7"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "03cq93qjfgxgr7zxadrjfbn43lk5f0x2lmd90ggx10p6jq47157v"; + sha256 = "1jsf74cym5v6nq70aij3l7axq8vf7rrc1lnb9siyb9lsfbnnxzqf"; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index e9c8b688fb92..4efe8da19180 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { sandybridge = [ "--disable-clz" ]; ivybridge = [ "--disable-clz" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; - buildInputs = []; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 57d6c852be8d..9351b90680d4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -109,6 +109,13 @@ stdenv.mkDerivation rec { # now set the cache dir to be withing the .sage directory. This is not # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + + # https://trac.sagemath.org/ticket/28472 + (fetchpatch { + name = "eclib-20190909.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d"; + sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |