sage: import networkx 2.7 update patch

main
Mauricio Collares 2 years ago
parent b6966d911d
commit 49cddf1a78
  1. 8
      pkgs/applications/science/math/sage/sage-src.nix
  2. 11
      pkgs/applications/science/math/sage/sagelib.nix

@ -156,6 +156,14 @@ stdenv.mkDerivation rec {
# adapted from https://trac.sagemath.org/ticket/23712#comment:22
./patches/tachyon-renamed-focallength.patch
# https://trac.sagemath.org/ticket/33495
(fetchSageDiff {
base = "9.6.beta5";
name = "networkx-2.7-update.patch";
rev = "8452003846a7303100847d8d0ed642fc642c11d6";
sha256 = "sha256-A/XMouPlc2sjFp30L+56fBGJXydS2EtzfPOV98FCDqI=";
})
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

@ -181,11 +181,16 @@ buildPythonPackage rec {
# some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg
# are generated by the bootstrap script using m4. these can fetch data from
# build/pkgs, either directly or via sage-get-system-packages.
sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
sed -i 's/, <3.4//' ../rpy2/install-requires.txt
sed -i 's/, <4.3//' ../sphinx/install-requires.txt
sed -i '/sage_conf/d' src/setup.cfg.m4
sed -i '/sage_conf/d' src/requirements.txt.m4
# version lower bounds are useful, but upper bounds are a hassle because
# Sage tests already catch any relevant API breakage.
# according to the discussion at https://trac.sagemath.org/ticket/33520,
# upper bounds will be less noisy starting from Sage 9.6.
sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
sed -i 's/, <[^, ]*//' ../*/install-requires.txt
for infile in src/*.m4; do
if [ -f "$infile" ]; then
outfile="src/$(basename $infile .m4)"

Loading…
Cancel
Save