Merge branch 'develop' of git://trac.sagemath.org/sage into u/gh-klie…

…m/face_iterator_simple_face_2

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.2.beta10, Release Date: 2020-08-23
+SageMath version 9.2.beta11, Release Date: 2020-09-01

build/bin/sage-site

@@ -157,6 +157,13 @@ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
     # cause the build to hang. If stdin is /dev/null, TeX just aborts.
     shift
     export LANG=C # to ensure it is possible to scrape out non-EN locale warnings
+
+    # See #30351: bugs in macOS implementations of openblas/libgopm can cause
+    # docbuild to hang if multiple OpenMP threads are allowed.
+    if [ `uname` = 'Darwin' ]; then
+        export OMP_NUM_THREADS=1
+    fi
+
     exec sage-python -m sage_setup.docbuild "$@" </dev/null
 fi
 

build/bin/write-dockerfile.sh

@@ -91,6 +91,18 @@ EOF
         EXISTS="pacman -Si"
         INSTALL="pacman -Su --noconfirm"
         ;;
+    nix*)
+        # https://hub.docker.com/r/nixos/nix
+        cat <<EOF
+ARG BASE_IMAGE=nixos/nix:latest
+FROM \${BASE_IMAGE} as with-system-packages
+RUN nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgs
+RUN nix-channel --update
+EOF
+        INSTALL="nix-env --install"
+        RUN="RUN nix-shell --packages \$PACKAGES --run "\'
+        ENDRUN=\'
+        ;;
     void*)
 	# https://hub.docker.com/r/voidlinux/masterdir-x86_64-musl
 	cat <<EOF
@@ -178,7 +190,7 @@ ADD src/bin src/bin
 ADD m4 ./m4
 ADD build ./build
 ARG BOOTSTRAP=./bootstrap
-$RUN sh -x -c "\${BOOTSTRAP}"
+$RUN sh -x -c "\${BOOTSTRAP}" $ENDRUN
 
 FROM bootstrapped as configured
 #:configuring:
@@ -187,11 +199,11 @@ ARG EXTRA_CONFIGURE_ARGS=""
 EOF
 if [ ${WITH_SYSTEM_SPKG} = "force" ]; then
     cat <<EOF
-$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; cat config.log; ./configure --enable-build-as-root; cat config.log; exit 1)
+$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; cat config.log; ./configure --enable-build-as-root; cat config.log; exit 1) $ENDRUN
 EOF
 else
     cat <<EOF
-$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (cat config.log; exit 1)
+$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (cat config.log; exit 1) $ENDRUN
 EOF
 fi
 cat <<EOF
@@ -204,7 +216,7 @@ ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
 ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
 #:toolchain:
-$RUN make \${USE_MAKEFLAGS} base-toolchain
+$RUN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN
 
 FROM with-base-toolchain as with-targets-pre
 ARG NUMPROC=8
@@ -214,7 +226,7 @@ ENV SAGE_CHECK=warn
 ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
 #:make:
 ARG TARGETS_PRE="sagelib-build-deps"
-$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE}
+$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN
 
 FROM with-targets-pre as with-targets
 ARG NUMPROC=8
@@ -224,7 +236,7 @@ ENV SAGE_CHECK=warn
 ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
 ADD src src
 ARG TARGETS="build"
-$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS}
+$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS} $ENDRUN
 
 FROM with-targets as with-targets-optional
 ARG NUMPROC=8
@@ -233,7 +245,7 @@ ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
 ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py"
 ARG TARGETS_OPTIONAL="ptest"
-$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)"
+$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN
 
 #:end:
 EOF

build/pkgs/arb/distros/nix.txt

@@ -0,0 +1 @@
+arb

build/pkgs/boost/distros/nix.txt

@@ -0,0 +1 @@
+boost

build/pkgs/certifi/checksums.ini

@@ -1,4 +1,5 @@
 tarball=certifi-VERSION.tar.gz
-sha1=f3873edcfc60c52e97e6601b2576ccdac419281a
-md5=76381d19d0a1171fecb2d1002b81424e
-cksum=2417220143
+sha1=4bb6fad4f43f262f61d306581d9e29c91ff1d1e2
+md5=89525ece725d674d91b0c43007d2a47e
+cksum=4236975362
+upstream_url=https://pypi.io/packages/source/c/certifi/certifi-VERSION.tar.gz

build/pkgs/certifi/package-version.txt

@@ -1 +1 @@
-2019.3.9
+2020.6.20

build/pkgs/cliquer/distros/nix.txt

@@ -0,0 +1 @@
+cliquer

build/pkgs/cmake/checksums.ini

@@ -1,4 +1,5 @@
 tarball=cmake-VERSION.tar.gz
-sha1=7851f87185f80e260ea634d5985ec9215fe408c8
-md5=f3ebc79b5dec85b49abe75958ffa1a03
-cksum=1559829871
+sha1=23092c6a5ae9ecde368abbfda7bae0d01edb7387
+md5=7a882b3764f42981705286ac9daa29c2
+cksum=1249294118
+upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz

build/pkgs/cmake/package-version.txt

@@ -1 +1 @@
-3.11.0
+3.18.2

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=cfb4eea9dde2eec3d05faed38b08439f089bafac
-md5=a2cbec40a5d6bfeef128d264b12cccaf
-cksum=3145132943
+sha1=bc02b89295bae975608586b7717f5bc6d6e6ef61
+md5=1f20546274d26f840ffd3001a077e341
+cksum=690405059

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-e0e5b0c014ab64a59663b29ea081073125d806e2
+1b9d7cff30fd43e7133ef06b53f646453e35cfa1

build/pkgs/cvxopt/checksums.ini

@@ -1,4 +1,5 @@
 tarball=cvxopt-VERSION.tar.gz
-sha1=b16cf3b1c941d763ea0451e947e5661d38ee0473
-md5=aac3db3fc3cf11d9ad2e42d89e94ca5a
-cksum=3018809057
+sha1=cc1f19aafa8eb5b135861f43d5d9e18b1304cd11
+md5=45044c5ac2a8f22d4f7572b5459e84dd
+cksum=962955599
+upstream_url=https://pypi.io/packages/source/c/cvxopt/cvxopt-VERSION.tar.gz

build/pkgs/cvxopt/package-version.txt

@@ -1 +1 @@
-1.2.3
+1.2.5

build/pkgs/cvxopt/patches/libsuitesparse_path.patch

@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index d312416..4fa14c4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -58,9 +58,9 @@ if sys.platform.startswith("darwin"):
+     SUITESPARSE_LIB_DIR = '/usr/local/lib'
+     SUITESPARSE_INC_DIR = '/usr/local/include'
+ else:
+-    if glob("/usr/lib/x86_64-linux-gnu/libsuitesparse*"):
+-        # Ubuntu/Debian
+-        SUITESPARSE_LIB_DIR = "/usr/lib/x86_64-linux-gnu"
++    SUITESPARSE_LIB_SUFF = glob("/usr/lib/*/libsuitesparse*")
++    if SUITESPARSE_LIB_SUFF: # Ubuntu/Debian
++        SUITESPARSE_LIB_DIR = "/usr/lib/"+SUITESPARSE_LIB_SUFF[0].split('/')[3]
+         SUITESPARSE_INC_DIR = "/usr/include/suitesparse"
+     elif glob("/usr/lib64/libsuitesparse*"):
+         # CentOS/Fedora/RedHat

build/pkgs/ecl/distros/nix.txt

@@ -0,0 +1 @@
+ecl

build/pkgs/eclib/distros/nix.txt

@@ -0,0 +1 @@
+eclib

build/pkgs/ecm/distros/nix.txt

@@ -0,0 +1 @@
+ecm

build/pkgs/fflas_ffpack/distros/nix.txt

@@ -0,0 +1 @@
+fflas-ffpack

build/pkgs/flint/distros/nix.txt

@@ -0,0 +1 @@
+flint

build/pkgs/flintqs/distros/nix.txt

@@ -0,0 +1 @@
+flintqs

build/pkgs/freetype/distros/nix.txt

@@ -0,0 +1 @@
+freetype

build/pkgs/gap/distros/nix.txt

@@ -0,0 +1 @@
+gap

build/pkgs/gf2x/checksums.ini

@@ -1,4 +1,5 @@
 tarball=gf2x-VERSION.tar.gz
-sha1=53c8876a1de869332ce126b77596aeb06fe06bff
-md5=bff500f8e577c6098af15bc00c7cef37
-cksum=1463710603
+sha1=1b9c7e14031afc5488b9aa27f5501f78c90f00b4
+md5=842f087ce423c279dced26b85b0fd1d0
+cksum=3368093312
+upstream_url=https://gitlab.inria.fr/gf2x/gf2x/uploads/c46b1047ba841c20d1225ae73ad6e4cd/gf2x-1.3.0.tar.gz

build/pkgs/gf2x/package-version.txt

@@ -1 +1 @@
-1.2.p0
+1.3.0

build/pkgs/gf2x/spkg-install.in

@@ -7,10 +7,6 @@ cd src
 # Use newer version of config.guess and config.sub (see Trac #19727)
 cp "$SAGE_ROOT"/config/config.* config
 
-# As config/acinclude.m4 is patched, we need to touch some files to prevent
-# autotools to invoke black magic.
-touch aclocal.m4 configure Makefile.in gf2x/gf2x-config.h.in
-
 if [ "$SAGE_DEBUG" = "yes" ]; then
     echo "Building a debug version of gf2x."
     export CFLAGS="-O0 -g $CFLAGS"

build/pkgs/gfan/distros/nix.txt

@@ -0,0 +1 @@
+gfan

build/pkgs/giac/checksums.ini

@@ -1,5 +1,5 @@
 tarball=giac-VERSION.tar.bz2
-sha1=c8b4b40dae98a83adda0142332a482c4fec2d4eb
-md5=504151eb5f483a24c941822d792f0bb3
-cksum=3611162964
+sha1=873f44e8b6a8f43121c30587d99016763c9e047c
+md5=52eda3193e16ab05b4fb2a727c8f3308
+cksum=2879733923
 upstream_url=https://trac.sagemath.org/raw-attachment/ticket/29552/giac-VERSION.tar.bz2

build/pkgs/giac/dependencies

@@ -1,4 +1,4 @@
-readline libpng $(MP_LIBRARY) mpfr mpfi ntl gsl pari
+readline libpng $(MP_LIBRARY) mpfr mpfi ntl gsl pari glpk curl
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/giac/distros/nix.txt

@@ -0,0 +1 @@
+giac

build/pkgs/giac/package-version.txt

@@ -1 +1 @@
-1.5.0.87
+1.5.0.87p0