diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-08-05 16:50:06 +0200 |
|---|---|---|
| committer | Timo Kaufmann <timokau@zoho.com> | 2018-08-05 21:09:56 +0200 |
| commit | a8b048c686c4b7b5af2c8e6236f496f69e666584 (patch) | |
| tree | f0d957a2fa9d74ca29128af90c122711736be50a /pkgs/applications/science/math/sage/patches/spkg-scripts.patch | |
| parent | 75cb04672f4150ea81a76ad68650b60935a2c8f5 (diff) | |
| download | nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.tar nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.tar.gz nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.tar.bz2 nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.tar.lz nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.tar.xz nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.tar.zst nixlib-a8b048c686c4b7b5af2c8e6236f496f69e666584.zip | |
sage: 8.3 -> 8.4.beta0
Diffstat (limited to 'pkgs/applications/science/math/sage/patches/spkg-scripts.patch')
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/spkg-scripts.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/pkgs/applications/science/math/sage/patches/spkg-scripts.patch b/pkgs/applications/science/math/sage/patches/spkg-scripts.patch deleted file mode 100644 index 4d37998b288b..000000000000 --- a/pkgs/applications/science/math/sage/patches/spkg-scripts.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit f02714d4aea80e17cb8df62bab75d7c1a1b61a8e -Author: Timo Kaufmann <timokau@zoho.com> -Date: Mon Jul 9 18:26:18 2018 +0200 - - Don't attempt to create dirs when showing pkg info - - The script dir cannot be assumed to be writeable after installation. - -diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg -index f3e02aeae5..190d558ad1 100755 ---- a/build/bin/sage-spkg -+++ b/build/bin/sage-spkg -@@ -167,14 +167,6 @@ if [ -z "$SAGE_BUILD_DIR" ]; then - export SAGE_BUILD_DIR="$SAGE_LOCAL/var/tmp/sage/build" - fi - --for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS"; do -- mkdir -p "$dir" -- if [ $? -ne 0 ]; then -- error_msg "Error creating directory $dir" -- exit 1 -- fi --done -- - - # Remove '.' from PYTHONPATH, which may also come from SAGE_PATH, to avoid - # trouble with setuptools / easy_install (cf. #10192, #10176): -@@ -563,11 +555,13 @@ fi - # Setup directories - ################################################################## - --mkdir -p "$SAGE_BUILD_DIR" --if [ $? -ne 0 ]; then -- error_msg "Error creating directory $SAGE_BUILD_DIR" -- exit 1 --fi -+for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do -+ mkdir -p "$dir" -+ if [ $? -ne 0 ]; then -+ error_msg "Error creating directory $dir" -+ exit 1 -+ fi -+done - - # Trac #5852: check write permissions - if [ ! -w "$SAGE_BUILD_DIR" ]; then |