diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2021-12-06 11:17:24 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2021-12-06 11:17:24 +0100 |
| commit | 5f9cdd06ef09bf0450a16c5a2ef61ff050e5c116 (patch) | |
| tree | f73bcd692b7544081d9d300b31ffd3232fff25c2 /pkgs/data/misc | |
| parent | be65588e5d5ee37fa72cecffc347bbc5895f9a52 (diff) | |
| parent | edb8dd5e47ce8c7db77455ea4e26c969a3711406 (diff) | |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/conway_polynomials/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/data/misc/elliptic_curves/default.nix | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix index cabc28a89ce9e..1f5c4d57f76a5 100644 --- a/pkgs/data/misc/conway_polynomials/default.nix +++ b/pkgs/data/misc/conway_polynomials/default.nix @@ -1,14 +1,12 @@ { lib, stdenv , fetchurl -, python2 +, python3 }: stdenv.mkDerivation rec { pname = "conway_polynomials"; version = "0.5"; - pythonEnv = python2.withPackages (ps: with ps; [ six ]); - src = fetchurl { url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2"; sha256 = "05zb1ly9x2bbscqv0jgc45g48xx77mfs7qdbqhn4ihmihn57iwnq"; @@ -16,8 +14,8 @@ stdenv.mkDerivation rec { # Script that creates the "database" (nested python array) and pickles it spkg-install = fetchurl { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0m12nfb37j3bn4bp06ddgnyp2d6z0hg5f83pbbjszxw7vxs33a82"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=9.2"; + sha256 = "1bwnqasnyv793hxg29viing4dnliz29grkhldsirq19d509yk1fs"; }; installPhase = '' @@ -31,7 +29,7 @@ stdenv.mkDerivation rec { export SAGE_SHARE="$out/share" export PYTHONPATH=$PWD - ${pythonEnv.interpreter} ${spkg-install} + ${python3.interpreter} ${spkg-install} ''; meta = with lib; { diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix index 9825940002109..daa017a681128 100644 --- a/pkgs/data/misc/elliptic_curves/default.nix +++ b/pkgs/data/misc/elliptic_curves/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, python2 +, python3 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export SAGE_SHARE="$out/share" export PYTHONPATH=$PWD - ${python2.interpreter} ${spkg-install} + ${python3.interpreter} ${spkg-install} ''; meta = with lib; { |