diff options
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/arb/default.nix | 16 |
2 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1144057b188..096f2212cc4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -129,6 +129,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch/?id=2ab1546b3e21d1d0ab3b4fcd58576848b3a2d888"; sha256 = "1c5gnasq7y9xxj762bn79bis0zi8d9bgg7jzlf64ifixsrc5cymb"; }) + + # arb 2.13.0 -> 2.14.0 + (fetchpatch { + name = "arb-2.14.0.patch"; + url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e"; + sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index ea70e645453..bca519c7628 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "1fl9gmxf6c1cphk5r8jbys5pywj2rfm705kv0055i0aqc6hrv303"; + sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; }; buildInputs = [mpir gmp mpfr flint]; configureFlags = [ @@ -17,19 +17,11 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; doCheck = true; - patches = [ - # https://github.com/fredrik-johansson/arb/pull/210, included in next release - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/fredrik-johansson/arb/pull/210.patch"; - name = "return-exact-zero-where-possible.patch"; - sha256 = "01j9npnpmwh4dla9i05qdn606hy34gy9bz7c9bbsqm7az3n7pxjg"; - }) - ]; - meta = { + meta = with stdenv.lib; { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [stdenv.lib.maintainers.raskin]; + maintainers = with maintainers; [ raskin timokau ]; platforms = stdenv.lib.platforms.linux; }; } |