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: a172554adb12
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8201f4f6fda7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 26, 2020

  1. linbox: backport upstream fixes 

    References:
linbox-team/linbox@f78117d
linbox-team/linbox@4ff828e

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
    @omasanori
    omasanori committed Oct 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e0fecf4 View commit details

Commits on Nov 4, 2020

  1. Merge pull request #101382 from omasanori/linbox-fix 

    linbox: backport upstream fixes
    @timokau
    timokau authored Nov 4, 2020
    Copy the full SHA
    8201f4f View commit details
Showing with 28 additions and 2 deletions.
  1. +15 −2 pkgs/development/libraries/linbox/default.nix
  2. +13 −0 pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
17 changes: 15 additions & 2 deletions pkgs/development/libraries/linbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);

stdenv.mkDerivation rec {
pname = "linbox";
version = "1.6.3";

version = "1.6.3"; # TODO: Check postPatch script on update

src = fetchFromGitHub {
owner = "linbox-team";
@@ -36,6 +35,20 @@ stdenv.mkDerivation rec {
fflas-ffpack
];

patches = [
# Remove inappropriate `const &` qualifiers on data members that can be
# modified via member functions.
# See also: https://github.com/linbox-team/linbox/pull/256
./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update
];

postPatch = ''
# Remove @LINBOXSAGE_LIBS@ that is actually undefined.
# See also: https://github.com/linbox-team/linbox/pull/249
# TODO: Remove on 1.7.0 update
find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \;
'';

configureFlags = [
"--with-blas-libs=-lblas"
"--disable-optimization"
13 changes: 13 additions & 0 deletions pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/linbox/algorithms/det-rational.h
+++ b/linbox/algorithms/det-rational.h
@@ -79,8 +79,8 @@
struct MyRationalModularDet {
const Blackbox &A;
const MyMethod &M;
- const Integer &mul;//multiplicative prec;
- const Integer &div;
+ Integer mul;//multiplicative prec;
+ Integer div;

MyRationalModularDet(const Blackbox& b, const MyMethod& n,
const Integer & p1, const Integer & p2) :