Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

16 changes: 7 additions & 9 deletions pkgs/applications/science/math/sage/sage-src.nix
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,13 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/32959
./patches/linbox-1.7-upgrade.patch

# To emit better tracebacks, IPython 8 parses Python files using the ast
# module (via the stack_data package). Since Cython is a superset of Python,
# this results in no Cython code being printed in tracebacks. Fixing this
# properly is tracked in https://github.com/alexmojaki/stack_data/issues/21,
# but for now we just disable the corresponding test. An alternative would
# be to revert IPython's IPython/core/ultratb.py, but this would need to be
# Sage-specific (since it would worsen tracebacks for pure Python code).
# Sage tracks this at https://trac.sagemath.org/ticket/33170
./patches/no-cython-sources-in-tracebacks-on-ipython8.patch
# https://trac.sagemath.org/ticket/33170
(fetchSageDiff {
base = "9.5.rc1";
name = "ipython-8-update.patch";
rev = "a90a314616d86d6be9c0d5233f0d36c4bfe06231";
sha256 = "sha256-pXdtokTo84xNCnV+HyAKEzG562z8FjzJ7hczOja0dRw=";
})

# https://trac.sagemath.org/ticket/32968
(fetchSageDiff {
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/python-modules/stack-data/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ asttokens
, buildPythonPackage
, cython
, executing
, fetchFromGitHub
, git
Expand All @@ -15,13 +16,13 @@

buildPythonPackage rec {
pname = "stack-data";
version = "0.1.0";
version = "0.2.0";

src = fetchFromGitHub {
owner = "alexmojaki";
repo = "stack_data";
rev = "v${version}";
sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec=";
sha256 = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc=";
};

SETUPTOOLS_SCM_PRETEND_VERSION = version;
Expand All @@ -39,6 +40,7 @@ buildPythonPackage rec {
];

checkInputs = [
cython
littleutils
pygments
pytestCheckHook
Expand Down