summary refs log tree commit diff
path: root/pkgs/applications/science/math/sage/sage-env.nix
diff options
context:
space:
mode:
authorMauricio Collares <mauricio@collares.org>2021-09-13 22:56:34 -0300
committerMauricio Collares <mauricio@collares.org>2022-01-30 13:15:20 -0300
commitcecbb55fb0e844fd07d30b2dc73717aa5fcf5a81 (patch)
treed62fa687a42ab4a17463d7317b3e403372dd38cf /pkgs/applications/science/math/sage/sage-env.nix
parent0aef6270cd9a238126568df3749ccd8765c3c7cf (diff)
downloadnixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.tar
nixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.tar.gz
nixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.tar.bz2
nixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.tar.lz
nixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.tar.xz
nixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.tar.zst
nixpkgs-cecbb55fb0e844fd07d30b2dc73717aa5fcf5a81.zip
sage: 9.4 -> 9.5
Diffstat (limited to 'pkgs/applications/science/math/sage/sage-env.nix')
-rw-r--r--pkgs/applications/science/math/sage/sage-env.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index ae0b9f7453b..e680c0c3b22 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -2,7 +2,7 @@
 , lib
 , writeTextFile
 , sagelib
-, sage_docbuild
+, sage-docbuild
 , env-locations
 , gfortran
 , bash
@@ -45,11 +45,10 @@
 , flint
 , gmp
 , mpfr
-, pynac
 , zlib
 , gsl
 , ntl
-, jdk8
+, jdk
 , less
 }:
 
@@ -60,8 +59,6 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 # dependencies.
 
 let
-  jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-
   runtimepath = (lib.makeBinPath ([
     "@sage-local@"
     "@sage-local@/build"
@@ -163,7 +160,6 @@ writeTextFile rec {
         gmp
         mpfr
         pari
-        pynac
         zlib
         eclib
         gsl
@@ -179,7 +175,6 @@ writeTextFile rec {
         glpk
         flint
         gap
-        pynac
         mpfr.dev
       ])
     }'
@@ -193,5 +188,5 @@ writeTextFile rec {
   '';
 } // { # equivalent of `passthru`, which `writeTextFile` doesn't support
   lib = sagelib;
-  docbuild = sage_docbuild;
+  docbuild = sage-docbuild;
 }