summary refs log tree commit diff
path: root/pkgs/development/libraries/arb
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
commitd9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch)
tree82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/development/libraries/arb
parent8b834605628fabd43b1b26a1724fb22c83150e2d (diff)
parent8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff)
downloadnixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/arb')
-rw-r--r--pkgs/development/libraries/arb/default.nix16
1 files changed, 4 insertions, 12 deletions
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;
   };
 }