diff options
| author | Mauricio Collares <mauricio@collares.org> | 2021-03-06 23:13:37 -0300 |
|---|---|---|
| committer | Mauricio Collares <mauricio@collares.org> | 2021-03-09 21:28:46 -0300 |
| commit | 3f02cdae14dd2deacb2792d84733079b9b0796a0 (patch) | |
| tree | b73021d952eccba97bdb7aa437d773e45ad9f0b3 | |
| parent | a2967199a432a0a79921a8a66894388811e26fd2 (diff) | |
| download | nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.tar nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.tar.gz nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.tar.bz2 nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.tar.lz nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.tar.xz nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.tar.zst nixpkgs-3f02cdae14dd2deacb2792d84733079b9b0796a0.zip | |
sage: reenable pexpect interrupt test
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch | 29 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 3 |
2 files changed, 0 insertions, 32 deletions
diff --git a/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch b/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch deleted file mode 100644 index 374c7207919..00000000000 --- a/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py -index 88a33b0349..b3321f0bec 100644 ---- a/src/sage/interfaces/singular.py -+++ b/src/sage/interfaces/singular.py -@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect): - """ - Send an interrupt to Singular. If needed, additional - semi-colons are sent until we get back at the prompt. -- -- TESTS: -- -- The following works without restarting Singular:: -- -- sage: a = singular(1) -- sage: _ = singular._expect.sendline('1+') # unfinished input -- sage: try: -- ....: alarm(0.5) -- ....: singular._expect_expr('>') # interrupt this -- ....: except KeyboardInterrupt: -- ....: pass -- Control-C pressed. Interrupting Singular. Please wait a few seconds... -- -- We can still access a:: -- -- sage: 2*a -- 2 - """ - # Work around for Singular bug - # http://www.singular.uni-kl.de:8002/trac/ticket/727 diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 2d9f719d8a4..bd718cff612 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -87,9 +87,6 @@ stdenv.mkDerivation rec { rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6"; sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0="; }) - - # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945) - ./patches/disable-pexpect-intermittent-failure.patch ]; # Patches needed because of package updates. We could just pin the versions of |