diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:14:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:14:34 +0200 |
| commit | eab41878ac16a80b1189d5e4aeec5e037f6571db (patch) | |
| tree | 8bd9dcfadee430fc3f853bfacdd6220bc4e35152 /pkgs/applications/science | |
| parent | 11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27 (diff) | |
| parent | afd04a49ed4d03923adf51352ce2bce1fa72455d (diff) | |
| download | nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.gz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.bz2 nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.lz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.xz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.zst nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/pynac/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-env.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 05c0c0e8ec62..4022383dbc7d 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.25"; + version = "0.7.26"; pname = "pynac"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3"; + sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d"; }; buildInputs = [ diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 8fd69f62171a..0b67b3cff12b 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -44,6 +44,7 @@ , gsl , ntl , jdk +, less }: # This generates a `sage-env` shell file that will be sourced by sage on startup. @@ -92,6 +93,7 @@ let rubiks flintqs jdk # only needed for `jmol` which may be replaced in the future + less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] )); in |