Unverified Commit 03eff4d9 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #178456 from collares/eclib-20220621 

eclib: 20210625 -> 20220621
parents 2a41e4f3 55a53e1d

pkgs/applications/science/math/sage/sage-src.nix

+7 −0
Original line number Diff line number Diff line
@@ -117,6 +117,13 @@ stdenv.mkDerivation rec { 
    # 5.0 hits nixpkgs.

    # https://github.com/sphinx-doc/sphinx/pull/10372

    ./patches/docutils-0.18.1-deprecation.patch



    (fetchSageDiff {

      name = "eclib-20220621-update.patch";

      base = "9.7.beta4";

      rev = "9b65d73399b33043777ba628a4d318638aec6e0e";

      sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI=";

    })

  ];



  patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

pkgs/development/libraries/eclib/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ assert withFlint -> flint != null; 


stdenv.mkDerivation rec {

  pname = "eclib";

  version = "20210625"; # upgrade might break the sage interface

  version = "20220621"; # upgrade might break the sage interface

  # sage tests to run:

  # src/sage/interfaces/mwrank.py

  # src/sage/libs/eclib
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 
    # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561

    # for upstream's explanation of the above

    url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2";

    sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA=";

    sha256 = "sha256-EfoCNhnXGuN5SxgPFES4BaevhSRzU1JvT3ARq9NMJhM=";

  };

  buildInputs = [

    pari