pyrox.dev / nixpkgs
lol
fork atom

linbox: backport upstream fixes

References:
https://github.com/linbox-team/linbox/commit/f78117d9c365efd46f5ea2903b553a08c4029aeb
https://github.com/linbox-team/linbox/commit/4ff828e20053ab2ef9adc4ce6931d159fd513cef

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>

Masanori Ogino e0fecf44 ec3aa4c1

+28 -2
+15 -2
pkgs/development/libraries/linbox/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "linbox"; 17 - version = "1.6.3"; 18 - 17 + version = "1.6.3"; # TODO: Check postPatch script on update 19 18 20 19 src = fetchFromGitHub { 21 20 owner = "linbox-team"; ··· 35 34 gmpxx 36 35 fflas-ffpack 37 36 ]; 37 + 38 + patches = [ 39 + # Remove inappropriate `const &` qualifiers on data members that can be 40 + # modified via member functions. 41 + # See also: https://github.com/linbox-team/linbox/pull/256 42 + ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update 43 + ]; 44 + 45 + postPatch = '' 46 + # Remove @LINBOXSAGE_LIBS@ that is actually undefined. 47 + # See also: https://github.com/linbox-team/linbox/pull/249 48 + # TODO: Remove on 1.7.0 update 49 + find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; 50 + ''; 38 51 39 52 configureFlags = [ 40 53 "--with-blas-libs=-lblas"
+13
pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
··· 1 + --- a/linbox/algorithms/det-rational.h 2 + +++ b/linbox/algorithms/det-rational.h 3 + @@ -79,8 +79,8 @@ 4 + struct MyRationalModularDet { 5 + const Blackbox &A; 6 + const MyMethod &M; 7 + - const Integer &mul;//multiplicative prec; 8 + - const Integer &div; 9 + + Integer mul;//multiplicative prec; 10 + + Integer div; 11 + 12 + MyRationalModularDet(const Blackbox& b, const MyMethod& n, 13 + const Integer & p1, const Integer & p2) :