Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 90e1bccdaff0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 291018b34e67
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 7, 2018

  1. arb: 2.13.0 -> 2.14.0 (#44600)

    @timokau @xeji
    timokau authored and xeji committed Aug 7, 2018
    Copy the full SHA
    291018b View commit details
Showing with 11 additions and 12 deletions.
  1. +7 −0 pkgs/applications/science/math/sage/sage-src.nix
  2. +4 −12 pkgs/development/libraries/arb/default.nix
7 changes: 7 additions & 0 deletions pkgs/applications/science/math/sage/sage-src.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ++ [
16 changes: 4 additions & 12 deletions pkgs/development/libraries/arb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}