diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix index b7bb781363b4..8e49235c6d0d 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/development/libraries/flint/3.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, gmp, mpfr, @@ -23,26 +22,13 @@ assert stdenv.mkDerivation rec { pname = "flint3"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { - url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-/bOkMaN0ZINKz/O9wUX0/o0PlR3VMnxMb5P0y6xcJwA="; + url = "https://flintlib.org/download/flint-${version}.tar.gz"; + hash = "sha256-ynvkbXeXInfrb+DE92dUhDL1a7U0qhfW26LXzOFc0j8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/flintlib/flint/commit/e7d005c369754243cba32bd782ea2a5fc874fde5.diff"; - hash = "sha256-IqEtYEpNVXfoTeerh/0ig+eDqUpAlGdBB3uO8ShYh3o="; - }) - # C99 compliance (avoid using I as identifier): https://github.com/flintlib/flint/pull/2027 - (fetchpatch { - name = "flint3-reserved-identifier.patch"; - url = "https://github.com/flintlib/flint/commit/b579cdd2d45aa1109a764f6838e9888b937e7ac5.patch"; - hash = "sha256-8GLlA9ACzzxSiYaxLv9+p0oJA5TS7289b0EyoNcsSaU="; - }) - ]; - nativeBuildInputs = [ autoconf automake @@ -68,8 +54,6 @@ stdenv.mkDerivation rec { # We're not using autoreconfHook because flint's bootstrap # script calls autoreconf, among other things. preConfigure = '' - # the following configure.ac fix is only needed for flint 3.1.X - sed -i 's/if "$ac_cv_prog_cxx_g" = "yes"/if test "$ac_cv_prog_cxx_g" = "yes"/' configure.ac echo "Executing bootstrap.sh" ./bootstrap.sh ''; @@ -92,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast Library for Number Theory"; - license = licenses.gpl2Plus; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ smasher164 ] ++ teams.sage.members; platforms = platforms.unix; homepage = "https://www.flintlib.org/";