diff options
| author | Mauricio Collares <mauricio@collares.org> | 2021-05-05 09:02:19 -0300 |
|---|---|---|
| committer | Mauricio Collares <mauricio@collares.org> | 2021-05-11 16:49:10 -0300 |
| commit | 2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12 (patch) | |
| tree | 39a6be04a8a6adc0577562847326756634220c56 | |
| parent | ca26ea50d66737922d0edfaaf07449576ece7f8c (diff) | |
| download | nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.tar nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.tar.gz nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.tar.bz2 nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.tar.lz nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.tar.xz nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.tar.zst nixpkgs-2a95fe1aea19e6f93a0c8553df0d3504ebbe5e12.zip | |
gap: 4.11.0 -> 4.11.1
| -rw-r--r-- | pkgs/applications/science/math/gap/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch | 13 |
2 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 3b3d8a58b56..c309423f142 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , makeWrapper , readline , gmp @@ -35,7 +34,7 @@ let "autpgrp-*" "alnuth-*" "crisp-*" - "ctbllib" + "ctbllib-*" "FactInt-*" "fga" "irredsol-*" @@ -62,11 +61,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { - url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; - sha256 = "sha256-vwcKENwqxgWT/mXfD4c9ctTWdQHobrJipva9SPyGhgI="; + url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; + sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ="; }; # remove all non-essential packages (which take up a lot of space) @@ -84,23 +83,6 @@ stdenv.mkDerivation rec { makeWrapper ]; - patches = [ - # Fix for locale specific tests causing issues. Already upstream. - # Backport of https://github.com/gap-system/gap/pull/4022 - (fetchpatch { - name = "remove-locale-specific-tests.patch"; - url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch"; - sha256 = "sha256-De+T9Y7ewRT6plJrj2VR8axRvD/JCTYKOBWB7Bw0oq0="; - }) - - # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965 - (fetchpatch { - name = "mark-genstackfuncbags-as-noinline.patch"; - url = "https://github.com/gap-system/gap/commit/f0a8f49ff8dad0a5fa77253d45457c6f40f96778.patch"; - sha256 = "sha256-GU9tOP1stX2vn8m8kXOBupEpxIYArA76ibKL8eLn0MY="; - }) - ]; - # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. # tests are run twice, once with all packages loaded and once without # checkTarget = "teststandard"; diff --git a/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch b/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch deleted file mode 100644 index 3a2f7231c09..00000000000 --- a/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gasman.c b/src/gasman.c -index 417811401..314a74190 100644 ---- a/src/gasman.c -+++ b/src/gasman.c -@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void ) - #endif - - --void GenStackFuncBags ( void ) -+NOINLINE void GenStackFuncBags ( void ) - { - Bag * top; /* top of stack */ - Bag * p; /* loop variable */ |