diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-02-10 23:56:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 23:56:18 +0000 |
| commit | 06ff90f540d0dcf77a5aa34fb1ad323da8c1f8f7 (patch) | |
| tree | 461bfbc8c6739e08ff786a100d2931af8c8ccfcf | |
| parent | d00459d18d018d95e8b2fb4963cf09dd9d03c6fe (diff) | |
| parent | b8c69782a27f08c02c39b5eee23455dbf6066e67 (diff) | |
Merge pull request #159020 from collares/arb-2.22.1
arb: 2.21.1 -> 2.22.1
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/libraries/arb/default.nix | 6 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 95b01d9f3f583..019694fd265ef 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -114,18 +114,26 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + # Upstream will wait until Sage 9.7 to upgrade to linbox 1.7 because it + # does not support gcc 6. We can upgrade earlier. + # https://trac.sagemath.org/ticket/32959 + ./patches/linbox-1.7-upgrade.patch + # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { - base = "9.5.beta8"; + base = "9.5"; name = "sphinx-4.3-update.patch"; rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; }) - # Upstream has not upgraded to linbox 1.7 yet because it conflicts with - # pre-4.2.1p3 versions of Singular, but we don't have this problem. - # https://trac.sagemath.org/ticket/32959 - ./patches/linbox-1.7-upgrade.patch + # https://trac.sagemath.org/ticket/33189 + (fetchSageDiff { + base = "9.5"; + name = "arb-2.22-update.patch"; + rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579"; + sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index e47dcd8e0ba20..dc160c37ad236 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "arb"; - version = "2.21.1"; + version = "2.22.1"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "sha256-OBY2gKVnvrZLVrv+d6rXQLo026mrGB9eyNV4LESgrNI="; + sha256 = "sha256-Xd3dy7zr4i3pULLFOYtedpS5Yj9Ljwyu6r4kfhRynmE="; }; buildInputs = [ mpir gmp mpfr flint ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; + enableParallelBuilding = true; + doCheck = true; meta = with lib; { |