mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-17 12:50:04 +00:00
Compare commits
521 Commits
nixos-unst
...
haskell-up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b8bfd98b3a | ||
|
|
520aab6a26 | ||
|
|
3257a290dd | ||
|
|
d3194c02c2 | ||
|
|
100186c249 | ||
|
|
3e2b669b13 | ||
|
|
41461f1b1c | ||
|
|
c571020cc0 | ||
|
|
f02bd24925 | ||
|
|
30ab336cd4 | ||
|
|
e30dfca943 | ||
|
|
8c8052288c | ||
|
|
7ef1f0bfde | ||
|
|
6fb79dc3cb | ||
|
|
846e516b73 | ||
|
|
c5707a7bd4 | ||
|
|
c07bc6e2f8 | ||
|
|
d9ed937db7 | ||
|
|
a6a2a1796a | ||
|
|
1017eafaf5 | ||
|
|
bc74f4015d | ||
|
|
2478965db4 | ||
|
|
1217001b63 | ||
|
|
3d35b67b0b | ||
|
|
3737770316 | ||
|
|
077581beda | ||
|
|
5c8de9484d | ||
|
|
0f4a29c798 | ||
|
|
397345d386 | ||
|
|
1dec9ab545 | ||
|
|
9cc5499bf1 | ||
|
|
375374b719 | ||
|
|
98080383d3 | ||
|
|
a449f3a268 | ||
|
|
68c6dae79d | ||
|
|
67bf9043b1 | ||
|
|
318e2a9e8f | ||
|
|
d839a79f6e | ||
|
|
731d505530 | ||
|
|
85d8611633 | ||
|
|
369737df40 | ||
|
|
b14808e380 | ||
|
|
475d4aa27e | ||
|
|
1c34c7f6c3 | ||
|
|
885ed3ec18 | ||
|
|
37e4c5dee5 | ||
|
|
d2c12646d0 | ||
|
|
ed523f3d76 | ||
|
|
0a923a21a2 | ||
|
|
7defa9ebc8 | ||
|
|
16d284469f | ||
|
|
511d1e0bfb | ||
|
|
54f26e6ec5 | ||
|
|
2feca18139 | ||
|
|
146cf8edd7 | ||
|
|
3ed2c7e787 | ||
|
|
88efbce838 | ||
|
|
9aa7e277d0 | ||
|
|
e40ee4b4fa | ||
|
|
f302f038e1 | ||
|
|
6be6cc9ccf | ||
|
|
5c7097d108 | ||
|
|
c78a4b5429 | ||
|
|
c84a36caab | ||
|
|
435e9b05fe | ||
|
|
574feb33c5 | ||
|
|
28bfecf41a | ||
|
|
92e8b1811e | ||
|
|
a7b06e028f | ||
|
|
022a0ad933 | ||
|
|
a0439ec2ba | ||
|
|
d36781e24d | ||
|
|
dd065049af | ||
|
|
29d2812b7e | ||
|
|
3767c91f9a | ||
|
|
8b9a673c1c | ||
|
|
405a54987e | ||
|
|
50ba83bd2d | ||
|
|
a01c66acaf | ||
|
|
d3b8be81a8 | ||
|
|
467d528969 | ||
|
|
0b8ba6744d | ||
|
|
875a3a5dbe | ||
|
|
40b76b77e7 | ||
|
|
dcbf4fd862 | ||
|
|
af25c7891d | ||
|
|
ecc90485e0 | ||
|
|
582a47d164 | ||
|
|
35bbabcc81 | ||
|
|
02f183acd1 | ||
|
|
3fb2ae8756 | ||
|
|
c022230402 | ||
|
|
0d161d6bf7 | ||
|
|
401a7b2ea1 | ||
|
|
24d928ae66 | ||
|
|
6e8192fc92 | ||
|
|
2e8fa702e3 | ||
|
|
b228fd3bc9 | ||
|
|
14d9e11267 | ||
|
|
c745615671 | ||
|
|
1c75264348 | ||
|
|
ebb10ffb74 | ||
|
|
abb4be61e6 | ||
|
|
4479c174f3 | ||
|
|
f3c6c12566 | ||
|
|
f3f3cd0559 | ||
|
|
d174047339 | ||
|
|
257e6594e1 | ||
|
|
653400d170 | ||
|
|
65bb1f6dc7 | ||
|
|
e7bb4f9d44 | ||
|
|
8b35ab5a46 | ||
|
|
b91a28c831 | ||
|
|
135ddd3065 | ||
|
|
dfe7bd1c25 | ||
|
|
af7c2eea09 | ||
|
|
8c4ee9bc8c | ||
|
|
a9a8567628 | ||
|
|
e021218908 | ||
|
|
8175001f58 | ||
|
|
d6d0eb9bcd | ||
|
|
4111be5b73 | ||
|
|
37ecebb9e4 | ||
|
|
8597ae6ab7 | ||
|
|
8bf9cb3ab6 | ||
|
|
1027cca0b0 | ||
|
|
e665ed3e2d | ||
|
|
bff137ddc7 | ||
|
|
2d1fe98d85 | ||
|
|
41d990226a | ||
|
|
a007df4e16 | ||
|
|
2b2a0aac02 | ||
|
|
86922aed38 | ||
|
|
dd516856e6 | ||
|
|
928b7bc0fb | ||
|
|
7554ac32f6 | ||
|
|
854435d497 | ||
|
|
667abdf0a6 | ||
|
|
5cbd2e121e | ||
|
|
2bfd7ae693 | ||
|
|
c7c781f9ad | ||
|
|
3ad3df3213 | ||
|
|
76ae1ad467 | ||
|
|
72169cece3 | ||
|
|
cfda1c7ca7 | ||
|
|
f6a92561fc | ||
|
|
9745c05cf8 | ||
|
|
c94f146ea5 | ||
|
|
6c41d523f9 | ||
|
|
944495f675 | ||
|
|
3314fcd1d2 | ||
|
|
d78e1df3ac | ||
|
|
0c42aa2b8b | ||
|
|
b9f877b238 | ||
|
|
11e0f4c678 | ||
|
|
179eff5553 | ||
|
|
e7f659cb57 | ||
|
|
edee302be2 | ||
|
|
677378b435 | ||
|
|
51f3af4a42 | ||
|
|
de6e972b4f | ||
|
|
375f55b9dc | ||
|
|
b21c1bfba8 | ||
|
|
64cad13777 | ||
|
|
cea0d6d290 | ||
|
|
cbc29ba88a | ||
|
|
329a84bda4 | ||
|
|
039e7d4321 | ||
|
|
895aa19bba | ||
|
|
0e4dda44be | ||
|
|
3ba16f9b5e | ||
|
|
3df67b93de | ||
|
|
8ed8d7cd2f | ||
|
|
2f153b164f | ||
|
|
f4290a712d | ||
|
|
8125c8f952 | ||
|
|
8fb5f5f8a0 | ||
|
|
fc0af5e28b | ||
|
|
a9d59c8d18 | ||
|
|
13e05d0bc2 | ||
|
|
8f7c86887d | ||
|
|
b29c6b8f9c | ||
|
|
55bbb3b7c9 | ||
|
|
b04bb80014 | ||
|
|
93cb8fb139 | ||
|
|
0100807fdc | ||
|
|
89e7632843 | ||
|
|
2c5eb85631 | ||
|
|
6d4cf664be | ||
|
|
8b057c40b5 | ||
|
|
754e7391d2 | ||
|
|
1f46410e29 | ||
|
|
ffd5c0f686 | ||
|
|
b3d151a51a | ||
|
|
2f89f5073d | ||
|
|
c4be39b04d | ||
|
|
c3f4056d8d | ||
|
|
b455c9d332 | ||
|
|
e1647a36da | ||
|
|
3f450dd19b | ||
|
|
841b8f5979 | ||
|
|
4cd1cda986 | ||
|
|
ad3c53a521 | ||
|
|
5bf4154b18 | ||
|
|
b519de25a3 | ||
|
|
eaa79b902b | ||
|
|
79f8691e65 | ||
|
|
3aa4d2d68f | ||
|
|
c3d77c8517 | ||
|
|
5d1e564405 | ||
|
|
e58f85ec8d | ||
|
|
877e5290de | ||
|
|
4be3abfe1f | ||
|
|
5a6a8cded2 | ||
|
|
f25caecf7a | ||
|
|
dbb43d1da6 | ||
|
|
86b532d04c | ||
|
|
08f8496ff9 | ||
|
|
ab222dd942 | ||
|
|
bb0a89d397 | ||
|
|
b6af5b43ea | ||
|
|
14328fc8f6 | ||
|
|
7ad02aa7c0 | ||
|
|
311763be2d | ||
|
|
36a316ea88 | ||
|
|
2a38509e0f | ||
|
|
8707585398 | ||
|
|
790c31e061 | ||
|
|
1b8e493a4c | ||
|
|
58673d30d4 | ||
|
|
beccc5847a | ||
|
|
3adf419aa4 | ||
|
|
b52f4adde7 | ||
|
|
bd16497ad4 | ||
|
|
ffc266319e | ||
|
|
23f3cee192 | ||
|
|
fa192c1915 | ||
|
|
78d4679404 | ||
|
|
a05b62f756 | ||
|
|
2e37254a0d | ||
|
|
e1f0c80964 | ||
|
|
3ae4f100fa | ||
|
|
b92b966ae0 | ||
|
|
3f0da4e5f2 | ||
|
|
338603c0d4 | ||
|
|
3c1773c843 | ||
|
|
826465b345 | ||
|
|
ad05226f3d | ||
|
|
9da5406197 | ||
|
|
21dcddba97 | ||
|
|
f8b6781bea | ||
|
|
e83add3066 | ||
|
|
d4fadf1842 | ||
|
|
48ea35d0b8 | ||
|
|
5903a7f72d | ||
|
|
a428929e72 | ||
|
|
d6499c4e3c | ||
|
|
9728ac8f06 | ||
|
|
1ae532eb77 | ||
|
|
5df69cc621 | ||
|
|
6046acb728 | ||
|
|
87283c7045 | ||
|
|
ea31f133da | ||
|
|
5a5cd26432 | ||
|
|
d47687c04d | ||
|
|
08f0950a50 | ||
|
|
f4c6e009f9 | ||
|
|
a1beaf2803 | ||
|
|
3594aefa35 | ||
|
|
3b19ff96a1 | ||
|
|
19573606e8 | ||
|
|
7632f2c418 | ||
|
|
b393efc343 | ||
|
|
eef2380c20 | ||
|
|
e3c24ee8db | ||
|
|
116208d9cf | ||
|
|
a332844436 | ||
|
|
86ed8342de | ||
|
|
31f495afe9 | ||
|
|
da941382a6 | ||
|
|
920b50911d | ||
|
|
43159787fd | ||
|
|
a603053a30 | ||
|
|
5865c4be2c | ||
|
|
b72ec6bdee | ||
|
|
c818fb7e53 | ||
|
|
88daa4b688 | ||
|
|
d82c0d269e | ||
|
|
0b6b59708c | ||
|
|
9220258efb | ||
|
|
a8560ee995 | ||
|
|
cfdc80cdd7 | ||
|
|
523ffbe971 | ||
|
|
3aed88a715 | ||
|
|
1c3465fcb7 | ||
|
|
54112f9a6b | ||
|
|
92cbc9ca81 | ||
|
|
6a3c990a99 | ||
|
|
39ee207b1d | ||
|
|
d64edb78f9 | ||
|
|
54726cb9e3 | ||
|
|
b7659cdb62 | ||
|
|
bcf85400c4 | ||
|
|
e3927c07f7 | ||
|
|
8486e8a7b3 | ||
|
|
4f0970401a | ||
|
|
9959ce2f44 | ||
|
|
3f085fe61c | ||
|
|
f61423d87c | ||
|
|
4aeebf57da | ||
|
|
4c7647a6d3 | ||
|
|
afda14f1d4 | ||
|
|
e9af2ed4be | ||
|
|
2735e861f0 | ||
|
|
92ca07b6a5 | ||
|
|
e82d6b924f | ||
|
|
94aa8f8960 | ||
|
|
75496eb67a | ||
|
|
9c55dbeccf | ||
|
|
cef090d1ab | ||
|
|
4132fb9736 | ||
|
|
98c655c09a | ||
|
|
3f49232af6 | ||
|
|
7100632254 | ||
|
|
b078be0041 | ||
|
|
92779d4478 | ||
|
|
070e7a021f | ||
|
|
71b5964ed6 | ||
|
|
00a35c51c7 | ||
|
|
dbd129b241 | ||
|
|
26066e1e2b | ||
|
|
60f1d07046 | ||
|
|
a5e06de0c4 | ||
|
|
8833922b3e | ||
|
|
d0e8fdd1bd | ||
|
|
9122c84035 | ||
|
|
f479cbacab | ||
|
|
f87fabdc91 | ||
|
|
f94cecf640 | ||
|
|
fc0932307c | ||
|
|
ffbec19b05 | ||
|
|
435e7264b6 | ||
|
|
480f0726e7 | ||
|
|
4d0ae93287 | ||
|
|
81ef0ce73b | ||
|
|
24211dd381 | ||
|
|
8b99224c3e | ||
|
|
d56383f426 | ||
|
|
2836c4b1f4 | ||
|
|
16a3b0c7d9 | ||
|
|
7db16b7a40 | ||
|
|
85b5c86354 | ||
|
|
3f6c25ad80 | ||
|
|
a8988fede0 | ||
|
|
68f69e8b05 | ||
|
|
9bbb567bb9 | ||
|
|
5f8a3af9eb | ||
|
|
b25e3e8489 | ||
|
|
a220c38f46 | ||
|
|
fdbcfd8b47 | ||
|
|
eff6c0e60e | ||
|
|
5a03008b47 | ||
|
|
6dd4da168b | ||
|
|
4cbc2251c7 | ||
|
|
a8233a24e1 | ||
|
|
da4f3989f0 | ||
|
|
e0497b3d10 | ||
|
|
a49c815e3d | ||
|
|
f213d6af36 | ||
|
|
aba749b3bb | ||
|
|
e64658550c | ||
|
|
07d2edc929 | ||
|
|
b52ea84a40 | ||
|
|
f394a62a65 | ||
|
|
ad66699b02 | ||
|
|
084d450fa7 | ||
|
|
ec138222f7 | ||
|
|
5a13f175d1 | ||
|
|
117625921f | ||
|
|
2c44031fe0 | ||
|
|
d34ba4d817 | ||
|
|
e34ce374a1 | ||
|
|
a00be59a94 | ||
|
|
ab20ff9b2f | ||
|
|
f5ac7ff926 | ||
|
|
995d34a153 | ||
|
|
9208b19946 | ||
|
|
9029909ba3 | ||
|
|
b82be3afe6 | ||
|
|
248b70dc3b | ||
|
|
0baca65faa | ||
|
|
b1528a1baf | ||
|
|
200316c491 | ||
|
|
3c4f10205c | ||
|
|
827c840fb1 | ||
|
|
095f6729ca | ||
|
|
1352e67378 | ||
|
|
0814616eaf | ||
|
|
f70431ea67 | ||
|
|
8383c3f904 | ||
|
|
cac8c10692 | ||
|
|
739281cf7a | ||
|
|
ef5a2561e3 | ||
|
|
a5f1afdf0f | ||
|
|
cbe86ed815 | ||
|
|
5617c0ba47 | ||
|
|
caf8327196 | ||
|
|
89b9cdcbba | ||
|
|
3c3354afa3 | ||
|
|
8cc9c34bcb | ||
|
|
8c3d964e79 | ||
|
|
cadaf97e4e | ||
|
|
593c21a56a | ||
|
|
6306c15610 | ||
|
|
884892c2c1 | ||
|
|
627dd785ad | ||
|
|
180157dfa4 | ||
|
|
0d1190abf7 | ||
|
|
c24d964453 | ||
|
|
9ec4c8e1b6 | ||
|
|
b32a192bcf | ||
|
|
338f88c94a | ||
|
|
a262ae9474 | ||
|
|
9f367b9af0 | ||
|
|
9227423f57 | ||
|
|
79b85a6061 | ||
|
|
07837352f5 | ||
|
|
422b020e60 | ||
|
|
d58b43bad8 | ||
|
|
e4e45c45d7 | ||
|
|
a0811c1859 | ||
|
|
41dec8b399 | ||
|
|
4b9529d490 | ||
|
|
eca559367a | ||
|
|
d217b14de6 | ||
|
|
5aafdde3a0 | ||
|
|
9eb68607ef | ||
|
|
430963bdf1 | ||
|
|
4ca20a7582 | ||
|
|
39ad1cb021 | ||
|
|
6ad984ce3d | ||
|
|
8b0587a6d1 | ||
|
|
668847dd15 | ||
|
|
40f0c70593 | ||
|
|
265fda252f | ||
|
|
e1eeed9ea6 | ||
|
|
d3928686c3 | ||
|
|
fb629a8712 | ||
|
|
1fa9545db7 | ||
|
|
7b203a8cdf | ||
|
|
3080e495c5 | ||
|
|
41a68a1180 | ||
|
|
2c84961290 | ||
|
|
eb378a86bf | ||
|
|
b8880df8ac | ||
|
|
79a87d6750 | ||
|
|
61b9e0b5f4 | ||
|
|
2cb1137ad8 | ||
|
|
dc341cc322 | ||
|
|
7ef227eef6 | ||
|
|
df2259de34 | ||
|
|
fbfe792c92 | ||
|
|
18c743b5c9 | ||
|
|
1912d24658 | ||
|
|
8b3bed966a | ||
|
|
8ca5572327 | ||
|
|
f1cd3a542b | ||
|
|
28ea7d3e94 | ||
|
|
015d2be85f | ||
|
|
dcd5f66215 | ||
|
|
c990defdc1 | ||
|
|
ef80ea96c0 | ||
|
|
70b3bb6148 | ||
|
|
9f87b41bbc | ||
|
|
9eab5d0982 | ||
|
|
31b3654bd0 | ||
|
|
fd7118d37f | ||
|
|
3f0c2996b0 | ||
|
|
58545c6507 | ||
|
|
bd20e4d544 | ||
|
|
40fdae7a02 | ||
|
|
4dfddc5e2d | ||
|
|
a42cf3de47 | ||
|
|
98472212df | ||
|
|
1166f6d5fe | ||
|
|
3100f81d11 | ||
|
|
cfae19b0e2 | ||
|
|
4c79be7954 | ||
|
|
a5d168008d | ||
|
|
8960ba3747 | ||
|
|
4bac4c007b | ||
|
|
449e33902d | ||
|
|
cfb525e8c7 | ||
|
|
90e108c717 | ||
|
|
a9c7731b36 | ||
|
|
0e972a63ef | ||
|
|
db6cdf8674 | ||
|
|
83742b85ed | ||
|
|
7fe7f911c5 | ||
|
|
379b9966b6 | ||
|
|
8e147a7423 | ||
|
|
e78b52efb2 | ||
|
|
9db26c0d78 | ||
|
|
44c90f8b11 | ||
|
|
6ae08b4b8c | ||
|
|
e71086f1ad | ||
|
|
a9a7b4af3b | ||
|
|
6e6ee420cc | ||
|
|
4f5821131d | ||
|
|
7c90da01b9 | ||
|
|
87258e4b4c | ||
|
|
07855b2421 | ||
|
|
0ec79f0885 | ||
|
|
9adad48243 | ||
|
|
2e0690adfb | ||
|
|
e9724bc92f | ||
|
|
3b2f54505e | ||
|
|
5498d6a4fe | ||
|
|
b0f9043b9f | ||
|
|
fcd62a690f | ||
|
|
fe8e3efa4f |
@@ -562,6 +562,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
```
|
||||
|
||||
##### `fetchYarnDeps` arguments {#javascript-fetchyarndeps}
|
||||
|
||||
`fetchYarnDeps` accepts the following arguments:
|
||||
|
||||
- `yarnLock`: Path to the `yarn.lock` file to fetch dependencies for.
|
||||
- `hash` (or `sha256`): The output hash of the offline cache.
|
||||
- `mirrorUrl`: Optional registry mirror URL used in place of the default yarn
|
||||
registry (`https://registry.yarnpkg.com/`). When set, any resolved URL
|
||||
pointing at the default registry is rewritten to use this mirror before
|
||||
downloading. This is useful for pointing at a local or internal registry
|
||||
mirror. Note that changing the mirror does not change the output hash, since
|
||||
the downloaded contents are identical.
|
||||
|
||||
```nix
|
||||
{
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
mirrorUrl = "https://registry.npmmirror.com/";
|
||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
##### `yarnConfigHook` arguments {#javascript-yarnconfighook}
|
||||
|
||||
By default, `yarnConfigHook` relies upon the attribute `${yarnOfflineCache}` (or `${offlineCache}` if the former is not set) to find the location of the offline cache produced by `fetchYarnDeps`. To disable this phase, you can set `dontYarnInstallDeps = true` or override the `configurePhase`.
|
||||
|
||||
@@ -3906,6 +3906,9 @@
|
||||
"javascript-yarn-v3-v4": [
|
||||
"index.html#javascript-yarn-v3-v4"
|
||||
],
|
||||
"javascript-fetchyarndeps": [
|
||||
"index.html#javascript-fetchyarndeps"
|
||||
],
|
||||
"javascript-yarnconfighook": [
|
||||
"index.html#javascript-yarnconfighook"
|
||||
],
|
||||
|
||||
39
maintainers/scripts/haskell/eval-pkg-sets.sh
Executable file
39
maintainers/scripts/haskell/eval-pkg-sets.sh
Executable file
@@ -0,0 +1,39 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash
|
||||
#!nix-shell -p jq git
|
||||
# shellcheck shell=bash
|
||||
#
|
||||
# Usage: eval-pkg-sets.sh [extra flags for nix-* commands ...]
|
||||
#
|
||||
# Must be executed in a git checkout of Nixpkgs.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
NIXPKGS="$(git rev-parse --show-toplevel)"
|
||||
PKGSETS="$(nix-env --readonly-mode --json --drv-path -f "$NIXPKGS" -qaP -A haskell.compiler "$@" \
|
||||
| jq -r 'to_entries | unique_by(.value.drvPath) .[] .key | sub("^haskell.compiler";"haskell.packages")')"
|
||||
|
||||
trap 'exit 1' SIGINT SIGTERM
|
||||
|
||||
set +e
|
||||
|
||||
badsets=""
|
||||
for set in $PKGSETS; do
|
||||
# Confirm an equivalent package set to haskell.compiler.$entry exists and is usable
|
||||
if ! nix-instantiate --readonly-mode -A "$set.ghc" "$@" > /dev/null 2>&1; then
|
||||
echo "Skipping $set... ($set.ghc does not evaluate)"
|
||||
else
|
||||
echo "Evaluating $set..."
|
||||
|
||||
if ! nix-env --readonly-mode -f "$NIXPKGS" -qaP --drv-path -A "$set" "$@" > /dev/null; then
|
||||
badsets+="$set "
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$badsets" ]; then
|
||||
echo "Found potential eval issues in the following sets:" >&2
|
||||
# shellcheck disable=SC2086
|
||||
printf '%s\n' $badsets
|
||||
exit 1
|
||||
fi
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
# Attention: For unknown reasons, the script can't be easily cancelled and needs to be killed manually if it shouldn't run to completion.
|
||||
|
||||
use std log
|
||||
use std/log
|
||||
|
||||
let broken_config = "pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml"
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ fi
|
||||
|
||||
# Stackage solver to use, LTS or Nightly
|
||||
# (should be capitalized like the display name)
|
||||
SOLVER=LTS
|
||||
SOLVER=Nightly
|
||||
# Stackage solver version, if any. Use latest if empty
|
||||
VERSION=
|
||||
TMP_TEMPLATE=update-stackage.XXXXXXX
|
||||
@@ -105,6 +105,7 @@ sed -r \
|
||||
-e '/ hledger-ui /d' \
|
||||
-e '/ hledger-web /d' \
|
||||
-e '/ spacecookie /d' \
|
||||
-e '/ hnix-store-core /d' \
|
||||
< "${tmpfile_new}" >> $stackage_config
|
||||
# Explanations:
|
||||
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
|
||||
|
||||
@@ -4,12 +4,8 @@
|
||||
package,
|
||||
...
|
||||
}:
|
||||
let
|
||||
mkTestName =
|
||||
pkg: "${pkg.pname}_${builtins.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor pkg.version)}";
|
||||
in
|
||||
{
|
||||
name = mkTestName package;
|
||||
name = package.pname;
|
||||
meta.maintainers = lib.teams.redis.members;
|
||||
|
||||
nodes = {
|
||||
|
||||
@@ -83,7 +83,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gimp";
|
||||
version = "3.2.4";
|
||||
version = "3.2.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-cxK8U+nG0tAFbKe5PxxrmHB5Rt2TT3FMIbh0bstgFYg=";
|
||||
hash = "sha256-QLFekK0MDGMbdto8Rn6phH+lwk83QTrFtJKASGCijNg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "153.0.8010.36",
|
||||
"version": "153.0.8010.47",
|
||||
"chromedriver": {
|
||||
"version": "153.0.8010.37",
|
||||
"hash_darwin": "sha256-IMyEnUmK3slNB/QDZ+vtUyzHyU0AB+L6+BMbpCRluYA=",
|
||||
"hash_darwin_aarch64": "sha256-cd1ZWatLQFIkPtCdVacrxFaFfj3rjG9qJ7kGlL3C6OA="
|
||||
"version": "153.0.8010.48",
|
||||
"hash_darwin": "sha256-/4yv3KWuvKNAro9oeK+PFsTOrg878yS11aDYSX5S890=",
|
||||
"hash_darwin_aarch64": "sha256-5eO1WwJ8iQrXUjHb776Z1YahR/A8aCoX7JrJXQEcIQ8="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
|
||||
"hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
|
||||
"rev": "73934a44f61e6b3878d1943064c141a5a820f5f7",
|
||||
"hash": "sha256-D7Oqukze3CzYVWN9AQq9zN6HN2GcZ6b7ZSqhM5bjvUU=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
|
||||
"hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
|
||||
"rev": "ed04c8113c6538f3e1264042da8cb4afd100369b",
|
||||
"hash": "sha256-mZrVJ/P3tPoiSkGBH4fEjNAexLsjAzts8jjkCQZ4kOs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -132,8 +132,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
|
||||
"hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
|
||||
"rev": "28ffc61fc935c599677cff4dddfa4a12209ce500",
|
||||
"hash": "sha256-6ySDyyQs/nfFF9AeoUY57GYDx7V8b0GQ17PCwQkzZVk="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -632,8 +632,8 @@
|
||||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
|
||||
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
|
||||
"rev": "15a6644ba1c45f1acc16ac1e883efc3e56c6bed2",
|
||||
"hash": "sha256-YJD9n8cxoqTrTQJHKuZFW2qnlNcNmh5rQlBpnlF46to="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
@@ -672,8 +672,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
|
||||
"hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
|
||||
"rev": "fca11a08da7c1ed3777b40b31611961c85c63c43",
|
||||
"hash": "sha256-iQNNgvRVUuyAcSVE+pNJWrWz0NJd/MZLxd9vbYztong="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -842,8 +842,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
|
||||
"hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
|
||||
"rev": "6b96683d44174e78ff4e65cb274bad56dc108231",
|
||||
"hash": "sha256-Oa1wzIbWVPX0x7adJVPUxQocK5gofG0vE56QTg0XKCs="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
@@ -853,7 +853,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "153.0.8010.36",
|
||||
"version": "153.0.8010.47",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "6411ed52842756261c66b6b8ece6b53ade2570f1",
|
||||
@@ -865,16 +865,16 @@
|
||||
"hash": "sha256-qvQ13Ws2tb4i2Hdu34kBHivYPAn8w06zjLdQgK4BIJg="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "153.0.8010.36-1",
|
||||
"hash": "sha256-JyvizS0oJC8J6VhtnpTKUGVbc31KCvTvwa4TmO+CHaY="
|
||||
"rev": "153.0.8010.47-1",
|
||||
"hash": "sha256-J/IiNmqJzL35TfiGbsqrXnI8lUizCWuxzVBHgo7cG80="
|
||||
},
|
||||
"npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "507c6ee3e2f3b2ca0e660547e5b9ea4820c67f4c",
|
||||
"hash": "sha256-q29a3PWQ7wMG4/JL9EyCK7EaDCeG+4Q/ruemOvvgeZM=",
|
||||
"rev": "73934a44f61e6b3878d1943064c141a5a820f5f7",
|
||||
"hash": "sha256-D7Oqukze3CzYVWN9AQq9zN6HN2GcZ6b7ZSqhM5bjvUU=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -944,8 +944,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "fca5efdfeff5daf430bc4458375c8d6b7e457400",
|
||||
"hash": "sha256-IoHQfdjZ6TV03VVzHZcxhPqGmNYNhKZrPG4BvQQfC7c="
|
||||
"rev": "ed04c8113c6538f3e1264042da8cb4afd100369b",
|
||||
"hash": "sha256-mZrVJ/P3tPoiSkGBH4fEjNAexLsjAzts8jjkCQZ4kOs="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -984,8 +984,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "225a7ba1bcb997d26de3e894e04fb341638e8c5a",
|
||||
"hash": "sha256-/ic1j1gu2wl5wCLCESfEcsLAPU5Dmsx8oKFb6RhYzg4="
|
||||
"rev": "28ffc61fc935c599677cff4dddfa4a12209ce500",
|
||||
"hash": "sha256-6ySDyyQs/nfFF9AeoUY57GYDx7V8b0GQ17PCwQkzZVk="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -1484,8 +1484,8 @@
|
||||
},
|
||||
"src/third_party/pthreadpool/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
|
||||
"rev": "02460584c6092e527c8b89f7df4de143d70e801f",
|
||||
"hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw="
|
||||
"rev": "15a6644ba1c45f1acc16ac1e883efc3e56c6bed2",
|
||||
"hash": "sha256-YJD9n8cxoqTrTQJHKuZFW2qnlNcNmh5rQlBpnlF46to="
|
||||
},
|
||||
"src/third_party/pyelftools": {
|
||||
"url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
|
||||
@@ -1524,8 +1524,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "4f574af2444846ceca4d277a8095c5d4229d175f",
|
||||
"hash": "sha256-HrpA4labNWXPWj/yiS9O8KjdQPwJOllmR5r66TwCjB0="
|
||||
"rev": "fca11a08da7c1ed3777b40b31611961c85c63c43",
|
||||
"hash": "sha256-iQNNgvRVUuyAcSVE+pNJWrWz0NJd/MZLxd9vbYztong="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -1694,8 +1694,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "f343157cebb388bfa416baccb5d35507e6fe8cc7",
|
||||
"hash": "sha256-zSCyFQpDMNygmV6N4TajL8VB5+VRynrMPV/wAiWsJO4="
|
||||
"rev": "6b96683d44174e78ff4e65cb274bad56dc108231",
|
||||
"hash": "sha256-Oa1wzIbWVPX0x7adJVPUxQocK5gofG0vE56QTg0XKCs="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
|
||||
@@ -104,6 +104,7 @@ in
|
||||
src ? null,
|
||||
hash ? "",
|
||||
sha256 ? "",
|
||||
mirrorUrl ? null,
|
||||
...
|
||||
}@args:
|
||||
let
|
||||
@@ -148,7 +149,9 @@ in
|
||||
|
||||
yarnLock=''${yarnLock:=$PWD/yarn.lock}
|
||||
mkdir -p $out
|
||||
(cd $out; prefetch-yarn-deps --verbose --builder $yarnLock)
|
||||
(cd $out; prefetch-yarn-deps --verbose --builder $yarnLock ${
|
||||
lib.optionalString (mirrorUrl != null) "--mirrorUrl ${lib.escapeShellArg mirrorUrl}"
|
||||
})
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -161,6 +164,7 @@ in
|
||||
"name"
|
||||
"hash"
|
||||
"sha256"
|
||||
"mirrorUrl"
|
||||
]
|
||||
++ (lib.optional (src == null) "src")
|
||||
))
|
||||
|
||||
@@ -21,15 +21,27 @@ const exec = async (...args) => {
|
||||
return res
|
||||
}
|
||||
|
||||
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1') => {
|
||||
const yarnRegistryUrl = 'https://registry.yarnpkg.com/';
|
||||
|
||||
function ensureTrailingSlash(str) {
|
||||
return str.endsWith('/') ? str : str + '/';
|
||||
}
|
||||
|
||||
const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha1', mirrorRegistryUrl = null) => {
|
||||
|
||||
const registryUrl =
|
||||
mirrorRegistryUrl && url.startsWith(yarnRegistryUrl)
|
||||
? url.replace(yarnRegistryUrl, ensureTrailingSlash(mirrorRegistryUrl))
|
||||
: url;
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const get = (url, redirects = 0) => https.get(url, (res) => {
|
||||
const get = (registryUrl, redirects = 0) => https.get(registryUrl, (res) => {
|
||||
if(redirects > 10) {
|
||||
reject('Too many redirects!');
|
||||
return;
|
||||
}
|
||||
if(res.statusCode === 301 || res.statusCode === 302) {
|
||||
const location = new URL(res.headers.location, url);
|
||||
const location = new URL(res.headers.location, registryUrl);
|
||||
if (verbose) console.log('following redirect to ' + location);
|
||||
return get(location, redirects + 1);
|
||||
}
|
||||
@@ -41,13 +53,13 @@ const downloadFileHttps = (fileName, url, expectedHash, verbose, hashType = 'sha
|
||||
file.close()
|
||||
const h = hash.read()
|
||||
if (expectedHash === undefined){
|
||||
console.log(`Warning: lockfile url ${url} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
|
||||
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`))
|
||||
console.log(`Warning: lockfile url ${registryUrl} doesn't end in "#<hash>" to validate against. Downloaded file had hash ${h}.`);
|
||||
} else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${registryUrl}`))
|
||||
resolve()
|
||||
})
|
||||
res.on('error', e => reject(e))
|
||||
})
|
||||
get(url)
|
||||
get(registryUrl)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -90,7 +102,7 @@ const isGitUrl = pattern => {
|
||||
return false
|
||||
}
|
||||
|
||||
const downloadPkg = (pkg, verbose) => {
|
||||
const downloadPkg = (pkg, verbose, mirrorUrl = null) => {
|
||||
for (let marker of ['@file:', '@link:']) {
|
||||
const split = pkg.key.split(marker)
|
||||
if (split.length == 2) {
|
||||
@@ -122,9 +134,9 @@ const downloadPkg = (pkg, verbose) => {
|
||||
} else if (url.startsWith('https://')) {
|
||||
if (typeof pkg.integrity === 'string' || pkg.integrity instanceof String) {
|
||||
const [ type, checksum ] = pkg.integrity.split('-')
|
||||
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type)
|
||||
return downloadFileHttps(fileName, url, Buffer.from(checksum, 'base64').toString('hex'), verbose, type, mirrorUrl)
|
||||
}
|
||||
return downloadFileHttps(fileName, url, hash, verbose)
|
||||
return downloadFileHttps(fileName, url, hash, verbose, 'sha1', mirrorUrl)
|
||||
} else if (url.startsWith('file:')) {
|
||||
console.warn(`ignoring unsupported file:path url "${url}"`)
|
||||
} else {
|
||||
@@ -155,11 +167,11 @@ const uniqueBy = (arr, callback) => {
|
||||
return [...map.values()]
|
||||
}
|
||||
|
||||
const prefetchYarnDeps = async (lockContents, verbose) => {
|
||||
const prefetchYarnDeps = async (lockContents, verbose, mirrorUrl) => {
|
||||
const lockData = lockfile.parse(lockContents)
|
||||
await performParallel(
|
||||
uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved)
|
||||
.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose))
|
||||
.map(([key, value]) => () => downloadPkg({ key, ...value }, verbose, mirrorUrl))
|
||||
)
|
||||
await fs.promises.writeFile('yarn.lock', lockContents)
|
||||
if (verbose) console.log('Done')
|
||||
@@ -173,18 +185,23 @@ Options:
|
||||
-h --help Show this help
|
||||
-v --verbose Verbose output
|
||||
--builder Only perform the download to current directory, then exit
|
||||
--mirrorUrl <url> Use the given registry mirror URL in place of the default
|
||||
yarn registry (${yarnRegistryUrl})
|
||||
`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const main = async () => {
|
||||
const args = process.argv.slice(2)
|
||||
let next, lockFile, verbose, isBuilder
|
||||
let next, lockFile, verbose, isBuilder, mirrorUrl
|
||||
while (next = args.shift()) {
|
||||
if (next == '--builder') {
|
||||
isBuilder = true
|
||||
} else if (next == '--verbose' || next == '-v') {
|
||||
verbose = true
|
||||
} else if (next == '--mirrorUrl') {
|
||||
mirrorUrl = args.shift()
|
||||
if (!mirrorUrl) showUsage()
|
||||
} else if (next == '--help' || next == '-h') {
|
||||
showUsage()
|
||||
} else if (!lockFile) {
|
||||
@@ -201,13 +218,13 @@ const main = async () => {
|
||||
}
|
||||
|
||||
if (isBuilder) {
|
||||
await prefetchYarnDeps(lockContents, verbose)
|
||||
await prefetchYarnDeps(lockContents, verbose, mirrorUrl)
|
||||
} else {
|
||||
const { stdout: tmpDir } = await exec('mktemp', [ '-d' ])
|
||||
|
||||
try {
|
||||
process.chdir(tmpDir.trim())
|
||||
await prefetchYarnDeps(lockContents, verbose)
|
||||
await prefetchYarnDeps(lockContents, verbose, mirrorUrl)
|
||||
const { stdout: hash } = await exec('nix-hash', [ '--type', 'sha256', '--base32', tmpDir.trim() ])
|
||||
console.log(hash)
|
||||
} finally {
|
||||
|
||||
@@ -9,6 +9,11 @@
|
||||
yarnLock = ./simple.lock;
|
||||
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
|
||||
};
|
||||
mirrorUrl = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./simple.lock;
|
||||
mirrorUrl = "https://registry.npmjs.com/";
|
||||
sha256 = "sha256-FRrt8BixleILmFB2ZV8RgPNLqgS+dlH5nWoPgeaaNQ8=";
|
||||
};
|
||||
gitDep = testers.invalidateFetcherByDrvHash fetchYarnDeps {
|
||||
yarnLock = ./git.lock;
|
||||
sha256 = "sha256-f90IiEzHDiBdswWewRBHcJfqqpPipaMg8N0DVLq2e8Q=";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.26.1";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bpftrace";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-h3gFnQq48oM5uK07xrykOCSJxhr6dqcyVUDoIKIRREY=";
|
||||
hash = "sha256-wYDSx2WngWS4Ucj82hLO0G46tiXhqskhMjmv7NuUVfw=";
|
||||
};
|
||||
|
||||
buildInputs = with llvmPackages; [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20260902";
|
||||
version = "20260915";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-Nu0SC9Qh4+wUzVCdo7m2z4pZH50FvCXehF3IiCoHXKM=";
|
||||
sha256 = "sha256-n538zzL8lRln6eLCJDivwh90RO2RZ7lykEDLVKV3Sa0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,27 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
buildGoModule,
|
||||
go,
|
||||
makeWrapper,
|
||||
writableTmpDirAsHomeHook,
|
||||
viceroy,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "16.0.0";
|
||||
version = "16.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gVKlAbiznaRKwDpiyap4Q3mIhn/ZbnUIFwG3l01ZXQ8=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
# since it is not needed after that.
|
||||
hash = "sha256-xGp5Fa4ruHpc2YAAbrva0zurt4wxC6XRdSpMMQGEB7c=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
@@ -30,39 +26,34 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
"cmd/fastly"
|
||||
];
|
||||
subPackages = [ "cmd/fastly" ];
|
||||
|
||||
vendorHash = "sha256-U2Ix8ZKGCDrWUJFFXJaL+1EBTbqblWp8slhruHhouIc=";
|
||||
vendorHash = "sha256-JUYBaiAz91jv8QFrfjpHnY442+qK7T0VZJcC/rCGhD4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
# Flags as provided by the build automation of the project:
|
||||
# https://github.com/fastly/cli/blob/7844f9f54d56f8326962112b5534e5c40e91bf09/.goreleaser.yml#L14-L18
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${finalAttrs.version}"
|
||||
"-X github.com/fastly/cli/pkg/revision.Environment=release"
|
||||
"-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}"
|
||||
"-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}"
|
||||
];
|
||||
preBuild = ''
|
||||
cp ./.fastly/config.toml ./pkg/config/config.toml
|
||||
ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)"
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/fastly/cli/pkg/revision.AppVersion=v${finalAttrs.version}"
|
||||
"-X github.com/fastly/cli/pkg/revision.Environment=release"
|
||||
];
|
||||
|
||||
# must embed viceroy to prevent fetching binary release on `fastly compute serve` invocation
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/fastly --prefix PATH : ${lib.makeBinPath [ viceroy ]} \
|
||||
wrapProgram $out/bin/fastly \
|
||||
--prefix PATH : ${lib.makeBinPath [ viceroy ]} \
|
||||
--set FASTLY_VICEROY_USE_PATH 1
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
export HOME="$(mktemp -d)"
|
||||
installShellCompletion --cmd fastly \
|
||||
--bash <($out/bin/fastly --completion-script-bash) \
|
||||
--zsh <($out/bin/fastly --completion-script-zsh)
|
||||
@@ -75,6 +66,7 @@ buildGoModule (finalAttrs: {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
ereslibre
|
||||
stepbrobd
|
||||
];
|
||||
mainProgram = "fastly";
|
||||
};
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_11,
|
||||
nodejs-slim_latest,
|
||||
darwin,
|
||||
actool,
|
||||
copyDesktopItems,
|
||||
@@ -20,18 +19,17 @@
|
||||
let
|
||||
electron = electron_43;
|
||||
|
||||
# Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
|
||||
pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };
|
||||
pnpm = pnpm_11;
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "feishin";
|
||||
version = "1.15.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeffvli";
|
||||
repo = "feishin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw=";
|
||||
hash = "sha256-1ZIw5XiN+2EhpHmdvN0HxgMSvn4QvN9B+ZJ3RlPXhLw=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -48,7 +46,7 @@ buildNpmPackage (finalAttrs: {
|
||||
src
|
||||
;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-9uG0AxIBAmuIPywg3p9fFCXmRvM9zDLhWfluSLRnUXY=";
|
||||
hash = "sha256-ltpz4e5Vv2vxt/93M4+vHUFJZjwTRwb2zrwvl1Lqjo8=";
|
||||
};
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
@@ -65,7 +63,7 @@ buildNpmPackage (finalAttrs: {
|
||||
postPatch = ''
|
||||
# release/app dependencies are installed on preConfigure
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"postinstall": "electron-builder install-app-deps",' ""
|
||||
--replace-fail '"postinstall": "install-electron && electron-builder install-app-deps",' ""
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString (!webVersion) ''
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goss";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goss-org";
|
||||
repo = "goss";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GdkLasokpWegjK4kZzAskp1NGwcuMjrjjau75cEo8kg=";
|
||||
hash = "sha256-4DCPPeTL2x6mMpcP/cdyQWpqehGWkk7MWM7P93WzwCA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rf6Xt54y1BN2o90rDW0WvEm4H5pPfsZ786MXFjsAFaM=";
|
||||
vendorHash = "sha256-NlOS5APp9R45QpYKwP673pmN7CR+Ufz8LxWyMkrVeq0=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -34,12 +34,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gpu-screen-recorder-ui";
|
||||
version = "1.13.7";
|
||||
version = "1.13.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/gpu-screen-recorder-ui";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-liBdZDHI32ElTTsHAZekYKFgZY1eP7rz4u7tM4pkpZ4=";
|
||||
hash = "sha256-f4jTv3IS73NWStg1af20pGKlqwIN9K9ZyLjKUX9Tp3s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -109,13 +109,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "immich";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ufdMwERs1h+m2usMHztZicRXpI20BM+2PeOLBArXw1Y=";
|
||||
hash = "sha256-napG+EMZbbbeq7R8FtnuDsDwdpxItkwTVWztnw07DfA=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "itg3encore";
|
||||
version = "0-unstable-2026-08-10";
|
||||
version = "0-unstable-2026-09-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarkBahamut162";
|
||||
repo = "itg3encore";
|
||||
rev = "5427331ee20e496092680400481165c503d2123e";
|
||||
hash = "sha256-Hvqxhpdqxo32uXkuFGUqlNk8517ughE0mGBs1L9PsHY=";
|
||||
rev = "e5177b5829c4ef521c3552f55f9080a3561d6216";
|
||||
hash = "sha256-cnGfEBTJYEqDNCmR8Wcbetm2qhhgMCh1LpzXBKKXdvA=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,55 +1,55 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
|
||||
"@esbuild/aix-ppc64@npm:0.27.5": "48203e49df4995ab8ead9e8def96381931901db904cd174e5cdc9d034f70431276e8ed93305a13c22390041e6933ec19624435f6f7c34f8a767d5979c3c6e145",
|
||||
"@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
|
||||
"@esbuild/android-arm64@npm:0.27.5": "6cfcae790d0cec7a9bd29f539d05ad5a5715815177bb62231a95c3a8b2fb651b099e3eef76c6c0f174be83864b0a1b244474c071df36c028e407c2325015fa01",
|
||||
"@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6",
|
||||
"@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
|
||||
"@esbuild/android-arm@npm:0.27.5": "4f856f7e508393c7e722e444b26a60f093ed4dfd11def0cbae13034e60dca6b356c302430a9230644f4ae2fd4e5a9ae620a4b69fa98a12062190195af2e57ec1",
|
||||
"@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848",
|
||||
"@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
|
||||
"@esbuild/android-x64@npm:0.27.5": "116456a795deccd12917aa61599c5f0278b2399c7c936dd92b667a53f45f695ac316c61b1b3929c1dde177cee447b2cd5c6b16283aaec1fc80d317ef414a0442",
|
||||
"@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
|
||||
"@esbuild/darwin-arm64@npm:0.27.5": "09b3f3f85eb4cdc3f00582b360be6f904b27d62f390f25815e6a27843bdfd9f087372ddb0718c1010078b34e96df68d115ce562891121684dc28fedcc22cdac5",
|
||||
"@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
|
||||
"@esbuild/darwin-x64@npm:0.27.5": "0a81d707bbc05a2b2f6ffc3e21f1596a7346c737b13cf789b59d7e86cb4d355ee6389f7ba2965da142ff40913dce986d5f2a8dfa6c940e704a017f418d9d7384",
|
||||
"@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.5": "fc705c9f299bef59a584f78a1ac8e686b3598639d8ad565170db7704d116665bfd7b0760c2d5901e363f972133a77e92bcf3ace16726b61540582a09c82ff284",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
|
||||
"@esbuild/freebsd-x64@npm:0.27.5": "bacab4f9d3e13eb9a2b0ad1403fb0a6d66d7bdd50e9209dff5c8d0d9151ad3dd64f6a709530858f1143ab30f89d508e3f29782219a23d258e455ed2dee360136",
|
||||
"@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
|
||||
"@esbuild/linux-arm64@npm:0.27.5": "4acfebf0f43e9dadb2a29cf336562e711961c23fbb6f3fec754f8a2848a0c63022b58cdc95c667fe6f5dc7cf55824cf6bcc49f96b53f29e72da0bc97102b472a",
|
||||
"@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
|
||||
"@esbuild/linux-arm@npm:0.27.5": "107786c947b02b6e7aca4f9ff3af8c14fe461f614f9c298d63b9474703ca7798d3650d52b6041412308eef46dc7215f56b4155391f9feb5b15b64718204f0009",
|
||||
"@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
|
||||
"@esbuild/linux-ia32@npm:0.27.5": "51c5322b4a834c3c8bc66d9503a8e2dfda4090aed848a533718773cece1b3a92fc10ab532bba81af1ce7eb7b3c244ef6aed2b59d480f32cf987d222e7c05950a",
|
||||
"@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
|
||||
"@esbuild/linux-loong64@npm:0.27.5": "92a0c8bfdf3214a485161184669adaa7dbd1d08fafb3bba50fd6dbd88b9a2e9c12705056e243e96a4eca3e8f0cdd65e5271261cb7f51429fd77d5dbc9fe49cbc",
|
||||
"@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
|
||||
"@esbuild/linux-mips64el@npm:0.27.5": "57326d2100e7a1be73c63a2827b981c926489fb86ce0482030b8a9049fc8086a8a229b98d83d34b4a9e459756e38ac9d453c2facd0e706b83dd8a08105a77445",
|
||||
"@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
|
||||
"@esbuild/linux-ppc64@npm:0.27.5": "d2e2b8b14ef6443ed23354ed45eaa0c176cddea25a4d84ac2a6dc76d7ce48de7928daecc3535f5cf4670b1ffbc562c43255e919ecc3f7c8c26f43b9b9d60e534",
|
||||
"@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
|
||||
"@esbuild/linux-riscv64@npm:0.27.5": "a943c97a6d031041cad40196be6f8112dbd7a642411bf7b24942de95f4c2caae31ca11b3e4724f1898f2b9f2e5a5c106636eea50eddc7db7cfbec8f443560798",
|
||||
"@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
|
||||
"@esbuild/linux-s390x@npm:0.27.5": "068865bc73484b97f1bcce6eca0195b30e8ce03dafdc6da7283b289023728f1cc7d0cbf5387fa6b89b072ddf8f9776b8cceb2981d2ebe3f2ea5e84ae8a77c448",
|
||||
"@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
|
||||
"@esbuild/linux-x64@npm:0.27.5": "6eb9d11d25e632607370d30d8fbc40c4357f6be293aeb33e6cd3fe73c18203b37f24b6e52d0939a499839fddcf9920b16862a3b923e425b99bacf9b80e787c5e",
|
||||
"@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.5": "d43426863ae1f6bd37478a30c84bdabbbafda3b2ab537a6f5051006ba13231e6842ba49a3f61a2dd30736048369660e134f028c6b2bef156c81a78dadeaf280e",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
|
||||
"@esbuild/netbsd-x64@npm:0.27.5": "b54f975bfc05f44a21884022a87367ceec3775cfc81d155bb2183ac5b9f51397589e10654eecc87ff9adee749a574e4ff724cb064907b2328e39ddb390760707",
|
||||
"@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.5": "dce25568a9642e9cacc9d4ae5a8c07dcb5bd2c7aee5f31259334074d30a380cdec2b3654b15978f3b64965d7622bda51dd203ab774f9a499e3b55425eaf926e3",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
|
||||
"@esbuild/openbsd-x64@npm:0.27.5": "fa51a43619b0da031f3b2eb6ece65d9cd6a69b9e3f03693463ed9878b04764478990dd3047591b6e2880375ada9eca8db20aca0df238afee1ad3b664f7adec65",
|
||||
"@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.5": "4c6ccc2c466158bb635918ecf530c14cbe536c2afeaa3e8e0c8b61f80875134573705b96a1854b07238df5b0e0eb1ad26b424d7a4b56b73b8813fdaec553e1a0",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
|
||||
"@esbuild/sunos-x64@npm:0.27.5": "e53d864a1e9f0b598461df53163dd837f1bbaba2f3590934b34bae132efb2c658d6f9b036d4e9a6f2b8327cb9b3ab99d7a8244009a856dd1063868d6989d204d",
|
||||
"@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
|
||||
"@esbuild/win32-arm64@npm:0.27.5": "cff774ddb4107461f5e48da9664a1813ad6234921cb51739a3915d2822e6429276f40f0edadb52f816a63143ded7e77b84b38416f1c98e7b80a8c8a6ae031363",
|
||||
"@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
|
||||
"@esbuild/win32-ia32@npm:0.27.5": "ae399419b6457492c53f2829f135285e87ca3bfde1bd11f780baa890b881b96659b0c7344d7e86c9e417531190e19f38a91f47ee1b238be5b5ce794957eac4b8",
|
||||
"@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
|
||||
"@esbuild/win32-x64@npm:0.27.5": "37a9f52ea621a0366ca72c4fca89e9a5e2734dbadeb46eaff89d1d81f09147db4ac4afd7905b5d8fde8e99bb4b28db52ec27b043d355711d97080b34393d75f8",
|
||||
"@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0",
|
||||
"@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f",
|
||||
"@img/sharp-darwin-arm64@npm:0.34.5": "0f872f02a49c87c1c844c9715a1c1e4449fab30c85711d948767d41ea1eba1cc7be8268b582d95513e66cff090ab520e4104dcf30cc6f598ee429b40e890eeec",
|
||||
@@ -122,8 +122,6 @@
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.2.0": "ff71a301051b237a32e14cb2b18117c72c5ab4524120184500e098fea028385806567fa55e4879c19f80d747774e3b8d913e0b4560abc8fe4881b392fda6ed79",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.2.0": "dd65d454384b6020b87f5f943121dd9d02e5bfbae2ec124a23f0a2034df02549c0ae4fb27558efda6668bab94b121c5463c4845431f2c1c9416a719176e1dd82",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.2.0": "13cba2a14f7864986f3331c327a137ad95cf366411c0b6d3f66593bb6ea04d0058e12bd0a09fde72bbfb8660a554f0b66d90754e21add3c99d899e2bd7dfe1d1",
|
||||
"dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
|
||||
"iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0",
|
||||
"lightningcss-android-arm64@npm:1.30.2": "823d5aa547e473e18832b47b575313dcfd9146697d53481c79b10dbbe45c62a7352f4da77f836b0c0e6a233545bb3456bece543f39e7d8ee6ef75b4d345af2fd",
|
||||
"lightningcss-darwin-arm64@npm:1.30.2": "23fd135ab0a081aec174a835b15218c5ad9ed4486823a1b8ddd8ca1795876e032201385cf6e3acd548a235d5f527e19ad213ca1c5fa0ef31d333d43d4f67fee8",
|
||||
"lightningcss-darwin-x64@npm:1.30.2": "4151c2744332798bcc83dea10c8da81a18c7dbc2d12c53a95149d7a5d24409b32f80eb42dd5933f109fe4c5715e25cfe6df3d21158191fdd682a99cc62f28b93",
|
||||
@@ -134,5 +132,10 @@
|
||||
"lightningcss-linux-x64-gnu@npm:1.30.2": "bc4959398f65fc60df2a2a011c2381029d9f92ed7a2a1930393bbef5515d3f18bd2885a4063f48031435595c22ddd10923c5e2ecbf53d086b18a3b65e10cfd47",
|
||||
"lightningcss-linux-x64-musl@npm:1.30.2": "2db0a94df42f23a051bac68ad0d4322f45bc0f47290810cbb012fc2292c42201ff1eae5ec0f83178da6f232ab4cc24a2fcaaf46b0867861966d9823610e352ac",
|
||||
"lightningcss-win32-arm64-msvc@npm:1.30.2": "307a014ddc51c6773be0b63db3ce3a09ff32c9093bd2e365689de0a07a45288a310154397f5dd6dfd6a5de726ebd4dec597482dd1bd4bfeeb65f5bff09d52ea0",
|
||||
"lightningcss-win32-x64-msvc@npm:1.30.2": "4c1b0406dad571a9754bf45becfd38af9d43eee94c93d8df881f862bc2597f72dc91dec0788aa67261cca79732c75afcd777e8786984a9e98d0d1fb66ced1a05"
|
||||
"lightningcss-win32-x64-msvc@npm:1.30.2": "4c1b0406dad571a9754bf45becfd38af9d43eee94c93d8df881f862bc2597f72dc91dec0788aa67261cca79732c75afcd777e8786984a9e98d0d1fb66ced1a05",
|
||||
"sqlite-vec-darwin-arm64@npm:0.1.9": "e1ad40eda22dd3a601565a1fcbc4d36e83560d4670dbef59639010a89fd3612697d2d5e2221d28a5044a6c461352ad83cc0595bb7e2b42594b9e76860f8a8291",
|
||||
"sqlite-vec-darwin-x64@npm:0.1.9": "71760fc97b4d1d15f503a378abfa4ad390192f5fd1009161261339f6a377a9f47f857ae2ee993e5b7e8ab1e49f168fd86976f23b4cf4da9a7ea9850709dd51ec",
|
||||
"sqlite-vec-linux-arm64@npm:0.1.9": "45b7e0ae0dc42acafc8e24b1f9f85b107b418cb7bc20a4f28ccb4abdacc45763fb417dd18c615c8aa76328da3b6bdd1d9e130baa97b446d62cf736da2ffa6010",
|
||||
"sqlite-vec-linux-x64@npm:0.1.9": "6608e83f4d0a838fa20589d055c00e67f4aa0f086212922efd0e1f64571d1e3f3014a765327f722ee11b2dbdcd618a7932e06fcdd5ebf15c57b8e157d95585c8",
|
||||
"sqlite-vec-windows-x64@npm:0.1.9": "8e2751b45cb93d8f896bf6e02b5676f75d7a68fdc199564401bd46ec2ddb81cce13f3ef96cfac15e14e5033eb96c322cb1fe21952b83aeb2abb54b769e43a426"
|
||||
}
|
||||
|
||||
@@ -44,10 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postFetch = ''
|
||||
# there's a file with a weird name that causes a hash mismatch on darwin
|
||||
rm $out/packages/app-cli/tests/support/photo*
|
||||
|
||||
# Remove after upstream updates to Yarn 4.14
|
||||
# https://github.com/laurent22/joplin/blob/dev/package.json#L103
|
||||
sed -i '/__metadata/{n;s/version: 8$/version: 9/;}' $out/yarn.lock
|
||||
'';
|
||||
inherit (releaseData) hash;
|
||||
};
|
||||
@@ -105,9 +101,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# before we can patchShebangs additional paths (see buildPhase).
|
||||
# https://github.com/NixOS/nixpkgs/blob/3cd051861c41df675cee20153bfd7befee120a98/pkgs/by-name/ya/yarn-berry/fetcher/yarn-berry-config-hook.sh#L83
|
||||
YARN_ENABLE_SCRIPTS = 0;
|
||||
|
||||
# Use nixpkgs' patched offline Yarn instead of Joplin's vendored Yarn.
|
||||
YARN_IGNORE_PATH = 1;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Nixpkgs provides Electron; don't run Joplin's networked Electron installer.
|
||||
sed -i "/^[[:space:]]*'installElectron',$/d" packages/app-desktop/gulpfile.ts
|
||||
|
||||
# Don't automatically build everything
|
||||
sed -i '/postinstall/d' package.json
|
||||
# Don't install onenote-converter subpackage deps
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "3.6.16",
|
||||
"hash": "sha256-0W6xNcEMXIs8XsoY6NqSud9D5fEmc5GKFC8Uo6CEtec=",
|
||||
"version": "3.7.18",
|
||||
"hash": "sha256-12ZRoEutQsNJlrPypNrsffeIj+2ekqB/s6HN9ks/+rU=",
|
||||
"plugins": {
|
||||
"io.github.jackgruber.backup": {
|
||||
"name": "joplin-plugin-backup",
|
||||
@@ -9,5 +9,5 @@
|
||||
"npmDepsHash": "sha256-xZJ0Oir1A6sLe0ztIyBu39Yy3D6sNrVaciOYG0k85l0="
|
||||
}
|
||||
},
|
||||
"deps_hash": "sha256-ejg0u9Dy3iaBusH248IbtJNpvd/zADyPJ9CplIK1A/w="
|
||||
"deps_hash": "sha256-W5hXh1i1rTe4OkhTvHPpDQgPSvRqTZ/GsJnHXE2D/2Y="
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
|
||||
hashable
|
||||
isocline
|
||||
lens
|
||||
lsp_2_8_0_0
|
||||
lsp
|
||||
mtl
|
||||
network
|
||||
network-simple
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcs50";
|
||||
version = "11.0.3";
|
||||
version = "11.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cs50";
|
||||
repo = "libcs50";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-G6QayPGR4lkeFuUYsFszekLAzzpA3hhIRmqt/OB0cdY=";
|
||||
hash = "sha256-guITfJoNEiQAjfKiDKltWoP8VcLsyeEuzU4odhpwyUI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "libigl";
|
||||
version = "2.6.3";
|
||||
version = "2.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libigl";
|
||||
repo = "libigl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uef7aTF2U3iPVAWDGRIsH0YV0l/w8VxtYFPYVkuC1dI=";
|
||||
hash = "sha256-/+wE3ZgqHWdLMaZZE/j7unrx10nd6sh9+JF5P0HB8i4=";
|
||||
};
|
||||
|
||||
# We could also properly use CMake, but we would have to heavily patch it
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmirage";
|
||||
version = "3.3.2";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-wMAzJpEue1QnDllWheFk3ZX+8pSkYw13s+GU0G/AOfs=";
|
||||
hash = "sha256-tICwgjCyJVr0DDrIY0TAx3/JloZgFOBaadVVTpA11ls=";
|
||||
};
|
||||
|
||||
env = {
|
||||
|
||||
@@ -48,8 +48,8 @@
|
||||
let
|
||||
# Upstream reads these from git, which the release tarball does not ship.
|
||||
# They are purely informational: `llama-server --version`, `/props`, and the web UI.
|
||||
buildNumber = "10809";
|
||||
buildCommit = "5266f24";
|
||||
buildNumber = "10964";
|
||||
buildCommit = "b29c606";
|
||||
|
||||
# It's necessary to consistently use backendStdenv when building with CUDA support,
|
||||
# otherwise we get libstdc++ errors downstream.
|
||||
@@ -87,7 +87,7 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -101,7 +101,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WImZjO3U9EXZUNP/FMpxo8PaTjQW8X2SBTfGwwFlZIM=";
|
||||
hash = "sha256-qu/K1RdJMzOxWr+qnHorpMB4650uctBHW/Og+4oDVLM=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "meilisearch";
|
||||
version = "1.53.1";
|
||||
version = "1.53.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meilisearch";
|
||||
repo = "meilisearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MQ3W8Y4ewJZA+ciBGKjGuV90ae4RaMJS+PIjCGGOV7A=";
|
||||
hash = "sha256-bbVuB8brplUAqKrmTBah4HKbmshv0n5Hn2v9hUnY62c=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=meilisearch" ];
|
||||
|
||||
cargoHash = "sha256-Rovn1xw3Bg7J+FeIMHQP2BW5IpDyCORud8VXIU8UpqI=";
|
||||
cargoHash = "sha256-ojRJPL3EHyGmWHcX5SLv11fkP1pUNKrYkd82GEC4zKE=";
|
||||
|
||||
# Default features include mini dashboard which downloads something from the internet.
|
||||
buildNoDefaultFeatures = true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchFromCodeberg,
|
||||
aeson,
|
||||
base,
|
||||
bytestring,
|
||||
@@ -26,7 +26,7 @@
|
||||
mkDerivation rec {
|
||||
pname = "mkjson";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
src = fetchFromCodeberg {
|
||||
owner = "mfussenegger";
|
||||
repo = "mkjson";
|
||||
rev = "${version}";
|
||||
|
||||
@@ -1,2 +1,19 @@
|
||||
{ haskell, haskellPackages }:
|
||||
haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { })
|
||||
{
|
||||
haskell,
|
||||
haskellPackages,
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
inherit (haskell.lib.compose) justStaticExecutables overrideCabal;
|
||||
|
||||
# The mkjson-doctest suite depends on specific RNG results not provided by the
|
||||
# GHC in Nixpkgs as of this writing.
|
||||
overrides = {
|
||||
testTargets = [ "mkjson-test" ];
|
||||
};
|
||||
raw-pkg = haskellPackages.callPackage ./generated.nix { };
|
||||
in
|
||||
lib.pipe raw-pkg [
|
||||
(overrideCabal overrides)
|
||||
justStaticExecutables
|
||||
]
|
||||
|
||||
@@ -2,31 +2,23 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mpd-mpris";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natsukagami";
|
||||
repo = "mpd-mpris";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU=";
|
||||
hash = "sha256-EOZiOFBe5j1WsrJLj8++QsgNUZR44M6ae40KKl2Qac8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ugJEw02jSsfObljDaup31zoQlf2HvwDRUljD7lp7Ys4=";
|
||||
|
||||
subPackages = [ "cmd/mpd-mpris" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/natsukagami/mpd-mpris/commit/1591f15548aed0f9741d723f24fb505cb24fafe8.patch";
|
||||
hash = "sha256-6ZqR4woKiIjwLxyafmidTM8eBXtvBzKNXZvtS1+KKKI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace services/mpd-mpris.service --replace-fail "ExecStart=" "ExecStart=$out/bin/"
|
||||
'';
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
libgcrypt,
|
||||
openssl,
|
||||
zlib,
|
||||
bzip2,
|
||||
nixosTests,
|
||||
@@ -28,11 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
libgcrypt # provides libgcrypt.m4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgcrypt
|
||||
openssl
|
||||
zlib
|
||||
bzip2
|
||||
];
|
||||
@@ -50,8 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-pkgconfigdir=${placeholder "out"}/lib/pkgconfig"
|
||||
"--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
|
||||
# Cross-compilation hacks
|
||||
"--with-libgcrypt-prefix=${lib.getDev libgcrypt}"
|
||||
"--with-crypto-lib=openssl"
|
||||
# workaround for cross compilation: https://github.com/dun/munge/issues/103
|
||||
"ac_cv_file__dev_spx=no"
|
||||
"x_ac_cv_check_fifo_recvfd=no"
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "neowall";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1ay1";
|
||||
repo = "neowall";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JzLp6/mJrYRq28XAIccsOxrG/RTDfWIojmmp1oQmiwI=";
|
||||
hash = "sha256-yxEC5PlTRg4U7M8I7/2jL48Qw/CX3F2phz6zxL6xfYU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
ethtool,
|
||||
iptables,
|
||||
kmod,
|
||||
libgcrypt,
|
||||
libndp,
|
||||
modemmanager,
|
||||
mobile-broadband-provider-info,
|
||||
@@ -231,7 +230,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gnutls
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ udevCheckHook ];
|
||||
|
||||
@@ -1,35 +1,17 @@
|
||||
diff --git a/lib/theme/mono_theme.dart b/lib/theme/mono_theme.dart
|
||||
index 5b87737c..3873fe84 100644
|
||||
index f750336..7790e50 100644
|
||||
--- a/lib/theme/mono_theme.dart
|
||||
+++ b/lib/theme/mono_theme.dart
|
||||
@@ -61,7 +61,7 @@ ThemeData _buildMonoTheme({required bool dark, required bool oled, required Targ
|
||||
|
||||
final base = ThemeData(
|
||||
platform: platform,
|
||||
- useMaterial3: true,
|
||||
+ useMaterial3: true, fontFamily: 'NotoSans',
|
||||
brightness: isDark ? Brightness.dark : Brightness.light,
|
||||
colorScheme: ColorScheme(
|
||||
brightness: isDark ? Brightness.dark : Brightness.light,
|
||||
@@ -108,7 +108,7 @@ ThemeData _buildMonoTheme({required bool dark, required bool oled, required Targ
|
||||
@@ -112,7 +112,11 @@ ThemeData _buildMonoTheme({required bool dark, required bool oled, required Targ
|
||||
titleTextStyle: TextStyle(color: c.text, fontSize: 18, fontWeight: .w700, letterSpacing: -0.2),
|
||||
),
|
||||
textTheme: Typography.englishLike2021
|
||||
- .apply(bodyColor: c.text, displayColor: c.text)
|
||||
+ .apply(fontFamily: 'NotoSans', bodyColor: c.text, displayColor: c.text)
|
||||
+ .apply(
|
||||
+ fontFamilyFallback: const ['Go Noto Current', 'Go Noto Current Hangul'],
|
||||
+ bodyColor: c.text,
|
||||
+ displayColor: c.text,
|
||||
+ )
|
||||
.copyWith(
|
||||
displayLarge: const TextStyle(fontWeight: .w700, letterSpacing: -0.5),
|
||||
titleMedium: const TextStyle(fontWeight: .w600),
|
||||
diff --git a/pubspec.yaml b/pubspec.yaml
|
||||
index 68f20256..419cc1d6 100644
|
||||
--- a/pubspec.yaml
|
||||
+++ b/pubspec.yaml
|
||||
@@ -152,3 +152,8 @@ flutter:
|
||||
- assets/shaders/anime4k/
|
||||
- assets/player_icons/
|
||||
- assets/rating_icons/
|
||||
+
|
||||
+ fonts:
|
||||
+ - family: NotoSans
|
||||
+ fonts:
|
||||
+ - asset: assets/fonts/NotoSans.ttc
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
|
||||
"auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
|
||||
"auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=",
|
||||
"background_downloader": "sha256-x1Z+Nlyvy+cc1EdRUikqZMDjVKdGHe7FOH2Yx9K0zhE=",
|
||||
"background_downloader": "sha256-ebNPYQVvMHX0lExBt3V+9k8cVtGFTSNPG457GH/+iVo=",
|
||||
"connectivity_plus": "sha256-sVUG5/6GF0Eu47BgUCkgbGi8w1ip5o0yQS00NnNjAGs=",
|
||||
"os_media_controls": "sha256-cNNTqIVJy9Yo7IrBAbIQFngOCT6ccWnOHVti7B/5jsQ="
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
flutter344,
|
||||
flutter347,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
@@ -21,17 +21,16 @@
|
||||
_7zz,
|
||||
makeBinaryWrapper,
|
||||
runCommand,
|
||||
noto-fonts-cjk-sans ? null,
|
||||
}:
|
||||
let
|
||||
pname = "plezy";
|
||||
version = "2.19.1";
|
||||
version = "2.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edde746";
|
||||
repo = "plezy";
|
||||
tag = version;
|
||||
hash = "sha256-vafKdaMUR6O3QzsPbMc/cW4cPmKxe9nDEe7bfIvfVFA=";
|
||||
hash = "sha256-q0oGOAHco7wWS8P2sUdplZS/Rvlh4a1/MVfRbrETQ/0=";
|
||||
};
|
||||
|
||||
simdutf = fetchurl {
|
||||
@@ -48,6 +47,7 @@ let
|
||||
meta = {
|
||||
description = "Modern cross-platform Emby, Plex & Jellyfin client built with Flutter";
|
||||
homepage = "https://github.com/edde746/plezy";
|
||||
changelog = "https://github.com/edde746/plezy/releases/tag/${version}";
|
||||
mainProgram = "plezy";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
@@ -63,7 +63,7 @@ let
|
||||
);
|
||||
};
|
||||
|
||||
linux = flutter344.buildFlutterApplication rec {
|
||||
linux = flutter347.buildFlutterApplication rec {
|
||||
inherit pname version src;
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
@@ -101,11 +101,6 @@ let
|
||||
substituteInPlace linux/CMakeLists.txt \
|
||||
--replace-fail "URL https://github.com/simdutf/simdutf/releases/download/v6.4.2/singleheader.zip" \
|
||||
"URL file://${simdutf}"
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
# Opt-in workaround for invisible text on aarch64-linux systems. Text was invisible; bundling the font as a Dart asset fixed it,
|
||||
# unknown why.
|
||||
install -Dm644 ${noto-fonts-cjk-sans}/share/fonts/opentype/noto-cjk/NotoSansCJK-VF.otf.ttc assets/fonts/NotoSans.ttc
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
@@ -143,7 +138,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg";
|
||||
hash = "sha256-fT/9DvzPTbX68GPo7MA+iX7jDQjp+jsAfRJ8Y8vxh+I=";
|
||||
hash = "sha256-cQ5lGdhnWnfVUI6fqx8pk5zgdaQrZbZxD5mSwVpTbmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -50,6 +50,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.3"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "ace891da0862b0e4cabbb064ee3fd87b2728b898949fdb366d83fe98342c9f19",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.2.0"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -118,8 +128,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "12ef3ff758709e3ceab8eccd6d43e0dea1c68ca1",
|
||||
"resolved-ref": "12ef3ff758709e3ceab8eccd6d43e0dea1c68ca1",
|
||||
"ref": "c52103f4a2d683c22ce3b8b8661da610644bfef1",
|
||||
"resolved-ref": "c52103f4a2d683c22ce3b8b8661da610644bfef1",
|
||||
"url": "https://github.com/edde746/background_downloader"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -307,7 +317,7 @@
|
||||
"version": "7.2.0"
|
||||
},
|
||||
"connectivity_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "connectivity_plus_platform_interface",
|
||||
"sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
|
||||
@@ -610,16 +620,6 @@
|
||||
"source": "hosted",
|
||||
"version": "2.1.3"
|
||||
},
|
||||
"globbing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "globbing",
|
||||
"sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"graphs": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -690,16 +690,6 @@
|
||||
"source": "hosted",
|
||||
"version": "4.1.2"
|
||||
},
|
||||
"injector": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "injector",
|
||||
"sha256": "ed389bed5b48a699d5b9561c985023d0d5cc88dd5ff2237aadcce5a5ab433e4e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.0"
|
||||
},
|
||||
"intl": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1091,6 +1081,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.5.2"
|
||||
},
|
||||
"posix": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "posix",
|
||||
"sha256": "bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.5.2"
|
||||
},
|
||||
"process": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1101,16 +1101,6 @@
|
||||
"source": "hosted",
|
||||
"version": "5.0.5"
|
||||
},
|
||||
"properties": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "properties",
|
||||
"sha256": "333f427dd4ed07bdbe8c75b9ff864a1e70b5d7a8426a2e8bdd457b65ae5ac598",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"provider": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1280,16 +1270,6 @@
|
||||
"source": "hosted",
|
||||
"version": "9.25.0"
|
||||
},
|
||||
"sentry_dart_plugin": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "sentry_dart_plugin",
|
||||
"sha256": "da9c1d0b3c87a251bfc36301f16af090a88c2d59128fe9a6f908f5ac20340c97",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.0"
|
||||
},
|
||||
"sentry_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1534,16 +1514,6 @@
|
||||
"source": "hosted",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"system_info2": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "system_info2",
|
||||
"sha256": "b937736ecfa63c45b10dde1ceb6bb30e5c0c340e14c441df024150679d65ac43",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
nix-update-script,
|
||||
go,
|
||||
buildGoModule,
|
||||
nodejs,
|
||||
@@ -37,9 +38,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
source = import ./source.nix;
|
||||
|
||||
inherit (source) version vendorHash;
|
||||
version = "3.14.0";
|
||||
|
||||
pname = "prometheus";
|
||||
|
||||
@@ -47,7 +46,7 @@ let
|
||||
owner = "prometheus";
|
||||
repo = "prometheus";
|
||||
tag = "v${version}";
|
||||
hash = source.hash;
|
||||
hash = "sha256-7PSfh+KWUpmL3BZ7INa1DOZ/ysaXXdWG9n/F+H0cGYo=";
|
||||
};
|
||||
|
||||
assets = stdenv.mkDerivation (finalAssetsAttrs: {
|
||||
@@ -66,7 +65,7 @@ let
|
||||
inherit (finalAssetsAttrs) pname version src;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = source.pnpmDepsHash;
|
||||
hash = "sha256-lmKUkeDdinb6WlnZSx3FnBlF/ACgUmvSMpYo84tRdCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -111,10 +110,11 @@ buildGoModule (finalAttrs: {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
vendorHash
|
||||
src
|
||||
;
|
||||
|
||||
vendorHash = "sha256-sCgxO2/w3Bi6Ncs/Q+JVZVtQC448FEx3llYxe/UxWEE=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
outputs = [
|
||||
@@ -234,7 +234,12 @@ buildGoModule (finalAttrs: {
|
||||
passthru = {
|
||||
inherit assets;
|
||||
tests = { inherit (nixosTests) prometheus; };
|
||||
updateScript = ./update.sh;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"assets"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
version = "3.14.0";
|
||||
hash = "sha256-7PSfh+KWUpmL3BZ7INa1DOZ/ysaXXdWG9n/F+H0cGYo=";
|
||||
pnpmDepsHash = "sha256-lmKUkeDdinb6WlnZSx3FnBlF/ACgUmvSMpYo84tRdCw=";
|
||||
vendorHash = "sha256-sCgxO2/w3Bi6Ncs/Q+JVZVtQC448FEx3llYxe/UxWEE=";
|
||||
}
|
||||
@@ -1,88 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix coreutils curl jq nix-prefetch-git
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
OWNER=prometheus
|
||||
REPO=prometheus
|
||||
|
||||
# Current version.
|
||||
LATEST_NIXPKGS_VERSION=$(nix eval --raw .#prometheus.version 2>/dev/null)
|
||||
UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION}
|
||||
|
||||
TARGET_TAG="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/$OWNER/$REPO/releases/latest" | jq -r '.tag_name')"
|
||||
TARGET_VERSION="$(echo "$TARGET_TAG" | sed -e 's/^v//')"
|
||||
|
||||
if [[ "$UPDATE_NIX_OLD_VERSION" == "$TARGET_VERSION" ]]; then
|
||||
# prometheus is up-to-date
|
||||
if [[ -n "$UPDATE_NIX_ATTR_PATH" ]]; then
|
||||
echo "[{}]";
|
||||
fi
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
|
||||
extractHash() {
|
||||
attr="${1?attr missing}"
|
||||
result="$(nix-build -A "$attr" 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)"
|
||||
[ -z "$result" ] && { echo "$FAKE_HASH"; } || { echo "$result"; }
|
||||
}
|
||||
|
||||
TMP=$(mktemp -d)
|
||||
trap 'rm -rf "$TMP"' EXIT
|
||||
|
||||
NIXPKGS_PROMETHEUS_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
|
||||
SOURCE_NIX="$NIXPKGS_PROMETHEUS_PATH/source.nix"
|
||||
|
||||
PREFETCH_JSON=$TMP/prefetch.json
|
||||
nix-prefetch-git --rev "$TARGET_TAG" --url "https://github.com/$OWNER/$REPO" > "$PREFETCH_JSON"
|
||||
PREFETCH_HASH="$(jq '.hash' -r < "$PREFETCH_JSON")"
|
||||
|
||||
cat > "$SOURCE_NIX" <<-EOF
|
||||
{
|
||||
version = "$TARGET_VERSION";
|
||||
hash = "$PREFETCH_HASH";
|
||||
pnpmDepsHash = "$FAKE_HASH";
|
||||
vendorHash = "$FAKE_HASH";
|
||||
}
|
||||
EOF
|
||||
|
||||
# Resolve pnpm hash first: the Go integration pulls in the assets, so a fake
|
||||
# pnpmDepsHash makes that stage fail.
|
||||
PNPM_DEPS_HASH=$(extractHash prometheus.assets.pnpmDeps)
|
||||
|
||||
cat > "$SOURCE_NIX" <<-EOF
|
||||
{
|
||||
version = "$TARGET_VERSION";
|
||||
hash = "$PREFETCH_HASH";
|
||||
pnpmDepsHash = "$PNPM_DEPS_HASH";
|
||||
vendorHash = "$FAKE_HASH";
|
||||
}
|
||||
EOF
|
||||
|
||||
# Now do the Go module fetch.
|
||||
VENDOR_HASH=$(extractHash prometheus.goModules)
|
||||
|
||||
cat > "$SOURCE_NIX" <<-EOF
|
||||
{
|
||||
version = "$TARGET_VERSION";
|
||||
hash = "$PREFETCH_HASH";
|
||||
pnpmDepsHash = "$PNPM_DEPS_HASH";
|
||||
vendorHash = "$VENDOR_HASH";
|
||||
}
|
||||
EOF
|
||||
|
||||
if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cat <<-EOF
|
||||
[{
|
||||
"attrPath": "$UPDATE_NIX_ATTR_PATH",
|
||||
"oldVersion": "$UPDATE_NIX_OLD_VERSION",
|
||||
"newVersion": "$TARGET_VERSION",
|
||||
"files": ["$SOURCE_NIX"]
|
||||
}]
|
||||
EOF
|
||||
@@ -10,12 +10,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "shelter";
|
||||
version = "0-unstable-2026-08-14";
|
||||
version = "0-unstable-2026-09-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uwu";
|
||||
repo = "shelter";
|
||||
rev = "d7cc2ce46e94c0dbbd28af741cb2f0c09d1b77fc";
|
||||
hash = "sha256-HFfggRZHVtkxvphllcYsbKa+CaifvUfb8tkhv7awrF4=";
|
||||
rev = "ee10d4ecb2fd62fb86ebfdbd37a4e28df9e72f11";
|
||||
hash = "sha256-Ew6RUhIS2gRuCNkbNCNtlmtYSGtjBR4h+UebuDVWhmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -58,6 +58,12 @@ clangStdenv.mkDerivation rec {
|
||||
patches = lib.optional enableActiveSync ./enable-activesync.patch;
|
||||
|
||||
postPatch = ''
|
||||
# Don't record the compile command line in .GCC.command.line sections of
|
||||
# the installed binaries: it embeds the store paths of the whole toolchain
|
||||
# and turns clang, llvm and gcc into runtime dependencies.
|
||||
substituteInPlace general.make \
|
||||
--replace-fail ' $(call cc-option,-frecord-gcc-switches)' ""
|
||||
|
||||
# Exclude NIX_ variables
|
||||
sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure
|
||||
|
||||
|
||||
@@ -23,6 +23,14 @@ clangStdenv.mkDerivation rec {
|
||||
hash = "sha256-0G28qDXygDe/TJ2znNE+NVQry3bkqUO59jqtJm/t2S4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Don't record the compile command line in .GCC.command.line sections of
|
||||
# the installed binaries: it embeds the store paths of the whole toolchain
|
||||
# and turns clang, llvm and gcc into runtime dependencies.
|
||||
substituteInPlace general.make \
|
||||
--replace-fail ' $(call cc-option,-frecord-gcc-switches)' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional (libpq != null) libpq.pg_config;
|
||||
buildInputs = [
|
||||
gnustep-base
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "tabbyapi";
|
||||
version = "0-unstable-2026-09-07";
|
||||
version = "0-unstable-2026-09-14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theroyallab";
|
||||
repo = "tabbyAPI";
|
||||
rev = "92198cca1aa48f83121027f5b9058c24d7c2d894";
|
||||
hash = "sha256-IQDsfTnIcaVmxk58Q8StEPS4O7LQwPVie6b04BWoeeQ=";
|
||||
rev = "53da7919d4e45c63f4acbcbbc00cbe0f60a1ce65";
|
||||
hash = "sha256-oKVxMoyMWZCuwLbsimTXO05Hdsw/2u2SVeYSFm1XsFg=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -35,7 +35,7 @@ let
|
||||
license = lib.licenses.gpl3;
|
||||
homepage = "https://tamarin-prover.github.io";
|
||||
description = "Security protocol verification in the symbolic model";
|
||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
||||
maintainers = [ ];
|
||||
hydraPlatforms = lib.platforms.linux; # maude is broken on darwin
|
||||
};
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
redis = nixosTests.valkey;
|
||||
valkey = nixosTests.valkey;
|
||||
unitTests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
|
||||
valkey-python = python3Packages.valkey;
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
versionCheckHook,
|
||||
_experimental-update-script-combinators,
|
||||
nix-update-script,
|
||||
@@ -19,6 +20,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hash = "sha256-XyVWNhVDo190/hnKj6A5dDYnlO9/WI0GYJIrkyfUkTw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix test for Rust 1.98: https://github.com/rust-lang/rust/pull/155527
|
||||
(fetchpatch {
|
||||
name = "update-snapshot-for-rust-1.98.patch";
|
||||
url = "https://github.com/g-plane/wasm-language-tools/commit/d7cabdba9fa90ec74a461dcc6b470288184d6c86.patch";
|
||||
hash = "sha256-dPPMebvNVVtFTURsxGGHTwZ6SM3CDMlZucENzwOO6/4=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoHash = "sha256-VoApXHdD8SF8ZqnDVynxunjVoZ5WKai2Xzw0UYy7hSg=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -4,6 +4,10 @@ if [[ -z "${__nix_wrapGNUstepAppsHook-}" ]]; then
|
||||
# Inherit arguments given in mkDerivation
|
||||
gnustepWrapperArgs=(${gnustepWrapperArgs-})
|
||||
|
||||
# NIX_GNUSTEP_SYSTEM_HEADERS is deliberately missing here: it only matters
|
||||
# while compiling and gnustep-base ignores it at run time, so writing it
|
||||
# into the installed config file would only pull the -dev outputs of every
|
||||
# build input into the runtime closure.
|
||||
gnustepConfigVars+=(
|
||||
GNUSTEP_MAKEFILES
|
||||
NIX_GNUSTEP_SYSTEM_APPS
|
||||
@@ -12,7 +16,6 @@ if [[ -z "${__nix_wrapGNUstepAppsHook-}" ]]; then
|
||||
NIX_GNUSTEP_SYSTEM_TOOLS
|
||||
NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
NIX_GNUSTEP_SYSTEM_LIBRARY
|
||||
NIX_GNUSTEP_SYSTEM_HEADERS
|
||||
NIX_GNUSTEP_SYSTEM_LIBRARIES
|
||||
NIX_GNUSTEP_SYSTEM_DOC
|
||||
NIX_GNUSTEP_SYSTEM_DOC_MAN
|
||||
@@ -38,30 +41,59 @@ if [[ -z "${__nix_wrapGNUstepAppsHook-}" ]]; then
|
||||
fi
|
||||
}
|
||||
|
||||
gsAddToIncludeSearchPath() {
|
||||
local -n ref="$1"
|
||||
# Without strictDeps, gnustep-make's environment hook also picks up
|
||||
# native build inputs, so the NIX_GNUSTEP_* paths include the compiler
|
||||
# wrapper and friends. Keeping those in the installed config file would
|
||||
# make the whole toolchain a runtime dependency (~1.6 GB).
|
||||
gsDropBuildOnlyPaths() {
|
||||
local -n pathsRef="$1"
|
||||
local -a kept=()
|
||||
local entry prefix
|
||||
local IFS=:
|
||||
|
||||
if [[ -d "$2" && "${ref-}" != *"$2"* ]]; then
|
||||
if [[ "${ref-}" != "" ]]; then
|
||||
ref+=" "
|
||||
fi
|
||||
for entry in ${pathsRef-}; do
|
||||
for prefix in "${gnustepRuntimePrefixes[@]}"; do
|
||||
if [[ "$entry" =~ ^"$prefix"(/|$) ]]; then
|
||||
kept+=("$entry")
|
||||
break
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
ref+="$2"
|
||||
fi
|
||||
pathsRef="${kept[*]}"
|
||||
}
|
||||
|
||||
gnustepRuntimePrefixes=()
|
||||
|
||||
for output in ${outputs:-out}; do
|
||||
gnustepRuntimePrefixes+=("${!output}")
|
||||
done
|
||||
|
||||
for pkg in \
|
||||
${pkgsHostHost+"${pkgsHostHost[@]}"} \
|
||||
${pkgsHostTarget+"${pkgsHostTarget[@]}"}
|
||||
do
|
||||
gnustepRuntimePrefixes+=("$pkg")
|
||||
done
|
||||
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$out/lib/GNUstep/Applications"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$out/lib/GNUstep/Applications"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$out/lib/GNUstep/WebApplications"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$out/bin"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$out/sbin"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$out/lib/GNUstep"
|
||||
gsAddToIncludeSearchPath NIX_GNUSTEP_SYSTEM_HEADERS "$out/include"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$out/lib"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$out/share/GNUstep/Documentation"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$out/share/man"
|
||||
gsAddToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$out/share/info"
|
||||
|
||||
for var in "${gnustepConfigVars[@]}"; do
|
||||
# GNUSTEP_MAKEFILES is a single path pointing at gnustep-make
|
||||
# rather than a search path assembled from the build environment.
|
||||
[[ "$var" == NIX_GNUSTEP_* ]] || continue
|
||||
gsDropBuildOnlyPaths "$var"
|
||||
done
|
||||
|
||||
for var in "${gnustepConfigVars[@]}"; do
|
||||
if [[ -n "${!var-}" ]]; then
|
||||
printf '%s="%s"\n' "$var" "${!var}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6.tar.gz",
|
||||
"sha256": "1qjd5gp9d4r4y6qjf52m7w9dzy9nq622aqv72ma8d4xlrxrrachp",
|
||||
"msg": "Update from Hackage at 2026-04-24T19:35:23Z"
|
||||
"commit": "16fcaf02df20067273e11bf29e352900483d788c",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/16fcaf02df20067273e11bf29e352900483d788c.tar.gz",
|
||||
"sha256": "0rm971hmbb2r57yh7spdncdjdwx7f6q6c4qzqg8v5xsrd18qimc7",
|
||||
"msg": "Update from Hackage at 2026-09-13T08:29:18Z"
|
||||
}
|
||||
|
||||
@@ -51,6 +51,11 @@ pkgs.haskell.packages.ghc98.override {
|
||||
# https://github.com/avh4/elm-format/blob/e7e5da37716acbfb4954a88128b5cc72b2c911d9/package/nix/generate_derivation.sh
|
||||
elm-format = justStaticExecutables (
|
||||
overrideCabal (drv: {
|
||||
# jailbreak required due to optparse-applicative bounds
|
||||
# optparse-applicative >=0.17.0.0 && <0.19
|
||||
# upstream PR https://github.com/avh4/elm-format/pull/841
|
||||
jailbreak = true;
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p ./generated
|
||||
cat <<EOHS > ./generated/Build_elm_format.hs
|
||||
@@ -77,8 +82,14 @@ pkgs.haskell.packages.ghc98.override {
|
||||
inherit elmPkgs;
|
||||
|
||||
# Needed for elm-format
|
||||
|
||||
avh4-lib = self.callPackage ./elm-format/avh4-lib.nix { };
|
||||
elm-format-lib = self.callPackage ./elm-format/elm-format-lib.nix { };
|
||||
# jailbreak required due to optparse-applicative bounds
|
||||
# optparse-applicative >=0.17.0.0 && <0.19
|
||||
# upstream PR https://github.com/avh4/elm-format/pull/841
|
||||
elm-format-lib = pkgs.haskell.lib.doJailbreak (
|
||||
self.callPackage ./elm-format/elm-format-lib.nix { }
|
||||
);
|
||||
elm-format-test-lib = self.callPackage ./elm-format/elm-format-test-lib.nix { };
|
||||
elm-format-markdown = self.callPackage ./elm-format/elm-format-markdown.nix { };
|
||||
};
|
||||
|
||||
5
pkgs/development/compilers/ghc/9.12.5.nix
Normal file
5
pkgs/development/compilers/ghc/9.12.5.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.12.4.20260713";
|
||||
url = "https://downloads.haskell.org/~ghc/9.12.5-rc3/ghc-9.12.4.20260713-src.tar.gz";
|
||||
sha256 = "cc77cff2014dd99c16c9f311f7558d9a11aa3c3a2dee47425b109c3dac35338c";
|
||||
}
|
||||
5
pkgs/development/compilers/ghc/9.14.2.nix
Normal file
5
pkgs/development/compilers/ghc/9.14.2.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
url = "https://downloads.haskell.org/~ghc/9.14.2-rc1/ghc-9.14.1.20260728-src.tar.xz";
|
||||
version = "9.14.1.20260728";
|
||||
sha256 = "015543170af3ca4bf3b2c4112a207b4738be72243883cb0dbbe673bcc316a04f";
|
||||
}
|
||||
@@ -118,6 +118,7 @@
|
||||
# While split sections are now enabled by default in ghc 8.8 for windows,
|
||||
# they seem to lead to `too many sections` errors when building base for
|
||||
# profiling.
|
||||
# TODO(@alexfmpe): test split sections again with GHC 9.14.2
|
||||
++ (if stdenv.targetPlatform.isWindows then [ "no_split_sections" ] else [ "split_sections" ]);
|
||||
in
|
||||
baseFlavour + lib.concatMapStrings (t: "+${t}") transformers,
|
||||
@@ -324,34 +325,21 @@
|
||||
]
|
||||
|
||||
# Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
lib.versionOlder version "9.12.4"
|
||||
|| (lib.versionAtLeast version "9.14" && lib.versionOlder version "9.15.20260129")
|
||||
)
|
||||
[
|
||||
./ghc-9.6-or-later-docs-sphinx-9.patch
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder version "9.12.4" || version == "9.14.1") [
|
||||
./ghc-9.6-or-later-docs-sphinx-9.patch
|
||||
]
|
||||
|
||||
# Fixes rts/Types.h missing from the install when targeting javascript
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
version == "9.12.3"
|
||||
# TODO(@sternenseemann): 9.14.2 will likely also have this patch
|
||||
|| (lib.versionAtLeast version "9.14" && lib.versionOlder version "9.15.20260127")
|
||||
)
|
||||
[
|
||||
(fetchpatch {
|
||||
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
|
||||
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
|
||||
includes = [ "rts/rts.cabal" ];
|
||||
})
|
||||
]
|
||||
++ lib.optionals (version == "9.12.3" || version == "9.14.1") [
|
||||
(fetchpatch {
|
||||
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
|
||||
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
|
||||
includes = [ "rts/rts.cabal" ];
|
||||
})
|
||||
]
|
||||
|
||||
# Enable GHCi on LoongArch64 (not in upstream's hardcoded platform list)
|
||||
++ lib.optionals stdenv.targetPlatform.isLoongArch64 [
|
||||
@@ -884,16 +872,6 @@ stdenv.mkDerivation (
|
||||
preInstall = ''
|
||||
pushd _build/bindist/*
|
||||
|
||||
''
|
||||
# the bindist configure script uses different env variables than the GHC configure script
|
||||
# see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/24211 krank:ignore-line
|
||||
+ lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
|
||||
export InstallNameToolCmd=$INSTALL_NAME_TOOL
|
||||
export OtoolCmd=$OTOOL
|
||||
''
|
||||
# Replicate configurePhase
|
||||
+ ''
|
||||
$configureScript "''${configureFlags[@]}"
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.15.20260322";
|
||||
rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
|
||||
sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
|
||||
version = "10.1.20260810";
|
||||
rev = "556db2f32f59ec2d3b1c225d24d677c60a695e3f";
|
||||
sha256 = "sha256-lB4udTc9hQZEnldmvpllDkCtUVte65/ZMhZd7rf5xOY=";
|
||||
}
|
||||
|
||||
@@ -35,10 +35,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "2.21.3-unstable-2026-03-30";
|
||||
version = "2.21.3-unstable-2026-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
|
||||
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
@@ -106,5 +106,5 @@ mkDerivation {
|
||||
'';
|
||||
homepage = "https://github.com/nixos/cabal2nix#readme";
|
||||
description = "Convert Cabal files into Nix build instructions";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "distribution-nixpkgs";
|
||||
version = "1.7.1.1-unstable-2026-03-30";
|
||||
version = "1.7.1.1-unstable-2026-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
|
||||
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
|
||||
enableSeparateDataOutput = true;
|
||||
@@ -49,5 +49,5 @@ mkDerivation {
|
||||
];
|
||||
homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";
|
||||
description = "Types and functions to manipulate the Nixpkgs distribution";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
}
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hackage-db";
|
||||
version = "2.1.3-unstable-2026-03-30";
|
||||
version = "2.1.3-unstable-2026-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
|
||||
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
@@ -38,5 +38,5 @@ mkDerivation {
|
||||
];
|
||||
homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";
|
||||
description = "Access cabal-install's Hackage database via Data.Map";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
}
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "language-nix";
|
||||
version = "2.3.0-unstable-2026-03-30";
|
||||
version = "2.3.0-unstable-2026-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
|
||||
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
|
||||
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
@@ -39,5 +39,5 @@ mkDerivation {
|
||||
];
|
||||
homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
|
||||
description = "Data types and functions to represent the Nix language";
|
||||
license = lib.licensesSpdx."BSD-3-Clause";
|
||||
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -37,4 +37,21 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
Win32 = null;
|
||||
|
||||
# core pkgs on later GHCs that we can reasonably provide a stub
|
||||
# or Hackage released version for (though they may not build).
|
||||
Cabal-syntax = self.Cabal-syntax_3_6_0_0;
|
||||
semaphore-compat = self.semaphore-compat_2_0_1;
|
||||
os-string = self.os-string_2_0_11;
|
||||
file-io = self.file-io_0_2_0;
|
||||
# Would need 2.25.*, but let's not bother
|
||||
haddock-api = self.haddock-api_2_29_1;
|
||||
haddock-library = self.haddock-library_1_11_0;
|
||||
|
||||
# core pkgs on later GHCs we can't provide at all
|
||||
system-cxx-std-lib = null;
|
||||
ghc-experimental = null;
|
||||
ghc-internal = null;
|
||||
ghc-platform = null;
|
||||
ghc-toolchain = null;
|
||||
}
|
||||
|
||||
@@ -65,54 +65,16 @@ in
|
||||
xhtml = null;
|
||||
Win32 = null;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
file-io = doDistribute self.file-io_0_2_0;
|
||||
haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
|
||||
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
|
||||
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0;
|
||||
|
||||
# “Unfortunately we are unable to support GHC 9.10.”
|
||||
apply-refact = dontDistribute (markBroken super.apply-refact);
|
||||
|
||||
stack =
|
||||
# Setup.hs depends on Cabal-syntax >= 3.14
|
||||
overrideCabal
|
||||
(drv: {
|
||||
setupHaskellDepends = drv.setupHaskellDepends or [ ] ++ [
|
||||
self.Cabal-syntax_3_14_2_0
|
||||
self.Cabal_3_14_2_0
|
||||
];
|
||||
# We need to tell GHC to ignore the Cabal core libraries while
|
||||
# compiling Setup.hs since it depends on Cabal >= 3.14.
|
||||
# ATTN: This override assumes we are using GHC 9.10.3 since we need
|
||||
# to give an exact Cabal version at the GHC (!) command line.
|
||||
# FIXME(@sternenseemann): make direct argument to generic-builder.nix
|
||||
env = drv.env or { } // {
|
||||
setupCompileFlags = lib.concatStringsSep " " [
|
||||
"-hide-package"
|
||||
"Cabal-syntax-3.12.1.0"
|
||||
"-hide-package"
|
||||
"Cabal-3.12.1.0"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
# Stack itself depends on Cabal >= 3.14 which also needs to be updated for deps
|
||||
(
|
||||
super.stack.overrideScope (
|
||||
sself: ssuper:
|
||||
let
|
||||
upgradeCabal =
|
||||
drv:
|
||||
lib.pipe drv [
|
||||
(addBuildDepends [ sself.Cabal_3_14_2_0 ])
|
||||
(appendConfigureFlags [ "--constraint=Cabal>=3.14" ])
|
||||
];
|
||||
in
|
||||
{
|
||||
pantry = upgradeCabal ssuper.pantry_0_11_2;
|
||||
rio-prettyprint = upgradeCabal ssuper.rio-prettyprint;
|
||||
hackage-security = upgradeCabal ssuper.hackage-security;
|
||||
hpack = upgradeCabal sself.hpack_0_39_1;
|
||||
stack = upgradeCabal ssuper.stack;
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
#
|
||||
# Version upgrades
|
||||
#
|
||||
@@ -124,10 +86,6 @@ in
|
||||
# Jailbreaks
|
||||
#
|
||||
floskell = doJailbreak super.floskell; # base <4.20
|
||||
# 2025-04-09: filepath <1.5
|
||||
haddock-library =
|
||||
assert super.haddock-library.version == "1.11.0";
|
||||
doJailbreak super.haddock-library;
|
||||
tree-sitter = doJailbreak super.tree-sitter; # containers <0.7, filepath <1.5
|
||||
|
||||
#
|
||||
@@ -136,6 +94,22 @@ in
|
||||
monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10
|
||||
|
||||
# Workaround https://github.com/haskell/haskell-language-server/issues/4674
|
||||
haskell-language-server = haskellLib.disableCabalFlag "hlint" super.haskell-language-server;
|
||||
haskell-language-server = lib.pipe super.haskell-language-server [
|
||||
(disableCabalFlag "hlint")
|
||||
(addBuildDepends [
|
||||
self.stan
|
||||
self.trial
|
||||
])
|
||||
(
|
||||
hls:
|
||||
hls.override {
|
||||
apply-refact = null;
|
||||
hlint = null;
|
||||
refact = null;
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
# test-suite uses MultilineStrings, which is only available in GHC 9.12+
|
||||
cabal-add = dontCheck super.cabal-add;
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ with haskellLib;
|
||||
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
|
||||
null
|
||||
else
|
||||
haskellLib.doDistribute self.terminfo_0_4_1_7;
|
||||
doDistribute self.terminfo_0_4_1_7;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
@@ -68,65 +68,10 @@ with haskellLib;
|
||||
xhtml = null;
|
||||
Win32 = null;
|
||||
|
||||
#
|
||||
# Hand pick versions that are compatible with ghc 9.12 and base 4.21
|
||||
#
|
||||
|
||||
extensions = doDistribute self.extensions_0_1_1_0;
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
|
||||
|
||||
#
|
||||
# Jailbreaks
|
||||
#
|
||||
|
||||
large-generics = doJailbreak super.large-generics; # base <4.20
|
||||
cpphs = overrideCabal (drv: {
|
||||
# jail break manually the conditional dependencies
|
||||
postPatch = ''
|
||||
sed -i 's/time >=1.5 \&\& <1.13/time >=1.5 \&\& <=1.14/g' cpphs.cabal
|
||||
'';
|
||||
}) super.cpphs;
|
||||
cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc.
|
||||
ghc-exactprint_1_12_0_0 = addBuildDepends [
|
||||
# cabal2nix drops conditional block: impl (ghc >= 9.12)
|
||||
self.Diff
|
||||
self.extra
|
||||
self.ghc-paths
|
||||
self.silently
|
||||
self.syb
|
||||
self.HUnit
|
||||
] super.ghc-exactprint_1_12_0_0;
|
||||
timezone-series = doJailbreak super.timezone-series; # time <1.14
|
||||
timezone-olson = doJailbreak super.timezone-olson; # time <1.14
|
||||
cabal-plan = doJailbreak super.cabal-plan; # base <4.21
|
||||
decimal-literals = doJailbreak super.decimal-literals; # base <4.21
|
||||
matrix-client = doJailbreak super.matrix-client; # time <1.13
|
||||
patat = doJailbreak super.patat; # time <1.13
|
||||
puresat = doJailbreak super.puresat; # base <4.21
|
||||
dbus = doJailbreak super.dbus; # template-haskell <2.23
|
||||
xmobar = doJailbreak super.xmobar; # base <4.21
|
||||
|
||||
#
|
||||
# Test suite issues
|
||||
#
|
||||
|
||||
relude = dontCheck super.relude;
|
||||
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/25930
|
||||
generic-lens = dontCheck super.generic-lens;
|
||||
|
||||
# Cabal 3.14 regression (incorrect datadir in tests): https://github.com/haskell/cabal/issues/10717
|
||||
alex = overrideCabal (drv: {
|
||||
preCheck = drv.preCheck or "" + ''
|
||||
export alex_datadir="$(pwd)/data"
|
||||
'';
|
||||
}) super.alex;
|
||||
|
||||
# https://github.com/sjakobi/newtype-generics/pull/28/files
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
# Test failure because of GHC bug:
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/25937
|
||||
# https://github.com/sol/interpolate/issues/20
|
||||
interpolate = dontCheckIf (lib.versionOlder self.ghc.version "9.12.3") super.interpolate;
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ with haskellLib;
|
||||
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
|
||||
null
|
||||
else
|
||||
haskellLib.doDistribute self.terminfo_0_4_1_7;
|
||||
doDistribute self.terminfo_0_4_1_7;
|
||||
text = null;
|
||||
time = null;
|
||||
transformers = null;
|
||||
@@ -76,49 +76,71 @@ with haskellLib;
|
||||
|
||||
scrod = doDistribute (unmarkBroken super.scrod);
|
||||
|
||||
# haskell-debugger only works with ghc 9.14+
|
||||
haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view);
|
||||
haskell-debugger = doDistribute (doJailbreak super.haskell-debugger); # hie-bios < 0.18, random >=1.3.1
|
||||
|
||||
#
|
||||
# Version upgrades
|
||||
#
|
||||
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
|
||||
hedgehog = doDistribute self.hedgehog_1_7;
|
||||
hie-bios = doDistribute (dontCheck self.hie-bios_0_19_0); # Tests access homeless-shelter.
|
||||
lifted-async = doDistribute self.lifted-async_0_11_0;
|
||||
parallel = doDistribute self.parallel_3_3_0_0;
|
||||
tagged = doDistribute self.tagged_0_8_10;
|
||||
unordered-containers = doDistribute self.unordered-containers_0_2_21;
|
||||
HTTP = doDistribute self.HTTP_4000_5_0;
|
||||
ghc-exactprint_1_14_1_0 = addBuildDepends [
|
||||
# cabal2nix drops conditional block: impl (ghc >= 9.14)
|
||||
self.containers
|
||||
self.Diff
|
||||
self.directory
|
||||
self.filepath
|
||||
self.ghc-paths
|
||||
self.silently
|
||||
self.syb
|
||||
self.HUnit
|
||||
] super.ghc-exactprint_1_14_1_0;
|
||||
|
||||
ghc-exactprint = doDistribute self.ghc-exactprint_1_14_1_0;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_14_1_20251220;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_14_1_20251220;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_14_2_0;
|
||||
|
||||
ormolu = doDistribute self.ormolu_0_9_0_0;
|
||||
fourmolu = doDistribute self.fourmolu_0_20_1_0;
|
||||
|
||||
inherit
|
||||
(
|
||||
let
|
||||
hls_overlay = lself: lsuper: {
|
||||
Cabal-syntax = lself.Cabal-syntax_3_16_1_0;
|
||||
Cabal = lself.Cabal_3_16_1_0;
|
||||
cabal-install = lself.cabal-install_3_16_1_0;
|
||||
# hlint does not support GHC 3.14, yet:
|
||||
# https://github.com/ndmitchell/hlint/issues/1672
|
||||
apply-refact = null;
|
||||
hlint = null;
|
||||
refact = null;
|
||||
# stylish-haskell does not support GHC 9.14, yet:
|
||||
# https://github.com/haskell/haskell-language-server/blob/5ce2a847d255ce6f420da49771711a89eee78541/haskell-language-server.cabal#L1544-L1546
|
||||
stylish-haskell = null;
|
||||
};
|
||||
in
|
||||
lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
|
||||
ghcide = super.ghcide;
|
||||
haskell-language-server = lib.pipe super.haskell-language-server [
|
||||
(disableCabalFlag "hlint")
|
||||
(disableCabalFlag "stylishHaskell")
|
||||
];
|
||||
hls-plugin-api = super.hls-plugin-api;
|
||||
}
|
||||
)
|
||||
ghcide
|
||||
haskell-language-server
|
||||
hls-plugin-api
|
||||
;
|
||||
|
||||
#
|
||||
# Jailbreaks
|
||||
#
|
||||
|
||||
primitive = doJailbreak (dontCheck super.primitive); # base <4.22 and a lot of dependencies on packages not yet working.
|
||||
splitmix = doJailbreak super.splitmix; # base <4.22
|
||||
|
||||
# https://github.com/phadej/boring/issues/48
|
||||
boring = doJailbreak super.boring;
|
||||
# https://github.com/haskellari/indexed-traversable/issues/49
|
||||
indexed-traversable = doJailbreak super.indexed-traversable;
|
||||
# https://github.com/haskellari/indexed-traversable/issues/50
|
||||
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
|
||||
# https://github.com/haskellari/these/issues/211
|
||||
these = doJailbreak super.these;
|
||||
# https://github.com/haskellari/these/issues/207
|
||||
semialign = doJailbreak super.semialign;
|
||||
# https://github.com/haskellari/time-compat/issues/48
|
||||
time-compat = doJailbreak super.time-compat;
|
||||
# https://github.com/haskell-hvr/uuid/issues/95
|
||||
uuid-types = doJailbreak super.uuid-types;
|
||||
# https://github.com/haskellari/qc-instances/issues/110
|
||||
quickcheck-instances = doJailbreak super.quickcheck-instances;
|
||||
# https://github.com/haskell/aeson/issues/1155
|
||||
text-iso8601 = doJailbreak super.text-iso8601;
|
||||
aeson = doJailbreak super.aeson;
|
||||
|
||||
# https://github.com/haskell-party/feed/issues/76
|
||||
feed = doJailbreak super.feed; # time<1.15, base<4.22
|
||||
|
||||
# https://github.com/well-typed/cborg/issues/373
|
||||
cborg = doJailbreak super.cborg;
|
||||
serialise = doJailbreak (
|
||||
@@ -134,29 +156,16 @@ with haskellLib;
|
||||
] super.serialise
|
||||
);
|
||||
|
||||
# https://github.com/sjakobi/newtype-generics/pull/28/files
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
# haskell-debugger only works with ghc 9.14+
|
||||
haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view);
|
||||
haskell-debugger = doDistribute (doJailbreak super.haskell-debugger); # hie-bios < 0.18, random >=1.3.1
|
||||
|
||||
ghc-exactprint_1_14_0_0 = addBuildDepends [
|
||||
# cabal2nix drops conditional block: impl (ghc >= 9.14)
|
||||
self.Diff
|
||||
self.extra
|
||||
self.ghc-paths
|
||||
self.silently
|
||||
self.syb
|
||||
self.HUnit
|
||||
] super.ghc-exactprint_1_14_0_0;
|
||||
|
||||
#
|
||||
# Test suite issues
|
||||
#
|
||||
|
||||
# Fails to compile with GHC 9.14 https://github.com/snoyberg/mono-traversable/pull/261
|
||||
mono-traversable = dontCheck super.mono-traversable;
|
||||
# https://github.com/maoe/ghc-trace-events/pull/17
|
||||
ghc-trace-events = doJailbreak super.ghc-trace-events; # base < 4.22
|
||||
# HLS, for some reason, decided to remove the hie-compat library from its tree
|
||||
# in https://github.com/haskell/haskell-language-server/pull/4613
|
||||
# even though hiedb (a dependency of HLS) unconditionally depends on it
|
||||
# for all GHC versions. As a result, no one has updated the base bound
|
||||
# of hie-compat to allow building it with GHC 9.14 neither in tree
|
||||
# (which no longer exists) nor on Hackage. Instead, HLS is updating their
|
||||
# cabal.project: https://github.com/haskell/haskell-language-server/blob/a4cfaa80ca94beded6f01547a161b37be7b33558/cabal.project#L78
|
||||
hie-compat = doJailbreak super.hie-compat; # base < 4.22
|
||||
|
||||
# Too strict bound on containers in test suite
|
||||
# https://github.com/jaspervdj/blaze-markup/issues/69
|
||||
@@ -164,4 +173,27 @@ with haskellLib;
|
||||
# https://github.com/jaspervdj/blaze-html/issues/151
|
||||
blaze-html = doJailbreak super.blaze-html;
|
||||
|
||||
# 2026-09-05: base <4.22
|
||||
# https://github.com/mitchellwrosen/tasty-hspec/pull/38
|
||||
tasty-hspec = doJailbreak super.tasty-hspec;
|
||||
|
||||
# 2026-09-05: containers <0.8
|
||||
# https://github.com/obsidiansystems/dependent-map/issues/59
|
||||
dependent-map = doJailbreak super.dependent-map;
|
||||
|
||||
#
|
||||
# Test suite issues
|
||||
#
|
||||
|
||||
# Fails to compile with GHC 9.14 https://github.com/snoyberg/mono-traversable/pull/261
|
||||
mono-traversable = dontCheck super.mono-traversable;
|
||||
# doctests broke with GHC 9.14, something to do with error messages
|
||||
# https://github.com/kcsongor/generic-lens/issues/174
|
||||
generic-lens = overrideCabal {
|
||||
testTargets = [
|
||||
"generic-lens-bifunctor"
|
||||
"inspection-tests"
|
||||
"generic-lens-syb-tree"
|
||||
];
|
||||
} super.generic-lens;
|
||||
}
|
||||
|
||||
@@ -49,14 +49,21 @@ self: super: {
|
||||
unix = null;
|
||||
# GHC only bundles the xhtml library if haddock is enabled, check if this is
|
||||
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
|
||||
xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
|
||||
xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_1_0;
|
||||
Win32 = null;
|
||||
|
||||
# Becomes a core package in GHC >= 9.8
|
||||
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
|
||||
semaphore-compat = doDistribute self.semaphore-compat_2_0_1;
|
||||
|
||||
# Becomes a core package in GHC >= 9.10
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
haddock-library = doDistribute (doJailbreak self.haddock-library_1_11_0);
|
||||
haddock-api = doDistribute (doJailbreak self.haddock-api_2_27_0);
|
||||
|
||||
# Becomes a core package in GHC >= 9.12, but needs unix >= 2.8
|
||||
file-io = null;
|
||||
|
||||
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
|
||||
ghc-experimental = null;
|
||||
@@ -97,9 +104,6 @@ self: super: {
|
||||
++ drv.testFlags or [ ];
|
||||
}) (doJailbreak super.hpack);
|
||||
|
||||
# Later versions require unix >= 2.8 which is tricky to provide with GHC 9.4
|
||||
crypton-x509-store = doDistribute self.crypton-x509-store_1_6_11;
|
||||
|
||||
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
|
||||
hiedb = dontCheck super.hiedb;
|
||||
|
||||
@@ -138,9 +142,6 @@ self: super: {
|
||||
# https://github.com/kowainik/relude/issues/436
|
||||
relude = dontCheck super.relude;
|
||||
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
path = self.path_0_9_5;
|
||||
|
||||
haskell-language-server =
|
||||
lib.throwIf pkgs.config.allowAliases
|
||||
"haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs"
|
||||
@@ -170,4 +171,5 @@ self: super: {
|
||||
|
||||
# Too strict lower bound on base
|
||||
primitive-addr = doJailbreak super.primitive-addr;
|
||||
base64 = doJailbreak super.base64;
|
||||
}
|
||||
|
||||
@@ -64,10 +64,10 @@ in
|
||||
iserv-proxy = addBuildDepend self.libiserv super.iserv-proxy;
|
||||
|
||||
# Becomes a core package in GHC >= 9.8
|
||||
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
|
||||
semaphore-compat = doDistribute self.semaphore-compat_2_0_1;
|
||||
|
||||
# Becomes a core package in GHC >= 9.10
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
|
||||
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
|
||||
ghc-experimental = null;
|
||||
@@ -76,6 +76,11 @@ in
|
||||
ghc-toolchain = null;
|
||||
ghc-platform = null;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
file-io = doDistribute self.file-io_0_2_0;
|
||||
haddock-api = doDistribute (doJailbreak self.haddock-api_2_29_1);
|
||||
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
|
||||
|
||||
# Needs base-orphans for GHC < 9.8 / base < 4.19
|
||||
some = addBuildDepend self.base-orphans super.some;
|
||||
|
||||
@@ -105,9 +110,6 @@ in
|
||||
cabal-install-solver = doJailbreak super.cabal-install-solver;
|
||||
cabal-install = doJailbreak super.cabal-install;
|
||||
|
||||
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
|
||||
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
|
||||
|
||||
# Jailbreaks for servant <0.20
|
||||
servant-lucid = doJailbreak super.servant-lucid;
|
||||
|
||||
@@ -208,13 +210,14 @@ in
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
inherit
|
||||
(
|
||||
let
|
||||
hls_overlay = lself: lsuper: {
|
||||
Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
|
||||
Cabal = lself.Cabal_3_10_3_0;
|
||||
# Test suite can't find executable due to https://github.com/haskell/cabal/issues/11598
|
||||
cabal-add = dontCheck lsuper.cabal-add_0_2_0_1;
|
||||
extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1);
|
||||
};
|
||||
in
|
||||
@@ -227,13 +230,16 @@ in
|
||||
self.retrie
|
||||
self.floskell
|
||||
self.markdown-unlit
|
||||
self.stan
|
||||
self.trial
|
||||
] super.haskell-language-server;
|
||||
hls-plugin-api = super.hls-plugin-api;
|
||||
hlint = self.hlint_3_8;
|
||||
lsp-types = super.lsp-types;
|
||||
ormolu = self.ormolu_0_7_4_0;
|
||||
ormolu = doJailbreak self.ormolu_0_7_4_0;
|
||||
retrie = doJailbreak (unmarkBroken super.retrie);
|
||||
stylish-haskell = self.stylish-haskell_0_14_6_0;
|
||||
stan = super.stan;
|
||||
stylish-haskell = doJailbreak self.stylish-haskell_0_14_6_0;
|
||||
}
|
||||
)
|
||||
apply-refact
|
||||
@@ -246,6 +252,7 @@ in
|
||||
lsp-types
|
||||
ormolu
|
||||
retrie
|
||||
stan
|
||||
stylish-haskell
|
||||
;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ in
|
||||
Win32 = null;
|
||||
|
||||
# Becomes a core package in GHC >= 9.10
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
|
||||
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
|
||||
ghc-experimental = null;
|
||||
@@ -73,6 +73,11 @@ in
|
||||
ghc-toolchain = null;
|
||||
ghc-platform = null;
|
||||
|
||||
# Become core packages in GHC >= 9.12
|
||||
file-io = doDistribute self.file-io_0_2_0;
|
||||
haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
|
||||
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
|
||||
|
||||
#
|
||||
# Version upgrades
|
||||
#
|
||||
@@ -106,7 +111,6 @@ in
|
||||
# A given major version of ghc-exactprint only supports one version of GHC.
|
||||
ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
|
||||
|
||||
haddock-library = doJailbreak super.haddock-library;
|
||||
ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
|
||||
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
|
||||
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
|
||||
@@ -116,6 +120,8 @@ in
|
||||
hls_overlay = lself: lsuper: {
|
||||
Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
|
||||
Cabal = lself.Cabal_3_10_3_0;
|
||||
# Test suite can't find executable due to https://github.com/haskell/cabal/issues/11598
|
||||
cabal-add = dontCheck lsuper.cabal-add_0_2_0_1;
|
||||
extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1);
|
||||
};
|
||||
in
|
||||
@@ -128,13 +134,16 @@ in
|
||||
self.retrie
|
||||
self.floskell
|
||||
self.markdown-unlit
|
||||
self.stan
|
||||
self.trial
|
||||
] super.haskell-language-server;
|
||||
hls-plugin-api = super.hls-plugin-api;
|
||||
hlint = self.hlint_3_8;
|
||||
lsp-types = super.lsp-types;
|
||||
ormolu = self.ormolu_0_7_4_0;
|
||||
ormolu = doJailbreak self.ormolu_0_7_4_0;
|
||||
retrie = doJailbreak (unmarkBroken super.retrie);
|
||||
stylish-haskell = self.stylish-haskell_0_14_6_0;
|
||||
stan = super.stan;
|
||||
stylish-haskell = doJailbreak self.stylish-haskell_0_14_6_0;
|
||||
}
|
||||
)
|
||||
apply-refact
|
||||
@@ -147,6 +156,7 @@ in
|
||||
lsp-types
|
||||
ormolu
|
||||
retrie
|
||||
stan
|
||||
stylish-haskell
|
||||
;
|
||||
}
|
||||
|
||||
@@ -32,8 +32,8 @@ with haskellLib;
|
||||
entropy = addBuildDepend self.ghcjs-dom super.entropy;
|
||||
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/25083#note_578275
|
||||
patch = haskellLib.disableParallelBuilding super.patch;
|
||||
reflex-dom-core = haskellLib.disableParallelBuilding super.reflex-dom-core;
|
||||
patch = disableParallelBuilding super.patch;
|
||||
reflex-dom-core = disableParallelBuilding super.reflex-dom-core;
|
||||
|
||||
# Marked as dontDistribute in -common because of jsaddle-webkit2gtk
|
||||
# which requires an unmaintained version of libsoup. Since this dep
|
||||
@@ -66,5 +66,5 @@ with haskellLib;
|
||||
}) super.splitmix;
|
||||
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/issues/26019#note_621324, without this flag the build OOMs
|
||||
SHA = haskellLib.appendConfigureFlag "--ghc-option=-fignore-interface-pragmas" super.SHA;
|
||||
SHA = appendConfigureFlag "--ghc-option=-fignore-interface-pragmas" super.SHA;
|
||||
})
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,71 +25,53 @@
|
||||
# not work.
|
||||
# keep-sorted start skip_lines=1 case=no numeric=yes
|
||||
default-package-overrides:
|
||||
- chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
|
||||
- clash-lib-hedgehog < 1.9 # needs to match clash-lib from Stackage
|
||||
# 2026-01-23: dataframe >= 0.3.3.7 uses random-1.3, which breaks dependency coherence on 25.11, whose default version is random-1.2
|
||||
# TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
|
||||
- dataframe == 0.3.3.6
|
||||
# 2025-12-26: Needs to match egison-pattern-src from Stackage LTS
|
||||
# 2025-12-26: Needs to match egison-pattern-src from Stackage
|
||||
- egison-pattern-src-th-mode < 0.2.2
|
||||
- extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
|
||||
# 2026-01-30: Needs to match hasql from Stackage LTS 24
|
||||
- hasql-notifications < 0.2.5.0
|
||||
# 2026-02-04: as requested by ghcide >= 2.13
|
||||
- hie-bios < 0.18.0
|
||||
- hiedb < 0.8.0
|
||||
# 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
|
||||
# https://github.com/haskell-nix/hnix/pull/1112
|
||||
# Note: When removing this, also remove hnix-store-core from maintainers/scripts/haskell/update-stackage.sh
|
||||
- hnix-store-core < 0.7
|
||||
- hnix-store-remote < 0.7
|
||||
# 2025-08-03: need to match stackage version of hosc
|
||||
- hsc3 >= 0.21 && < 0.22
|
||||
# 2026-04-19: needs to match tls and crypton-x509-store from Stackage LTS 24
|
||||
- http2-tls < 0.4.6
|
||||
# liquidhaskell-boot 0.9.10.1.2 requires this specific version of liquid-fixpoint
|
||||
- liquid-fixpoint == 0.9.6.3.2
|
||||
# liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
|
||||
- liquidhaskell == 0.9.10.*
|
||||
- liquidhaskell-boot == 0.9.10.*
|
||||
# 2025-03-07: HLS and many other pkgs don't support lsp >= 2.8 (yet)
|
||||
- lsp < 2.8
|
||||
- lsp-test < 0.18
|
||||
- lsp-types < 2.4
|
||||
# Needs to match microlens == 0.4.* in Stackage LTS 24
|
||||
# Needs to match microlens == 0.4.* in Stackage
|
||||
- microlens-pro < 0.2.0.4
|
||||
# 2026-04-06: 4.0.10 merely adjusts to dependencies that are incompatible with our LTS
|
||||
- mighttpd2 < 4.0.10
|
||||
# We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
|
||||
# this no longer works with later versions.
|
||||
- pandoc-crossref == 0.3.21
|
||||
# 2025-12-19: Needs to match Stackage version of rhine
|
||||
- rhine-bayes < 1.6
|
||||
# 2026-02-08: compatibility with crypton-x509* in Stackage LTS 24
|
||||
- x509-ocsp < 0.4.1.0
|
||||
# keep-sorted end
|
||||
|
||||
# keep-sorted start skip_lines=1 case=no numeric=yes
|
||||
extra-packages:
|
||||
- ansi-wl-pprint >= 0.6 && < 0.7 # 2025-07-07: used by gren <= 0.5.4
|
||||
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
|
||||
- Cabal == 3.10.*
|
||||
- Cabal == 3.12.*
|
||||
- Cabal == 3.14.*
|
||||
- Cabal == 3.16.* # version required for cabal-install and other packages
|
||||
- cabal-add == 0.1 # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it.
|
||||
- cabal-add < 0.2.1 # 2026-09-05: required for HLS with GHC <= 9.8
|
||||
- cabal-install == 3.14.* # 2026-07-26: required to match Cabal used when building HLS
|
||||
- cabal-install == 3.16.* # 2026-09-05: required to match Cabal used when building HLS
|
||||
- cabal-install-solver == 3.14.* # 2026-07-26: required to build cabal-install 3.14
|
||||
- cabal-install-solver == 3.16.* # 2026-09-05: required to build cabal-install 3.16
|
||||
- Cabal-syntax == 3.6.* # required for the GHC 9.0.2 package set
|
||||
- Cabal-syntax == 3.10.*
|
||||
- Cabal-syntax == 3.12.*
|
||||
- Cabal-syntax == 3.14.*
|
||||
- Cabal-syntax == 3.16.* # version required for cabal-install and other packages
|
||||
- crypton-x509-store < 1.6.12 # 2025-11-22: requires unix >= 2.8 which isn't available for GHC < 9.6
|
||||
- extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8)
|
||||
- fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
|
||||
- fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat
|
||||
- fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10
|
||||
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
|
||||
- ghc-exactprint == 1.7.* # 2025-03-09: needed for GHC == 9.6
|
||||
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
|
||||
- ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10
|
||||
- ghc-exactprint == 1.10.* # 2024-08-27: needed for GHC == 9.10
|
||||
- ghc-exactprint == 1.12.* # 2025-10-15: needed for GHC == 9.12
|
||||
- ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.4
|
||||
- ghc-lib == 9.8.* # 2025-12-11: preserve for GHC 9.6, 9.8
|
||||
@@ -100,33 +82,30 @@ extra-packages:
|
||||
- ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8
|
||||
- ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.*
|
||||
- ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.*
|
||||
- ghc-typelits-natnormalise < 0.8 # 2025-09-15: Stackage is stuck at 0.7.10
|
||||
- haddock-api == 2.27.* # 2026-05-22: latest version compatible with GHC 9.4
|
||||
- happy == 1.20.* # for ghc-lib-parser == 9.6.*
|
||||
- hashable < 1.5 # 2025-07-30: hashable >= 1.5 requires GHC >= 9.6
|
||||
- hasql < 1.7 # 2025-01-19: Needed for building postgrest
|
||||
- hasql-dynamic-statements < 0.3.1.6 # 2025-01-19: Needed for building postgrest
|
||||
- hasql-implicits < 0.2 # 2025-01-19: Needed for building postgrest
|
||||
- hasql-notifications < 0.2.3 # 2025-01-19: Needed for building postgrest
|
||||
- hasql-pool < 1.1 # 2025-01-19: Needed for building postgrest
|
||||
- hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest
|
||||
- hasql == 1.9.3.1 # 2026-09-05: Needed for building postgrest
|
||||
- hasql-dynamic-statements == 0.3.1.8 # 2026-09-05: Needed for building postgrest
|
||||
- hasql-implicits == 0.2.0.1 # 2026-09-05: Needed for building postgrest
|
||||
- hasql-notifications == 0.2.4.0 # 2026-09-05: Needed for building postgrest
|
||||
- hasql-pool == 1.3.0.4 # 2026-09-05: Needed for building postgrest
|
||||
- hasql-transaction == 1.2.1 # 2026-09-05: Needed for building postgrest
|
||||
- hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6
|
||||
- hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8
|
||||
- hpack == 0.39.1 # 2026-03-15: to match upstream stack-3.9.3
|
||||
- insert-ordered-containers < 0.3 # 2026-05-25: Needed for building postgrest
|
||||
- language-javascript == 0.7.0.0 # required by purescript
|
||||
- network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.*
|
||||
- ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
|
||||
- magic <= 1.1 # 2026-09-10: Needed for building git-annex
|
||||
- ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat
|
||||
- path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4
|
||||
- postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest
|
||||
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
|
||||
- ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci
|
||||
- postgresql-binary < 0.15 # 2026-09-05: Needed for building postgrest
|
||||
- semaphore-compat == 1.0.* # 2026-07-26: required to build cabal-install 3.14
|
||||
- ShellCheck == 0.10.0 # 2026-05-30: pinned by haskell-ci
|
||||
- simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2
|
||||
- stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6
|
||||
- stylish-haskell == 0.14.6.0 # 2025-09-21: needed for hls with ghc-lib 9.8
|
||||
- stylish-haskell == 0.15.0.1 # 2025-04-14: needed for hls with ghc-lib 9.10
|
||||
- swagger2 < 2.9 # 2026-05-25: Needed for building postgrest
|
||||
- tar == 0.6.3.0 # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6)
|
||||
- text-builder < 1 # 2025-08-27: Needed for building postgrest
|
||||
- text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest
|
||||
- validation == 1.1.5 # 2026-06-10: Needed for building geojson 4.1
|
||||
# keep-sorted end
|
||||
|
||||
# keep-sorted start skip_lines=1 case=no
|
||||
@@ -141,11 +120,14 @@ package-maintainers:
|
||||
- basic-sop
|
||||
- commutative-semigroups
|
||||
- generics-sop
|
||||
- ghcide
|
||||
- ghcjs-base
|
||||
- ghcjs-dom
|
||||
- ghcjs-dom-javascript
|
||||
- ghcjs-dom-jsaddle
|
||||
- haskell-debugger
|
||||
- hie-bios
|
||||
- hiedb
|
||||
- jsaddle
|
||||
- jsaddle-clib
|
||||
- jsaddle-dom
|
||||
@@ -156,6 +138,9 @@ package-maintainers:
|
||||
- large-records
|
||||
- lens-sop
|
||||
- linux-namespaces
|
||||
- lsp
|
||||
- lsp-test
|
||||
- lsp-types
|
||||
- monoidal-containers
|
||||
- proto-lens-arbitrary
|
||||
- proto3-suite
|
||||
@@ -165,10 +150,6 @@ package-maintainers:
|
||||
- universe
|
||||
- universe-some
|
||||
- warp
|
||||
Anton-Latukha:
|
||||
- hnix
|
||||
- hnix-store-core
|
||||
- hnix-store-remote
|
||||
artem:
|
||||
- BNFC-meta
|
||||
- alex-meta
|
||||
@@ -180,8 +161,6 @@ package-maintainers:
|
||||
- smtlib-backends-process
|
||||
- smtlib-backends-tests
|
||||
- vector-hashtables
|
||||
arturcygan:
|
||||
- hevm
|
||||
athas:
|
||||
- futhark
|
||||
auscyber:
|
||||
@@ -193,19 +172,9 @@ package-maintainers:
|
||||
- arch-web
|
||||
- uusi
|
||||
cdepillabout:
|
||||
- cloudy
|
||||
- password
|
||||
- password-instances
|
||||
- pretty-simple
|
||||
- stack
|
||||
- termonad
|
||||
centromere:
|
||||
- nfc
|
||||
dalpd:
|
||||
- dhall-lsp-server
|
||||
- ghc-vis
|
||||
- patat
|
||||
- svgcairo
|
||||
danielrolls:
|
||||
- aws-spend-summary
|
||||
- byte-count-reader
|
||||
@@ -224,64 +193,18 @@ package-maintainers:
|
||||
- elynx-seq
|
||||
- elynx-tools
|
||||
- elynx-tree
|
||||
- glasso
|
||||
- mcmc
|
||||
- pava
|
||||
- slynx
|
||||
- tlynx
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
erictapen:
|
||||
- hakyll
|
||||
Gabriella439:
|
||||
- annah
|
||||
- bench
|
||||
- break
|
||||
- dhall-bash
|
||||
- dhall-docs
|
||||
- dhall-json
|
||||
- dhall-lsp-server
|
||||
- dhall-nix
|
||||
- dhall-nixpkgs
|
||||
- dhall-openapi
|
||||
- dhall-text
|
||||
- dhall-yaml
|
||||
- dhall
|
||||
- dirstream
|
||||
- errors
|
||||
- foldl
|
||||
- index-core
|
||||
- lens-tutorial
|
||||
- list-transformer
|
||||
- managed
|
||||
- mmorph
|
||||
- morte
|
||||
- mvc-updates
|
||||
- mvc
|
||||
- nix-derivation
|
||||
- nix-diff
|
||||
- optional-args
|
||||
- optparse-generic
|
||||
- pipes-bytestring
|
||||
- pipes-concurrency
|
||||
- pipes-csv
|
||||
- pipes-extras
|
||||
- pipes-group
|
||||
- pipes-http
|
||||
- pipes-parse
|
||||
- pipes-safe
|
||||
- pipes
|
||||
- server-generic
|
||||
- total
|
||||
- turtle
|
||||
- typed-spreadsheet
|
||||
gridaphobe:
|
||||
- located-base
|
||||
iblech:
|
||||
- Agda
|
||||
ivanbrennan:
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
ilkecan:
|
||||
- enummapset
|
||||
jb55:
|
||||
# - bson-lens
|
||||
- cased
|
||||
@@ -377,32 +300,9 @@ package-maintainers:
|
||||
- Agda
|
||||
- agda2hs
|
||||
- irc-client
|
||||
- lambdabot
|
||||
- shake
|
||||
nomeata:
|
||||
- cabal-plan-bounds
|
||||
- lhs2tex
|
||||
- rec-def
|
||||
- tasty-expected-failure
|
||||
peti:
|
||||
- cabal2spec
|
||||
- funcmp
|
||||
- git-annex
|
||||
- hledger-interest
|
||||
- hopenssl
|
||||
- hsdns
|
||||
- hsemail
|
||||
- hsyslog
|
||||
- logging-facade-syslog
|
||||
- nix-paths
|
||||
- structured-haskell-mode
|
||||
- titlecase
|
||||
- xmonad
|
||||
- xmonad-contrib
|
||||
phijor:
|
||||
- cornelis
|
||||
poscat:
|
||||
- hinit
|
||||
psibi:
|
||||
- path-pieces
|
||||
- persistent
|
||||
@@ -656,7 +556,6 @@ package-maintainers:
|
||||
- finite-typelits
|
||||
- has-transformers
|
||||
- monad-bayes
|
||||
- monad-schedule
|
||||
- pulse-simple
|
||||
- openapi3-code-generator
|
||||
- rhine
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,6 @@
|
||||
dont-distribute-packages:
|
||||
|
||||
- 4Blocks
|
||||
- a-piece-of-flake
|
||||
- a50
|
||||
- abcBridge
|
||||
- AbortT-monadstf
|
||||
@@ -40,14 +39,11 @@ dont-distribute-packages:
|
||||
- afv
|
||||
- agda-server
|
||||
- agda-snippets-hakyll
|
||||
- age
|
||||
- agentx
|
||||
- aip
|
||||
- alg
|
||||
- algebra-checkers
|
||||
- algebra-driven-design
|
||||
- algebra-sql
|
||||
- algebraic-graph-duoids
|
||||
- algolia
|
||||
- AlgoRhythm
|
||||
- algorithmic-composition-additional
|
||||
@@ -136,6 +132,8 @@ dont-distribute-packages:
|
||||
- ast-monad-json
|
||||
- astview
|
||||
- async-ajax
|
||||
- atelier-db
|
||||
- atelier-testing
|
||||
- aterm-utils
|
||||
- atlassian-connect-core
|
||||
- atmos-dimensional-tf
|
||||
@@ -145,7 +143,6 @@ dont-distribute-packages:
|
||||
- attenuation-profunctors
|
||||
- AttoJson
|
||||
- attoparsec-enumerator
|
||||
- attoparsec-isotropic
|
||||
- attoparsec-iteratee
|
||||
- attoparsec-text-enumerator
|
||||
- atuin
|
||||
@@ -189,6 +186,13 @@ dont-distribute-packages:
|
||||
- babylon
|
||||
- backblaze-b2-hs
|
||||
- backdropper
|
||||
- baikai
|
||||
- baikai-agent
|
||||
- baikai-claude
|
||||
- baikai-effectful
|
||||
- baikai-kit
|
||||
- baikai-openai
|
||||
- baikai-trace-otel
|
||||
- balkon
|
||||
- ballast
|
||||
- bamboo
|
||||
@@ -213,11 +217,11 @@ dont-distribute-packages:
|
||||
- battleships
|
||||
- bayes-stack
|
||||
- bbi
|
||||
- bcp47-orphans
|
||||
- bdcs
|
||||
- bdcs-api
|
||||
- beam-th
|
||||
- beautifHOL
|
||||
- bech32-th
|
||||
- bein
|
||||
- belka
|
||||
- BerlekampAlgorithm
|
||||
@@ -374,7 +378,6 @@ dont-distribute-packages:
|
||||
- captcha-core
|
||||
- car-pool
|
||||
- carboncopy
|
||||
- cardano-addresses
|
||||
- CarneadesIntoDung
|
||||
- cartel
|
||||
- cas-hashable-s3
|
||||
@@ -420,7 +423,6 @@ dont-distribute-packages:
|
||||
- chart-svg-various
|
||||
- chart-unit
|
||||
- chassis
|
||||
- chatty
|
||||
- cheapskate-highlight
|
||||
- cheapskate-terminal
|
||||
- check-pvp
|
||||
@@ -448,6 +450,16 @@ dont-distribute-packages:
|
||||
- claferIG
|
||||
- claferwiki
|
||||
- clash
|
||||
- clash-ghc
|
||||
- clash-lib
|
||||
- clash-lib-hedgehog
|
||||
- clash-prelude
|
||||
- clash-prelude-hedgehog
|
||||
- clash-protocols
|
||||
- clash-protocols-base
|
||||
- clash-shake
|
||||
- clash-shockwaves
|
||||
- clash-vexriscv
|
||||
- classify-frog
|
||||
- classy-effects
|
||||
- classy-effects-th
|
||||
@@ -619,7 +631,6 @@ dont-distribute-packages:
|
||||
- cryptocipher
|
||||
- cryptoids
|
||||
- cryptoids-class
|
||||
- cryptol
|
||||
- cryptonite-cd
|
||||
- crystalfontz
|
||||
- CSPM-cspm
|
||||
@@ -627,7 +638,6 @@ dont-distribute-packages:
|
||||
- CSPM-Interpreter
|
||||
- CSPM-ToProlog
|
||||
- cspmchecker
|
||||
- css-class-bindings
|
||||
- csv-enumerator
|
||||
- ctpl
|
||||
- cube
|
||||
@@ -639,6 +649,7 @@ dont-distribute-packages:
|
||||
- dahdit-network
|
||||
- dahdit-test
|
||||
- daino
|
||||
- danecheck
|
||||
- Dangerous
|
||||
- dapi
|
||||
- darcs-benchmark
|
||||
@@ -649,7 +660,6 @@ dont-distribute-packages:
|
||||
- darcswatch
|
||||
- darkplaces-demo
|
||||
- darkplaces-rcon-util
|
||||
- dash-haskell
|
||||
- data-basic
|
||||
- data-cycle
|
||||
- data-default-extra
|
||||
@@ -673,17 +683,10 @@ dont-distribute-packages:
|
||||
- dbus-client
|
||||
- ddate
|
||||
- ddc-build
|
||||
- ddc-core
|
||||
- ddc-core-babel
|
||||
- ddc-core-eval
|
||||
- ddc-core-flow
|
||||
- ddc-core-llvm
|
||||
- ddc-core-salt
|
||||
- ddc-core-simpl
|
||||
- ddc-core-tetra
|
||||
- ddc-driver
|
||||
- ddc-interface
|
||||
- ddc-source-tetra
|
||||
- ddc-tools
|
||||
- ddc-war
|
||||
- ddci-core
|
||||
@@ -700,7 +703,6 @@ dont-distribute-packages:
|
||||
- definitive-parser
|
||||
- definitive-reactive
|
||||
- definitive-sound
|
||||
- defun
|
||||
- deka-tests
|
||||
- delicious
|
||||
- delimited-text
|
||||
@@ -725,7 +727,6 @@ dont-distribute-packages:
|
||||
- dewdrop
|
||||
- dfinity-radix-tree
|
||||
- dhall-lex
|
||||
- dhall-secret
|
||||
- dhscanner-kbapi
|
||||
- dhscanner-kbgen
|
||||
- dia-functions
|
||||
@@ -762,6 +763,7 @@ dont-distribute-packages:
|
||||
- DMuCheck
|
||||
- DnaProteinAlignment
|
||||
- dnf-repo
|
||||
- dnsbase
|
||||
- dobutokO-poetry
|
||||
- dobutokO-poetry-general
|
||||
- dobutokO-poetry-general-languages
|
||||
@@ -795,8 +797,6 @@ dont-distribute-packages:
|
||||
- dsmc-tools
|
||||
- DSTM
|
||||
- dtd
|
||||
- duoidal-transformers
|
||||
- duoids-hedgehog
|
||||
- Dust
|
||||
- Dust-crypto
|
||||
- Dust-tools
|
||||
@@ -821,6 +821,7 @@ dont-distribute-packages:
|
||||
- EditTimeReport
|
||||
- effect-monad
|
||||
- effective-aspects-mzv
|
||||
- eigen-hhlo
|
||||
- ekg-carbon
|
||||
- elasticsearch-interchange
|
||||
- electrs-client
|
||||
@@ -853,6 +854,9 @@ dont-distribute-packages:
|
||||
- ersatz-viz
|
||||
- esotericbot
|
||||
- EsounD
|
||||
- esqueleto
|
||||
- esqueleto-compat
|
||||
- esqueleto-postgis
|
||||
- esqueleto-streaming
|
||||
- estreps
|
||||
- Etage-Graph
|
||||
@@ -880,6 +884,9 @@ dont-distribute-packages:
|
||||
- eventium-memory
|
||||
- eventium-postgresql
|
||||
- eventium-sqlite
|
||||
- eventlog-live
|
||||
- eventlog-live-influxdb
|
||||
- eventlog-live-otelcol
|
||||
- EventSocket
|
||||
- eventsource-geteventstore-store
|
||||
- eventsource-store-specs
|
||||
@@ -912,7 +919,6 @@ dont-distribute-packages:
|
||||
- fallingblocks
|
||||
- family-tree
|
||||
- fast-arithmetic
|
||||
- fast-bech32
|
||||
- fastcdc
|
||||
- fastirc
|
||||
- fault-tree
|
||||
@@ -933,7 +939,6 @@ dont-distribute-packages:
|
||||
- feature-flipper-postgres
|
||||
- fedora-composes
|
||||
- fedora-img-dl
|
||||
- feed-gipeda
|
||||
- feed-translator
|
||||
- feed2lj
|
||||
- feed2twitter
|
||||
@@ -988,10 +993,8 @@ dont-distribute-packages:
|
||||
- fluid-idl-scotty
|
||||
- FM-SBLEX
|
||||
- fmt-for-rio
|
||||
- fnotation
|
||||
- foldl-transduce-attoparsec
|
||||
- follower
|
||||
- fontwhich
|
||||
- foo
|
||||
- Forestry
|
||||
- FormalGrammars
|
||||
@@ -1094,7 +1097,6 @@ dont-distribute-packages:
|
||||
- GenussFold
|
||||
- geodetic
|
||||
- geolite-csv
|
||||
- geomancy-layout
|
||||
- getemx
|
||||
- ghc-dump-util
|
||||
- ghc-imported-from
|
||||
@@ -1243,8 +1245,6 @@ dont-distribute-packages:
|
||||
- guarded-rewriting
|
||||
- GuiHaskell
|
||||
- GuiTV
|
||||
- h3spec
|
||||
- haal-models
|
||||
- habit
|
||||
- hablo
|
||||
- Hach
|
||||
@@ -1265,7 +1265,6 @@ dont-distribute-packages:
|
||||
- hackage2twitter
|
||||
- hackmanager
|
||||
- haddock
|
||||
- haddocset
|
||||
- hadoop-tools
|
||||
- haggis
|
||||
- hails-bin
|
||||
@@ -1329,7 +1328,6 @@ dont-distribute-packages:
|
||||
- haskell-aliyun
|
||||
- haskell-bitmex-client
|
||||
- haskell-debugger
|
||||
- haskell-docs
|
||||
- haskell-eigen-util
|
||||
- haskell-ftp
|
||||
- haskell-lsp
|
||||
@@ -1384,6 +1382,7 @@ dont-distribute-packages:
|
||||
- haskoin-crypto
|
||||
- haskoin-protocol
|
||||
- haskoin-script
|
||||
- haskoin-wallet
|
||||
- haskoon
|
||||
- haskoon-httpspec
|
||||
- haskoon-salvia
|
||||
@@ -1402,7 +1401,6 @@ dont-distribute-packages:
|
||||
- hasloGUI
|
||||
- hasql-postgres
|
||||
- hasql-postgres-options
|
||||
- hasql-postgresql-types
|
||||
- hasql-queue
|
||||
- hasql-streams-core
|
||||
- hasql-streams-example
|
||||
@@ -1423,6 +1421,7 @@ dont-distribute-packages:
|
||||
- Hayoo
|
||||
- hback
|
||||
- hbayes
|
||||
- hbayesian
|
||||
- hbb
|
||||
- hbf
|
||||
- hbro
|
||||
@@ -1438,7 +1437,6 @@ dont-distribute-packages:
|
||||
- hdbi-tests
|
||||
- hdiff
|
||||
- hdirect
|
||||
- hdocs
|
||||
- hdph
|
||||
- heart-app
|
||||
- heatitup
|
||||
@@ -1550,9 +1548,8 @@ dont-distribute-packages:
|
||||
- hmeap
|
||||
- hmeap-utils
|
||||
- hmep
|
||||
- HMock
|
||||
- hMPC
|
||||
- hmt-diagrams
|
||||
- hnix-store-db
|
||||
- HNM
|
||||
- hnormalise
|
||||
- hob
|
||||
@@ -1580,7 +1577,6 @@ dont-distribute-packages:
|
||||
- hoppy-docs
|
||||
- hoppy-runtime
|
||||
- hoppy-std
|
||||
- horde-ad
|
||||
- hotswap
|
||||
- hp2any-graph
|
||||
- hp2any-manager
|
||||
@@ -1657,6 +1653,7 @@ dont-distribute-packages:
|
||||
- hspec-pg-transact
|
||||
- hspec-setup
|
||||
- hspec-shouldbe
|
||||
- hspec-webdriver
|
||||
- hspecVariant
|
||||
- hsprocess
|
||||
- hsql-mysql
|
||||
@@ -1667,6 +1664,7 @@ dont-distribute-packages:
|
||||
- hsqml-demo-morris
|
||||
- hsqml-morris
|
||||
- hsreadability
|
||||
- hsrs
|
||||
- hssourceinfo
|
||||
- hssqlppp-th
|
||||
- hstar
|
||||
@@ -1690,9 +1688,9 @@ dont-distribute-packages:
|
||||
- http-response-decoder
|
||||
- http-tower-hs
|
||||
- http2-client-grpc
|
||||
- http2-client-grpc-effectful
|
||||
- http2-grpc-proto-lens
|
||||
- http2-grpc-proto3-wire
|
||||
- http3
|
||||
- https-everywhere-rules
|
||||
- https-everywhere-rules-raw
|
||||
- httpspec
|
||||
@@ -1748,6 +1746,7 @@ dont-distribute-packages:
|
||||
- hylotab
|
||||
- hyloutils
|
||||
- hyperbole
|
||||
- hyperbole-oauth2
|
||||
- hyperpublic
|
||||
- ide-backend
|
||||
- ide-backend-server
|
||||
@@ -1775,6 +1774,7 @@ dont-distribute-packages:
|
||||
- importify
|
||||
- imprevu-happstack
|
||||
- improve
|
||||
- imsos-monad
|
||||
- INblobs
|
||||
- inch
|
||||
- incremental-computing
|
||||
@@ -1811,6 +1811,7 @@ dont-distribute-packages:
|
||||
- IORefCAS
|
||||
- ipatch
|
||||
- ipc
|
||||
- ipedb
|
||||
- ipld-cid
|
||||
- ipprint
|
||||
- iptadmin
|
||||
@@ -1909,6 +1910,7 @@ dont-distribute-packages:
|
||||
- kansas-lava-shake
|
||||
- karakuri
|
||||
- katip-rollbar
|
||||
- kb-text-layout
|
||||
- keelung
|
||||
- keera-hails-mvc-environment-gtk
|
||||
- keera-hails-mvc-model-lightmodel
|
||||
@@ -1930,11 +1932,17 @@ dont-distribute-packages:
|
||||
- keid-geometry
|
||||
- keid-resource-gltf
|
||||
- keid-sound-openal
|
||||
- keiro
|
||||
- keiro-core
|
||||
- keiro-dsl
|
||||
- keiro-migrations
|
||||
- keiro-ops
|
||||
- keiro-pgmq
|
||||
- keiro-test-support
|
||||
- kerry
|
||||
- kevin
|
||||
- key-vault
|
||||
- keyring
|
||||
- keystore
|
||||
- keyvaluehash
|
||||
- keyword-args
|
||||
- kicad-data
|
||||
@@ -1942,6 +1950,11 @@ dont-distribute-packages:
|
||||
- KiCS-debugger
|
||||
- KiCS-prophecy
|
||||
- kif-parser
|
||||
- kioku-cli
|
||||
- kioku-core
|
||||
- kioku-migrate
|
||||
- kioku-migrations
|
||||
- kiroku-store-migrations
|
||||
- kit
|
||||
- kmeans-par
|
||||
- kmeans-vector
|
||||
@@ -2007,7 +2020,6 @@ dont-distribute-packages:
|
||||
- layered-state
|
||||
- layouting
|
||||
- lazy-hash-cache
|
||||
- lazy-scope
|
||||
- lda
|
||||
- ldap-scim-bridge
|
||||
- ldapply
|
||||
@@ -2159,6 +2171,7 @@ dont-distribute-packages:
|
||||
- manifold-random
|
||||
- Map
|
||||
- marionetta
|
||||
- marionette-effectful
|
||||
- markdown-pap
|
||||
- markdown2svg
|
||||
- markov-processes
|
||||
@@ -2168,7 +2181,6 @@ dont-distribute-packages:
|
||||
- marvin
|
||||
- marxup
|
||||
- masakazu-bot
|
||||
- massiv-persist
|
||||
- matchers
|
||||
- math-programming-glpk
|
||||
- math-programming-tests
|
||||
@@ -2197,8 +2209,6 @@ dont-distribute-packages:
|
||||
- meta-par-accelerate
|
||||
- MetaObject
|
||||
- metaplug
|
||||
- metar
|
||||
- metar-http
|
||||
- Metrics
|
||||
- metro
|
||||
- metro-socket
|
||||
@@ -2207,7 +2217,6 @@ dont-distribute-packages:
|
||||
- metro-transport-xor
|
||||
- metronome
|
||||
- MFlow
|
||||
- mfmts
|
||||
- Mhailist
|
||||
- Michelangelo
|
||||
- micro-gateway
|
||||
@@ -2390,7 +2399,6 @@ dont-distribute-packages:
|
||||
- network-rpca
|
||||
- network-stream
|
||||
- network-topic-models
|
||||
- network-transport-quic
|
||||
- network-websocket
|
||||
- neuron
|
||||
- newsletter-mailgun
|
||||
@@ -2417,6 +2425,7 @@ dont-distribute-packages:
|
||||
- nonlinear-optimization-ad
|
||||
- nonlinear-optimization-backprop
|
||||
- NoSlow
|
||||
- nostr
|
||||
- not-gloss
|
||||
- not-gloss-examples
|
||||
- notmuch-web
|
||||
@@ -2462,6 +2471,7 @@ dont-distribute-packages:
|
||||
- ogma-language-fret-cs
|
||||
- ogma-language-fret-reqs
|
||||
- ois-input-manager
|
||||
- okf-cli
|
||||
- olwrapper
|
||||
- om-kubernetes
|
||||
- online-csv
|
||||
@@ -2477,8 +2487,6 @@ dont-distribute-packages:
|
||||
- openssh-github-keys
|
||||
- opentelemetry-lightstep
|
||||
- opentok
|
||||
- opentracing-jaeger
|
||||
- opentracing-zipkin-v1
|
||||
- OpenVG
|
||||
- optimal-blocks
|
||||
- optimusprime
|
||||
@@ -2521,7 +2529,6 @@ dont-distribute-packages:
|
||||
- parco-attoparsec
|
||||
- parco-parsec
|
||||
- parconc-examples
|
||||
- parquet-haskell
|
||||
- parquet-hs
|
||||
- parse-help
|
||||
- parsestar
|
||||
@@ -2561,16 +2568,20 @@ dont-distribute-packages:
|
||||
- persistent-hssqlppp
|
||||
- persistent-iproute
|
||||
- persistent-map
|
||||
- persistent-pagination
|
||||
- persistent-postgresql
|
||||
- persistent-protobuf
|
||||
- persistent-sql-lifted
|
||||
- persistent-typed-db
|
||||
- persona-idp
|
||||
- peyotls
|
||||
- peyotls-codec
|
||||
- pg-entity
|
||||
- pg-migrate-test-support
|
||||
- pgmq-config
|
||||
- pgmq-effectful
|
||||
- pgmq-hasql
|
||||
- pgmq-migration
|
||||
- phatsort
|
||||
- phladiprelio-general-shared
|
||||
- phladiprelio-general-simple
|
||||
- phladiprelio-ukrainian-shared
|
||||
@@ -2619,18 +2630,6 @@ dont-distribute-packages:
|
||||
- Plot-ho-matic
|
||||
- PlslTools
|
||||
- plugins-auto
|
||||
- pms-application-service
|
||||
- pms-domain-service
|
||||
- pms-infra-cmdrun
|
||||
- pms-infra-filesystem
|
||||
- pms-infra-procspawn
|
||||
- pms-infra-serial
|
||||
- pms-infra-socket
|
||||
- pms-infra-watch
|
||||
- pms-infrastructure
|
||||
- pms-ui-notification
|
||||
- pms-ui-request
|
||||
- pms-ui-response
|
||||
- png-file
|
||||
- pngload
|
||||
- pointless-lenses
|
||||
@@ -2672,6 +2671,7 @@ dont-distribute-packages:
|
||||
- poseidon
|
||||
- poseidon-postgis
|
||||
- postgresql-common-persistent
|
||||
- postgresql-migration-persistent
|
||||
- postgresql-pure
|
||||
- postgresql-simple-ltree
|
||||
- postgresql-simple-queue
|
||||
@@ -2739,7 +2739,6 @@ dont-distribute-packages:
|
||||
- psql
|
||||
- ptera
|
||||
- ptera-th
|
||||
- pty-mcp-server
|
||||
- publicsuffixlist
|
||||
- puffytools
|
||||
- Pugs
|
||||
@@ -2776,8 +2775,6 @@ dont-distribute-packages:
|
||||
- queryparser-presto
|
||||
- queryparser-vertica
|
||||
- queuelike
|
||||
- quic-simple
|
||||
- quick-process
|
||||
- quickcheck-poly
|
||||
- quickcheck-regex
|
||||
- quickcheck-relaxng
|
||||
@@ -2883,6 +2880,8 @@ dont-distribute-packages:
|
||||
- reheat
|
||||
- rel8
|
||||
- relative-date
|
||||
- relay-pagination-conformance
|
||||
- relay-pagination-hasql
|
||||
- remote-json
|
||||
- remote-json-client
|
||||
- remote-json-server
|
||||
@@ -2961,7 +2960,6 @@ dont-distribute-packages:
|
||||
- rose-trie
|
||||
- roshask
|
||||
- rosmsg-bin
|
||||
- rounded
|
||||
- roundtrip-xml
|
||||
- route-generator
|
||||
- route-planning
|
||||
@@ -3053,6 +3051,7 @@ dont-distribute-packages:
|
||||
- secret-sharing
|
||||
- secrm
|
||||
- sednaDBXML
|
||||
- seihou-cli
|
||||
- seitz-symbol
|
||||
- SelectSequencesFromMSA
|
||||
- selenium-server
|
||||
@@ -3095,7 +3094,6 @@ dont-distribute-packages:
|
||||
- servant-rate-limit
|
||||
- servant-reason
|
||||
- servant-routes-golden
|
||||
- servant-serialization
|
||||
- servant-server-namedargs
|
||||
- servant-snap
|
||||
- servant-streaming-client
|
||||
@@ -3133,7 +3131,20 @@ dont-distribute-packages:
|
||||
- shibuya-kafka-adapter
|
||||
- shibuya-metrics
|
||||
- shibuya-pgmq-adapter
|
||||
- shikumi
|
||||
- shikumi-cache
|
||||
- shikumi-cache-postgres
|
||||
- shikumi-cache-redis
|
||||
- shikumi-compile
|
||||
- shikumi-eval
|
||||
- shikumi-okf
|
||||
- shikumi-optimize
|
||||
- shikumi-tools
|
||||
- shikumi-trace
|
||||
- shikumi-trace-otel
|
||||
- shine-varying
|
||||
- shomei-migrations
|
||||
- shomei-postgres
|
||||
- short-vec
|
||||
- short-vec-lens
|
||||
- ShortestPathProblems
|
||||
@@ -3156,7 +3167,6 @@ dont-distribute-packages:
|
||||
- sibe
|
||||
- sigma-ij
|
||||
- signals
|
||||
- signify-hs
|
||||
- silvi
|
||||
- simgi
|
||||
- simple-c-value
|
||||
@@ -3296,7 +3306,6 @@ dont-distribute-packages:
|
||||
- statistics-dirichlet
|
||||
- statsd-client
|
||||
- statsdi
|
||||
- steeloverseer
|
||||
- stern-brocot
|
||||
- STLinkUSB
|
||||
- stm-sbchan
|
||||
@@ -3356,6 +3365,9 @@ dont-distribute-packages:
|
||||
- syb-with-class-instances-text
|
||||
- SybWidget
|
||||
- sydtest-amqp
|
||||
- sydtest-mutation-plugin
|
||||
- sydtest-sqitch-postgres
|
||||
- sydtest-sqitch-postgres-persistent
|
||||
- sydtest-webdriver-screenshot
|
||||
- sydtest-webdriver-yesod
|
||||
- sylvia
|
||||
@@ -3481,7 +3493,7 @@ dont-distribute-packages:
|
||||
- toxcore-c
|
||||
- toysolver
|
||||
- tpb
|
||||
- trace-embrace
|
||||
- tpdb
|
||||
- tracing-control
|
||||
- trajectory
|
||||
- trans-fx-data
|
||||
@@ -3511,7 +3523,6 @@ dont-distribute-packages:
|
||||
- trurl
|
||||
- tsession-happstack
|
||||
- tsweb
|
||||
- tui-launcher
|
||||
- tuntap-simple
|
||||
- tup-functor
|
||||
- tuple-gen
|
||||
@@ -3655,7 +3666,6 @@ dont-distribute-packages:
|
||||
- vocoder-dunai
|
||||
- voicebase
|
||||
- vorbiscomment
|
||||
- vpn-router
|
||||
- vty-ui-extras
|
||||
- waargonaut
|
||||
- wahsp
|
||||
@@ -3676,7 +3686,7 @@ dont-distribute-packages:
|
||||
- wai-thrift
|
||||
- waldo
|
||||
- warp-grpc
|
||||
- warp-quic
|
||||
- warp-s2n-tls
|
||||
- warped
|
||||
- warpZ-tls
|
||||
- WashNGo
|
||||
@@ -3695,7 +3705,9 @@ dont-distribute-packages:
|
||||
- WebBits-multiplate
|
||||
- WebCont
|
||||
- webcrank-wai
|
||||
- webdriver
|
||||
- webdriver-w3c
|
||||
- webdriver-wrapper
|
||||
- webify
|
||||
- webserver
|
||||
- websnap
|
||||
@@ -3805,7 +3817,6 @@ dont-distribute-packages:
|
||||
- ycextra
|
||||
- yeamer
|
||||
- yeshql
|
||||
- yesod-alerts
|
||||
- yesod-articles
|
||||
- yesod-auth-ldap
|
||||
- yesod-auth-lti13
|
||||
|
||||
@@ -38,6 +38,7 @@ self: super: {
|
||||
Cabal-syntax = doDistribute self.Cabal-syntax_3_16_1_0;
|
||||
containers = doDistribute self.containers_0_8;
|
||||
exceptions = doDistribute self.exceptions_0_10_12;
|
||||
file-io = markBroken self.file-io_0_2_0;
|
||||
filepath = doDistribute self.filepath_1_5_5_0;
|
||||
ghc-bignum = null;
|
||||
ghc-boot = null;
|
||||
@@ -49,12 +50,14 @@ self: super: {
|
||||
ghc-platform = null;
|
||||
ghc-prim = null;
|
||||
ghci = null;
|
||||
haskeline = doDistribute self.haskeline_0_8_4_1;
|
||||
haddock-api = markBroken self.haddock-api_2_29_1; # depends on ghc
|
||||
haddock-library = markBroken self.haddock-library_1_11_0; # depends on ghc
|
||||
haskeline = doDistribute self.haskeline_0_8_5_0;
|
||||
hpc = markBroken self.hpc_0_7_0_2;
|
||||
integer-gmp = markBroken self.integer-gmp_1_1;
|
||||
libiserv = null;
|
||||
mtl = doDistribute self.mtl_2_3_2;
|
||||
os-string = doDistribute self.os-string_2_0_10;
|
||||
os-string = doDistribute self.os-string_2_0_11;
|
||||
parsec = doDistribute self.parsec_3_1_18_0;
|
||||
pretty = markBroken self.pretty_1_1_3_6;
|
||||
rts = null;
|
||||
@@ -63,10 +66,10 @@ self: super: {
|
||||
system-cxx-std-lib = null;
|
||||
template-haskell = null;
|
||||
terminfo = doDistribute self.terminfo_0_4_1_7;
|
||||
time = doDistribute self.time_1_15;
|
||||
time = doDistribute self.time_1_16_0_1;
|
||||
transformers = doDistribute self.transformers_0_6_3_0;
|
||||
unix = markBroken self.unix_2_8_8_0;
|
||||
xhtml = markBroken self.xhtml_3000_4_0_0;
|
||||
xhtml = markBroken self.xhtml_3000_4_1_0;
|
||||
|
||||
# MicroHs replacements for widely used libraries
|
||||
array = self.array-mhs;
|
||||
|
||||
@@ -130,6 +130,10 @@ builtins.intersectAttrs super {
|
||||
# Tests access homeless-shelter.
|
||||
hie-bios = dontCheck super.hie-bios;
|
||||
|
||||
# The test suite depends on an impure cabal-install installation in
|
||||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
###########################################
|
||||
### END HASKELL-LANGUAGE-SERVER SECTION ###
|
||||
###########################################
|
||||
@@ -624,17 +628,6 @@ builtins.intersectAttrs super {
|
||||
'';
|
||||
}) super.cryptol;
|
||||
|
||||
# Some test cases require network access
|
||||
hpack_0_39_1 = doDistribute (
|
||||
overrideCabal (drv: {
|
||||
testFlags = drv.testFlags or [ ] ++ [
|
||||
"--skip=/EndToEnd/hpack/defaults/fails if defaults don't exist/"
|
||||
"--skip=/Hpack.Defaults/ensureFile/downloads file if missing/"
|
||||
"--skip=/Hpack.Defaults/ensureFile/with 404/does not create any files/"
|
||||
];
|
||||
}) super.hpack_0_39_1
|
||||
);
|
||||
|
||||
# Tries accessing the GitHub API
|
||||
github-app-token = dontCheck super.github-app-token;
|
||||
|
||||
@@ -780,9 +773,13 @@ builtins.intersectAttrs super {
|
||||
# Wants to check against a real DB, Needs freetds
|
||||
odbc = dontCheck (addExtraLibraries [ pkgs.freetds ] super.odbc);
|
||||
|
||||
# Tests attempt to use npm to install from the network into
|
||||
# /homeless-shelter. Disabled.
|
||||
purescript = dontCheck super.purescript;
|
||||
purescript = lib.pipe super.purescript [
|
||||
# Tests attempt to use npm to install from the network into
|
||||
# /homeless-shelter. Disabled.
|
||||
dontCheck
|
||||
# Generate shell completions
|
||||
(self.generateOptparseApplicativeCompletions [ "purs" ])
|
||||
];
|
||||
|
||||
# Hardcoded include path
|
||||
poppler = overrideCabal (drv: {
|
||||
@@ -1015,6 +1012,11 @@ builtins.intersectAttrs super {
|
||||
# https://github.com/plow-technologies/servant-streaming/issues/12
|
||||
servant-streaming-server = dontCheck super.servant-streaming-server;
|
||||
|
||||
# testsuite (namely Tasty tests) uses built package as a GHC plugin
|
||||
# which does not work on Nix
|
||||
# since the path hasn't been established yet
|
||||
ghc-typelits-extra = dontCheck super.ghc-typelits-extra;
|
||||
|
||||
reanimate = overrideCabal (drv: {
|
||||
buildTools = (drv.buildTools or [ ]) ++ [
|
||||
# needed for testsuite
|
||||
@@ -1083,6 +1085,9 @@ builtins.intersectAttrs super {
|
||||
# Break dependency cycle between hedgehog, tasty-hedgehog and lifted-async
|
||||
lifted-async = dontCheck super.lifted-async;
|
||||
|
||||
# Break infinite recursion yesod-test → yesod-form → yesod-test
|
||||
yesod-test = dontCheck super.yesod-test;
|
||||
|
||||
# loc and loc-test depend on each other for testing. Break that infinite cycle:
|
||||
loc-test = super.loc-test.override { loc = dontCheck self.loc; };
|
||||
|
||||
@@ -1135,13 +1140,6 @@ builtins.intersectAttrs super {
|
||||
];
|
||||
}) super.lsp-test;
|
||||
|
||||
lsp_2_8_0_0 = doDistribute (
|
||||
super.lsp_2_8_0_0.override {
|
||||
lsp-types = self.lsp-types_2_4_0_0;
|
||||
}
|
||||
);
|
||||
lsp-types_2_4_0_0 = doDistribute super.lsp-types_2_4_0_0;
|
||||
|
||||
# the test suite attempts to run the binaries built in this package
|
||||
# through $PATH but they aren't in $PATH
|
||||
dhall-lsp-server = dontCheck super.dhall-lsp-server;
|
||||
@@ -1282,6 +1280,8 @@ builtins.intersectAttrs super {
|
||||
ln -sf git-annex git-remote-tor-annex
|
||||
PATH+=":$PWD"
|
||||
|
||||
checkFlagsArray+=("-J$NIX_BUILD_CORES")
|
||||
|
||||
echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
|
||||
|
||||
# Doesn't use Cabal's test mechanism
|
||||
@@ -1667,6 +1667,15 @@ builtins.intersectAttrs super {
|
||||
(disableCabalFlag "icu")
|
||||
];
|
||||
|
||||
# Tests spawn ghc with -fplugin and need this package's in-place package db.
|
||||
# The trailing colon keeps GHC's default package db in the package path.
|
||||
# https://hydra.nixos.org/build/329190094
|
||||
ghc-typelits-natnormalise = overrideCabal (drv: {
|
||||
preCheck = (drv.preCheck or "") + ''
|
||||
export NIX_GHC_PACKAGE_PATH_FOR_TEST=$PWD/dist/package.conf.inplace/:$packageConfDir:
|
||||
'';
|
||||
}) super.ghc-typelits-natnormalise;
|
||||
|
||||
# based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
|
||||
ihaskell = overrideCabal (drv: {
|
||||
# ihaskell's cabal file forces building a shared executable, which we need
|
||||
@@ -1847,9 +1856,11 @@ builtins.intersectAttrs super {
|
||||
enableSeparateBinOutput super.cachix
|
||||
);
|
||||
|
||||
hercules-ci-agent = super.hercules-ci-agent.override {
|
||||
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
|
||||
};
|
||||
hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] (
|
||||
super.hercules-ci-agent.override {
|
||||
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
|
||||
}
|
||||
);
|
||||
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (
|
||||
super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }
|
||||
);
|
||||
@@ -1980,9 +1991,6 @@ builtins.intersectAttrs super {
|
||||
builtins.mapAttrs (_: fourmoluTestFix) super
|
||||
)
|
||||
fourmolu
|
||||
fourmolu_0_14_0_0
|
||||
fourmolu_0_16_0_0
|
||||
fourmolu_0_18_0_0
|
||||
;
|
||||
|
||||
# Test suite needs to execute 'disco' binary
|
||||
@@ -2300,7 +2308,6 @@ builtins.intersectAttrs super {
|
||||
})
|
||||
) super)
|
||||
hpack
|
||||
hpack_0_38_1
|
||||
;
|
||||
|
||||
doctest = overrideCabal (drv: {
|
||||
@@ -2358,6 +2365,31 @@ builtins.intersectAttrs super {
|
||||
|
||||
# Workaround for flaky test: https://github.com/basvandijk/threads/issues/10
|
||||
threads = appendPatch ./patches/threads-flaky-test.patch super.threads;
|
||||
|
||||
idris = (self.generateOptparseApplicativeCompletions [ "idris" ]) super.idris;
|
||||
|
||||
# Generate cli completions for dhall.
|
||||
dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
|
||||
dhall-json = self.generateOptparseApplicativeCompletions [
|
||||
"dhall-to-json"
|
||||
"dhall-to-yaml"
|
||||
] super.dhall-json;
|
||||
dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix;
|
||||
dhall-nixpkgs = self.generateOptparseApplicativeCompletions [
|
||||
"dhall-to-nixpkgs"
|
||||
] super.dhall-nixpkgs;
|
||||
dhall-yaml = self.generateOptparseApplicativeCompletions [
|
||||
"dhall-to-yaml-ng"
|
||||
"yaml-to-dhall"
|
||||
] super.dhall-yaml;
|
||||
|
||||
update-nix-fetchgit = self.generateOptparseApplicativeCompletions [
|
||||
"update-nix-fetchgit"
|
||||
] super.update-nix-fetchgit;
|
||||
|
||||
hinit = self.generateOptparseApplicativeCompletions [ "hi" ] super.hinit;
|
||||
|
||||
hercules-ci-cli = self.generateOptparseApplicativeCompletions [ "hci" ] super.hercules-ci-cli;
|
||||
}
|
||||
|
||||
// lib.optionalAttrs pkgs.config.allowAliases (
|
||||
|
||||
49665
pkgs/development/haskell-modules/hackage-packages.nix
generated
49665
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,85 @@
|
||||
diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal
|
||||
--- old-darcs.net/darcs.cabal 2025-09-13 02:45:32.790227974 +0200
|
||||
+++ new-darcs.net/darcs.cabal 2025-09-13 02:45:32.791227985 +0200
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
custom-setup
|
||||
setup-depends: base >= 4.10 && < 4.21,
|
||||
- Cabal >= 2.4 && < 3.13,
|
||||
+ Cabal >= 2.4 && < 3.15,
|
||||
process >= 1.2.3.0 && < 1.7,
|
||||
filepath >= 1.4.1 && < 1.5.0.0,
|
||||
directory >= 1.2.7 && < 1.4
|
||||
--- old-darcs.net/Setup.hs 2026-06-22 14:55:26.775706597 +0200
|
||||
+++ new-darcs.net/Setup.hs 2026-06-22 14:56:31.996746207 +0200
|
||||
--- tmp2.hs 2026-06-22 14:55:26.775706597 +0200
|
||||
+++ /home/lukas/tmp.hs 2026-06-22 15:25:23.957579360 +0200
|
||||
--- tmp2.hs 2026-06-22 14:55:26.775706597 +0200
|
||||
+++ /home/lukas/tmp.hs 2026-06-22 15:28:17.448848236 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
-- portions copyright (c) 2008 David Roundy
|
||||
-- portions copyright (c) 2007-2009 Judah Jacobson
|
||||
{-# OPTIONS_GHC -Wall #-}
|
||||
+{-# LANGUAGE CPP #-}
|
||||
import Distribution.Simple
|
||||
( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
|
||||
import Distribution.PackageDescription ( PackageDescription )
|
||||
@@ -25,8 +26,17 @@
|
||||
import System.IO ( openFile, IOMode(..) )
|
||||
import System.Process (callProcess, runProcess)
|
||||
import Data.List( isInfixOf )
|
||||
+#if MIN_VERSION_Cabal_syntax(3,14,0)
|
||||
+import Distribution.Utils.Path ( (</>), interpretSymbolicPathCWD, makeRelativePathEx )
|
||||
+#else
|
||||
import System.FilePath ( (</>) )
|
||||
|
||||
+-- Shims so we can use the Cabal >= 3.14 API
|
||||
+interpretSymbolicPathCWD, makeRelativePathEx :: FilePath -> FilePath
|
||||
+interpretSymbolicPathCWD = id
|
||||
+makeRelativePathEx = id
|
||||
+#endif
|
||||
+
|
||||
import qualified Control.Exception as Exception
|
||||
|
||||
catchAny :: IO a -> (Exception.SomeException -> IO a) -> IO a
|
||||
@@ -73,22 +83,26 @@
|
||||
|
||||
buildManpage :: LocalBuildInfo -> IO ()
|
||||
buildManpage lbi = do
|
||||
- have_darcs_exe_dir <- doesDirectoryExist (buildDir lbi </> "darcs")
|
||||
+ have_darcs_exe_dir <- doesDirectoryExist
|
||||
+ $ interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs")
|
||||
when have_darcs_exe_dir $ do
|
||||
- let darcs = buildDir lbi </> "darcs/darcs"
|
||||
- manpage = buildDir lbi </> "darcs/darcs.1"
|
||||
+ let darcs = interpretSymbolicPathCWD
|
||||
+ $ buildDir lbi </> makeRelativePathEx "darcs/darcs"
|
||||
+ manpage = interpretSymbolicPathCWD
|
||||
+ $ buildDir lbi </> makeRelativePathEx "darcs/darcs.1"
|
||||
manpageHandle <- openFile manpage WriteMode
|
||||
void $ runProcess darcs ["help","manpage"]
|
||||
Nothing Nothing Nothing (Just manpageHandle) Nothing
|
||||
|
||||
installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO ()
|
||||
installManpage pkg lbi verbosity copy = do
|
||||
- have_manpage <- doesFileExist (buildDir lbi </> "darcs" </> "darcs.1")
|
||||
+ have_manpage <- doesFileExist
|
||||
+ $ interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs/darcs.1")
|
||||
when have_manpage $
|
||||
copyFiles
|
||||
verbosity
|
||||
(mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
|
||||
- [(buildDir lbi </> "darcs", "darcs.1")]
|
||||
+ [(interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs"), "darcs.1")]
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- version module
|
||||
@@ -124,7 +138,7 @@
|
||||
|
||||
generateVersionModule :: Verbosity -> LocalBuildInfo -> String -> String -> IO ()
|
||||
generateVersionModule verbosity lbi version state = do
|
||||
- let dir = autogenPackageModulesDir lbi
|
||||
+ let dir = interpretSymbolicPathCWD (autogenPackageModulesDir lbi)
|
||||
createDirectoryIfMissingVerbose verbosity True dir
|
||||
ctx <- context verbosity
|
||||
hash <- weakhash verbosity
|
||||
@@ -0,0 +1,13 @@
|
||||
Remove unused dependency.
|
||||
|
||||
--- old/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ new/darcs.cabal 2026-08-13 14:15:19.498074382 +0200
|
||||
@@ -427,7 +427,7 @@
|
||||
mtl >= 2.2.1 && < 2.4,
|
||||
transformers >= 0.4.2.0 && < 0.7,
|
||||
parsec >= 3.1.9 && < 3.2,
|
||||
- fgl >= 5.5.2.3 && < 5.9,
|
||||
+
|
||||
html >= 1.0.1.2 && < 1.1,
|
||||
filepath >= 1.4.1 && < 1.6,
|
||||
haskeline >= 0.7.2 && < 0.9,
|
||||
@@ -0,0 +1,29 @@
|
||||
--- old-darcs.net/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ new-darcs.net/darcs.cabal 2026-06-22 16:10:41.137461887 +0200
|
||||
@@ -416,7 +416,7 @@
|
||||
build-depends: unix >= 2.7.1.0 && < 2.9,
|
||||
directory >= 1.2.7 && < 1.4
|
||||
|
||||
- build-depends: base >= 4.10 && < 4.21,
|
||||
+ build-depends: base >= 4.10 && < 4.22,
|
||||
safe >= 0.3.20 && < 0.4,
|
||||
stm >= 2.1 && < 2.6,
|
||||
binary >= 0.5 && < 0.11,
|
||||
@@ -436,7 +436,7 @@
|
||||
base16-bytestring >= 1.0 && < 1.1,
|
||||
utf8-string >= 1 && < 1.1,
|
||||
vector >= 0.11 && < 0.14,
|
||||
- tar >= 0.5 && < 0.7,
|
||||
+ tar >= 0.5 && < 0.8,
|
||||
data-ordlist == 0.4.*
|
||||
|
||||
if impl(ghc < 8.10)
|
||||
@@ -462,7 +462,7 @@
|
||||
network >= 2.6 && < 3.3,
|
||||
conduit >= 1.3.0 && < 1.4,
|
||||
http-conduit >= 2.3 && < 2.4,
|
||||
- http-types >= 0.12.1 && < 0.12.5,
|
||||
+ http-types >= 0.12.1 && < 0.13,
|
||||
exceptions >= 0.6 && < 0.11,
|
||||
terminal-size >= 0.3.4 && < 0.4
|
||||
|
||||
15
pkgs/development/haskell-modules/patches/darcs-tls-2.2.patch
Normal file
15
pkgs/development/haskell-modules/patches/darcs-tls-2.2.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
Based on https://hub.darcs.net/darcs/darcs-screened/patch/523d0a3a5480024ea35fd5d17b35a05e9d3334a0
|
||||
|
||||
--- old/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ new/darcs.cabal 2026-08-13 14:18:55.376292224 +0200
|
||||
@@ -470,8 +470,8 @@
|
||||
cpp-options: -DHAVE_CRYPTON_CONNECTION
|
||||
build-depends: crypton-connection >= 0.4 && < 0.5,
|
||||
data-default >= 0.7.1.3 && < 0.9,
|
||||
- http-client-tls >= 0.3.5 && < 0.4,
|
||||
- tls >= 2.0.6 && < 2.2
|
||||
+ http-client-tls >= 0.3.5 && < 0.5,
|
||||
+ tls >= 2.0.6 && < 2.5
|
||||
else
|
||||
-- cannot use crypton-connection >= 0.4, so
|
||||
-- constraining indirect dependency to work around problems
|
||||
@@ -0,0 +1,64 @@
|
||||
From 7ec76d40250b1762f28adf34c38ece382bf52340 Mon Sep 17 00:00:00 2001
|
||||
From: sterni <sternenseemann@systemli.org>
|
||||
Date: Thu, 10 Sep 2026 12:18:13 +0200
|
||||
Subject: [PATCH] Use ram when interacting with crypton (>= 1.1)
|
||||
|
||||
This is a very simple patch for use in Nixpkgs which ships crypton >= 1.1
|
||||
and thus requires packages to use ram over memory when interacting with
|
||||
crypton. It makes no effort to preserve compat with older versions of
|
||||
crypton nor tries to eliminate the dependency on memory for simplicity's
|
||||
sake.
|
||||
|
||||
Joey Hess plans to add support for crypton >= 1.1 soon, but is waiting
|
||||
on fixes in other dependencies so it can actually be used with unmodified
|
||||
Hackage dependencies. Since we've already patched those issues, we
|
||||
can implement this stop gap solution.
|
||||
---
|
||||
Annex/Balanced.hs | 2 +-
|
||||
Utility/Hash/Crypton.hs | 2 +-
|
||||
git-annex.cabal | 3 ++-
|
||||
3 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Annex/Balanced.hs b/Annex/Balanced.hs
|
||||
index 9005440ad6..5c085ea186 100644
|
||||
--- a/Annex/Balanced.hs
|
||||
+++ b/Annex/Balanced.hs
|
||||
@@ -17,7 +17,7 @@ import Data.Maybe
|
||||
import qualified Data.List as L
|
||||
import Data.Bits (shiftL)
|
||||
import qualified Data.Set as S
|
||||
-import qualified "memory" Data.ByteArray as BA
|
||||
+import qualified "ram" Data.ByteArray as BA
|
||||
|
||||
-- The Int is how many UUIDs to pick.
|
||||
type BalancedPicker = S.Set UUID -> Key -> Int -> [UUID]
|
||||
diff --git a/Utility/Hash/Crypton.hs b/Utility/Hash/Crypton.hs
|
||||
index 4d290d0150..07e5351cfa 100644
|
||||
--- a/Utility/Hash/Crypton.hs
|
||||
+++ b/Utility/Hash/Crypton.hs
|
||||
@@ -69,7 +69,7 @@ module Utility.Hash.Crypton (
|
||||
import qualified Data.ByteString as S
|
||||
import qualified Data.ByteString.Lazy as L
|
||||
import Data.IORef
|
||||
-import qualified "memory" Data.ByteArray as BA
|
||||
+import qualified "ram" Data.ByteArray as BA
|
||||
import "crypton" Crypto.Hash
|
||||
|
||||
import Utility.Hash.Types
|
||||
diff --git a/git-annex.cabal b/git-annex.cabal
|
||||
index 270541a008..c649a50972 100644
|
||||
--- a/git-annex.cabal
|
||||
+++ b/git-annex.cabal
|
||||
@@ -289,7 +289,8 @@ Executable git-annex
|
||||
servant-client-core,
|
||||
warp (>= 3.2.8),
|
||||
warp-tls (>= 3.2.2),
|
||||
- crypton,
|
||||
+ crypton (>= 1.1),
|
||||
+ ram,
|
||||
crypton-connection (>= 0.4.3),
|
||||
crypton-x509-store,
|
||||
tls,
|
||||
--
|
||||
2.55.0
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
From f5a907574e3d77e1eb4768f4cc9807efcc753071 Mon Sep 17 00:00:00 2001
|
||||
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
|
||||
Date: Thu, 2 Oct 2025 04:02:54 +0000
|
||||
Subject: [PATCH] Fix test failure for small inputs by adding precondition
|
||||
|
||||
Co-authored-by: NathanHowell <170829+NathanHowell@users.noreply.github.com>
|
||||
---
|
||||
|
||||
diff --git a/tests/Main.hs b/tests/Main.hs
|
||||
index 140c942..7a69a72 100644
|
||||
--- a/tests/Main.hs
|
||||
+++ b/tests/Main.hs
|
||||
@@ -52,6 +52,7 @@ prop_compressAndDiscard = monadicIO . forAllM someBigString $ \ str -> do
|
||||
|
||||
prop_compressAndCheckLength :: Property
|
||||
prop_compressAndCheckLength = monadicIO . forAllM someBigString $ \ str -> do
|
||||
+ pre $ B.length str > 64
|
||||
len <- run . runResourceT $ Cl.sourceList [str] C.$$ compress Nothing C.=$= Cl.fold (\ acc el -> acc + B.length el) 0
|
||||
-- random strings don't compress very well
|
||||
assert (len > B.length str `div` 2)
|
||||
@@ -0,0 +1,26 @@
|
||||
Compare https://github.com/yesodweb/yesod/pull/1916
|
||||
|
||||
---
|
||||
|
||||
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
|
||||
index f91c905c..50881677 100644
|
||||
--- a/yesod-static.cabal
|
||||
+++ b/yesod-static.cabal
|
||||
@@ -45,7 +45,7 @@ library
|
||||
, hashable >= 1.1
|
||||
, hjsmin
|
||||
, http-types >= 0.7
|
||||
- , memory
|
||||
+ , ram >= 0.21 && < 0.23
|
||||
, mime-types >= 0.1
|
||||
, process
|
||||
, template-haskell
|
||||
@@ -106,7 +106,7 @@ test-suite tests
|
||||
, filepath
|
||||
, hjsmin
|
||||
, http-types
|
||||
- , memory
|
||||
+ , ram
|
||||
, mime-types
|
||||
, process
|
||||
, template-haskell
|
||||
@@ -15,8 +15,8 @@ mkDerivation {
|
||||
version = "0.19.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hercules-ci/optparse-applicative.git";
|
||||
sha256 = "068rsq9j0afrywbcqf6vg4ivfxbb68ab7f0lvg1na81mfn7sfakk";
|
||||
rev = "b55bb38a2aea0cf776aec707cdce7c7418146077";
|
||||
sha256 = "sha256-tO0V+TKS+ng6OJ8BztKwmV0tV4TnUXOD01ocTyO0sq0=";
|
||||
rev = "0.19.0.0-fork-1";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "httpcats";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/robur-coop/httpcats/releases/download/v${finalAttrs.version}/httpcats-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-5BymoyJS5JykTnSee0HhSKzbHkb8j6COuY7tZtGDGh0=";
|
||||
hash = "sha256-n0InZn+7jaDbf3WaMACdh3DPMfkfewmkcXQAVfR81rg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
125
pkgs/development/python-modules/dspy/default.nix
Normal file
125
pkgs/development/python-modules/dspy/default.nix
Normal file
@@ -0,0 +1,125 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
anyio,
|
||||
asyncer,
|
||||
cachetools,
|
||||
cloudpickle,
|
||||
datamodel-code-generator,
|
||||
diskcache,
|
||||
gepa,
|
||||
json-repair,
|
||||
litellm,
|
||||
mcp,
|
||||
numpy,
|
||||
openai,
|
||||
orjson,
|
||||
pillow,
|
||||
pydantic,
|
||||
pyprojectVersionPatchHook,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
regex,
|
||||
requests,
|
||||
tenacity,
|
||||
tqdm,
|
||||
typeguard,
|
||||
xxhash,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dspy";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stanfordnlp";
|
||||
repo = "dspy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xquV+FyDfejm1SCWYfuiezIkyutmm/1zOvd5X+oElrM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pyprojectVersionPatchHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
anyio
|
||||
asyncer
|
||||
cachetools
|
||||
cloudpickle
|
||||
diskcache
|
||||
gepa
|
||||
json-repair
|
||||
litellm
|
||||
mcp
|
||||
numpy
|
||||
openai
|
||||
orjson
|
||||
pydantic
|
||||
regex
|
||||
requests
|
||||
tenacity
|
||||
tqdm
|
||||
typeguard
|
||||
xxhash
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"asyncer"
|
||||
"gepa"
|
||||
"litellm"
|
||||
"typeguard"
|
||||
];
|
||||
|
||||
# optuna is an optional dependency that dspy can use but doesn't require at import time
|
||||
pythonRemoveDeps = [ "optuna" ];
|
||||
|
||||
# Prevent litellm from trying to fetch the remote model cost map at import
|
||||
# time, which fails in environments without direct internet access.
|
||||
postPatch = ''
|
||||
sed -i '1i import os; os.environ.setdefault("LITELLM_LOCAL_MODEL_COST_MAP", "true")' dspy/__init__.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "dspy" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
datamodel-code-generator
|
||||
pillow
|
||||
];
|
||||
|
||||
# skip tests that need network access
|
||||
disabledTestPaths = [
|
||||
"tests/signatures/test_adapter_image.py"
|
||||
];
|
||||
|
||||
# These tests start a litellm proxy server subprocess, which isn't available
|
||||
# in the nix build sandbox (upstream skips them on Python 3.14 for the same reason).
|
||||
disabledTests = [
|
||||
"test_chat_lms_can_be_queried"
|
||||
"test_dspy_cache"
|
||||
"test_lm_calls_support_callables"
|
||||
"test_lm_calls_support_pydantic_models"
|
||||
"test_responses_api_tool_calls"
|
||||
"test_streamify_yields_expected_response_chunks"
|
||||
"test_streaming_response_yields_expected_response_chunks"
|
||||
"test_text_lms_can_be_queried"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Programming — not prompting — language models";
|
||||
homepage = "https://github.com/stanfordnlp/dspy";
|
||||
changelog = "https://github.com/stanfordnlp/dspy/releases/tag/${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ jherland ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
@@ -22,18 +22,28 @@
|
||||
typing-extensions,
|
||||
}:
|
||||
let
|
||||
newerThanTuring = lib.filter (version: lib.versionOlder "7.9" version) torch.cudaCapabilities;
|
||||
# https://github.com/turboderp-org/exllamav3/blob/master/.github/workflows/build.yml#L55
|
||||
# https://github.com/turboderp-org/exllamav3/issues/44
|
||||
# Using unsupported platforms the build will fail
|
||||
cudaCapabilities = lib.intersectLists torch.cudaCapabilities [
|
||||
"8.0"
|
||||
"8.6"
|
||||
"8.9"
|
||||
"9.0"
|
||||
"10.0"
|
||||
"12.0"
|
||||
];
|
||||
in
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "exllamav3";
|
||||
version = "1.4.8";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turboderp-org";
|
||||
repo = "exllamav3";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CnbJR5rsHzNEeQBJLdD7LGrrTgy+GKpvop1R4uY4d8U=";
|
||||
hash = "sha256-gW6A2nWx3lumnJz7r7vxQyC1qM9Agqdr0DiL68yJvAI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -57,7 +67,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
flash-linear-attention
|
||||
flash-linear-attention # Upstream vendors it instead
|
||||
llguidance
|
||||
marisa-trie
|
||||
numpy
|
||||
@@ -73,9 +83,9 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
|
||||
env = lib.optionalAttrs torch.cudaSupport {
|
||||
CUDA_HOME = lib.getDev cudaPackages.cuda_nvcc;
|
||||
# exllamav3 only supports turing or newer GPUs
|
||||
# https://github.com/turboderp-org/exllamav3/issues/44
|
||||
TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" newerThanTuring;
|
||||
TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" (
|
||||
cudaCapabilities ++ [ "${lib.last cudaCapabilities}+PTX" ]
|
||||
);
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "exllamav3" ];
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pyprojectVersionPatchHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
@@ -20,6 +21,10 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pyprojectVersionPatchHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gepa" ];
|
||||
|
||||
# test suite requires network access
|
||||
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "microsoft";
|
||||
repo = "playwright-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DHMX7RaySqfy2Xi+Rw4nUg9pYrpxIksjq1JhWfknOaI=";
|
||||
hash = "sha256-RwIn+0EcHnStjORVFmT7gp4bGjl+qer1FgtI3+aPF2w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
libgcrypt,
|
||||
libgpg-error,
|
||||
libjpeg8,
|
||||
libmanette,
|
||||
libopus,
|
||||
libpng,
|
||||
libsoup_3,
|
||||
@@ -167,6 +168,7 @@ let
|
||||
libgcrypt
|
||||
libgpg-error
|
||||
libjpeg8
|
||||
libmanette
|
||||
libopus
|
||||
libpng
|
||||
libsoup_3
|
||||
|
||||
@@ -149,7 +149,6 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Test that the stack in Nixpkgs uses the same version of Hpack as the upstream stack release";
|
||||
maintainers = with lib.maintainers; [ cdepillabout ];
|
||||
|
||||
# This derivation internally runs a statically-linked version of stack from
|
||||
# upstream. This statically-linked version of stack is only available for
|
||||
|
||||
@@ -3619,14 +3619,13 @@ with pkgs;
|
||||
|
||||
haskellPackages = recurseIntoAttrs (
|
||||
# Prefer native-bignum to avoid linking issues with gmp;
|
||||
# GHC 9.10 doesn't work too well with iserv-proxy.
|
||||
if stdenv.hostPlatform.isStatic then
|
||||
haskell.packages.native-bignum.ghc912
|
||||
# JS backend can't use gmp
|
||||
else if stdenv.hostPlatform.isGhcjs then
|
||||
haskell.packages.native-bignum.ghc910
|
||||
haskell.packages.native-bignum.ghc912
|
||||
else
|
||||
haskell.packages.ghc910
|
||||
haskell.packages.ghc912
|
||||
);
|
||||
|
||||
# haskellPackages.ghc is build->host (it exposes the compiler used to build the
|
||||
@@ -3640,14 +3639,13 @@ with pkgs;
|
||||
ghc =
|
||||
targetPackages.haskellPackages.ghc or (
|
||||
# Prefer native-bignum to avoid linking issues with gmp;
|
||||
# GHC 9.10 doesn't work too well with iserv-proxy.
|
||||
if stdenv.hostPlatform.isStatic then
|
||||
haskell.compiler.native-bignum.ghc912
|
||||
# JS backend can't use GMP
|
||||
else if stdenv.targetPlatform.isGhcjs then
|
||||
haskell.compiler.native-bignum.ghc910
|
||||
haskell.compiler.native-bignum.ghc912
|
||||
else
|
||||
haskell.compiler.ghc910
|
||||
haskell.compiler.ghc912
|
||||
);
|
||||
|
||||
# TODO(@NixOS/haskell): deprecate this alias?
|
||||
|
||||
@@ -66,7 +66,7 @@ let
|
||||
ghc96 = sets.ghc967;
|
||||
ghc98 = sets.ghc984;
|
||||
ghc910 = sets.ghc9103;
|
||||
ghc912 = sets.ghc9123;
|
||||
ghc912 = sets.ghc9125;
|
||||
ghc914 = sets.ghc9141;
|
||||
|
||||
microhs_0_15 = sets.microhs_0_15_4_0;
|
||||
@@ -189,6 +189,14 @@ in
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
inherit buildTargetLlvmPackages llvmPackages;
|
||||
};
|
||||
ghc9125 = callPackage ../development/compilers/ghc/9.12.5.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
bb.packages.ghc9103;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
inherit buildTargetLlvmPackages llvmPackages;
|
||||
};
|
||||
ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
@@ -197,6 +205,14 @@ in
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
inherit buildTargetLlvmPackages llvmPackages;
|
||||
};
|
||||
ghc9142 = callPackage ../development/compilers/ghc/9.14.2.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
bb.packages.ghc9103;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
inherit buildTargetLlvmPackages llvmPackages;
|
||||
};
|
||||
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
|
||||
bootPkgs =
|
||||
# No suitable bindist packaged yet
|
||||
@@ -296,11 +312,21 @@ in
|
||||
ghc = bh.compiler.ghc9124;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
|
||||
};
|
||||
ghc9125 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9125;
|
||||
ghc = bh.compiler.ghc9125;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
|
||||
};
|
||||
ghc9141 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9141;
|
||||
ghc = bh.compiler.ghc9141;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { };
|
||||
};
|
||||
ghc9142 = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghc9142;
|
||||
ghc = bh.compiler.ghc9142;
|
||||
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { };
|
||||
};
|
||||
ghcHEAD = callPackage ../development/haskell-modules {
|
||||
buildHaskellPackages = bh.packages.ghcHEAD;
|
||||
ghc = bh.compiler.ghcHEAD;
|
||||
|
||||
@@ -5258,6 +5258,8 @@ self: super: with self; {
|
||||
|
||||
dsnap = callPackage ../development/python-modules/dsnap { };
|
||||
|
||||
dspy = callPackage ../development/python-modules/dspy { };
|
||||
|
||||
dt8852 = callPackage ../development/python-modules/dt8852 { };
|
||||
|
||||
dtfabric = callPackage ../development/python-modules/dtfabric { };
|
||||
|
||||
@@ -67,7 +67,9 @@ let
|
||||
ghc967
|
||||
ghc984
|
||||
ghc9103
|
||||
ghc9123
|
||||
ghc9125
|
||||
ghc9141
|
||||
ghc9142
|
||||
];
|
||||
|
||||
# packagePlatforms applied to `haskell.packages.*`
|
||||
@@ -525,22 +527,49 @@ let
|
||||
compilerNames.ghc948
|
||||
] released;
|
||||
Cabal_3_10_3_0 = lib.subtractLists [
|
||||
# time < 1.13 conflicts with time == 1.14.*
|
||||
compilerNames.ghc9123
|
||||
# time < 1.13 conflicts with time == 1.14.* || == 1.15.*
|
||||
compilerNames.ghc9125
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
] released;
|
||||
Cabal_3_12_1_0 = lib.subtractLists [
|
||||
# time < 1.15 conflicts with time == 1.15.*
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
] released;
|
||||
Cabal_3_14_2_0 = lib.subtractLists [
|
||||
# time < 1.15 conflicts with time == 1.15.*
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
] released;
|
||||
Cabal_3_12_1_0 = released;
|
||||
Cabal_3_14_2_0 = released;
|
||||
Cabal_3_16_1_0 = released;
|
||||
Cabal_3_18_1_0 = released;
|
||||
cabal2nix = released;
|
||||
cabal2nix-unstable = released;
|
||||
funcmp = released;
|
||||
# haddock-{api,library} are core packages as of GHC >= 9.12
|
||||
haddock-api = [
|
||||
compilerNames.ghc94
|
||||
compilerNames.ghc96
|
||||
# No version compatible with 9.8 nor 9.10 released to Hackage
|
||||
];
|
||||
haddock-library = [
|
||||
compilerNames.ghc94
|
||||
compilerNames.ghc96
|
||||
compilerNames.ghc98
|
||||
compilerNames.ghc910
|
||||
];
|
||||
haskell-debugger = [
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
];
|
||||
haskell-language-server = released;
|
||||
hoogle = released;
|
||||
hlint = lib.subtractLists [
|
||||
compilerNames.ghc9123
|
||||
# https://github.com/ndmitchell/hlint/issues/1672
|
||||
# https://github.com/ndmitchell/hlint/pull/1673
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
] released;
|
||||
hpack = released;
|
||||
hsdns = released;
|
||||
@@ -549,28 +578,28 @@ let
|
||||
language-nix = released;
|
||||
nix-paths = released;
|
||||
titlecase = released;
|
||||
ghc-exactprint = released;
|
||||
ghc-lib = released;
|
||||
ghc-lib-parser = released;
|
||||
ghc-lib-parser-ex = released;
|
||||
ghc-source-gen = lib.subtractLists [
|
||||
compilerNames.ghc9123
|
||||
] released;
|
||||
ghc-source-gen = released;
|
||||
ghc-tags = lib.subtractLists [
|
||||
compilerNames.ghc9123
|
||||
# https://github.com/arybczak/ghc-tags/pull/31
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
] released;
|
||||
hashable = released;
|
||||
primitive = released;
|
||||
scrod = [
|
||||
compilerNames.ghc9141
|
||||
compilerNames.ghc9142
|
||||
];
|
||||
semaphore-compat = [
|
||||
# Compiler < 9.8 don't have the semaphore-compat core package, but
|
||||
# requires unix >= 2.8.1.0 which implies GHC >= 9.6 for us.
|
||||
compilerNames.ghc967
|
||||
];
|
||||
weeder = lib.subtractLists [
|
||||
compilerNames.ghc9123
|
||||
] released;
|
||||
weeder = released;
|
||||
|
||||
# MicroHs core packages
|
||||
ghc-compat = [
|
||||
|
||||
Reference in New Issue
Block a user