mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-23 00:50:59 +00:00
Compare commits
470 Commits
nixos-unst
...
haskell-up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7632f2c418 | ||
|
|
6e369fe949 | ||
|
|
7c7f615746 | ||
|
|
2526016ba5 | ||
|
|
fa33c15b8e | ||
|
|
537df83fd5 | ||
|
|
da6ddce0c1 | ||
|
|
aba291733c | ||
|
|
1fe2bbbbd4 | ||
|
|
465ae3ed88 | ||
|
|
44bcc84ace | ||
|
|
68ed3f3cce | ||
|
|
64ce5470f3 | ||
|
|
218da86414 | ||
|
|
c2a681da35 | ||
|
|
84ddfbdb9c | ||
|
|
e9b1570739 | ||
|
|
c7a7416734 | ||
|
|
cb4fe91888 | ||
|
|
d293b600a3 | ||
|
|
5c5192eacf | ||
|
|
1a767feaef | ||
|
|
3d42c0a0ac | ||
|
|
4b38070ce3 | ||
|
|
165d7304be | ||
|
|
0ba583cda0 | ||
|
|
f7719390ce | ||
|
|
682cacc61b | ||
|
|
ed82c137bb | ||
|
|
d1df288526 | ||
|
|
ed8b5cb5ef | ||
|
|
561305933d | ||
|
|
2769ab3d43 | ||
|
|
a06c4a66e8 | ||
|
|
7a4a8df415 | ||
|
|
4983c8ff83 | ||
|
|
06e2e7b2c5 | ||
|
|
ed1aa9b8f7 | ||
|
|
41c9acb3ea | ||
|
|
33fe6e86b7 | ||
|
|
466e3db874 | ||
|
|
6221f864cd | ||
|
|
15e0b1b805 | ||
|
|
1092aa680c | ||
|
|
7cad4dfebe | ||
|
|
c58667e35f | ||
|
|
c58ce2fb5f | ||
|
|
d93f90fadd | ||
|
|
a0bf208c74 | ||
|
|
92f7fbc232 | ||
|
|
ccf5105455 | ||
|
|
d47348e680 | ||
|
|
823e04528e | ||
|
|
94311d9cb5 | ||
|
|
4f121c9662 | ||
|
|
140555144a | ||
|
|
62052f0bb6 | ||
|
|
48e9eca41f | ||
|
|
01527b0214 | ||
|
|
9a620280a8 | ||
|
|
8a73ac806b | ||
|
|
5c649291c9 | ||
|
|
72cf9fa282 | ||
|
|
2b289990cf | ||
|
|
e24717ea63 | ||
|
|
9d61dbc566 | ||
|
|
34c106cef3 | ||
|
|
700c1448d5 | ||
|
|
7a41b6b3d7 | ||
|
|
5910e1cf0e | ||
|
|
b4d12599a2 | ||
|
|
b2586a47aa | ||
|
|
c3ea815eb9 | ||
|
|
a06756ed11 | ||
|
|
9f2b521e31 | ||
|
|
33c556c45d | ||
|
|
28e5642d94 | ||
|
|
392a731ec3 | ||
|
|
f5257f77e4 | ||
|
|
c7011b0a9e | ||
|
|
487ed283b1 | ||
|
|
fe53ec4525 | ||
|
|
03efb9e853 | ||
|
|
771992ab8f | ||
|
|
0a9d0fe378 | ||
|
|
bdd384114b | ||
|
|
4898a4107d | ||
|
|
5d1cfd1fa0 | ||
|
|
700f592f4b | ||
|
|
a32b02e167 | ||
|
|
b8117fffa9 | ||
|
|
546fb8fe1b | ||
|
|
b14f5555ae | ||
|
|
3b840d46af | ||
|
|
d5bf3451a7 | ||
|
|
e8893979ed | ||
|
|
305b075f17 | ||
|
|
13599c523c | ||
|
|
da499b8b5f | ||
|
|
8d03bdea10 | ||
|
|
f993ce2ffd | ||
|
|
42586aaeb2 | ||
|
|
d433491075 | ||
|
|
2b4eb507f4 | ||
|
|
3a3ba3c18b | ||
|
|
7a1e75f683 | ||
|
|
2599fa9847 | ||
|
|
4de306f9d5 | ||
|
|
a99ebbea5c | ||
|
|
e7a98248f5 | ||
|
|
8779735d47 | ||
|
|
3b94d36d7d | ||
|
|
a8340d6475 | ||
|
|
41f076d2ed | ||
|
|
d6d0c1a3a4 | ||
|
|
4f9a49b49c | ||
|
|
ca3c4e4fd4 | ||
|
|
ab07aeec58 | ||
|
|
5648ac4351 | ||
|
|
289ee59179 | ||
|
|
b7ed9466c5 | ||
|
|
d490db1b5c | ||
|
|
1aed5d1e90 | ||
|
|
3b4a2f5533 | ||
|
|
82d4f5b39f | ||
|
|
d4686579c3 | ||
|
|
348e6977bd | ||
|
|
49aad6bcb7 | ||
|
|
6aa8cdeae4 | ||
|
|
eab52df279 | ||
|
|
8fd082ce8a | ||
|
|
2457364261 | ||
|
|
54769f3399 | ||
|
|
f57e9dddb6 | ||
|
|
5d4dccf414 | ||
|
|
d1d9dc2a1a | ||
|
|
b2cb632cb1 | ||
|
|
8574ae1a41 | ||
|
|
60f46db569 | ||
|
|
d6830397b3 | ||
|
|
e8f3271c6d | ||
|
|
82b8c86508 | ||
|
|
4165703b83 | ||
|
|
b4a424fb29 | ||
|
|
cb1cdb2b01 | ||
|
|
35a6ed3041 | ||
|
|
44ab10a93c | ||
|
|
6f4867d884 | ||
|
|
05ab63fcd9 | ||
|
|
b09733d369 | ||
|
|
8d29261d94 | ||
|
|
539df81347 | ||
|
|
6138d2d546 | ||
|
|
7fe79f3d01 | ||
|
|
164dd56a60 | ||
|
|
dbdb636652 | ||
|
|
469aba3b91 | ||
|
|
a4f0634015 | ||
|
|
0f5d8c3364 | ||
|
|
c36286be13 | ||
|
|
e0990a2f95 | ||
|
|
eef2380c20 | ||
|
|
c8ed772afc | ||
|
|
f98476d04f | ||
|
|
58d6fde159 | ||
|
|
93b7f83727 | ||
|
|
e586aa8c0b | ||
|
|
5b8dd6608e | ||
|
|
2ba1187f64 | ||
|
|
76ba128cbf | ||
|
|
545cf26bdd | ||
|
|
1c30f12981 | ||
|
|
8c22e94dcd | ||
|
|
7a00a681ee | ||
|
|
6bb92e1743 | ||
|
|
8288543817 | ||
|
|
7e7c6ca50a | ||
|
|
1fcd0d95f4 | ||
|
|
98ac34f02e | ||
|
|
b74cf98da8 | ||
|
|
84224d7c2c | ||
|
|
4e626fe7e5 | ||
|
|
8238cfe212 | ||
|
|
ae3ee2881e | ||
|
|
378aa2aeaa | ||
|
|
31a9a16659 | ||
|
|
f8e9d6cf64 | ||
|
|
127f6348f8 | ||
|
|
766cbd5238 | ||
|
|
3365007706 | ||
|
|
7f42cc775a | ||
|
|
e3c24ee8db | ||
|
|
6cc5988077 | ||
|
|
a96dd43b01 | ||
|
|
c1aaaed128 | ||
|
|
a9b4d6ec32 | ||
|
|
116208d9cf | ||
|
|
7d094b8f8d | ||
|
|
d73a035db1 | ||
|
|
a332844436 | ||
|
|
a6e06b6c68 | ||
|
|
903abf98e9 | ||
|
|
86ed8342de | ||
|
|
31f495afe9 | ||
|
|
5c37261b8a | ||
|
|
14420c0e61 | ||
|
|
e4378c08cc | ||
|
|
61ea77dd41 | ||
|
|
da941382a6 | ||
|
|
0be63e5872 | ||
|
|
920b50911d | ||
|
|
43159787fd | ||
|
|
a603053a30 | ||
|
|
5865c4be2c | ||
|
|
b72ec6bdee | ||
|
|
c818fb7e53 | ||
|
|
88daa4b688 | ||
|
|
d82c0d269e | ||
|
|
0b6b59708c | ||
|
|
9220258efb | ||
|
|
cd7e23422b | ||
|
|
778f1c6575 | ||
|
|
a8560ee995 | ||
|
|
d8a4aa50cf | ||
|
|
388592c282 | ||
|
|
cfdc80cdd7 | ||
|
|
4f210bb6a9 | ||
|
|
8c32533795 | ||
|
|
ad71e926ec | ||
|
|
aa0d0cb777 | ||
|
|
3b7b78262a | ||
|
|
523ffbe971 | ||
|
|
3aed88a715 | ||
|
|
1c3465fcb7 | ||
|
|
54112f9a6b | ||
|
|
92cbc9ca81 | ||
|
|
a1b1421843 | ||
|
|
afed809954 | ||
|
|
6a3c990a99 | ||
|
|
ebab660e15 | ||
|
|
39ee207b1d | ||
|
|
d64edb78f9 | ||
|
|
54726cb9e3 | ||
|
|
b7659cdb62 | ||
|
|
01397f0372 | ||
|
|
16ab2db83b | ||
|
|
f83e77f48f | ||
|
|
bcf85400c4 | ||
|
|
e3927c07f7 | ||
|
|
8486e8a7b3 | ||
|
|
4f0970401a | ||
|
|
9959ce2f44 | ||
|
|
3f085fe61c | ||
|
|
f61423d87c | ||
|
|
4aeebf57da | ||
|
|
4c7647a6d3 | ||
|
|
afda14f1d4 | ||
|
|
e9af2ed4be | ||
|
|
2735e861f0 | ||
|
|
92ca07b6a5 | ||
|
|
e82d6b924f | ||
|
|
94aa8f8960 | ||
|
|
75496eb67a | ||
|
|
9c55dbeccf | ||
|
|
cef090d1ab | ||
|
|
4132fb9736 | ||
|
|
98c655c09a | ||
|
|
3f49232af6 | ||
|
|
7100632254 | ||
|
|
b078be0041 | ||
|
|
a2d5d09342 | ||
|
|
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 | ||
|
|
995d34a153 | ||
|
|
9208b19946 | ||
|
|
9029909ba3 | ||
|
|
b82be3afe6 | ||
|
|
248b70dc3b | ||
|
|
0baca65faa | ||
|
|
b1528a1baf | ||
|
|
200316c491 | ||
|
|
3c4f10205c | ||
|
|
827c840fb1 | ||
|
|
095f6729ca | ||
|
|
1352e67378 | ||
|
|
0814616eaf | ||
|
|
f70431ea67 | ||
|
|
8383c3f904 | ||
|
|
cac8c10692 | ||
|
|
3cb8b0787d | ||
|
|
dfde99fd70 | ||
|
|
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 | ||
|
|
032fd2f441 | ||
|
|
e1a817a38c | ||
|
|
fe8e3efa4f |
@@ -2734,6 +2734,11 @@
|
||||
githubId = 574938;
|
||||
name = "Jonathan Glines";
|
||||
};
|
||||
auscaster = {
|
||||
github = "auscaster";
|
||||
githubId = 100876;
|
||||
name = "Kam Low";
|
||||
};
|
||||
auscyber = {
|
||||
email = "ivyp@outlook.com.au";
|
||||
github = "auscyber";
|
||||
|
||||
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
|
||||
@@ -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 verson, 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.
|
||||
|
||||
@@ -83,6 +83,12 @@
|
||||
|
||||
- Apache Kafka has dropped support for ZooKeeper mode. The `apacheKafka_3_9` and `apacheKafka_4_0` packages have been removed, as every remaining packaged version is KRaft-only. The `services.apache-kafka.zookeeper` option (previously an alias for `services.apache-kafka.settings."zookeeper.connect"`) has been removed; migrate your cluster to [KRaft](#module-services-apache-kafka-kraft) mode instead.
|
||||
|
||||
- `virtualisation.registries.block` / `insecure` / `search` were deprecated,
|
||||
because they mapped to the deprecated V1 `registries.conf` format.
|
||||
See the new option {option}`virtualisation.registries.settings`
|
||||
and [containers-registries.conf(5)](https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md)
|
||||
to migrate to the new configuration format.
|
||||
|
||||
- When Avahi's mDNS resolver is enabled (`services.avahi.nssmdns4` or `services.avahi.nssmdns6`), only the minimal mDNS resolver is enabled by default to avoid adding a 5 second delay to every failed reverse hostname lookup (e.g., delaying ping by 5 seconds). The "full" mDNS resolver now remains disabled unless `services.avahi.nssmdnsFull` is also enabled. Users who have customized [`/etc/mdns.allow`](https://github.com/avahi/nss-mdns/tree/master#etcmdnsallow) to allow mDNS domains not ending `.local` must enable `services.avahi.nssmdnsFull` to continue to resolve such domains.
|
||||
|
||||
- String values passed to `services.phpfpm.settings`, `services.phpfpm.pools.<name>.phpEnv`, and `services.phpfpm.pools.<name>.settings` are now properly quoted and escaped, except for the `${}` syntax that is left as-is. If you are manually escaping these values, please adjust accordingly.
|
||||
|
||||
@@ -23,11 +23,16 @@ let
|
||||
allowSubstitutes = false;
|
||||
buildInputs = [
|
||||
cfg.package
|
||||
pkgs.gtk2
|
||||
];
|
||||
|
||||
disallowedReferences = [
|
||||
(lib.getDev pkgs.gtk2)
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/etc/gtk-2.0/
|
||||
GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache
|
||||
GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
|
||||
'';
|
||||
|
||||
gtk3_cache =
|
||||
@@ -37,11 +42,16 @@ let
|
||||
allowSubstitutes = false;
|
||||
buildInputs = [
|
||||
cfg.package
|
||||
pkgs.gtk3
|
||||
];
|
||||
|
||||
disallowedReferences = [
|
||||
(lib.getDev pkgs.gtk3)
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out/etc/gtk-3.0/
|
||||
GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache
|
||||
GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
{
|
||||
options = {
|
||||
programs.corefreq = {
|
||||
enable = lib.mkEnableOption "Whether to enable the corefreq daemon and kernel module";
|
||||
enable = lib.mkEnableOption "the corefreq daemon and kernel module";
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
|
||||
pluginOptions = lib.types.submodule {
|
||||
options = {
|
||||
active = lib.mkEnableOption "Whether to enable this plugin";
|
||||
active = lib.mkEnableOption "this plugin";
|
||||
direction = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"in"
|
||||
|
||||
@@ -9,6 +9,15 @@ let
|
||||
|
||||
inherit (lib) literalExpression mkOption types;
|
||||
|
||||
oldRegistriesOptionsUsed = lib.any (x: x != [ ]) (
|
||||
with cfg.registries;
|
||||
[
|
||||
search
|
||||
insecure
|
||||
block
|
||||
]
|
||||
);
|
||||
|
||||
toml = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
@@ -61,30 +70,54 @@ in
|
||||
};
|
||||
|
||||
registries = {
|
||||
# TODO: remove those options in 26.11
|
||||
search = mkOption {
|
||||
visible = false;
|
||||
type = types.listOf types.str;
|
||||
default = [
|
||||
"docker.io"
|
||||
"quay.io"
|
||||
];
|
||||
default = [ ];
|
||||
description = ''
|
||||
List of repositories to search.
|
||||
|
||||
Deprecated, examine {option}`virtualisation.registries.settings` instead.
|
||||
'';
|
||||
};
|
||||
|
||||
insecure = mkOption {
|
||||
default = [ ];
|
||||
visible = false;
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of insecure repositories.
|
||||
|
||||
Deprecated, examine {option}`virtualisation.registries.settings` instead.
|
||||
'';
|
||||
};
|
||||
|
||||
block = mkOption {
|
||||
default = [ ];
|
||||
visible = false;
|
||||
type = types.listOf types.str;
|
||||
description = ''
|
||||
List of blocked repositories.
|
||||
|
||||
Deprecated, examine {option}`virtualisation.registries.settings` instead.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = toml.type;
|
||||
default = {
|
||||
registry = [
|
||||
{ location = "docker.io"; }
|
||||
{ location = "quay.io"; }
|
||||
];
|
||||
};
|
||||
description = ''
|
||||
repositories.conf configuration.
|
||||
|
||||
Examine [containers-registries.conf(5)] for more information about the format.
|
||||
|
||||
[containers-registries.conf(5)]: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md
|
||||
'';
|
||||
};
|
||||
};
|
||||
@@ -112,6 +145,15 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
warnings = lib.optional oldRegistriesOptionsUsed "the options virtualisation.registries.search / insecure / block are deprecated. See virtualisation.registries.settings instead.";
|
||||
|
||||
virtualisation.containers.registries.settings = lib.mkIf oldRegistriesOptionsUsed {
|
||||
registries = {
|
||||
block.registries = cfg.registries.block;
|
||||
insecure.registries = cfg.registries.insecure;
|
||||
search.registries = cfg.registries.search;
|
||||
};
|
||||
};
|
||||
|
||||
virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ];
|
||||
|
||||
@@ -136,9 +178,7 @@ in
|
||||
|
||||
"containers/storage.conf".source = toml.generate "storage.conf" cfg.storage.settings;
|
||||
|
||||
"containers/registries.conf".source = toml.generate "registries.conf" {
|
||||
registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries;
|
||||
};
|
||||
"containers/registries.conf".source = toml.generate "registries.conf" cfg.registries.settings;
|
||||
|
||||
"containers/policy.json".source =
|
||||
if cfg.policy != { } then
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
position = "start-of-file";
|
||||
}
|
||||
];
|
||||
vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY=";
|
||||
vendorHash = "sha256-cvgq/Djlxjiu0C5QjaxrlEeG7O2mB6mGAwV7/reYlpY=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
|
||||
machine.succeed(f"${run "gnome-extensions enable {extension}"}")
|
||||
wait_time = 5
|
||||
while getState(extension) == "ACTIVATING" and (wait_time := wait_time - 1) > 0:
|
||||
while "ACTIVATING" in getState(extension) and (wait_time := wait_time - 1) > 0:
|
||||
machine.log(f"Extension {extension} is still activating, waiting {wait_time} more seconds")
|
||||
machine.sleep(1)
|
||||
checkState("ACTIVE", extension)
|
||||
|
||||
@@ -2042,6 +2042,20 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
blink-lib = buildVimPlugin {
|
||||
pname = "blink.lib";
|
||||
version = "0-unstable-2026-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saghen";
|
||||
repo = "blink.lib";
|
||||
rev = "5876dd95deeb70aadbe9f1c0b7117a135061cdac";
|
||||
hash = "sha256-FsDcgBiD3fl0EO1advAoQBbA2HY1p8Ja7lwhmpB++Zc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/saghen/blink.lib/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
blink-nerdfont-nvim = buildVimPlugin {
|
||||
pname = "blink-nerdfont.nvim";
|
||||
version = "0-unstable-2025-12-14";
|
||||
|
||||
@@ -3,25 +3,26 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
vimPlugins,
|
||||
vimUtils,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Saghen";
|
||||
repo = "blink.pairs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PTbj6jlXNRUOmwFSplvRDDiyyGqkBzUKtuBrvZm9kzM=";
|
||||
hash = "sha256-XWrsZAH0tIPyRjr3PnAS2QAGE3+1z00jdnsxkKG0qPE=";
|
||||
};
|
||||
|
||||
blink-pairs-lib = rustPlatform.buildRustPackage {
|
||||
pname = "blink-pairs";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU=";
|
||||
cargoHash = "sha256-XLlluprxhVueHhkIufJa7fJXvFxpJJzh89+yL9PZ4GI=";
|
||||
|
||||
env = {
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
@@ -42,13 +43,15 @@ vimUtils.buildVimPlugin {
|
||||
pname = "blink.pairs";
|
||||
inherit version src;
|
||||
|
||||
dependencies = [ vimPlugins.blink-lib ];
|
||||
|
||||
preInstall =
|
||||
let
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in
|
||||
''
|
||||
mkdir -p target/release
|
||||
ln -s ${blink-pairs-lib}/lib/libblink_pairs${ext} target/release/
|
||||
mkdir -p lib
|
||||
ln -s ${blink-pairs-lib}/lib/libblink_pairs_parser${ext} lib/
|
||||
'';
|
||||
|
||||
nvimSkipModules = [
|
||||
@@ -71,6 +74,9 @@ vimUtils.buildVimPlugin {
|
||||
homepage = "https://github.com/Saghen/blink.pairs";
|
||||
changelog = "https://github.com/Saghen/blink.pairs/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ isabelroses ];
|
||||
maintainers = with lib.maintainers; [
|
||||
isabelroses
|
||||
saadndm
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -146,6 +146,7 @@ https://github.com/MahanRahmati/blink-nerdfont.nvim/,,
|
||||
https://github.com/mikavilpas/blink-ripgrep.nvim/,,
|
||||
https://github.com/Saghen/blink.compat/,,
|
||||
https://github.com/Saghen/blink.indent/,,
|
||||
https://github.com/saghen/blink.lib/,,
|
||||
https://github.com/dundalek/bloat.nvim/,,
|
||||
https://github.com/HampusHauffman/block.nvim/,,
|
||||
https://github.com/uloco/bluloco.nvim/,,
|
||||
|
||||
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-vx8fRGGW9fJYKC1Q1627NrjxqqO/zRkH83aLyc4Rxn0=";
|
||||
hash = "sha256-nDKqXhU97h0iBPPFASaCSzEdi6H48IW1rn4iB9cD36Y=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-ZWwau/aSMsamcVBrtuSWI2HiKeZHfMqBLj9WQO8IA20=";
|
||||
hash = "sha256-gIN2FE6ROma6v3vJX/Wi+OqFrq5/YV7kJXNMwGRw0Z8=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-a4yKVABQ0nVzlqS071ae5DYEqv8jgjSwLjxkEAroZvE=";
|
||||
hash = "sha256-rb50iFTniwhY/iqsKBN4jfV4j+RxjLF126opVkReyGA=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.216";
|
||||
version = "2.1.217";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -4852,8 +4852,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "emacs-mcx";
|
||||
publisher = "tuttieee";
|
||||
version = "0.110.11";
|
||||
hash = "sha256-LiiZI0Ze5F5w7OtiqY7wMpzdtyof/ynUH57wRfQnxFs=";
|
||||
version = "0.111.0";
|
||||
hash = "sha256-3z4B1NBQD3hbGcwWpS48bXuUAN1jVlSRLF0PDKGJH3A=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
|
||||
@@ -5577,8 +5577,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-zig";
|
||||
publisher = "ziglang";
|
||||
version = "0.6.18";
|
||||
hash = "sha256-jn/2Nmz6N84BCWnRdnM8w5AdiF2hh55h39SDTmRry5I=";
|
||||
version = "0.6.19";
|
||||
hash = "sha256-kdoks0da6+uofzvN5lulkDAVihSS7xoF/Q6Fo5yzQbg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2026-07-06";
|
||||
version = "0-unstable-2026-07-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "d137f0cacff196fb44a2783ecbc6e8ddb3e57cfc";
|
||||
hash = "sha256-4KPYwvtVLrzZcn3LYqSWmP+qWFjtNsCjrVY/L93/ZOE=";
|
||||
rev = "a4a0bab7f8931433588f2fcad9045c85b277373d";
|
||||
hash = "sha256-sniDrr5kSU/OnoE08WXNmTTstfI6cHyq4I7xjtrM+7c=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "pcsx2";
|
||||
version = "0-unstable-2026-06-29";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "ps2";
|
||||
rev = "b03969a333f38de21f866c2a10da4300d170364d";
|
||||
hash = "sha256-djGM6hMQCvJQG2+PWDRLeM+13/Q8upD25uhH4vU/yko=";
|
||||
rev = "43129ad5ccbde21b022dd3b3fad1862f72a109bf";
|
||||
hash = "sha256-frS44hQeMAgNMEJ5xzmt4fUpx5om5csUsE4qe4kZBao=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "150.0.7871.128",
|
||||
"version": "150.0.7871.181",
|
||||
"chromedriver": {
|
||||
"version": "150.0.7871.129",
|
||||
"hash_darwin_aarch64": "sha256-CtfrqG/AeXCg7Sl6LoidM+OhYvBWkRJoAxv3g68wqUw="
|
||||
"version": "150.0.7871.182",
|
||||
"hash_darwin_aarch64": "sha256-JddVyl8sX2ab0M5qWoHslf1r+u8tkzkCZePR4M+eNMA="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -20,8 +20,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "81891e5ca708047763816c778216799ef14c66cb",
|
||||
"hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=",
|
||||
"rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9",
|
||||
"hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -91,8 +91,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956",
|
||||
"hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o="
|
||||
"rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c",
|
||||
"hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -136,8 +136,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "01249a97332468dbdd6cf5edb8dd7bae77875de5",
|
||||
"hash": "sha256-tzomo+GTec2zixxk61gtlma/sjcBImgbLMwA+mIp1LM="
|
||||
"rev": "d089fc91e7e4881362463faf8efe9ae435e34660",
|
||||
"hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw3/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -656,8 +656,8 @@
|
||||
},
|
||||
"src/third_party/skia": {
|
||||
"url": "https://skia.googlesource.com/skia.git",
|
||||
"rev": "bee4c917220040e147f14964635ff92ce6c5a3f6",
|
||||
"hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8="
|
||||
"rev": "587c5b0f5a7b0260826a0c19094c2d952195066e",
|
||||
"hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo="
|
||||
},
|
||||
"src/third_party/smhasher/src": {
|
||||
"url": "https://chromium.googlesource.com/external/smhasher.git",
|
||||
@@ -826,8 +826,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f",
|
||||
"hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA="
|
||||
"rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638",
|
||||
"hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs="
|
||||
},
|
||||
"src/agents/shared": {
|
||||
"url": "https://chromium.googlesource.com/chromium/agents.git",
|
||||
|
||||
@@ -54,13 +54,13 @@
|
||||
"vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=",
|
||||
"hash": "sha256-lSjpFr0qBhCvwE1+DgaGPQe9gsgVNPh+go801BhedfY=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v3.38.3",
|
||||
"rev": "v3.38.5",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-se32x/vxIRiAewIIUZb/wR9eB6sDpDzN3n7OS5m8t5g="
|
||||
"vendorHash": "sha256-gSGsjK6JOBN5NdV7tpTXU7UMze9t7UHMDe/W7suFNU0="
|
||||
},
|
||||
"argoproj-labs_argocd": {
|
||||
"hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=",
|
||||
@@ -364,22 +364,22 @@
|
||||
"vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U="
|
||||
},
|
||||
"drfaust92_bitbucket": {
|
||||
"hash": "sha256-TPRHLR1wqX2uxV51iSk7IveqNQ1lLEy51G0fnfAM0No=",
|
||||
"hash": "sha256-m5Ya99ulMesUwl54sbHuvOYumbPcAhWMESVGbXIOJpE=",
|
||||
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
|
||||
"owner": "DrFaust92",
|
||||
"repo": "terraform-provider-bitbucket",
|
||||
"rev": "v2.51.0",
|
||||
"rev": "v2.52.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-RtS88NqkO1nG/8znM0sQqsAIfDc+sOMy8N4T4hmvaVA="
|
||||
"vendorHash": "sha256-uokHd4hDvWl6mrBa062F/uZmYPnW3TIZZKZwKBVq+Lo="
|
||||
},
|
||||
"e-breuninger_netbox": {
|
||||
"hash": "sha256-rCDopABF6BDJo4sdwfy+GrU9EPAIldjddj+j7opf8FA=",
|
||||
"hash": "sha256-qyzw5a35twJ5gsEe0ANv6a9MMD0UyV8hYbYt/2bBJ/k=",
|
||||
"homepage": "https://registry.terraform.io/providers/e-breuninger/netbox",
|
||||
"owner": "e-breuninger",
|
||||
"repo": "terraform-provider-netbox",
|
||||
"rev": "v5.6.2",
|
||||
"rev": "v5.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WaeRXTqXakFTYMHio+VLIKS4kS5wHQdY5zdJYwrlVjE="
|
||||
"vendorHash": "sha256-y9GRTuoh1X6GfGkGZbPpO500y8DoJS1dnwZL3BCTUcY="
|
||||
},
|
||||
"equinix_equinix": {
|
||||
"hash": "sha256-Tn8CnLx2ibkj7qlzpYCX7Cm+yoTcZujVELMJSbG+/ec=",
|
||||
@@ -508,13 +508,13 @@
|
||||
"vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc="
|
||||
},
|
||||
"hashicorp_aws": {
|
||||
"hash": "sha256-876U9ojKfnJCRKaTFhW9NvBQ6fvTpC0NYE+fhwkCwk8=",
|
||||
"hash": "sha256-ZeFC9ebkt7SWFOCpt6zD60wOTRB8tiV6SQYr/O38FRw=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v6.54.0",
|
||||
"rev": "v6.55.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-lxxSwaBXrl2xrZJ+OHrCBvHKmsq3D9Om7/Y0zPaYIQg="
|
||||
"vendorHash": "sha256-/6esBCIsNXUmx38NXUk/d3Td4uSgwZXvkETQhaERwLQ="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-SziDO4K6qv62zolBKdrhXIyaEOMM5hJ0h6ros1wC2l0=",
|
||||
@@ -715,13 +715,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hetznercloud_hcloud": {
|
||||
"hash": "sha256-Clbg0LS5SYpaEyevbZ+oDG3xFXEWjV376JvStPi3MnU=",
|
||||
"hash": "sha256-pfcgLftuPwbVsKVPAE0iF9p59eK12dtLjwPY2YMy4KE=",
|
||||
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
|
||||
"owner": "hetznercloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.66.0",
|
||||
"rev": "v1.66.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-6knIcS3hkzt3R1IC1hA6EKOceJl51/pJXpftEaZjgtY="
|
||||
"vendorHash": "sha256-Hh9sMVRVVoUEsu6nqdHhmPO2q4xPfyb0VNbhDvyPdRg="
|
||||
},
|
||||
"huaweicloud_huaweicloud": {
|
||||
"hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=",
|
||||
|
||||
@@ -27,6 +27,12 @@ rec {
|
||||
hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8=";
|
||||
}
|
||||
)
|
||||
# remove usage of deprecated pkg_resources
|
||||
# remove on next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/ab244d9c483b23f53e2548b73236d7fe4b94cb3f.patch";
|
||||
hash = "sha256-Wd6OK0BdyTcjLy1NhkLp9N2oOcQWB6geEPOlYDTBsHw=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -106,8 +106,6 @@
|
||||
libxdmcp,
|
||||
dbusSupport ? true,
|
||||
dbus,
|
||||
joystickSupport ? true,
|
||||
cwiid,
|
||||
nfsSupport ? true,
|
||||
libnfs,
|
||||
pulseSupport ? true,
|
||||
@@ -374,7 +372,6 @@ stdenv.mkDerivation (
|
||||
libxfixes
|
||||
]
|
||||
++ lib.optional dbusSupport dbus
|
||||
++ lib.optional joystickSupport cwiid
|
||||
++ lib.optional nfsSupport libnfs
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional pipewireSupport pipewire
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2026-07-11";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "c59d59711268395b324fa5d4af149f2f94f17b4f";
|
||||
hash = "sha256-+hDuzZtsKkoP5mD0VmzO/mXNjP0RPLz+hzK2XFUBvpc=";
|
||||
rev = "e2db7f7db42e1a47fd8317bb861dea6d5d38ca7e";
|
||||
hash = "sha256-D26Kba5fNdufL+QGiJRn0Nn8Haw+YHyhRKJa6ymEvLs=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
26
pkgs/by-name/ar/arcanist/dont-require-python3-in-path.patch
Normal file
26
pkgs/by-name/ar/arcanist/dont-require-python3-in-path.patch
Normal file
@@ -0,0 +1,26 @@
|
||||
Don't require python3 in PATH
|
||||
|
||||
Once packaged, the arcanoid.py script has an absolute path shebang to
|
||||
python3, so there is no need to also require python3 in PATH.
|
||||
|
||||
This prevents leaking in a python3 in PATH in the environment which arc
|
||||
runs linters etc.
|
||||
|
||||
Author: bjorn.forsman@gmail.com
|
||||
diff -uNr arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php arcanist.new/src/workflow/ArcanistAnoidWorkflow.php
|
||||
--- arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php 2022-03-31 13:23:30.865095192 +0200
|
||||
+++ arcanist.new/src/workflow/ArcanistAnoidWorkflow.php 2022-04-01 12:19:15.644159639 +0200
|
||||
@@ -24,13 +24,6 @@
|
||||
}
|
||||
|
||||
protected function runWorkflow() {
|
||||
- if (!Filesystem::binaryExists('python3')) {
|
||||
- throw new PhutilArgumentUsageException(
|
||||
- pht(
|
||||
- 'The "arc anoid" workflow requires "python3" to be available '.
|
||||
- 'in your $PATH.'));
|
||||
- }
|
||||
-
|
||||
$support_dir = phutil_get_library_root('arcanist');
|
||||
$support_dir = dirname($support_dir);
|
||||
$support_dir = $support_dir.'/support/';
|
||||
102
pkgs/by-name/ar/arcanist/package.nix
Normal file
102
pkgs/by-name/ar/arcanist/package.nix
Normal file
@@ -0,0 +1,102 @@
|
||||
{
|
||||
bison,
|
||||
cacert,
|
||||
fetchFromGitHub,
|
||||
flex,
|
||||
php,
|
||||
lib,
|
||||
stdenv,
|
||||
installShellFiles,
|
||||
which,
|
||||
python3,
|
||||
}:
|
||||
|
||||
# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being
|
||||
# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but
|
||||
# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance
|
||||
# anyway... So just do everything at once.
|
||||
let
|
||||
makeArcWrapper = toolset: ''
|
||||
cat << WRAPPER > $out/bin/${toolset}
|
||||
#!$shell -e
|
||||
export PATH='${php}/bin:${which}/bin'\''${PATH:+':'}\$PATH
|
||||
exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"
|
||||
WRAPPER
|
||||
chmod +x $out/bin/${toolset}
|
||||
'';
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "arcanist";
|
||||
version = "0-unstable-2026-07-19";
|
||||
|
||||
# The phorgeit fork is the maintained continuation of the upstream
|
||||
# (archived) phacility/arcanist.
|
||||
src = fetchFromGitHub {
|
||||
owner = "phorgeit";
|
||||
repo = "arcanist";
|
||||
rev = "b084cd508f587aaa2ed6fef5e2cee163b4bdd259";
|
||||
hash = "sha256-8QxRCYF4gnuuOBO2lZm9bbfj0ApeqUobPy/MXfhH8zE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont-require-python3-in-path.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
# python3 stays in buildInputs so patchShebangs resolves the
|
||||
# arcanoid.py shebang; php also runs at build time (xhpast codegen).
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
installShellFiles
|
||||
php
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace support/xhpast/Makefile \
|
||||
--replace "-minline-all-stringops" ""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
make xhpast -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/libexec
|
||||
make install -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES
|
||||
cp -R . $out/libexec/arcanist
|
||||
ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt $out/libexec/arcanist/resources/ssl/default.pem
|
||||
|
||||
${makeArcWrapper "arc"}
|
||||
${makeArcWrapper "phage"}
|
||||
|
||||
$out/bin/arc shell-complete --generate --
|
||||
installShellCompletion --cmd arc --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh
|
||||
installShellCompletion --cmd phage --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/arc help diff -- > /dev/null
|
||||
$out/bin/phage help alias -- > /dev/null
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Command line interface to Phorge and Phabricator";
|
||||
homepage = "https://we.phorge.it/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "arc";
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
alsa-lib,
|
||||
audacious-bare,
|
||||
curl,
|
||||
@@ -24,6 +25,7 @@
|
||||
libogg,
|
||||
libopenmpt,
|
||||
libpulseaudio,
|
||||
libresidfp,
|
||||
libsamplerate,
|
||||
libsidplayfp,
|
||||
libsndfile,
|
||||
@@ -54,7 +56,21 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-HfO59DOIYsEpBzUyaLYh/gXfz+zvH8lIY2yBVCn3wks=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ];
|
||||
patches = [
|
||||
./0001-Set-plugindir-to-PREFIX-lib-audacious.patch
|
||||
|
||||
# Remove when version >= 4.6
|
||||
(fetchpatch {
|
||||
name = "0001-audacious-plugins-sid-Use-new-sidplayfp-API.patch";
|
||||
url = "https://github.com/audacious-media-player/audacious-plugins/commit/42c05763a136d6523d611473ff3701e2d9e30bec.patch";
|
||||
hash = "sha256-bTC9nZFNwyo4PsGrLyDiQJDOrHTUDHUQaxEFe/wFPME=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-audacious-plugins-sid-Support-version-3.0-of-libsidplayfp-version.patch";
|
||||
url = "https://github.com/audacious-media-player/audacious-plugins/commit/2aaf45bd3840858e23b75d5863129a510299abd6.patch";
|
||||
hash = "sha256-FbGLd3aiKeoJXKgTMIdI/oBEx5EzcqyhL0jWhG6Fyfw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
@@ -85,6 +101,7 @@ stdenv.mkDerivation rec {
|
||||
libnotify
|
||||
libogg
|
||||
libpulseaudio
|
||||
libresidfp
|
||||
libsamplerate
|
||||
libsidplayfp
|
||||
libsndfile
|
||||
|
||||
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
baloo
|
||||
matthiasbeyer
|
||||
sshine
|
||||
];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-agent-acp";
|
||||
version = "0.58.1";
|
||||
version = "0.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agentclientprotocol";
|
||||
repo = "claude-agent-acp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9bnUVYfE3iMOcHFg9PK25MoMla978/YbkZLzWgVkd84=";
|
||||
hash = "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cqglQ/XW+E1U0CzhUBltKduwKdgvjH3hrPRb5MZJovM=";
|
||||
npmDepsHash = "sha256-dJeUPTcGN616YVKLcsiGgSn8wb7NhJZuZmPRHeUxR4U=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
{
|
||||
"version": "2.1.216",
|
||||
"commit": "7fead72f57c595d5a353a2e477bd2608d27ddcc6",
|
||||
"buildDate": "2026-07-20T18:40:59Z",
|
||||
"version": "2.1.217",
|
||||
"commit": "9963b018d22c3e6659c99e135e687870301b5c67",
|
||||
"buildDate": "2026-07-21T18:45:36Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "d01b49210d72ecbe277a2665d104bacccddf2d22185be99446d2929e0edfc48d",
|
||||
"size": 249225584
|
||||
"checksum": "5840c777fd47115e9ca276e165563c6e121e7c7e2b4d86598e0025f8cc37de56",
|
||||
"size": 250456784
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "e17cdc51437bd7a80ce0244d25045f568d67b212eea4ff81b83ee90f8666e42f",
|
||||
"size": 258670096
|
||||
"checksum": "8387a6fd44edfd40d7e74c5fdc3270a15f5e6b1b58c7c6fee560e70d3d1943da",
|
||||
"size": 259908496
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "9e3a6aecc5164f607e1183aea2092c7d7705d146e504a6207df291776996a8ea",
|
||||
"size": 264158112
|
||||
"checksum": "40c53507ac669c1d438366c19760c22f52748a06e50e0fc0e353d2cb73425597",
|
||||
"size": 265337760
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "74deca45220b8080ec75ab099bd5a5980e41a2b5879846a008fb115d436de085",
|
||||
"size": 267353072
|
||||
"checksum": "2630fc5dc6db61bc03f86b95daf47766e5ed5b61873f7bb7cfea764c5ac5a9ba",
|
||||
"size": 268573680
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "70b5dcf81bd13212ab26ec9427fa87527cd44ceb3a2a21ac04308d0f1a418a52",
|
||||
"size": 257406312
|
||||
"checksum": "e219a631e194e71bccbea2f81f5678c75f745aa6e7a74e8a407610c906d1299b",
|
||||
"size": 258585960
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "54ac63736128b3aa9a73e2d9ba1f35177eb69d7b97d975f63a36d33fe0666652",
|
||||
"size": 261976656
|
||||
"checksum": "7c44188927edbf7b918b41bc7a284292359b1ad556b7802db0148adb4b395732",
|
||||
"size": 263197264
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "902215367918866f3c36564e115bd5636d60178acf28181713d449275b833540",
|
||||
"size": 258288288
|
||||
"checksum": "6e4a3a4679f381178a90cf741de9ce924a3274304b09277695ac3a679628ca17",
|
||||
"size": 259460768
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "850ba4969ca49964b418863648131f65f76107be36d6719ff0aaaf3dfc9a422e",
|
||||
"size": 252663968
|
||||
"checksum": "f0128e1a50b8d7dec5bb4dbdff0ef622f617e798df61ebb009ed3f03d2afe613",
|
||||
"size": 253836448
|
||||
}
|
||||
},
|
||||
"sdkCompat": {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
installShellFiles,
|
||||
nixosTests,
|
||||
externalPlugins ? [ ],
|
||||
vendorHash ? "sha256-9LLTgIjOOMvYx4nhy+6X9bEBvqlKeTx//39q+YWXeHw=",
|
||||
vendorHash ? "sha256-K7cHC6IVawJmlCLR45SKEowXw7SfURIePHzj1LvKS84=",
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coredns";
|
||||
version = "1.14.3";
|
||||
version = "1.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coredns";
|
||||
repo = "coredns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uk4oWsUxaGdLQzX5JywYzi7pmQHGo06uQdLeOkP4U/s";
|
||||
hash = "sha256-3BKXmrsSsDWFl6MT6c5Q8wcQiApO1vG0KeUtJLm89jU=";
|
||||
};
|
||||
|
||||
inherit vendorHash;
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in
|
||||
index 3afbb14..b8df9d9 100644
|
||||
--- a/common/include/lib.mak.in
|
||||
+++ b/common/include/lib.mak.in
|
||||
@@ -22,7 +22,7 @@ static: $(STATIC_LIB)
|
||||
shared: $(SHARED_LIB)
|
||||
|
||||
$(STATIC_LIB): $(OBJECTS)
|
||||
- ar rcs $(STATIC_LIB) $(OBJECTS)
|
||||
+ $(AR) rcs $(STATIC_LIB) $(OBJECTS)
|
||||
|
||||
$(SHARED_LIB): $(OBJECTS)
|
||||
$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 82ca3e1..0a78283 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then
|
||||
AC_MSG_ERROR([bison not found])
|
||||
fi
|
||||
|
||||
+AC_CHECK_TOOL([AR], [ar], [:])
|
||||
+
|
||||
AC_ARG_WITH(
|
||||
[python],
|
||||
[AS_HELP_STRING([--without-python],[compile without python support])],
|
||||
@@ -1,65 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
bison,
|
||||
flex,
|
||||
bluez,
|
||||
pkg-config,
|
||||
gtk2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cwiid";
|
||||
version = "unstable-2010-02-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abstrakraft";
|
||||
repo = "cwiid";
|
||||
rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
|
||||
sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [ "--without-python" ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./fix-ar.diff
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bluez
|
||||
gtk2
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
bison
|
||||
flex
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
NIX_LDFLAGS = "-lbluetooth";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
# Some programs (for example, cabal-install) have problems with the double 0
|
||||
sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Linux Nintendo Wiimote interface";
|
||||
homepage = "http://cwiid.org";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ bennofs ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dblab";
|
||||
version = "0.44.1";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danvergara";
|
||||
repo = "dblab";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zf/51s9RoK59XLYWHSuZEt8/KfuZtZkRAfH6UCDHH6A=";
|
||||
hash = "sha256-BxGw3vWBpPlzRtP0IRXZUJrsp0hN9yBrvNp+Mk2q7aM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A=";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
zlib,
|
||||
libtiff,
|
||||
@@ -23,9 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-JUF3IX0LOtpeAJPuTbAJo79sCuPuhh7KNIuQJfcFN/A=";
|
||||
};
|
||||
|
||||
# The following patches are taken from the Debian package
|
||||
# See https://salsa.debian.org/med-team/dcmtk
|
||||
patches = [
|
||||
# Remove when updating past 3.7.0.
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-5663.patch";
|
||||
url = "https://github.com/DCMTK/dcmtk/commit/edbb085e45788dccaf0e64d71534cfca925784b8.patch";
|
||||
hash = "sha256-aSK/G5zI1Zyz0aonxnbWP/W5Ra6xCBYGxgPhM+05LXs=";
|
||||
})
|
||||
# The following patches are taken from the Debian package
|
||||
# See https://salsa.debian.org/med-team/dcmtk
|
||||
(fetchurl {
|
||||
url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/01_dcmtk_3.6.0-1.patch";
|
||||
hash = "sha256-kDEZvPqcF8+PYID24srMoPSBPltmnGiJ67LHsLVcPYM=";
|
||||
|
||||
@@ -7,24 +7,24 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3000.1.27";
|
||||
version = "3000.2.17";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz";
|
||||
hash = "sha256-y0kHpKT2wZvquR0EOIpFN2EMC84BpOOOKLXWwE0nygo=";
|
||||
hash = "sha256-8OHpNjr8buaMTvh7q0rrf/XMCKX6g4NQ7zzu/bsqK+I=";
|
||||
};
|
||||
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz";
|
||||
hash = "sha256-gyWbCpfLNphBjoSGVIhi7hgGToBKceavEKn//yDA1uw=";
|
||||
hash = "sha256-EW3HHvCFqSK8P/DqA3fUsmxSmkMdWCRuNlcpE+LSViQ=";
|
||||
};
|
||||
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
|
||||
hash = "sha256-OnpANdMh9ws9FHwfwWR63OSaC/P3MB+eAV33JxQNUaQ=";
|
||||
hash = "sha256-YOLt0yH1zV4c/fPW1eEgZPJTJsqONqitcfQ9AAdF3/g=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "dnsdiag";
|
||||
version = "2.9.3";
|
||||
version = "2.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "farrokhi";
|
||||
repo = "dnsdiag";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CMWjPgdYRL730AkC+PZaDAeefq9jCbO4o3RcdlIqsmU=";
|
||||
hash = "sha256-R/yv3cPohMQ+DoUj1cvm96Ts2+QFy+SQQoji+HADf8U=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "cryptography" ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "docker-credential-env";
|
||||
version = "1.6.1";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isometry";
|
||||
repo = "docker-credential-env";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EqSlbgGOuGQ2Y7aZ4MqUBgWK0aVI7Afi/KAxfdVu0zE=";
|
||||
hash = "sha256-KsOLY1XDJVrsm2rnDCffPqtlD2yw+arWsJaItwoOyUQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTrFRpRjdLXKTvj7I2KYcIsFfuWLHPnjKV+3Q6b6DDs=";
|
||||
vendorHash = "sha256-Qr6T7NJaJcFD0EYuPS7mWJi0tjyut1aQ+Wbarc0tpGY=";
|
||||
|
||||
ldflags =
|
||||
let
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dolt";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SyoTBkIjZ1yZQXYo1qcdU18Yo84U1xjkNYU4pYlX748=";
|
||||
hash = "sha256-vy5Bw8hALFlsQAYFoTnk0AX87ebiDDu0nGqVbaZ3P5E=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-/NC/yKi/XJB0fhfgeH4Arao0lr+i16YsDGWlS5pmx+0=";
|
||||
vendorHash = "sha256-DO3lR4sjxFOSiO2YIri8PqH3cpNuxD45FWX7Ushov3s=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "doppler";
|
||||
version = "3.76.0";
|
||||
version = "3.76.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-CmNSn4WRWMP07qC5APw8PTouCUOHJrz1ZYqpKhdiIDM=";
|
||||
hash = "sha256-8df60dWV/8ZezCAXVT7wmzCCB/TyljzAszv8sy7qRjU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u6SB3SXCqu7Y2aUoTAJ01mtDCxMofVQLAde1jDxVvks=";
|
||||
vendorHash = "sha256-rDpr4qWhMWXEhgZrmoW5tzPZif3KAv3gDtJNtXzbVq0=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fdkaac";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nu774";
|
||||
repo = "fdkaac";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yx+adbWs1qmuK+geHjCj7i56URDLVrUdLbJ2gKrJ1Oo=";
|
||||
hash = "sha256-8fI3mbHPb6E5YXl4RaqU8P0ALldkOh+RKfecDX87m/s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flyway";
|
||||
version = "12.11.0";
|
||||
version = "13.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-2IVSuzrtwqsvqpj7KlCQblD7j7HCK3HMOs1tkcL0ClU=";
|
||||
sha256 = "sha256-uVbvjvfEw+JqTicfB3N2a+Cxm6fJRptOJm4C8oZ15ao=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-B/QyB6ZdyjIBBOOZG1nnVcXyqbPGyf56AndELzi3IZY=";
|
||||
hash = "sha256-6nM9dJ6eoQ4ec6VfW1p6rxQ2U8CnOKe9unQ32jSnAWY=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-IRSg7/jj8QRvVYuHiYzci/mWrQ2lW6RJy9QdZs/guFI=";
|
||||
hash = "sha256-r4drlfi1jz86w1b7LIt6pz7sW4WB7UiU49uVwxtXKdw=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.6.269";
|
||||
version = "5.6.274";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gelly";
|
||||
version = "1.9.2";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fingel";
|
||||
repo = "gelly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WcnPNsFvQ/CqvAYxWeoAWZiJ62bOgLe8fGNeyh2B+8s=";
|
||||
hash = "sha256-GYMLV4hffaIbqUp1b5ERo2QQqiKRlHe9oXfq+wNH/hM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0ZKW2xxjTn84mWBrK6zhw/uiOnd5sD+URu2O0a1TZW8=";
|
||||
cargoHash = "sha256-CsmcXlkOec/KJ59Ng7MyGsfjWQ80YyV6MztRFULmvDA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "git-spice";
|
||||
version = "0.31.1";
|
||||
version = "0.31.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abhinav";
|
||||
repo = "git-spice";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XPDsjGufzShPdGQs90TCILNWeGntaZWizffqi10EUVw=";
|
||||
hash = "sha256-0f7n27oSz6a3piaXA4jj7UWgS6Vl4WzRkHh5VAF3tGo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xcU0B+ju1f/JfNVKpXkIy5SO9rd3O9Nl0FizW3kVgI0=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotify-cli";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-GwPIGWEpj5GjGV9bz3LctZctHQe+Vywoc1piNb9vAAw=";
|
||||
sha256 = "sha256-l6WiwAIxKSQnciyssY+dfEdn+GuCSrXdxxBNek4XRiA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+G0LWlPiDcYmEou4gpoIU/OAjzQ3VSHftM1ViG9lhYM=";
|
||||
vendorHash = "sha256-320MFcSPv05Zh/Lawq6ry+eemcsRpJu85LSd6TOZ8mM=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/gotify
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotlsaflare";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stenstromen";
|
||||
repo = "gotlsaflare";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Zw8RfwAR6dw4YUSdML1QJCXVj1s9ZNzr3LTb2vt2fjI=";
|
||||
hash = "sha256-LDUrLeIgEr0IaYUHRdPtk2soYGbPAycQcroIUMrmVKg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OaaIhXh9+iqMBnP4pHxuJMynXxvfY6iiv+Cd4Dq1I+I=";
|
||||
vendorHash = "sha256-btvgwiYm+ccT9BPVO42bxidKfOBDrBMT3WidDlMi17k=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hacompanion";
|
||||
version = "1.0.30";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobias-kuendig";
|
||||
repo = "hacompanion";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-TC1ZnYT5WGbKP2Y2pOKaLj8Hmr3lU+LShkNV2DpcyDk=";
|
||||
hash = "sha256-WwzfRsRfDMiK7V9XH/G86+illsbQdTw+MEXNmW5MLLg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SohjueM0DwSuh7XVClYiWA/5d0V6x2vmp5aPxgmIJYY=";
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "igsc";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "igsc";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-GdeGGrnkxJQlg+vVQan5rJW/rxlStD4TAmWxfloX0+k=";
|
||||
hash = "sha256-NSNLiUMJBGtnfWUDIPIukyjgcI1YX9cfDDWphW8uSWs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
721
pkgs/by-name/ja/jadx/deps.json
generated
721
pkgs/by-name/ja/jadx/deps.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,79 +1,143 @@
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index df96f46c..f1f422f2 100644
|
||||
index 0f4d3f09..a44eec6f 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -126,42 +126,11 @@ fun isNonStable(version: String): Boolean {
|
||||
destinationDirectory.set(layout.buildDirectory)
|
||||
@@ -129,19 +129,6 @@ fun loadEnv(file: File): Map<String, String> {
|
||||
return envMap
|
||||
}
|
||||
|
||||
-val distWin by tasks.registering(Zip::class) {
|
||||
- group = "jadx"
|
||||
- description = "Build Windows bundle"
|
||||
-
|
||||
- from(distWinConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
-val distWinWithJre by tasks.registering(Zip::class) {
|
||||
- description = "Build Windows with JRE bundle"
|
||||
-
|
||||
- from(distWinWithJreConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
val dist by tasks.registering {
|
||||
group = "jadx"
|
||||
description = "Build jadx distribution zip bundles"
|
||||
|
||||
dependsOn(pack)
|
||||
-
|
||||
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
|
||||
- if (os.isWindows) {
|
||||
- if (project.hasProperty("bundleJRE")) {
|
||||
- println("Build win bundle with JRE")
|
||||
- dependsOn(distWinWithJre)
|
||||
- } else {
|
||||
- dependsOn(distWin)
|
||||
- }
|
||||
-val distWinConfiguration =
|
||||
- configurations.create("distWinConfiguration") {
|
||||
- isCanBeConsumed = false
|
||||
- }
|
||||
}
|
||||
-val distWinWithJreConfiguration =
|
||||
- configurations.create("distWinWithJreConfiguration") {
|
||||
- isCanBeConsumed = false
|
||||
- }
|
||||
-dependencies {
|
||||
- distWinConfiguration(project(":jadx-gui", "distWinConfiguration"))
|
||||
- distWinWithJreConfiguration(project(":jadx-gui", "distWinWithJreConfiguration"))
|
||||
-}
|
||||
-
|
||||
val copyArtifacts =
|
||||
tasks.register<Copy>("copyArtifacts") {
|
||||
val jarCliPattern = "jadx-cli-(.*)-all.jar".toPattern()
|
||||
@@ -186,45 +173,12 @@ fun loadEnv(file: File): Map<String, String> {
|
||||
}
|
||||
}
|
||||
|
||||
val cleanBuildDir by tasks.registering(Delete::class) {
|
||||
-val distWin =
|
||||
- tasks.register<Zip>("distWin") {
|
||||
- group = "jadx"
|
||||
- description = "Build Windows bundle"
|
||||
-
|
||||
- from(distWinConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWin"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
-
|
||||
-val distWinWithJre =
|
||||
- tasks.register<Zip>("distWinWithJre") {
|
||||
- description = "Build Windows with JRE bundle"
|
||||
-
|
||||
- from(distWinWithJreConfiguration)
|
||||
-
|
||||
- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
|
||||
- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
-
|
||||
val dist =
|
||||
tasks.register("dist") {
|
||||
group = "jadx"
|
||||
description = "Build jadx distribution zip bundles"
|
||||
|
||||
dependsOn(pack)
|
||||
-
|
||||
- val os = DefaultNativePlatform.getCurrentOperatingSystem()
|
||||
- if (os.isWindows) {
|
||||
- if (project.hasProperty("bundleJRE")) {
|
||||
- println("Build win bundle with JRE")
|
||||
- dependsOn(distWinWithJre)
|
||||
- } else {
|
||||
- dependsOn(distWin)
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
val cleanBuildDir =
|
||||
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
|
||||
index ed67e57a..99aa9eb4 100644
|
||||
index 15f610b4..99aa9eb4 100644
|
||||
--- a/buildSrc/build.gradle.kts
|
||||
+++ b/buildSrc/build.gradle.kts
|
||||
@@ -4,8 +4,6 @@
|
||||
@@ -4,10 +4,6 @@
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
|
||||
-
|
||||
- implementation("org.openrewrite:plugin:6.19.1")
|
||||
- implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.2.0")
|
||||
- implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0")
|
||||
}
|
||||
|
||||
repositories {
|
||||
diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
|
||||
index 0f60d301..5e577155 100644
|
||||
index 256dadde..7e044113 100644
|
||||
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
|
||||
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
|
||||
@@ -3,8 +3,6 @@
|
||||
@@ -1,15 +1,8 @@
|
||||
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
||||
-import net.ltgt.gradle.errorprone.CheckSeverity
|
||||
-import net.ltgt.gradle.errorprone.errorprone
|
||||
-import net.ltgt.gradle.nullaway.nullaway
|
||||
|
||||
plugins {
|
||||
java
|
||||
checkstyle
|
||||
-
|
||||
- id("jadx-rewrite")
|
||||
- id("net.ltgt.errorprone")
|
||||
- id("net.ltgt.nullaway")
|
||||
}
|
||||
|
||||
val jadxVersion: String by rootProject.extra
|
||||
val jadxVersion = rootProject.extra["jadxVersion"] as String
|
||||
@@ -30,9 +23,6 @@
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||
|
||||
testCompileOnly("org.jetbrains:annotations:26.1.0")
|
||||
-
|
||||
- errorprone("com.google.errorprone:error_prone_core:2.50.0")
|
||||
- errorprone("com.uber.nullaway:nullaway:0.13.7")
|
||||
}
|
||||
|
||||
repositories {
|
||||
@@ -77,21 +67,4 @@
|
||||
if (checkEnabled) {
|
||||
options.compilerArgs.add("-XDaddTypeAnnotationsToSymbol=true")
|
||||
}
|
||||
- options.errorprone {
|
||||
- isEnabled = checkEnabled
|
||||
- allErrorsAsWarnings = jadxBuildChecksMode == "warn"
|
||||
- excludedPaths = ".*/test/.*"
|
||||
- nullaway {
|
||||
- if (jadxBuildChecksMode == "error") {
|
||||
- error()
|
||||
- }
|
||||
- annotatedPackages.add("jadx")
|
||||
- }
|
||||
- // TODO: fix and enable all checks
|
||||
- disable("MixedMutabilityReturnType")
|
||||
- disable("EqualsGetClass")
|
||||
- disable("OperatorPrecedence")
|
||||
- disable("UnusedVariable")
|
||||
- disable("ImmutableEnumChecker")
|
||||
- }
|
||||
}
|
||||
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
|
||||
deleted file mode 100644
|
||||
index ceca3fe5..00000000
|
||||
index c6f3e979..00000000
|
||||
--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
|
||||
+++ /dev/null
|
||||
@@ -1,35 +0,0 @@
|
||||
@@ -86,10 +150,10 @@ index ceca3fe5..00000000
|
||||
-}
|
||||
-
|
||||
-dependencies {
|
||||
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.41.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.29.2")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.39.0")
|
||||
- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.38.0")
|
||||
-}
|
||||
-
|
||||
-tasks {
|
||||
@@ -113,7 +177,7 @@ index ceca3fe5..00000000
|
||||
- }
|
||||
-}
|
||||
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
|
||||
index 2677881f..4cec0884 100644
|
||||
index fec42601..c4e20570 100644
|
||||
--- a/jadx-gui/build.gradle.kts
|
||||
+++ b/jadx-gui/build.gradle.kts
|
||||
@@ -3,7 +3,6 @@
|
||||
@@ -124,7 +188,7 @@ index 2677881f..4cec0884 100644
|
||||
id("org.beryx.runtime") version "2.0.1"
|
||||
}
|
||||
|
||||
@@ -129,36 +128,6 @@
|
||||
@@ -142,42 +141,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -145,79 +209,92 @@ index 2677881f..4cec0884 100644
|
||||
- supportUrl.set("https://github.com/skylot/jadx")
|
||||
-
|
||||
- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%")
|
||||
- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList())
|
||||
- classpath.set(
|
||||
- tasks
|
||||
- .getByName("shadowJar")
|
||||
- .outputs.files
|
||||
- .map { "%EXEDIR%/lib/${it.name}" }
|
||||
- .sorted()
|
||||
- .toList(),
|
||||
- )
|
||||
- println("Launch4J classpath: ${classpath.get()}")
|
||||
-
|
||||
- chdir.set("") // don't change current dir
|
||||
- libraryDir.set("") // don't add any libs
|
||||
-}
|
||||
-
|
||||
-fun escapeJVMOptions(): List<String> {
|
||||
- return application.applicationDefaultJvmArgs
|
||||
-fun escapeJVMOptions(): List<String> =
|
||||
- application.applicationDefaultJvmArgs
|
||||
- .toList()
|
||||
- .map { if (it.startsWith("-D")) "\"$it\"" else it }
|
||||
-}
|
||||
-
|
||||
runtime {
|
||||
addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages")
|
||||
addOptions("--strip-debug", "--no-header-files", "--no-man-pages")
|
||||
addModules(
|
||||
@@ -179,48 +148,6 @@ fun escapeJVMOptions(): List<String> {
|
||||
@@ -198,66 +161,6 @@ fun escapeJVMOptions(): List<String> =
|
||||
}
|
||||
}
|
||||
|
||||
-val copyDistWin by tasks.registering(Copy::class) {
|
||||
- description = "Copy files for Windows bundle"
|
||||
-val copyDistWin =
|
||||
- tasks.register<Copy>("copyDistWin") {
|
||||
- description = "Copy files for Windows bundle"
|
||||
-
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
-val copyDistWinWithJre by tasks.registering(Copy::class) {
|
||||
- description = "Copy files for Windows with JRE bundle"
|
||||
-val copyDistWinWithJre =
|
||||
- tasks.register<Copy>("copyDistWinWithJre") {
|
||||
- description = "Copy files for Windows with JRE bundle"
|
||||
-
|
||||
- val jreTask = tasks.runtime.get()
|
||||
- dependsOn(jreTask)
|
||||
- from(jreTask.jreDir) {
|
||||
- include("**/*")
|
||||
- into("jre")
|
||||
- val jreTask = tasks.runtime.get()
|
||||
- dependsOn(jreTask)
|
||||
- from(jreTask.jreDir) {
|
||||
- include("**/*")
|
||||
- into("jre")
|
||||
- }
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
- }
|
||||
- val libTask = tasks.getByName("shadowJar")
|
||||
- dependsOn(libTask)
|
||||
- from(libTask.outputs) {
|
||||
- include("*.jar")
|
||||
- into("lib")
|
||||
- }
|
||||
- val exeTask = tasks.getByName("createExe")
|
||||
- dependsOn(exeTask)
|
||||
- from(exeTask.outputs) {
|
||||
- include("*.exe")
|
||||
- }
|
||||
- into(layout.buildDirectory.dir("jadx-gui-with-jre-win"))
|
||||
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
-}
|
||||
-
|
||||
/**
|
||||
* Register and expose distribution artifacts to use in top level packaging tasks
|
||||
*/
|
||||
@@ -230,10 +157,6 @@ fun escapeJVMOptions(): List<String> {
|
||||
val distWinWithJreConfiguration by configurations.creating {
|
||||
isCanBeResolved = false
|
||||
}
|
||||
-/**
|
||||
- * Register and expose distribution artifacts to use in top level packaging tasks
|
||||
- */
|
||||
-val distWinConfiguration =
|
||||
- configurations.create("distWinConfiguration") {
|
||||
- isCanBeResolved = false
|
||||
- }
|
||||
-val distWinWithJreConfiguration =
|
||||
- configurations.create("distWinWithJreConfiguration") {
|
||||
- isCanBeResolved = false
|
||||
- }
|
||||
-artifacts {
|
||||
- add(distWinConfiguration.name, copyDistWin)
|
||||
- add(distWinWithJreConfiguration.name, copyDistWinWithJre)
|
||||
-}
|
||||
|
||||
val syncNLSLines by tasks.registering(JavaExec::class) {
|
||||
group = "jadx-dev"
|
||||
-
|
||||
val syncNLSLines =
|
||||
tasks.register<JavaExec>("syncNLSLines") {
|
||||
group = "jadx-dev"
|
||||
|
||||
@@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jadx";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skylot";
|
||||
repo = "jadx";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WONsXDNhlDuqKsS2Olz3ndZIbi6mdi9JBKaHPpcdTQQ=";
|
||||
hash = "sha256-qwGFMj18xJOrBudthAIeKc/PT0uUzjmTgBYovF4A/94=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "kakoune-lsp";
|
||||
version = "21.0.1";
|
||||
version = "21.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kakoune-lsp";
|
||||
repo = "kakoune-lsp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZBeUxH/CBpg/Af1rYjOPWAyDkRNvgeifltpP5GGr+wA=";
|
||||
hash = "sha256-nY/DOXE7youb/xpUU7T0t23vSMrGqlEa6qs5tclDE88=";
|
||||
};
|
||||
|
||||
patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ];
|
||||
|
||||
cargoHash = "sha256-TBjoUy2e9GLYa0fNI1NgC4rr32vZXqaUGYksaSHE8hg=";
|
||||
cargoHash = "sha256-1ktWlguBYURqIEotG9D4953bJm0TMM7+BzufFqXUibk=";
|
||||
|
||||
meta = {
|
||||
description = "Kakoune Language Server Protocol Client";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "KDDockWidgets";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDAB";
|
||||
repo = "KDDockWidgets";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-/ioCX/Txqr84uJJYPhVLrZKug6VdWQDVirmsTg42PXs=";
|
||||
sha256 = "sha256-Bb9ZQTJ77Brn0XQY2DaBB68xk3Hw1ORuIU0xWIBVmhg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
|
||||
hashable
|
||||
isocline
|
||||
lens
|
||||
lsp_2_8_0_0
|
||||
lsp
|
||||
mtl
|
||||
network
|
||||
network-simple
|
||||
|
||||
105
pkgs/by-name/li/libresidfp/package.nix
Normal file
105
pkgs/by-name/li/libresidfp/package.nix
Normal file
@@ -0,0 +1,105 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
testers,
|
||||
withDocumentation ? true,
|
||||
autoreconfHook,
|
||||
doxygen,
|
||||
graphviz,
|
||||
makeFontsConf,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libresidfp";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libresidfp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xPIyJZWL5+tW3xk9b4dlL4klxXM6+cy38cALuhsH1zk=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
]
|
||||
++ lib.optionals withDocumentation [
|
||||
"doc"
|
||||
];
|
||||
|
||||
# https://github.com/libsidplayfp/libresidfp/pull/41
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace-fail 'AC_SUBST([LIB_MAJOR])NEWS.md' 'AC_SUBST([LIB_MAJOR])'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals withDocumentation [
|
||||
doxygen
|
||||
graphviz
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
# Supposedly runtime detection only supported on GCC
|
||||
# __builtin_cpu_supports on GCC's list of x86 built-in functions
|
||||
(lib.strings.withFeatureAs true "simd" (
|
||||
if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none"
|
||||
))
|
||||
(lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildFlags = [
|
||||
"all"
|
||||
]
|
||||
++ lib.optionals withDocumentation [
|
||||
"doc"
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
postInstall = lib.optionalString withDocumentation ''
|
||||
mkdir -p $doc/share/doc/
|
||||
mv docs/html $doc/share/doc/libresidfp
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs withDocumentation {
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
versionCheck = true;
|
||||
};
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = "[a-zA-Z]";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Cycle exact SID emulation";
|
||||
homepage = "https://github.com/libsidplayfp/libresidfp";
|
||||
changelog = "https://github.com/libsidplayfp/libresidfp/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.OPNA2608 ];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [
|
||||
"libresidfp"
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -10,7 +10,7 @@
|
||||
doxygen,
|
||||
graphviz,
|
||||
libexsid,
|
||||
libgcrypt,
|
||||
libresidfp,
|
||||
libusb1,
|
||||
perl,
|
||||
pkg-config,
|
||||
@@ -19,24 +19,29 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.16.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gOnLjOw9TN2b0ne7Otm5DZhV/2D1xjLxwnaYilnlBgc=";
|
||||
hash = "sha256-T0No3gxlG/IHHReJ23ET9MYvKgMgCP+e9YivBbLQm0I=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
]
|
||||
++ lib.optionals docSupport [ "doc" ];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
perl
|
||||
@@ -50,30 +55,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
libexsid
|
||||
libgcrypt
|
||||
libresidfp
|
||||
libusb1
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
(lib.strings.enableFeature true "hardsid")
|
||||
(lib.strings.withFeature true "gcrypt")
|
||||
(lib.strings.withFeature true "exsid")
|
||||
(lib.strings.withFeature true "usbsid")
|
||||
# Supposedly runtime detection only supported on GCC
|
||||
# https://github.com/libsidplayfp/libsidplayfp/commit/65874166b14d44467782d2996f7b644fbde0ee87
|
||||
# __builtin_cpu_supports on GCC's list of x86 built-in functions
|
||||
(lib.strings.withFeatureAs true "simd" (
|
||||
if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none"
|
||||
))
|
||||
(lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
|
||||
];
|
||||
|
||||
# Make Doxygen happy with the setup, reduce log noise
|
||||
env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
});
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preBuild = ''
|
||||
# Reduce noise from fontconfig during doc building
|
||||
@@ -89,6 +81,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv docs/html $doc/share/doc/libsidplayfp/
|
||||
'';
|
||||
|
||||
# Make Doxygen happy with the setup, reduce log noise
|
||||
env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf {
|
||||
fontDirectories = [ ];
|
||||
});
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = gitUpdater {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
@@ -19,24 +18,16 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.7.37";
|
||||
version = "0.7.39";
|
||||
pname = "libsolv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "libsolv";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-hiumMnTJ3eP+acH2V0eNTM71Fw//IWQPechCA0+kH1s=";
|
||||
hash = "sha256-nl1g1BKauSXV54xjO/1jDQMbr1WfycupR0CPqkgkzrA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-9149";
|
||||
url = "https://github.com/openSUSE/libsolv/commit/210386037c892a720972ad35a3d8f7073b4d763b.patch";
|
||||
hash = "sha256-ju3xn78UGMR5usq1e1ovFTWnKW1TPDA77sNGx8yc8Z8=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_COMPLEX_DEPS=true"
|
||||
(lib.cmakeBool "ENABLE_CONDA" withConda)
|
||||
|
||||
@@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libvgm";
|
||||
version = "0-unstable-2026-06-07";
|
||||
version = "0-unstable-2026-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValleyBell";
|
||||
repo = "libvgm";
|
||||
rev = "08471963604c29353501439c4d6f97b57bf8b07b";
|
||||
hash = "sha256-1ddlxs/iq993DkjfYbdyCESspqfhAnmkjErALczpmdI=";
|
||||
rev = "867223e7c33d63de115d1ab955f784c44f19040a";
|
||||
hash = "sha256-GuvngfkqLy3E5Esb+HOnY6G1XYDyDzv1yz+NccaclGI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -18,18 +18,18 @@
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lux-cli";
|
||||
|
||||
version = "0.36.1";
|
||||
version = "0.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lumen-oss";
|
||||
repo = "lux";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-260gORAxU0l3gxv4ojUSmdNgHvdLpQNPdLkn8ze4HGA=";
|
||||
hash = "sha256-LTZGWwk4gVsPhNWpzK7kq5fYih8xgf0KbyPW50dDYO8=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "lux-cli";
|
||||
|
||||
cargoHash = "sha256-P9XonyY+gC0ni8WqkMPWJW6AjU4EBB7BEjxZ3U/q2qM=";
|
||||
cargoHash = "sha256-xpPXCTrlZE3Gl0AsA4O/baQyHtvOAf6cPaUdAEtwmx0=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -70,6 +70,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substitute $src/contrib/systemd/mako.service $out/lib/systemd/user/mako.service \
|
||||
--replace-fail '/usr/bin' "$out/bin"
|
||||
chmod 0644 $out/lib/systemd/user/mako.service
|
||||
|
||||
# Route D-Bus activation through the unit installed above, so it
|
||||
# waits for graphical-session.target instead of exec'ing mako
|
||||
# before the compositor is up.
|
||||
echo "SystemdService=mako.service" \
|
||||
>> $out/share/dbus-1/services/fr.emersion.mako.service
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -164,11 +164,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "150.0.4078.65";
|
||||
version = "150.0.4078.83";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-mt8fx6gJE5PGFiMLeceJ5rmLmwmQXaxx7VY8yPIQqyE=";
|
||||
hash = "sha256-uTn6/f4Q9eifaJr5/U6i7KmJAtJKxHeaUsdV+omcqlQ=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -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
|
||||
]
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
libarchive,
|
||||
libass,
|
||||
libbluray,
|
||||
libbs2b,
|
||||
libcaca,
|
||||
libcdio,
|
||||
libcdio-paranoia,
|
||||
@@ -66,7 +65,6 @@
|
||||
alsaSupport ? stdenv.hostPlatform.isLinux,
|
||||
archiveSupport ? true,
|
||||
bluraySupport ? true,
|
||||
bs2bSupport ? true,
|
||||
cacaSupport ? true,
|
||||
cddaSupport ? false,
|
||||
cmsSupport ? true,
|
||||
@@ -180,7 +178,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals alsaSupport [ alsa-lib ]
|
||||
++ lib.optionals archiveSupport [ libarchive ]
|
||||
++ lib.optionals bluraySupport [ libbluray ]
|
||||
++ lib.optionals bs2bSupport [ libbs2b ]
|
||||
++ lib.optionals cacaSupport [ libcaca ]
|
||||
++ lib.optionals cddaSupport [
|
||||
libcdio
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "msedgedriver";
|
||||
version = "150.0.4078.65";
|
||||
version = "150.0.4078.83";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
|
||||
hash = "sha256-TwGjt8Hw4rvwW2OwkIcqRzKLXu1dRL7/9n+Zq3VmKag=";
|
||||
hash = "sha256-hmzL3ucHgKxPT1/WwqfWUWndSMUEf7n0Z0Wh9Rgm/MU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mtail";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaqx0r";
|
||||
repo = "mtail";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KX47oD7qLBpwItUVltysiekjy4wtpK13SVdvjSx9jmU=";
|
||||
hash = "sha256-uwEx/nhktiThUfV6tvTchEt4/hTpQsN+EXXSqL+Fzio=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nerdfetch";
|
||||
version = "8.5.4";
|
||||
version = "8.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThatOneCalculator";
|
||||
repo = "NerdFetch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tV8Ug7i/BTD+TxUCejwYdGLYauAYos18AnWQ1XgynWs=";
|
||||
hash = "sha256-LSp5UNXp4WBDk2MIb4UBxifTTYI36SpRU7BHL38p8VQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -25,17 +25,19 @@
|
||||
webp-pixbuf-loader,
|
||||
libavif,
|
||||
libheif,
|
||||
versionCheckHook,
|
||||
fontconfig,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nocturne";
|
||||
version = "1.3.2";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeffser";
|
||||
repo = "Nocturne";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uXsl438K0Ew0fdrKtGf28VkHQ76loDWKLJkounzqhEQ=";
|
||||
hash = "sha256-q2jN1X/2Iayzqf+2d1roQ9dbZKGqWy3sXC78lKXLzPM=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -104,6 +106,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# avoid installing Navidrome at runtime if not available, incompatible with the nix store
|
||||
patches = [ ./disable-navidrome-setup.patch ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckKeepEnvironment = [
|
||||
"XDG_CACHE_HOME"
|
||||
"FONTCONFIG_FILE"
|
||||
];
|
||||
# it still errors due to lack of display, but the retcode is 0 and the version is printed
|
||||
preInstallCheck = ''
|
||||
export XDG_CACHE_HOME=$(mktemp -d)
|
||||
export FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Adwaita music player for OpenSubsonic servers like Navidrome";
|
||||
homepage = "https://jeffser.com/nocturne/";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nym";
|
||||
version = "2024.14-crunch-patched";
|
||||
version = "2026.9-venaco";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nymtech";
|
||||
repo = "nym";
|
||||
tag = "nym-binaries-v${version}";
|
||||
hash = "sha256-ze0N+Hg+jVFKaoreCrZUUA3cHGtUZFtxCh5RwTqOdsc=";
|
||||
hash = "sha256-s3I4yfJfewJpMSqzHXmMFzvsfQAsVNZKzIroatpnfpA=";
|
||||
};
|
||||
|
||||
swagger-ui = fetchurl {
|
||||
@@ -27,11 +27,18 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-51QdzV4eYnA+pC1b7TagSF1g+n67IvZw3euJyI3ZRtM=";
|
||||
cargoHash = "sha256-ifdz+jZK9Hgezx4/Q9bDsOZOFynqE4GEFfIwXISuxp8=";
|
||||
|
||||
env = {
|
||||
SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
VERGEN_BUILD_TIMESTAMP = "0";
|
||||
VERGEN_BUILD_SEMVER = version;
|
||||
VERGEN_GIT_COMMIT_TIMESTAMP = "0";
|
||||
VERGEN_GIT_BRANCH = "master";
|
||||
VERGEN_RUSTC_SEMVER = rustc.version;
|
||||
VERGEN_RUSTC_CHANNEL = "stable";
|
||||
VERGEN_CARGO_PROFILE = "release";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,18 +55,12 @@ rustPlatform.buildRustPackage rec {
|
||||
rev-prefix = "nym-binaries-v";
|
||||
};
|
||||
|
||||
env = {
|
||||
VERGEN_BUILD_TIMESTAMP = "0";
|
||||
VERGEN_BUILD_SEMVER = version;
|
||||
VERGEN_GIT_COMMIT_TIMESTAMP = "0";
|
||||
VERGEN_GIT_BRANCH = "master";
|
||||
VERGEN_RUSTC_SEMVER = rustc.version;
|
||||
VERGEN_RUSTC_CHANNEL = "stable";
|
||||
VERGEN_CARGO_PROFILE = "release";
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
"--skip=ping::http::tests::resolve_host_with_valid_hostname_returns_some"
|
||||
"--skip=ecash::tests::credential_tests::blind_sign_correct"
|
||||
"--skip=ecash::tests::credential_tests::already_issued"
|
||||
"--skip=ecash::tests::issued_ticketbooks::issued_ticketbooks_for"
|
||||
"--skip=ecash::tests::issued_ticketbooks::issued_ticketbooks_challenge_commitment"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
|
||||
hash = "sha256-2wl06I6/yF/V5P9MFCCzpEiX4G+YTtXWRjvh+wDyB1U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
|
||||
vendorHash = "sha256-2MMWs30e7GB0pcPmmDvw6RTBzKYXNwothAuQMZAFHoE=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -11,32 +11,26 @@
|
||||
fontconfig,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openboardview";
|
||||
version = "9.95.2";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenBoardView";
|
||||
repo = "OpenBoardView";
|
||||
tag = version;
|
||||
hash = "sha256-B5VnuycRt8h7Cz3FTIbhcGcXuA60zPCz0FMvFENTwws=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rvCWzIbjEZOHh5diaeP4xVIRsMHqt4PGMuYOGfWvwhA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-darwin-build.patch";
|
||||
url = "https://github.com/OpenBoardView/OpenBoardView/commit/a1de2e5de908afd83eceed757260f6425314af2e.patch?full_index=1";
|
||||
hash = "sha256-DK+K4F0+QGqaoWCyc8AvuIsaiTCqhAG6AsTNg2hegh0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
python3Packages.jinja2
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
@@ -62,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
wrapGApp "$out/bin/${pname}" \
|
||||
wrapGApp "$out/bin/${finalAttrs.pname}" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]}
|
||||
'';
|
||||
|
||||
@@ -74,8 +68,9 @@ stdenv.mkDerivation rec {
|
||||
description = "Linux SDL/ImGui edition software for viewing .brd files";
|
||||
mainProgram = "openboardview";
|
||||
homepage = "https://github.com/OpenBoardView/OpenBoardView";
|
||||
changelog = "https://github.com/OpenBoardView/OpenBoardView/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ k3a ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open-iscsi";
|
||||
version = "2.1.11";
|
||||
version = "2.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "open-iscsi";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Xs2EiNSkRtAQPoagCAKl07VndYKDspGLchxMvsfvTi0=";
|
||||
hash = "sha256-CJkThrLskIOAFOLkMn+Jk7oSEjeLqBZlm2ll0MspBqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "opkssh";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openpubkey";
|
||||
repo = "opkssh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-COACiBNXHEpzZyGGYmz0uj0ubzYJFRabAEku2qOjLcg=";
|
||||
hash = "sha256-c+ZcC9m+PfwFyLSz+dwahYdQe+wKHQHECT+gNp1rdQU=";
|
||||
};
|
||||
|
||||
ldflags = [ "-X main.Version=${finalAttrs.version}" ];
|
||||
|
||||
vendorHash = "sha256-aRWu4yB83hBKtW78MVMg7l8iSzHdLgnYgskgt32tiLw=";
|
||||
vendorHash = "sha256-BmU/8Y6CweVnOeHftQhacKKLccQk1uNljzHe+/zkUn4=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
111
pkgs/by-name/pl/playdate-sdk/package.nix
Normal file
111
pkgs/by-name/pl/playdate-sdk/package.nix
Normal file
@@ -0,0 +1,111 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
curl,
|
||||
fetchurl,
|
||||
gsettings-desktop-schemas,
|
||||
gtk3,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "playdate-sdk";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.panic.com/playdate_sdk/Linux/PlaydateSDK-${version}.tar.gz";
|
||||
sha256 = "sha256-yKEl3UpVY3lB9LxAsx0RotTsNHv8WS76ZqpzRi6BSZg=";
|
||||
};
|
||||
|
||||
srcScript = ./playdate-simulator-wrapper.sh;
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/playdate-sdk
|
||||
cp -r * $out/share/playdate-sdk
|
||||
mkdir -p $out/bin
|
||||
|
||||
#### pdc
|
||||
makeWrapper $out/share/playdate-sdk/bin/pdc $out/bin/pdc \
|
||||
--run 'export PLAYDATE_SDK_PATH="''${XDG_DATA_HOME:-''$HOME/.local/share}/playdate-sdk-${version}"'
|
||||
|
||||
#### pdutil
|
||||
makeWrapper $out/share/playdate-sdk/bin/pdutil $out/bin/pdutil \
|
||||
--run 'export PLAYDATE_SDK_PATH="''${XDG_DATA_HOME:-''$HOME/.local/share}/playdate-sdk-${version}"'
|
||||
|
||||
#### PlaydateSimulator
|
||||
cp $srcScript $out/bin/PlaydateSimulator
|
||||
substituteInPlace $out/bin/PlaydateSimulator \
|
||||
--subst-var-by out "$out" \
|
||||
--subst-var-by version "${version}" \
|
||||
--subst-var-by ldLibraryPath "${
|
||||
lib.makeLibraryPath [
|
||||
curl
|
||||
]
|
||||
}" \
|
||||
--subst-var-by gsettingsSchemas "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}"
|
||||
chmod +x $out/bin/PlaydateSimulator
|
||||
|
||||
#### C API includes
|
||||
mkdir -p $out/include
|
||||
cp -r $out/share/playdate-sdk/C_API/pd_api $out/include/pd_api
|
||||
cp $out/share/playdate-sdk/C_API/pd_api.h $out/include/pd_api.h
|
||||
|
||||
#### udev rules
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp $out/share/playdate-sdk/Resources/50-playdate.rules $out/etc/udev/rules.d/
|
||||
|
||||
#### icons
|
||||
install -Dm644 $out/share/playdate-sdk/Resources/date.play.simulator.svg $out/share/icons/hicolor/scalable/apps/PlaydateSimulator.svg
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "PlaydateSimulator";
|
||||
exec = "PlaydateSimulator %u";
|
||||
icon = "PlaydateSimulator";
|
||||
desktopName = "Playdate Simulator";
|
||||
comment = "A toolset for developing games on the Playdate handheld console";
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "PlaydateSimulator";
|
||||
mimeTypes = [
|
||||
"application/x-playdate-game"
|
||||
"x-scheme-handler/playdate-simulator"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Official SDK and development tools for the Playdate handheld console, including Lua/C APIs, simulator, and Mirror capture utility";
|
||||
homepage = "https://play.date";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ atomicptr ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
18
pkgs/by-name/pl/playdate-sdk/playdate-simulator-wrapper.sh
Normal file
18
pkgs/by-name/pl/playdate-sdk/playdate-simulator-wrapper.sh
Normal file
@@ -0,0 +1,18 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
USER_SDK_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/playdate-sdk-@version@"
|
||||
NIX_SDK_DIR="@out@/share/playdate-sdk"
|
||||
|
||||
if [ ! -d "$USER_SDK_DIR" ]; then
|
||||
echo "Initializing Playdate SDK workspace at $USER_SDK_DIR..."
|
||||
mkdir -p "$USER_SDK_DIR"
|
||||
cp -r "$NIX_SDK_DIR/." "$USER_SDK_DIR"
|
||||
chmod -R u+w "$USER_SDK_DIR"
|
||||
fi
|
||||
|
||||
export PLAYDATE_SDK_PATH="$USER_SDK_DIR"
|
||||
export LD_LIBRARY_PATH="@ldLibraryPath@"
|
||||
export XDG_DATA_DIRS="@gsettingsSchemas@:${XDG_DATA_DIRS:-}"
|
||||
|
||||
exec "$USER_SDK_DIR/bin/PlaydateSimulator" "$@"
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rattler-build";
|
||||
version = "0.68.0";
|
||||
version = "0.70.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "rattler-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dS+PLxG5HfORy3hCEipS1rCoqCttHcqwsvIXwE5lQ/w=";
|
||||
hash = "sha256-kvcxBrP6vzbhtzgFqMfTZwQlCJ6wnaAYbCNLotGQnK4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uJjS0dE89XRy1irTZv1piH2Mm9/CqeNuUJl8Ntc4V8c=";
|
||||
cargoHash = "sha256-UoZqxpcLZqXxZYTfLIaqMa/1gkIn9Ntmk2qsnaTmV7s=";
|
||||
|
||||
doCheck = false; # test requires network access
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "runpodctl";
|
||||
version = "2.6.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runpod";
|
||||
repo = "runpodctl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hx0plQ5og4C6UY7r8RjYKo8LVk+WnWhtRErr0riNKbQ=";
|
||||
hash = "sha256-QorGhaHwgzcJJXa36dejLdN8STa8Q7H8qvKK66g2JBA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-38d+nWZDjWgcK091G3JCGtBqyE7iJ60edAhbx8GzxPM=";
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
python313Packages, # Require a working version of Kivy, which is not yet working with Python 3.14
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
python313Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sideband";
|
||||
version = "1.9.7";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -15,16 +15,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "markqvist";
|
||||
repo = "Sideband";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YL8wqZGBrMEtm+mLVjyaZpTPj8XVM0YUjP6Kfo7QHfw=";
|
||||
hash = "sha256-RCSSyTtt2eN9hYT1xzPYjJloPjnkIS6bo21PHrlg5S8=";
|
||||
};
|
||||
|
||||
# Unable to upstream all of this
|
||||
# Reason: An owner of this repository has disabled the ability to open pull requests.
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail \
|
||||
"lxst>=0.4.6" \
|
||||
"lxst" \
|
||||
--replace-fail \
|
||||
'"kivymd")' \
|
||||
'"sbapp/kivymd")'
|
||||
@@ -32,15 +29,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
substituteInPlace sbapp/main.py \
|
||||
--replace-fail \
|
||||
"1.9.2" \
|
||||
"1.9.7"
|
||||
"2.0.0"
|
||||
'';
|
||||
|
||||
build-system = with python3Packages; [
|
||||
build-system = with python313Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
with python313Packages;
|
||||
[
|
||||
audioop-lts
|
||||
beautifulsoup4
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sioyek";
|
||||
version = "2.0.0-unstable-2026-07-11";
|
||||
version = "2.0.0-unstable-2026-07-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahrm";
|
||||
repo = "sioyek";
|
||||
rev = "8c4008653f3279633fe1e7e2a1be057aa210fe73";
|
||||
hash = "sha256-5GJpXyLhRziSWJLrDIfzXZS4QPMqiRhEp6gcPoSy1/8=";
|
||||
rev = "efc88cd7e0985e81d1707c907968088c44f75aea";
|
||||
hash = "sha256-dOjWV9NlTY0L9SK960TcVw02aSThYF9GcbmkTN9BUa0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff '--color=auto' -Naur smpeg-r390.orig/acinclude/gtk-2.0.m4 smpeg-r390/acinclude/gtk-2.0.m4
|
||||
--- smpeg-r390.orig/acinclude/gtk-2.0.m4 1970-01-01 08:00:01.000000000 +0800
|
||||
+++ smpeg-r390/acinclude/gtk-2.0.m4 2021-12-16 15:52:17.776001058 +0800
|
||||
@@ -24,10 +24,8 @@
|
||||
|
||||
no_gtk=""
|
||||
|
||||
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
-
|
||||
if test x$PKG_CONFIG != xno ; then
|
||||
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
|
||||
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
|
||||
:
|
||||
else
|
||||
echo "*** pkg-config too old; version 0.7 or better required."
|
||||
@@ -7,11 +7,8 @@
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
gtk2,
|
||||
m4,
|
||||
pkg-config,
|
||||
libGLU,
|
||||
libGL,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
@@ -29,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ./libx11.patch ] ++ [
|
||||
./format.patch
|
||||
./gcc6.patch
|
||||
./gtk.patch
|
||||
# These patches remove use of the `register` storage class specifier,
|
||||
# allowing smpeg to build with clang 16, which defaults to C++17.
|
||||
(fetchpatch {
|
||||
@@ -50,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-gtk-player=no"
|
||||
"--enable-opengl-player=no"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
@@ -61,11 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
gtk2
|
||||
libGLU
|
||||
libGL
|
||||
];
|
||||
|
||||
outputs = [
|
||||
@@ -93,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig"
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://icculus.org/smpeg/";
|
||||
description = "MPEG decoding library";
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "sonarqube-cli";
|
||||
version = "1.2.0.3278";
|
||||
version = "1.3.0.3493";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -18,15 +18,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${baseUrl}/linux/sonarqube-cli-${finalAttrs.version}-linux-x86-64.bin";
|
||||
hash = "sha256-UIdR1ldHKTV7pBWjZxVxMLH7T15ZWdbL0WFw042l+Vc=";
|
||||
hash = "sha256-yZnnhz9T3xlRKq5T4QifE7s+jYdoDYqg0d4vjYAZUMk=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${baseUrl}/linux/sonarqube-cli-${finalAttrs.version}-linux-arm64.bin";
|
||||
hash = "sha256-w0NbqtRMJ5UGF6plslKCTsATBxP1RAc8SxwnFbi3CFE=";
|
||||
hash = "sha256-VwGfm4VAAVwKulqebe/D1Gsf+YT6EvcWAll7TIK+5nk=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "${baseUrl}/macos/sonarqube-cli-${finalAttrs.version}-macos-arm64.bin";
|
||||
hash = "sha256-ehrq6hMONdZXDj9MjzLenvyb2hhwEIuhGJQCt7p/Ju0=";
|
||||
hash = "sha256-9MgNTDxITnwlRTlZMbwANfiV3q7BAAPUR54I08rSgEU=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "soteria";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imvaskel";
|
||||
repo = "soteria";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g6DGb8PWfc5YyjUpO9q3q0MxcPUbMjatOi6POFcZEE4=";
|
||||
hash = "sha256-2NlQSie3W7MgHyIX4AD2KX4yK13jNdL5hptmZBUkVBk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6Pk60J2RAInRgCiIk9thZRwwAyCQvychh5nVHmKU7Iw=";
|
||||
cargoHash = "sha256-MZjNhrcnHYq8hbZaXBPxVDrgLmsbhkeSfV/ugWxUayo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
39
pkgs/by-name/so/sourcey/package.nix
Normal file
39
pkgs/by-name/so/sourcey/package.nix
Normal file
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "sourcey";
|
||||
version = "3.6.5";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcey";
|
||||
repo = "sourcey";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l1MpeJKGlQfiLCtCNMlG6ZEDYYLTMIy+N9sddDkxKXc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Wwa7//iSvBmLCogVqk8aAUX9kn9FZsndvX00JBoXI+0=";
|
||||
|
||||
npmDepsFetcherVersion = 2;
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Open source documentation platform for OpenAPI specs and markdown";
|
||||
homepage = "https://sourcey.com";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "sourcey";
|
||||
maintainers = with lib.maintainers; [ auscaster ];
|
||||
};
|
||||
})
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "spotdl";
|
||||
version = "4.5.0";
|
||||
version = "4.5.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spotDL";
|
||||
repo = "spotify-downloader";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u5t8t9NJq+h/ujeLObKDCQG4brTqwdjSDslemmhePdc=";
|
||||
hash = "sha256-qztG9q7hwajyCTVg0iTrPrvL2UYrzAPw7Z+CFOTSi/U=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spruce";
|
||||
version = "1.35.11";
|
||||
version = "1.35.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geofffranks";
|
||||
repo = "spruce";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-HejGA21Mm8yNvCoVJkwp+Uld3sfwtufyx/yH1xOGbgE=";
|
||||
hash = "sha256-A1B9xFXqjxV34aPdg7tHOZIzQQR6boHTTO0ao2osiTY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.97";
|
||||
version = "3.16.99";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5r8r57m+Ilce6Onu/svc05yyrLGH5S65RixbwqlpmPU=";
|
||||
hash = "sha256-IZaEcG/u1zgJBxXc2Dyx0gxzpnmWQQ5NUyOrDBLiOXk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "suitesparse-graphblas";
|
||||
version = "10.3.1";
|
||||
version = "10.3.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "DrTimothyAldenDavis";
|
||||
repo = "GraphBLAS";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-m+sjfRdgIwH/FEaHkEp6fl5+fehNcBDLVc4f5H5Lslw=";
|
||||
hash = "sha256-M9MSJfrZP8VY/CPGbQkjyLFVXg25xy+8mIiJsHOdhBI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "4.20.11";
|
||||
version = "4.21.0";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "unciv";
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-O9A11GJyz6yApD7Nni11TEohT+8hRDG02k6lQWtBHgw=";
|
||||
hash = "sha256-qQ4zEa/jBTp6C82b83cz1ogbNtSkaA84uLeHRUAKNJk=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vintagestory";
|
||||
version = "1.22.4";
|
||||
version = "1.22.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6efnjDUXMweOzN1mnkwVyQzQjs1QlFHBss1qb62Z2o0=";
|
||||
hash = "sha256-ozpjsnqJKFdzKeJuOSuurYN8UEvLrBw17quGZeMN8PY=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
alsa-lib,
|
||||
dav1d,
|
||||
dbus,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
@@ -25,16 +26,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayvr";
|
||||
version = "26.2.1";
|
||||
version = "26.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wlx-team";
|
||||
repo = "wayvr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-v1Wkelru825KV+ciXD9esLq39oTyMm/Z4rRbN+jjviY=";
|
||||
hash = "sha256-SdHN3jDe2QJaRORy452RP7kTMxPOZOB/yjpApUOLhRU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-d6iRaOHq+4j90L76bx7+EwCLOY4MxPeqm3ELJ5H9O+8=";
|
||||
cargoHash = "sha256-eGmlFtlorKG7uygLer3UW6ERLQzdugoYyXVSC2sFh+k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -43,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
dav1d
|
||||
dbus
|
||||
libx11
|
||||
libxext
|
||||
@@ -78,6 +80,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
postInstall = ''
|
||||
install -D wayvr/wayvr.desktop -t $out/share/applications
|
||||
install -D wayvr/wayvr.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
|
||||
rm $out/bin/prost_build
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -7,18 +7,22 @@
|
||||
wsjtx.overrideAttrs (
|
||||
finalAttrs: old: {
|
||||
pname = "wsjtz";
|
||||
version = "2.0.16";
|
||||
version = "2.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sq9fve";
|
||||
repo = "wsjt-z";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O7HHAr3am4bH4b/RldoaB9LWWhciUbDc+u+lPO60UUY=";
|
||||
hash = "sha256-YxO4pSdKKeO0Ye7Ay/0gdjPvceLbC5eMQk1ZBh1ZHCw=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/wsjtx $out/bin/wsjtz
|
||||
mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version
|
||||
|
||||
substituteInPlace $out/share/applications/wsjtx.desktop \
|
||||
--replace-fail "Exec=wsjtx" "Exec=wsjtz" \
|
||||
--replace-fail "Name=wsjtx" "Name=wsjtz"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -27,6 +31,7 @@ wsjtx.overrideAttrs (
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
Cryolitia
|
||||
scd31
|
||||
];
|
||||
mainProgram = "wsjtz";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.26.0-mo3";
|
||||
version = "6.26.0-mo4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ceh/B0afhVbAhDQcYen+TWNSswXcSiUzCvrQJizVmpQ=";
|
||||
hash = "sha256-rPOu231VgVAgvfcv8ecPsTSKyUa/Oi8nQYIIbVkx1Sc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "yamlscript";
|
||||
version = "0.2.27";
|
||||
version = "0.2.29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar";
|
||||
hash = "sha256-d2kG10M+AeADVRzzjShx5CMTpsVgScF5NDimQm/B0DM=";
|
||||
hash = "sha256-xbppej6p8r4fAx7xL5wQBgAqDFrCPRyT+LbwOUytbbA=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -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": "6debb08ec29f31bffb358dd022a8fce4a3ceb839",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6debb08ec29f31bffb358dd022a8fce4a3ceb839.tar.gz",
|
||||
"sha256": "1h30jg3qbyqbsa3g59pm7kvv56g7bvkwsvzpv8v7zgrcwf2cmi5p",
|
||||
"msg": "Update from Hackage at 2026-07-15T08:37:28Z"
|
||||
}
|
||||
|
||||
2
pkgs/desktops/gnome/extensions/.gitignore
vendored
Normal file
2
pkgs/desktops/gnome/extensions/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
# cache file with scraped data from https://extensions.gnome.org
|
||||
extension-index-*.json
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
glib,
|
||||
@@ -8,17 +8,18 @@
|
||||
gettext,
|
||||
jq,
|
||||
intltool,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell-extension-EasyScreenCast";
|
||||
version = "1.12.0";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EasyScreenCast";
|
||||
repo = "EasyScreenCast";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-+DVuUClLhPEVN2VIBkJJI51V9TTS5Q9y6wflEGyt6AY=";
|
||||
hash = "sha256-VYf5RHZHe6QIzQRW/oZ2tEHIo184xPqqx+hKAcCwOMg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
|
||||
|
||||
passthru.extensionUuid = "EasyScreenCast@iacopodeenosee.gmail.com";
|
||||
passthru = {
|
||||
extensionUuid = "EasyScreenCast@iacopodeenosee.gmail.com";
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simplifies the use of the video recording function integrated in gnome shell";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/extension.js b/extension.js
|
||||
index 32a7c7c..a7ed98e 100644
|
||||
index ef82bdc..2cdeab7 100644
|
||||
--- a/extension.js
|
||||
+++ b/extension.js
|
||||
@@ -720,7 +720,7 @@ const EasyScreenCastIndicator = GObject.registerClass({
|
||||
@@ -731,7 +731,7 @@ const EasyScreenCastIndicator = GObject.registerClass({
|
||||
Lib.TalkativeLog('-*-execute post command');
|
||||
|
||||
// launch cmd after registration
|
||||
@@ -12,25 +12,15 @@ index 32a7c7c..a7ed98e 100644
|
||||
const mapObj = {
|
||||
_fpath: pathFile,
|
||||
diff --git a/prefs.js b/prefs.js
|
||||
index b58b160..2298d5a 100644
|
||||
index 7e21b53..730eec3 100644
|
||||
--- a/prefs.js
|
||||
+++ b/prefs.js
|
||||
@@ -709,7 +709,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
|
||||
Lib.TalkativeLog('-^-NOT SET xdg-user video');
|
||||
|
||||
ctx.CtrlExe.Execute(
|
||||
- '/usr/bin/sh -c "echo $HOME"',
|
||||
+ '/bin/sh -c "echo $HOME"',
|
||||
true,
|
||||
(success, out) => {
|
||||
Lib.TalkativeLog(`-^-CALLBACK sync S: ${success} out: ${out}`);
|
||||
@@ -879,7 +879,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
|
||||
);
|
||||
@@ -834,7 +834,7 @@ const EasyScreenCastSettingsWidget = GObject.registerClass({
|
||||
refBufferLog.text = '';
|
||||
|
||||
ctx.CtrlExe.Execute(
|
||||
- 'journalctl /usr/bin/gnome-shell --since "15 min ago" --output=cat --no-pager',
|
||||
+ 'journalctl @gnomeShell@/bin/.gnome-shell-wrapped --since "15 min ago" --output=cat --no-pager',
|
||||
false,
|
||||
success => {
|
||||
Lib.TalkativeLog(`-^-CALLBACK async S= ${success}`);
|
||||
|
||||
(result, stdout) => {
|
||||
Lib.TalkativeLog(`-^-CALLBACK async S= ${result}`);
|
||||
refBufferLog.text = stdout;
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
unstableGitUpdater,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "argos";
|
||||
version = "unstable-2025-09-25";
|
||||
version = "50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p-e-w";
|
||||
repo = "argos";
|
||||
rev = "c0dc23880e52a2f78b7a5c35b5b3781d5b1366f7";
|
||||
hash = "sha256-A/ugbKxnUJdoMN724ECtRm0QWwCVopmbltt+fUKBp7E=";
|
||||
tag = "GNOME-50";
|
||||
hash = "sha256-KwW4Hzp+0TqFU1ygPURNbbT+ZzQN7eocn2R4IJFmNZQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -24,7 +23,6 @@ stdenv.mkDerivation {
|
||||
passthru = {
|
||||
extensionUuid = "argos@pew.worldwidemann.com";
|
||||
extensionPortalSlug = "argos";
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user