tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gap: 4.11.0 -> 4.11.1
Mauricio Collares
4 years ago
2a95fe1a
ca26ea50
+4
-35
2 changed files
expand all
collapse all
unified
split
pkgs
applications
science
math
gap
default.nix
mark-genstackfuncbags-as-noinline.patch
+4
-22
pkgs/applications/science/math/gap/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchurl
4
4
-
, fetchpatch
5
4
, makeWrapper
6
5
, readline
7
6
, gmp
···
35
34
"autpgrp-*"
36
35
"alnuth-*"
37
36
"crisp-*"
38
38
-
"ctbllib"
37
37
+
"ctbllib-*"
39
38
"FactInt-*"
40
39
"fga"
41
40
"irredsol-*"
···
62
61
stdenv.mkDerivation rec {
63
62
pname = "gap";
64
63
# https://www.gap-system.org/Releases/
65
65
-
version = "4.11.0";
64
64
+
version = "4.11.1";
66
65
67
66
src = fetchurl {
68
68
-
url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
69
69
-
sha256 = "sha256-vwcKENwqxgWT/mXfD4c9ctTWdQHobrJipva9SPyGhgI=";
67
67
+
url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
68
68
+
sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ=";
70
69
};
71
70
72
71
# remove all non-essential packages (which take up a lot of space)
···
82
81
83
82
nativeBuildInputs = [
84
83
makeWrapper
85
85
-
];
86
86
-
87
87
-
patches = [
88
88
-
# Fix for locale specific tests causing issues. Already upstream.
89
89
-
# Backport of https://github.com/gap-system/gap/pull/4022
90
90
-
(fetchpatch {
91
91
-
name = "remove-locale-specific-tests.patch";
92
92
-
url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch";
93
93
-
sha256 = "sha256-De+T9Y7ewRT6plJrj2VR8axRvD/JCTYKOBWB7Bw0oq0=";
94
94
-
})
95
95
-
96
96
-
# fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965
97
97
-
(fetchpatch {
98
98
-
name = "mark-genstackfuncbags-as-noinline.patch";
99
99
-
url = "https://github.com/gap-system/gap/commit/f0a8f49ff8dad0a5fa77253d45457c6f40f96778.patch";
100
100
-
sha256 = "sha256-GU9tOP1stX2vn8m8kXOBupEpxIYArA76ibKL8eLn0MY=";
101
101
-
})
102
84
];
103
85
104
86
# "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min.
-13
pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch
···
1
1
-
diff --git a/src/gasman.c b/src/gasman.c
2
2
-
index 417811401..314a74190 100644
3
3
-
--- a/src/gasman.c
4
4
-
+++ b/src/gasman.c
5
5
-
@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void )
6
6
-
#endif
7
7
-
8
8
-
9
9
-
-void GenStackFuncBags ( void )
10
10
-
+NOINLINE void GenStackFuncBags ( void )
11
11
-
{
12
12
-
Bag * top; /* top of stack */
13
13
-
Bag * p; /* loop variable */