Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sage: remove optional jmol dep (and thus also jre8) #382929

Merged
merged 1 commit into from
Mar 18, 2025
Merged
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
3 changes: 0 additions & 3 deletions pkgs/by-name/sa/sage/env-locations.nix
Original file line number Diff line number Diff line change
@@ -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}"
5 changes: 0 additions & 5 deletions pkgs/by-name/sa/sage/sage-env.nix
Original file line number Diff line number Diff line change
@@ -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
]
)