git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #167679 from collares/sage-networkx27

sage: post python-unstable/staging-next merge fixes

commitf087013f8e7a18e381a74ebc1706ee268abb3061 authorArtturi <Artturin@artturin.com> dateThu 7 Apr 2022, 23:29 (5 years ago) parent55e580b79cc492
3 files changed+30−7
compare with master
unifiedsplit
pkgs/applications/science/math/sage/sage-env.nix+2 pkgs/applications/science/math/sage/sage-src.nix+20−4 pkgs/applications/science/math/sage/sagelib.nix+8−3
pkgs/applications/science/math/sage/sage-env.nix+2
@@ -151,6 +151,7 @@ writeTextFile rec {
151151
152152 # needed for cython
153153 export CC='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc'
154+ export CXX='${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++'
154155 # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar
155156 export LDFLAGS='${
156157 lib.concatStringsSep " " (map (pkg: "-L${pkg}/lib") [
@@ -178,6 +179,7 @@ writeTextFile rec {
178179 mpfr.dev
179180 ])
180181 }'
182+ export CXXFLAGS=$CFLAGS
181183
182184 export SAGE_LIB='${sagelib}/${python3.sitePackages}'
183185
pkgs/applications/science/math/sage/sage-src.nix+20−4
@@ -121,10 +121,10 @@ stdenv.mkDerivation rec {
121121
122122 # https://trac.sagemath.org/ticket/33170
123123 (fetchSageDiff {
124− base = "9.5.rc1";
125− name = "ipython-8-update.patch";
126− rev = "a90a314616d86d6be9c0d5233f0d36c4bfe06231";
127− sha256 = "sha256-pXdtokTo84xNCnV+HyAKEzG562z8FjzJ7hczOja0dRw=";
124+ base = "9.6.beta5";
125+ name = "ipython-8.1-update.patch";
126+ rev = "4d2b53f1541375861310af3a7f7109c1c2ed475d";
127+ sha256 = "sha256-ELda/VBzsQH7NdFas69fQ35QPUoJCeLx/gxT1j7qGR8=";
128128 })
129129
130130 # https://trac.sagemath.org/ticket/32968
@@ -156,6 +156,22 @@ stdenv.mkDerivation rec {
156156
157157 # adapted from https://trac.sagemath.org/ticket/23712#comment:22
158158 ./patches/tachyon-renamed-focallength.patch
159+
160+ # https://trac.sagemath.org/ticket/33336
161+ (fetchSageDiff {
162+ base = "9.6.beta2";
163+ name = "scipy-1.8-update.patch";
164+ rev = "9c8235e44ffb509efa8a3ca6cdb55154e2b5066d";
165+ sha256 = "sha256-bfc4ljNOxVnhlmxIuNbjbKl4vJXYq2tlF3Z8bbC8PWw=";
166+ })
167+
168+ # https://trac.sagemath.org/ticket/33495
169+ (fetchSageDiff {
170+ base = "9.6.beta5";
171+ name = "networkx-2.7-update.patch";
172+ rev = "8452003846a7303100847d8d0ed642fc642c11d6";
173+ sha256 = "sha256-A/XMouPlc2sjFp30L+56fBGJXydS2EtzfPOV98FCDqI=";
174+ })
159175 ];
160176
161177 patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
pkgs/applications/science/math/sage/sagelib.nix+8−3
@@ -181,11 +181,16 @@ buildPythonPackage rec {
181181 # some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg
182182 # are generated by the bootstrap script using m4. these can fetch data from
183183 # build/pkgs, either directly or via sage-get-system-packages.
184− sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
185− sed -i 's/, <3.4//' ../rpy2/install-requires.txt
186− sed -i 's/, <4.3//' ../sphinx/install-requires.txt
187184 sed -i '/sage_conf/d' src/setup.cfg.m4
188185 sed -i '/sage_conf/d' src/requirements.txt.m4
186+
187+ # version lower bounds are useful, but upper bounds are a hassle because
188+ # Sage tests already catch any relevant API breakage.
189+ # according to the discussion at https://trac.sagemath.org/ticket/33520,
190+ # upper bounds will be less noisy starting from Sage 9.6.
191+ sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt
192+ sed -i 's/, <[^, ]*//' ../*/install-requires.txt
193+
189194 for infile in src/*.m4; do
190195 if [ -f "$infile" ]; then
191196 outfile="src/$(basename $infile .m4)"