pyrox.dev
singular: replace local patches by upstream ones
+19
-10
pkgs/applications/science/math/singular/default.nix
+19
-10
pkgs/applications/science/math/singular/default.nix
···
31
owner = "Singular";
32
repo = "Singular";
33
34
-
# 4.2.0p2 is not tagged, but the tarball matches commit
35
-
# 6f68939ddf612d96e3caaaaa8275f77613ac1da8. the commit below has
36
-
# two extra fixes.
37
-
rev = "3cda50c00a849455efa2502e56596955491a353a";
38
-
sha256 = "sha256-OizPhGE6L2LTOrKfeDdDB6BSdvYkDVXvbbYjV14hnHM=";
39
40
# if a release is tagged it will be in the format below.
41
# rev = "Release${lib.replaceStrings ["."] ["-"] version}";
···
60
# https://github.com/alsa-project/alsa-firmware/issues/3 for a
61
# related issue.
62
./use-older-ax-prog-cc-for-build.patch
63
] ++ lib.optionals enableDocs [
64
# singular supports building without 4ti2, bertini, normaliz or
65
# topcom just fine, but the docbuilding does not skip manual pages
···
67
# doc2tex.pl::HandleLib, since it seems to ignore "-exclude"
68
# argumens). skip them manually.
69
./disable-docs-for-optional-unpackaged-deps.patch
70
];
71
72
configureFlags = [
···
83
substituteInPlace Tst/regress.cmd --replace 'mysystem_catch("hostname")' 'nix_test_runner'
84
85
patchShebangs .
86
-
'' + lib.optionalString enableDocs ''
87
-
# work around encoding problem
88
-
sed -i -e 's/\xb7/@cdot{}/g' doc/decodegb.doc
89
'';
90
91
# For reference (last checked on commit 75f460d):
···
149
150
# singular tests are a bit complicated, see
151
# https://github.com/Singular/Singular/tree/spielwiese/Tst
152
-
# https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773
153
testsToRun = [
154
"Old/universal.lst"
155
"Buch/buch.lst"
···
181
2>"$TMPDIR/out-err.log"
182
183
# unfortunately regress.cmd always returns exit code 0, so check stderr
184
-
# https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773
185
if [[ -s "$TMPDIR/out-err.log" ]]; then
186
cat "$TMPDIR/out-err.log"
187
exit 1
···
31
owner = "Singular";
32
repo = "Singular";
33
34
+
# 4.2.0p2 is not tagged, but the tarball matches the commit below.
35
+
rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8";
36
+
sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8=";
37
38
# if a release is tagged it will be in the format below.
39
# rev = "Release${lib.replaceStrings ["."] ["-"] version}";
···
58
# https://github.com/alsa-project/alsa-firmware/issues/3 for a
59
# related issue.
60
./use-older-ax-prog-cc-for-build.patch
61
+
62
+
# https://github.com/Singular/Singular/issues/1086
63
+
(fetchpatch {
64
+
name = "schubert-lib-fails-with-too-many-cpus.patch";
65
+
url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch";
66
+
sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA=";
67
+
})
68
] ++ lib.optionals enableDocs [
69
# singular supports building without 4ti2, bertini, normaliz or
70
# topcom just fine, but the docbuilding does not skip manual pages
···
72
# doc2tex.pl::HandleLib, since it seems to ignore "-exclude"
73
# argumens). skip them manually.
74
./disable-docs-for-optional-unpackaged-deps.patch
75
+
76
+
# fix some non-ascii characters in doc/decodegb.doc
77
+
(fetchpatch {
78
+
name = "decodegb-ascii.patch";
79
+
url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch";
80
+
sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw=";
81
+
})
82
];
83
84
configureFlags = [
···
95
substituteInPlace Tst/regress.cmd --replace 'mysystem_catch("hostname")' 'nix_test_runner'
96
97
patchShebangs .
98
'';
99
100
# For reference (last checked on commit 75f460d):
···
158
159
# singular tests are a bit complicated, see
160
# https://github.com/Singular/Singular/tree/spielwiese/Tst
161
+
# https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773
162
testsToRun = [
163
"Old/universal.lst"
164
"Buch/buch.lst"
···
190
2>"$TMPDIR/out-err.log"
191
192
# unfortunately regress.cmd always returns exit code 0, so check stderr
193
+
# https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773
194
if [[ -s "$TMPDIR/out-err.log" ]]; then
195
cat "$TMPDIR/out-err.log"
196
exit 1