From 89de2178e4ee3459c7a876024b46d6bb883f7266 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Mon, 17 Feb 2025 09:58:06 -0500
Subject: [PATCH] sage: remove optional jmol dep (and thus also jre8)

We are now past Sage 10.5, and jmol is now optional so unneeded in the
default env.

See https://github.com/sagemath/sage/issues/31027
---
 pkgs/by-name/sa/sage/env-locations.nix | 3 ---
 pkgs/by-name/sa/sage/sage-env.nix      | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/pkgs/by-name/sa/sage/env-locations.nix b/pkgs/by-name/sa/sage/env-locations.nix
index 8a9974af763e..4d4ebf7e57bc 100644
--- a/pkgs/by-name/sa/sage/env-locations.nix
+++ b/pkgs/by-name/sa/sage/env-locations.nix
@@ -9,7 +9,6 @@
   polytopes_db,
   gap,
   combinatorial_designs,
-  jmol,
   mathjax,
   three,
   cysignals,
@@ -37,8 +36,6 @@ writeTextFile rec {
     export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/'
     export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs"
     export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona"
-    export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar
-    export JSMOL_DIR="${jmol}/share/jsmol"
     export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax"
     export THREEJS_DIR="${three}/lib/node_modules/three"
     export SAGE_INCLUDE_DIRECTORIES="${cysignals}/${cysignals.pythonModule.sitePackages}"
diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
index 0a1dabb14347..a480159d34c2 100644
--- a/pkgs/by-name/sa/sage/sage-env.nix
+++ b/pkgs/by-name/sa/sage/sage-env.nix
@@ -31,7 +31,6 @@
   rWrapper,
   gfan,
   cddlib,
-  jmol,
   tachyon,
   glpk,
   eclib,
@@ -50,7 +49,6 @@
   zlib,
   gsl,
   ntl,
-  jre8,
   less,
 }:
 
@@ -87,7 +85,6 @@ let
       rWrapper
       gfan
       cddlib
-      jmol
       tachyon
       glpk
       eclib
@@ -98,7 +95,6 @@ let
       ecm
       lcalc
       rubiks
-      jre8 # only needed for `jmol` (https://sourceforge.net/p/jmol/mailman/message/58818762/), which will be optional in sage 10.5
       less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
     ])
   );
@@ -176,7 +172,6 @@ writeTextFile rec {
                 eclib
                 gsl
                 ntl
-                jmol
                 sympow
               ]
             )