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: 7a216124d1ba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b57d852af77
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 5, 2019

  1. pari: slight refactoring 

    Use pname, one line per argument.
    @timokau
    timokau committed Mar 5, 2019
    Copy the full SHA
    5a23cb5 View commit details

  2. pari: add timokau as maintainer 

    I'm mostly interested in this package because it is a dependency of
sage. I'd like to be notified on changes (which ofBorg will do when I'm
listed as a maintainer).
    @timokau
    timokau committed Mar 5, 2019
    Copy the full SHA
    00fa98f View commit details

  3. pari: fix off-by-one error 

    Done by applying upstream patch. Will be included in the next release.

Upstream: https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
    @timokau
    timokau committed Mar 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a648b8c View commit details

Commits on Mar 6, 2019

  1. Merge pull request #56905 from timokau/pari-fix 

     pari: fix off-by-one error
    @Mic92
    Mic92 authored Mar 6, 2019
    Copy the full SHA
    9b57d85 View commit details
Showing with 23 additions and 6 deletions.
  1. +23 −6 pkgs/applications/science/math/pari/default.nix
29 changes: 23 additions & 6 deletions pkgs/applications/science/math/pari/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,37 @@
{ stdenv, fetchurl
, gmp, readline, libX11, tex, perl
{ stdenv
, fetchurl
, fetchpatch
, gmp
, readline
, libX11
, tex
, perl
, withThread ? true, libpthreadstubs
}:

assert withThread -> libpthreadstubs != null;

stdenv.mkDerivation rec {

name = "pari-${version}";
pname = "pari";
version = "2.11.1";

src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
};

patches = [
# Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream)
# https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
# https://trac.sagemath.org/ticket/27335
(fetchpatch {
name = "fix-off-by-one-error.patch";
# only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5";
sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6";
})
];

buildInputs = [
gmp
readline
@@ -70,7 +87,7 @@ stdenv.mkDerivation rec {
homepage = http://pari.math.u-bordeaux.fr;
downloadPage = http://pari.math.u-bordeaux.fr/download.html;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes raskin AndersonTorres ];
maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ];
platforms = platforms.linux ++ platforms.darwin;
updateWalker = true;
};