summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-04-09 02:24:19 +0200
committerGitHub <noreply@github.com>2021-04-09 02:24:19 +0200
commit14ef96000de58087cea35681c48a6e3620f8e67f (patch)
treec84402522f3c3d682823930b6a0bc8e682565915
parent77de1a7f9cf6138c51eb491d0684feca7c571b4c (diff)
parent962cac656b1104f63a7d8cf99b90a0b27c16edde (diff)
downloadnixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.tar
nixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.tar.gz
nixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.tar.bz2
nixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.tar.lz
nixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.tar.xz
nixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.tar.zst
nixpkgs-14ef96000de58087cea35681c48a6e3620f8e67f.zip
Merge pull request #118730 from TethysSvensson/master
flint: 2.5.2 -> 2.7.1
-rw-r--r--pkgs/development/libraries/flint/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index 7bfa701db73..2c540d13008 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -1,6 +1,5 @@
 { lib, stdenv
 , fetchurl
-, fetchpatch
 , gmp
 , mpir
 , mpfr
@@ -13,10 +12,10 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa
 
 stdenv.mkDerivation rec {
   pname = "flint";
-  version = "2.5.2"; # remove libflint.so.MAJOR patch when updating
+  version = "2.7.1";
   src = fetchurl {
     url = "http://www.flintlib.org/flint-${version}.tar.gz";
-    sha256 = "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb";
+    sha256 = "07j8r96kdzp19cy3a5yvpjxf90mkd6103yr2n42qmpv7mgcjyvhq";
   };
   buildInputs = [
     gmp
@@ -41,14 +40,6 @@ stdenv.mkDerivation rec {
   # issues with ntl -- https://github.com/wbhart/flint2/issues/487
   NIX_CXXSTDLIB_COMPILE = "-std=c++11";
 
-  patches = [
-    (fetchpatch {
-      # Always produce libflint.so.MAJOR; will be included in the next flint version
-      # See https://github.com/wbhart/flint2/pull/347
-      url = "https://github.com/wbhart/flint2/commit/49fbcd8f736f847d3f9667f9f7d5567ef4550ecb.patch";
-      sha256 = "09w09bpq85kjf752bd3y3i5lvy59b8xjiy7qmrcxzibx2a21pj73";
-    })
-  ];
   doCheck = true;
   meta = {
     inherit version;