diff options
author | Mauricio Collares <mauricio@collares.org> | 2024-01-02 13:18:11 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-02 13:18:11 -0300 |
commit | 24954c2e7388e46a48d71a82e612d49f6bee35d6 (patch) | |
tree | 345570ac0baee9aa0c192d8c6c171688fc0811b9 /pkgs/applications/science | |
parent | 4a010834c722aaefc05e3c4520e258a006d26305 (diff) | |
parent | 2c045c78900d6e388cac68ece0e8df0126b972b9 (diff) | |
download | nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.tar nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.tar.gz nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.tar.bz2 nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.tar.lz nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.tar.xz nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.tar.zst nixlib-24954c2e7388e46a48d71a82e612d49f6bee35d6.zip |
Merge pull request #278257 from nevivurn/fix/sage-ecl
sage: import 10.2.beta3 patches
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 97754c04d95c..96b1adb562f4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -131,6 +131,20 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/461727b453712550a2c5dc0ae11933523255aaed.diff"; sha256 = "sha256-mC8084VQoUBk4hocALF+Y9Cwb38Zt360eldi/SSjna8="; }) + + # https://github.com/sagemath/sage/pull/36218, landed in 10.2.beta3 + (fetchpatch { + name = "sageenv-disable-file-validation.patch"; + url = "https://github.com/sagemath/sage/commit/31a764f4a9ec54d3ea970aa9514a088c4e603ebd.diff"; + sha256 = "sha256-NhYUTTmYlyjss3eS8HZXP8U11TElQY0cv6KW4wBOaJY="; + }) + + # https://github.com/sagemath/sage/pull/36235, landed in 10.2.beta3 + (fetchpatch { + name = "ecl-23.9.9.patch"; + url = "https://github.com/sagemath/sage/commit/b6b50a80e9660c002d069019f5b8f04e9324a423.diff"; + sha256 = "sha256-nF+5oKad1VYms6Dxr1t9/V0XBkoMfhy0KCY/ZPddrm0="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |