mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-06 05:13:37 +00:00
Compare commits
377 Commits
python-upd
...
backport-5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74b48864c6 | ||
|
|
a2836c188f | ||
|
|
96a72fbaed | ||
|
|
60b9e1dc3c | ||
|
|
1135c0f766 | ||
|
|
ab8312e2d5 | ||
|
|
e7f04f94b4 | ||
|
|
2bffcb8989 | ||
|
|
f5f814139c | ||
|
|
7f0d3a844d | ||
|
|
6ef2dfbb97 | ||
|
|
232872cf59 | ||
|
|
13bcbeb89d | ||
|
|
2c8590c277 | ||
|
|
9a1524f0a3 | ||
|
|
6876f432c2 | ||
|
|
5e23ac95f1 | ||
|
|
9c104004c9 | ||
|
|
1e1294a640 | ||
|
|
0d1936c8c0 | ||
|
|
15bb2dbda5 | ||
|
|
3aceba606e | ||
|
|
6723eb42c3 | ||
|
|
fd9e0e2a14 | ||
|
|
594a718819 | ||
|
|
221d3819c1 | ||
|
|
327f16f847 | ||
|
|
0e0ca99858 | ||
|
|
4f17aa01c1 | ||
|
|
c34b067aa1 | ||
|
|
454271cb7d | ||
|
|
153866bfe2 | ||
|
|
0f2774f80a | ||
|
|
52ddaa37a1 | ||
|
|
3a5811a964 | ||
|
|
b3720aa01e | ||
|
|
30dbdee6e3 | ||
|
|
902d19f7e2 | ||
|
|
1948b0d114 | ||
|
|
87070ced98 | ||
|
|
4ac7d8e47e | ||
|
|
36582c3341 | ||
|
|
5fa68180ec | ||
|
|
fa3884c0e3 | ||
|
|
5aa0e33e6f | ||
|
|
2ae8f80a7a | ||
|
|
53d282aed5 | ||
|
|
d54f68253a | ||
|
|
7b304d5b29 | ||
|
|
a175342a9f | ||
|
|
bf51a9c2de | ||
|
|
27a614a5ce | ||
|
|
1b5b4b0404 | ||
|
|
dda7625e77 | ||
|
|
34bec04d13 | ||
|
|
b9f5c1e419 | ||
|
|
31ff1cf723 | ||
|
|
cf7b308a25 | ||
|
|
b5b6f0ccb0 | ||
|
|
27bc1e0a1f | ||
|
|
f39f6df443 | ||
|
|
deec732956 | ||
|
|
b9419538ef | ||
|
|
760ee4df33 | ||
|
|
def8ae4d4a | ||
|
|
3f06aa825f | ||
|
|
836b59c280 | ||
|
|
39dfa7bc79 | ||
|
|
0e8b8ecf89 | ||
|
|
9699ff7370 | ||
|
|
bfd65e9a21 | ||
|
|
bb0550d2a4 | ||
|
|
1730cf98dc | ||
|
|
45ce5b1fba | ||
|
|
bc68793f57 | ||
|
|
0521704373 | ||
|
|
087e5b630c | ||
|
|
4e6aad3d71 | ||
|
|
80b58151da | ||
|
|
6c61841def | ||
|
|
54b9bb7668 | ||
|
|
a34b19c925 | ||
|
|
d53d306c0a | ||
|
|
3a75bdbb4a | ||
|
|
140b61c984 | ||
|
|
66d1276b57 | ||
|
|
8e1367a936 | ||
|
|
845e295cdd | ||
|
|
682104475a | ||
|
|
c763e2327a | ||
|
|
b1ec51efd8 | ||
|
|
9b8e0b12cd | ||
|
|
e96bdf6ed7 | ||
|
|
ed88353018 | ||
|
|
21135470b4 | ||
|
|
b2a1d9207d | ||
|
|
ccba28dd47 | ||
|
|
323dfd4232 | ||
|
|
4b2e906049 | ||
|
|
cbe752c149 | ||
|
|
89692a46b8 | ||
|
|
89f482e666 | ||
|
|
04de8ffd1d | ||
|
|
1b0a83cc7d | ||
|
|
331eb8035d | ||
|
|
e9413dda55 | ||
|
|
081aca7aeb | ||
|
|
5f775d7ea3 | ||
|
|
b2eada3a05 | ||
|
|
09d2088fea | ||
|
|
d84405d974 | ||
|
|
68a93745d3 | ||
|
|
d0444f46f9 | ||
|
|
887789e977 | ||
|
|
cb6554026c | ||
|
|
149e7fb745 | ||
|
|
8b2a452dd5 | ||
|
|
231c6d79dd | ||
|
|
bbb918b1f6 | ||
|
|
52463989a1 | ||
|
|
4d63832378 | ||
|
|
4b19988c94 | ||
|
|
5888ab115d | ||
|
|
ab905305b5 | ||
|
|
4df567a2f1 | ||
|
|
b997463fc2 | ||
|
|
11e32c793e | ||
|
|
f009f2d3a9 | ||
|
|
7e41cf4173 | ||
|
|
0c739c2565 | ||
|
|
c57fe4bc08 | ||
|
|
f7b9110ef4 | ||
|
|
1941fa2ce5 | ||
|
|
4ae09cbfdd | ||
|
|
2ad81b95e9 | ||
|
|
41d5cd7e7e | ||
|
|
fec5bcf841 | ||
|
|
a090168385 | ||
|
|
6ecc9c6467 | ||
|
|
b3277c7dcc | ||
|
|
9e008ca2a4 | ||
|
|
362844e8d7 | ||
|
|
5447a68e1c | ||
|
|
36d3b814e6 | ||
|
|
a4e57357d6 | ||
|
|
07be792e52 | ||
|
|
bf8cc53bb8 | ||
|
|
f587b4798a | ||
|
|
11169ea95f | ||
|
|
e9181fae4e | ||
|
|
26976edf65 | ||
|
|
18fc9349b7 | ||
|
|
bb58603cf8 | ||
|
|
c4d62d97d1 | ||
|
|
c0ff8c5ea5 | ||
|
|
e713b4f218 | ||
|
|
e8b485c354 | ||
|
|
27c6fb79cf | ||
|
|
14bd57aedd | ||
|
|
c14d877ac6 | ||
|
|
7f7385c363 | ||
|
|
c1b5ed33c8 | ||
|
|
cbe69277cf | ||
|
|
55f0fdf30b | ||
|
|
636542dce1 | ||
|
|
abae498e43 | ||
|
|
f0ddca605d | ||
|
|
b85031e3b9 | ||
|
|
f8290a6360 | ||
|
|
1bfa2844d7 | ||
|
|
06faf434dd | ||
|
|
3bf9dfe2ea | ||
|
|
89f35aab25 | ||
|
|
5ee9ad1b7c | ||
|
|
a778ae0abd | ||
|
|
4d9189447a | ||
|
|
65ab15fdd5 | ||
|
|
196fe731e7 | ||
|
|
f6ebec3edc | ||
|
|
0936562f09 | ||
|
|
612a2e73cf | ||
|
|
04e78b4065 | ||
|
|
8e5c732a6c | ||
|
|
49943a6043 | ||
|
|
375a836bdb | ||
|
|
da778ea3df | ||
|
|
88e7af78ca | ||
|
|
91ff8d91dc | ||
|
|
763d6e189a | ||
|
|
6204830f7b | ||
|
|
db933900f0 | ||
|
|
1d207fc18d | ||
|
|
f06baa4b12 | ||
|
|
6a131d5e10 | ||
|
|
b7f6ae77f4 | ||
|
|
b85bf0189f | ||
|
|
3ecffaa913 | ||
|
|
edb670c9a4 | ||
|
|
746bf9e72e | ||
|
|
7141e726cf | ||
|
|
f352236954 | ||
|
|
4c323a3a09 | ||
|
|
40b20ce2fe | ||
|
|
548109cb5c | ||
|
|
5892eeb5c6 | ||
|
|
7b47888eed | ||
|
|
bfa198d3cb | ||
|
|
3ed77f6be2 | ||
|
|
efae21db94 | ||
|
|
c7813fbe8c | ||
|
|
161b8c8d92 | ||
|
|
0cb195e653 | ||
|
|
aac45e7c5d | ||
|
|
1f84a84fd8 | ||
|
|
50e9abd4d5 | ||
|
|
4ea4af20af | ||
|
|
29824d0819 | ||
|
|
4e926c69c2 | ||
|
|
9ce5dd3a61 | ||
|
|
61ea2bb237 | ||
|
|
71698205b8 | ||
|
|
9dde6d6888 | ||
|
|
1675be7358 | ||
|
|
e35e0188ba | ||
|
|
e94c35b322 | ||
|
|
ec9eeb85c3 | ||
|
|
085b1395e9 | ||
|
|
8d4f54dc55 | ||
|
|
6a5409cb98 | ||
|
|
8072d62389 | ||
|
|
82065d16f0 | ||
|
|
7fcb458a06 | ||
|
|
a0d03c9ddc | ||
|
|
ee3f02e689 | ||
|
|
8d3fb58c90 | ||
|
|
8f84d93eea | ||
|
|
4d87df77fe | ||
|
|
8ed0934a96 | ||
|
|
8d2eaa762a | ||
|
|
45aa6e3456 | ||
|
|
88aeab524d | ||
|
|
5cc04113ec | ||
|
|
b8d260dd14 | ||
|
|
9b87281b89 | ||
|
|
29598a7627 | ||
|
|
97b4b665f9 | ||
|
|
59e94373e8 | ||
|
|
67de202206 | ||
|
|
34bf125ce3 | ||
|
|
01ba43d795 | ||
|
|
15e630ca35 | ||
|
|
d8fb34e72f | ||
|
|
944a00877a | ||
|
|
99cbef2888 | ||
|
|
19b722db14 | ||
|
|
3c2cac77ea | ||
|
|
dc6361e63e | ||
|
|
3dc9d7878d | ||
|
|
e7680378ae | ||
|
|
f336998635 | ||
|
|
1b60b62749 | ||
|
|
8f4f8924be | ||
|
|
3eb2a1b52a | ||
|
|
cf143940f9 | ||
|
|
221ecd7001 | ||
|
|
182cfbd047 | ||
|
|
632e240fd5 | ||
|
|
aec8047ca6 | ||
|
|
1aa63e4f5f | ||
|
|
b1619a4ef0 | ||
|
|
3dc0105541 | ||
|
|
f6ebb8c223 | ||
|
|
7596362959 | ||
|
|
4af760ff20 | ||
|
|
ab0df422bd | ||
|
|
b968491899 | ||
|
|
953cc572a3 | ||
|
|
50aea46f4f | ||
|
|
a909cc52ed | ||
|
|
571318a88f | ||
|
|
00e44259f4 | ||
|
|
95521573a4 | ||
|
|
a81e27cbbd | ||
|
|
d5ca66cf88 | ||
|
|
955b98c8eb | ||
|
|
0496d850d3 | ||
|
|
864d6f3032 | ||
|
|
df3a038f6d | ||
|
|
44e4222a59 | ||
|
|
6eac63c88a | ||
|
|
3c0ec23127 | ||
|
|
50e5328693 | ||
|
|
cfd88eaba1 | ||
|
|
86a3bb014d | ||
|
|
bbde42c80f | ||
|
|
0d3b353aaf | ||
|
|
7d28e0e202 | ||
|
|
5009939ae3 | ||
|
|
94a342c366 | ||
|
|
3f913b77ef | ||
|
|
24797747de | ||
|
|
810dae540a | ||
|
|
95f9aff0d9 | ||
|
|
f3d2476517 | ||
|
|
69f605171d | ||
|
|
c345638ec7 | ||
|
|
79b46bcf71 | ||
|
|
fd04332791 | ||
|
|
d6db5aabf7 | ||
|
|
f20c9d6a13 | ||
|
|
cf73e8d78d | ||
|
|
8c25e6bdc0 | ||
|
|
f851b430ce | ||
|
|
22bff227a1 | ||
|
|
9e308aa8c0 | ||
|
|
4bffbfab77 | ||
|
|
36dd490504 | ||
|
|
7acb2d19b5 | ||
|
|
297b2d795b | ||
|
|
a820ef2699 | ||
|
|
31e79603d1 | ||
|
|
bb48016b3b | ||
|
|
08544ba5cb | ||
|
|
88ce442adc | ||
|
|
981e7ce009 | ||
|
|
38e2454f01 | ||
|
|
3930a2c1cc | ||
|
|
77d41323e7 | ||
|
|
9a0a0c0d8b | ||
|
|
6081b0320c | ||
|
|
614cdd7b0e | ||
|
|
4f5a6cb074 | ||
|
|
fd3e3d317f | ||
|
|
fadc6cb95d | ||
|
|
1b741c8b22 | ||
|
|
b8b34804b5 | ||
|
|
ebd63f6886 | ||
|
|
978486f839 | ||
|
|
5909aede31 | ||
|
|
2df4274007 | ||
|
|
891d109b27 | ||
|
|
4b682b2ce7 | ||
|
|
51cbf2738d | ||
|
|
56adf3a77f | ||
|
|
be4b75107f | ||
|
|
995debc65c | ||
|
|
321284d69f | ||
|
|
622109b905 | ||
|
|
4bd0192e93 | ||
|
|
621d246e27 | ||
|
|
f32d36ae38 | ||
|
|
353aa7f888 | ||
|
|
ebdb5acac5 | ||
|
|
40cd680020 | ||
|
|
5c1be16756 | ||
|
|
239fd9e7ad | ||
|
|
3d68ffd154 | ||
|
|
f8e3d3bd26 | ||
|
|
3ad8c3222d | ||
|
|
148c1057f2 | ||
|
|
9f9c38223a | ||
|
|
15c6cd83d5 | ||
|
|
9c1ff69fc2 | ||
|
|
9eb740507b | ||
|
|
f48e2500ce | ||
|
|
a57d3837bb | ||
|
|
4c0cad3482 | ||
|
|
d1319eeba0 | ||
|
|
9ffe8b6b6e | ||
|
|
0d1aeb93c0 | ||
|
|
1fa88c7c27 | ||
|
|
ef21843689 | ||
|
|
ff6703771d | ||
|
|
688915f6e4 | ||
|
|
bd507c09ea | ||
|
|
679a8a401e | ||
|
|
705e992991 |
11
.github/labeler-no-sync.yml
vendored
11
.github/labeler-no-sync.yml
vendored
@@ -33,4 +33,15 @@
|
||||
- maintainers/github-teams.json
|
||||
- base-branch: ['master']
|
||||
|
||||
"backport release-26.05":
|
||||
- all:
|
||||
- changed-files:
|
||||
- any-glob-to-any-file:
|
||||
- .github/actions/**/*
|
||||
- .github/workflows/*
|
||||
- .github/labeler*.yml
|
||||
- ci/**/*.*
|
||||
- maintainers/github-teams.json
|
||||
- base-branch: ['master']
|
||||
|
||||
# keep-sorted end
|
||||
|
||||
4
.github/workflows/backport.yml
vendored
4
.github/workflows/backport.yml
vendored
@@ -21,7 +21,7 @@ defaults:
|
||||
jobs:
|
||||
backport:
|
||||
name: Backport Pull Request
|
||||
if: vars.NIXPKGS_CI_APP_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))
|
||||
if: vars.NIXPKGS_CI_CLIENT_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))
|
||||
runs-on: ubuntu-slim
|
||||
timeout-minutes: 3
|
||||
steps:
|
||||
@@ -30,7 +30,7 @@ jobs:
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-contents: write
|
||||
permission-pull-requests: write
|
||||
|
||||
4
.github/workflows/bot.yml
vendored
4
.github/workflows/bot.yml
vendored
@@ -57,10 +57,10 @@ jobs:
|
||||
|
||||
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_CLIENT_ID
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-administration: read
|
||||
permission-contents: write
|
||||
|
||||
4
.github/workflows/comment.yml
vendored
4
.github/workflows/comment.yml
vendored
@@ -31,10 +31,10 @@ jobs:
|
||||
|
||||
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_CLIENT_ID
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-pull-requests: write
|
||||
|
||||
|
||||
2
.github/workflows/edited.yml
vendored
2
.github/workflows/edited.yml
vendored
@@ -39,7 +39,7 @@ jobs:
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-pull-requests: write
|
||||
|
||||
|
||||
35
.github/workflows/periodic-merge-24h.yml
vendored
35
.github/workflows/periodic-merge-24h.yml
vendored
@@ -22,7 +22,7 @@ defaults:
|
||||
|
||||
jobs:
|
||||
periodic-merge:
|
||||
if: github.repository_owner == 'NixOS'
|
||||
if: github.repository_owner == 'NixOS' || github.event_name == 'workflow_dispatch'
|
||||
strategy:
|
||||
# don't fail fast, so that all pairs are tried
|
||||
fail-fast: false
|
||||
@@ -35,7 +35,7 @@ jobs:
|
||||
into: staging-next-25.11
|
||||
- from: staging-next-25.11
|
||||
into: staging-25.11
|
||||
- from: master
|
||||
- from: release-26.05
|
||||
into: staging-next-26.05
|
||||
- from: staging-next-26.05
|
||||
into: staging-26.05
|
||||
@@ -49,3 +49,34 @@ jobs:
|
||||
name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
|
||||
secrets:
|
||||
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
|
||||
# Resets the target branch of the current haskell-updates PR.
|
||||
# This makes GitHub hide all the commits that are already part of staging and gives us a much clearer PR view.
|
||||
haskell-updates:
|
||||
needs: periodic-merge
|
||||
runs-on: ubuntu-slim
|
||||
permissions:
|
||||
pull-requests: write
|
||||
steps:
|
||||
- name: Find PR and update target branch
|
||||
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||
with:
|
||||
script: |
|
||||
// There will at most be a single haskell-updates PR anyway, so no need to paginate.
|
||||
await Promise.all(
|
||||
(
|
||||
await github.rest.pulls.list({
|
||||
...context.repo,
|
||||
state: 'open',
|
||||
head: `${context.repo.owner}:haskell-updates`,
|
||||
})
|
||||
).data.map((pr) =>
|
||||
github.rest.pulls.update({
|
||||
...context.repo,
|
||||
pull_number: pr.number,
|
||||
// Just updating to the same branch to trigger a UI update.
|
||||
// This is staging most of the time, but could be staging-next in rare cases.
|
||||
base: pr.base.ref,
|
||||
}),
|
||||
),
|
||||
)
|
||||
|
||||
2
.github/workflows/periodic-merge-6h.yml
vendored
2
.github/workflows/periodic-merge-6h.yml
vendored
@@ -22,7 +22,7 @@ defaults:
|
||||
|
||||
jobs:
|
||||
periodic-merge:
|
||||
if: github.repository_owner == 'NixOS'
|
||||
if: github.repository_owner == 'NixOS' || github.event_name == 'workflow_dispatch'
|
||||
strategy:
|
||||
# don't fail fast, so that all pairs are tried
|
||||
fail-fast: false
|
||||
|
||||
2
.github/workflows/periodic-merge.yml
vendored
2
.github/workflows/periodic-merge.yml
vendored
@@ -29,7 +29,7 @@ jobs:
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-contents: write
|
||||
permission-pull-requests: write
|
||||
|
||||
4
.github/workflows/review.yml
vendored
4
.github/workflows/review.yml
vendored
@@ -28,10 +28,10 @@ jobs:
|
||||
|
||||
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_CLIENT_ID
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-pull-requests: write
|
||||
|
||||
|
||||
2
.github/workflows/teams.yml
vendored
2
.github/workflows/teams.yml
vendored
@@ -22,7 +22,7 @@ jobs:
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
id: app-token
|
||||
with:
|
||||
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
|
||||
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
|
||||
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
|
||||
permission-administration: read
|
||||
permission-contents: write
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
|
||||
There is a TeX Live packaging that lives entirely under attribute `texlive`.
|
||||
|
||||
## User's guide (experimental new interface) {#sec-language-texlive-user-guide-experimental}
|
||||
|
||||
Release 23.11 ships with a new interface that will eventually replace `texlive.combine`.
|
||||
## User's guide {#sec-language-texlive-user-guide}
|
||||
|
||||
- For basic usage, use some of the prebuilt environments available at the top level, such as `texliveBasic`, `texliveSmall`. For the full list of prebuilt environments, inspect `texlive.schemes`.
|
||||
|
||||
@@ -24,7 +22,7 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c
|
||||
|
||||
- `texlive.withPackages` uses the same logic as `buildEnv`. Only parts of a package are installed in an environment: its 'runtime' files (`tex` output), binaries (`out` output), and support files (`tlpkg` output). Moreover, man and info pages are assembled into separate `man` and `info` outputs. To add only the TeX files of a package, or its documentation (`texdoc` output), just specify the outputs:
|
||||
```nix
|
||||
texlive.withPackages (
|
||||
texliveBasic.withPackages (
|
||||
ps: with ps; [
|
||||
texdoc # recommended package to navigate the documentation
|
||||
perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries
|
||||
@@ -34,64 +32,19 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c
|
||||
)
|
||||
```
|
||||
|
||||
- To add the documentation for all packages in the environment, use
|
||||
```nix
|
||||
texliveSmall.overrideAttrs { withDocs = true; }
|
||||
```
|
||||
This can be applied before or after calling `withPackages`. The parameter `withSources` adds all source containers.
|
||||
|
||||
- All packages distributed by TeX Live, which contains most of CTAN, are available and can be found under `texlive.pkgs`:
|
||||
```ShellSession
|
||||
$ nix repl
|
||||
nix-repl> :l <nixpkgs>
|
||||
nix-repl> texlive.pkgs.[TAB]
|
||||
```
|
||||
Note that the packages in `texlive.pkgs` are only provided for search purposes and must not be used directly.
|
||||
|
||||
- **Experimental and subject to change without notice:** to add the documentation for all packages in the environment, use
|
||||
```nix
|
||||
texliveSmall.__overrideTeXConfig { withDocs = true; }
|
||||
```
|
||||
This can be applied before or after calling `withPackages`.
|
||||
|
||||
The function currently supports the parameters `withDocs`, `withSources`, and `requireTeXPackages`.
|
||||
|
||||
## User's guide {#sec-language-texlive-user-guide}
|
||||
|
||||
- For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support.
|
||||
|
||||
- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this. Most CTAN packages should be available:
|
||||
|
||||
```nix
|
||||
texlive.combine {
|
||||
inherit (texlive)
|
||||
scheme-small
|
||||
collection-langkorean
|
||||
algorithms
|
||||
cm-super
|
||||
;
|
||||
}
|
||||
```
|
||||
|
||||
- There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences).
|
||||
|
||||
- By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add `pkgFilter` function to `combine`.
|
||||
|
||||
```nix
|
||||
texlive.combine {
|
||||
# inherit (texlive) whatever-you-want;
|
||||
pkgFilter =
|
||||
pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.hasManpages || pkg.pname == "cm-super";
|
||||
# elem tlType [ "run" "bin" "doc" "source" ]
|
||||
# there are also other attributes: version, name
|
||||
}
|
||||
```
|
||||
|
||||
- You can list packages e.g. by `nix repl`.
|
||||
|
||||
```ShellSession
|
||||
$ nix repl
|
||||
nix-repl> :l <nixpkgs>
|
||||
nix-repl> texlive.collection-[TAB]
|
||||
```
|
||||
|
||||
- Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example, `scheme-basic`, into the combination.
|
||||
|
||||
- TeX Live packages are also available under `texlive.pkgs` as derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.combine` but are available for other uses. To repackage a font, for instance, use
|
||||
These are derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.withPackages` but are available for other uses. To repackage a font, for instance, use
|
||||
|
||||
```nix
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -112,9 +65,9 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c
|
||||
|
||||
## Custom packages {#sec-language-texlive-custom-packages}
|
||||
|
||||
You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its `"tex"` output, according to the [TeX Directory Structure](https://tug.ctan.org/tds/tds.html). Dependencies on other TeX packages can be listed in the attribute `tlDeps`.
|
||||
You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its `"tex"` output, according to the [TeX Directory Structure](https://tug.ctan.org/tds/tds.html). Dependencies on other TeX packages can be listed in the attribute `passthru.tlDeps`, which is a function taking a package set and returning a list of packages.
|
||||
|
||||
The functions `texlive.combine` and `texlive.withPackages` recognise the following outputs:
|
||||
The function `texlive.withPackages` recognise the following outputs:
|
||||
|
||||
- `"out"`: contents are linked in the TeX Live environment, and binaries in the `$out/bin` folder are wrapped;
|
||||
- `"tex"`: linked in `$TEXMFDIST`; files should follow the TDS (for instance `$tex/tex/latex/foiltex/foiltex.cls`);
|
||||
@@ -122,8 +75,6 @@ The functions `texlive.combine` and `texlive.withPackages` recognise the followi
|
||||
- `"tlpkg"`: linked in `$TEXMFROOT/tlpkg`;
|
||||
- `"man"`, `"info"`, ...: the other outputs are combined into separate outputs.
|
||||
|
||||
When using `pkgFilter`, `texlive.combine` will assign `tlType` respectively `"bin"`, `"run"`, `"doc"`, `"source"`, `"tlpkg"` to the above outputs.
|
||||
|
||||
Here is a (very verbose) example. See also the packages `auctex`, `eukleides`, `mftrace` for more examples.
|
||||
|
||||
```nix
|
||||
@@ -138,7 +89,7 @@ let
|
||||
"tex"
|
||||
"texdoc"
|
||||
];
|
||||
passthru.tlDeps = with texlive; [ latex ];
|
||||
passthru.tlDeps = ps: [ ps.latex ];
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
@@ -169,13 +120,14 @@ let
|
||||
latexmk
|
||||
]
|
||||
))
|
||||
# multiple-outputs.sh fails if $out is not defined
|
||||
(writeShellScript "force-tex-output.sh" ''
|
||||
out="''${tex-}"
|
||||
'')
|
||||
writableTmpDirAsHomeHook # Need a writable $HOME for latexmk
|
||||
];
|
||||
|
||||
# multiple-outputs.sh fails if $out is not defined
|
||||
preHook = ''
|
||||
out="''${tex-}"
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -4428,11 +4428,9 @@
|
||||
"sec-language-texlive": [
|
||||
"index.html#sec-language-texlive"
|
||||
],
|
||||
"sec-language-texlive-user-guide-experimental": [
|
||||
"index.html#sec-language-texlive-user-guide-experimental"
|
||||
],
|
||||
"sec-language-texlive-user-guide": [
|
||||
"index.html#sec-language-texlive-user-guide"
|
||||
"index.html#sec-language-texlive-user-guide",
|
||||
"index.html#sec-language-texlive-user-guide-experimental"
|
||||
],
|
||||
"sec-language-texlive-custom-packages": [
|
||||
"index.html#sec-language-texlive-custom-packages"
|
||||
|
||||
@@ -5058,12 +5058,6 @@
|
||||
github = "cigrainger";
|
||||
githubId = 3984794;
|
||||
};
|
||||
ciil = {
|
||||
email = "simon@lackerbauer.com";
|
||||
github = "ciil";
|
||||
githubId = 3956062;
|
||||
name = "Simon Lackerbauer";
|
||||
};
|
||||
cilki = {
|
||||
github = "cilki";
|
||||
githubId = 10459406;
|
||||
@@ -7360,12 +7354,6 @@
|
||||
github = "DSeeLP";
|
||||
githubId = 46624152;
|
||||
};
|
||||
dsferruzza = {
|
||||
email = "david.sferruzza@gmail.com";
|
||||
github = "dsferruzza";
|
||||
githubId = 1931963;
|
||||
name = "David Sferruzza";
|
||||
};
|
||||
dsluijk = {
|
||||
name = "Dany Sluijk";
|
||||
email = "nix@dany.dev";
|
||||
|
||||
@@ -220,9 +220,22 @@
|
||||
|
||||
- `services.mattermost` now defaults to version 11, which has dropped support for MySQL in favor of Postgres. As a result, all support for MySQL has been removed from the module.
|
||||
See the [migration steps](https://docs.mattermost.com/deployment-guide/manual-postgres-migration.html) if you were not running Postgres.
|
||||
Note that version 11 also restricts the user limit to 250 [by default](https://forum.mattermost.com/t/clarification-request-on-user-limits-max-250-user-server-v-11/25309);
|
||||
see the `pkgs.mattermost` removeUserLimit and removeFreeBadge options combined with `services.mattermost.package` to change this behavior. For example:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.mattermost.package = pkgs.mattermost.override {
|
||||
removeUserLimit = true;
|
||||
removeFreeBadge = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- `post-resume.target` has been removed. See {manpage}`systemd.special(7)` about `sleep.target` for instructions on ordering a process after resume with `ExecStop=`.
|
||||
|
||||
- `services.vsftpd` no longer automatically configures a PAM module. This means configurations using `services.vsftpd.localUsers` will no longer work unless `services.vsftpd.enableVirtualUsers` and `services.vsftpd.userDbPath` are also configured. The old behaviour can be restored by setting `security.pam.services.vsftpd.enable = true`, although this only ever worked by accident and may not be secure.
|
||||
|
||||
- `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
|
||||
package instead of attrs. Now, by default, nixpkgs.coredns in conjunction with dockerTools.buildImage is used, instead
|
||||
of pulling the upstream container image from Docker Hub. If you want the old behavior, you can set:
|
||||
|
||||
@@ -70,7 +70,7 @@ in
|
||||
defaultChannel = mkOption {
|
||||
internal = true;
|
||||
type = types.str;
|
||||
default = "https://channels.nixos.org/nixos-unstable";
|
||||
default = "https://channels.nixos.org/nixos-26.05";
|
||||
description = "Default NixOS channel to which the root user is subscribed.";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -51,6 +51,7 @@ let
|
||||
VENDOR_URL = optionalString isNixos "https://nixos.org/";
|
||||
DOCUMENTATION_URL = optionalString isNixos "https://nixos.org/learn.html";
|
||||
SUPPORT_URL = optionalString isNixos "https://nixos.org/community.html";
|
||||
SUPPORT_END = "2026-12-31";
|
||||
BUG_REPORT_URL = optionalString isNixos "https://github.com/NixOS/nixpkgs/issues";
|
||||
ANSI_COLOR = optionalString isNixos "0;38;2;126;186;228";
|
||||
IMAGE_ID = optionalString (config.system.image.id != null) config.system.image.id;
|
||||
|
||||
@@ -47,6 +47,9 @@ in
|
||||
|
||||
{
|
||||
config = lib.mkIf (cfg.enable && nixPackage.pname == "lix") {
|
||||
# Require the tun kernel module for pasta, can be disabled if pasta is not used.
|
||||
boot.kernelModules.tun = lib.mkDefault true;
|
||||
|
||||
environment.systemPackages = [
|
||||
nixPackage
|
||||
pkgs.nix-info
|
||||
|
||||
@@ -245,156 +245,134 @@ in
|
||||
};
|
||||
|
||||
###### implementation
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
warnings = lib.optional (wrappers != { } && !config.security.enableWrappers) ''
|
||||
security.enableWrappers is set to false, but the following wrappers are still enabled and will be silently ignored: ${lib.concatStringsSep ", " (lib.attrNames wrappers)}. This might prevent fundamental functionalities, like PAM authentication. To avoid this warning, either set security.enableWrappers = true, or explicitly disable each wrapper with `enable = false`.
|
||||
'';
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
!(
|
||||
!config.security.enableWrappers && lib.any (u: u.isNormalUser) (lib.attrValues config.users.users)
|
||||
);
|
||||
message = ''
|
||||
security.enableWrappers is disabled but normal users are defined
|
||||
(${
|
||||
lib.concatStringsSep ", " (
|
||||
lib.mapAttrsToList (n: _: n) (lib.filterAttrs (_: u: u.isNormalUser) config.users.users)
|
||||
)
|
||||
}). Without SUID wrappers, users cannot login. Either enable wrappers or remove all normal user accounts.
|
||||
'';
|
||||
}
|
||||
];
|
||||
}
|
||||
(lib.mkIf config.security.enableWrappers {
|
||||
assertions = lib.mapAttrsToList (name: opts: {
|
||||
assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
|
||||
message = ''
|
||||
The security.wrappers.${name} wrapper is not valid:
|
||||
setuid/setgid and capabilities are mutually exclusive.
|
||||
'';
|
||||
}) wrappers;
|
||||
config = lib.mkIf config.security.enableWrappers {
|
||||
|
||||
security.wrappers =
|
||||
let
|
||||
mkSetuidRoot = source: {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
inherit source;
|
||||
};
|
||||
in
|
||||
{
|
||||
# These are mount related wrappers that require the +s permission.
|
||||
mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
|
||||
umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
|
||||
assertions = lib.mapAttrsToList (name: opts: {
|
||||
assertion = opts.setuid || opts.setgid -> opts.capabilities == "";
|
||||
message = ''
|
||||
The security.wrappers.${name} wrapper is not valid:
|
||||
setuid/setgid and capabilities are mutually exclusive.
|
||||
'';
|
||||
}) wrappers;
|
||||
|
||||
security.wrappers =
|
||||
let
|
||||
mkSetuidRoot = source: {
|
||||
setuid = true;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
inherit source;
|
||||
};
|
||||
|
||||
# Make sure our wrapperDir exports to the PATH env variable when
|
||||
# initializing the shell
|
||||
environment.extraInit = ''
|
||||
# Wrappers override other bin directories.
|
||||
export PATH="${wrapperDir}:$PATH"
|
||||
'';
|
||||
|
||||
security.apparmor.includes = lib.mapAttrs' (
|
||||
wrapName: wrap:
|
||||
lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
|
||||
include "${
|
||||
pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
|
||||
(securityWrapper wrap.source)
|
||||
]
|
||||
}"
|
||||
mrpx ${wrap.source},
|
||||
''
|
||||
) wrappers;
|
||||
|
||||
systemd.mounts = [
|
||||
{
|
||||
where = parentWrapperDir;
|
||||
what = "tmpfs";
|
||||
type = "tmpfs";
|
||||
options = lib.concatStringsSep "," [
|
||||
"nodev"
|
||||
"mode=755"
|
||||
"size=${config.security.wrapperDirSize}"
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.suid-sgid-wrappers = {
|
||||
description = "Create SUID/SGID Wrappers";
|
||||
wantedBy = [ "sysinit.target" ];
|
||||
before = [
|
||||
"sysinit.target"
|
||||
"shutdown.target"
|
||||
];
|
||||
conflicts = [ "shutdown.target" ];
|
||||
after = [ "systemd-sysusers.service" ];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
unitConfig.RequiresMountsFor = [
|
||||
"/nix/store"
|
||||
"/run/wrappers"
|
||||
];
|
||||
serviceConfig.RestrictSUIDSGID = false;
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
chmod 755 "${parentWrapperDir}"
|
||||
|
||||
# We want to place the tmpdirs for the wrappers to the parent dir.
|
||||
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
|
||||
chmod a+rx "$wrapperDir"
|
||||
|
||||
${lib.concatStringsSep "\n" mkWrappedPrograms}
|
||||
|
||||
if [ -L ${wrapperDir} ]; then
|
||||
# Atomically replace the symlink
|
||||
# See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
|
||||
old=$(readlink -f ${wrapperDir})
|
||||
if [ -e "${wrapperDir}-tmp" ]; then
|
||||
rm --force --recursive "${wrapperDir}-tmp"
|
||||
fi
|
||||
ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
|
||||
mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
|
||||
rm --force --recursive "$old"
|
||||
else
|
||||
# For initial setup
|
||||
ln --symbolic "$wrapperDir" "${wrapperDir}"
|
||||
fi
|
||||
'';
|
||||
in
|
||||
{
|
||||
# These are mount related wrappers that require the +s permission.
|
||||
mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
|
||||
umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
|
||||
};
|
||||
|
||||
###### wrappers consistency checks
|
||||
system.checks = lib.singleton (
|
||||
pkgs.runCommand "ensure-all-wrappers-paths-exist"
|
||||
{
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
''
|
||||
# make sure we produce output
|
||||
mkdir -p $out
|
||||
# Make sure our wrapperDir exports to the PATH env variable when
|
||||
# initializing the shell
|
||||
environment.extraInit = ''
|
||||
# Wrappers override other bin directories.
|
||||
export PATH="${wrapperDir}:$PATH"
|
||||
'';
|
||||
|
||||
echo -n "Checking that Nix store paths of all wrapped programs exist... "
|
||||
security.apparmor.includes = lib.mapAttrs' (
|
||||
wrapName: wrap:
|
||||
lib.nameValuePair "nixos/security.wrappers/${wrapName}" ''
|
||||
include "${
|
||||
pkgs.apparmorRulesFromClosure { name = "security.wrappers.${wrapName}"; } [
|
||||
(securityWrapper wrap.source)
|
||||
]
|
||||
}"
|
||||
mrpx ${wrap.source},
|
||||
''
|
||||
) wrappers;
|
||||
|
||||
declare -A wrappers
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
|
||||
systemd.mounts = [
|
||||
{
|
||||
where = parentWrapperDir;
|
||||
what = "tmpfs";
|
||||
type = "tmpfs";
|
||||
options = lib.concatStringsSep "," [
|
||||
"nodev"
|
||||
"mode=755"
|
||||
"size=${config.security.wrapperDirSize}"
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
for name in "''${!wrappers[@]}"; do
|
||||
path="''${wrappers[$name]}"
|
||||
if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
|
||||
test -t 1 && echo -ne '\033[1;31m'
|
||||
echo "FAIL"
|
||||
echo "The path $path does not exist!"
|
||||
echo 'Please, check the value of `security.wrappers."'$name'".source`.'
|
||||
test -t 1 && echo -ne '\033[0m'
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
systemd.services.suid-sgid-wrappers = {
|
||||
description = "Create SUID/SGID Wrappers";
|
||||
wantedBy = [ "sysinit.target" ];
|
||||
before = [
|
||||
"sysinit.target"
|
||||
"shutdown.target"
|
||||
];
|
||||
conflicts = [ "shutdown.target" ];
|
||||
after = [ "systemd-sysusers.service" ];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
unitConfig.RequiresMountsFor = [
|
||||
"/nix/store"
|
||||
"/run/wrappers"
|
||||
];
|
||||
serviceConfig.RestrictSUIDSGID = false;
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = ''
|
||||
chmod 755 "${parentWrapperDir}"
|
||||
|
||||
echo "OK"
|
||||
''
|
||||
);
|
||||
})
|
||||
];
|
||||
# We want to place the tmpdirs for the wrappers to the parent dir.
|
||||
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
|
||||
chmod a+rx "$wrapperDir"
|
||||
|
||||
${lib.concatStringsSep "\n" mkWrappedPrograms}
|
||||
|
||||
if [ -L ${wrapperDir} ]; then
|
||||
# Atomically replace the symlink
|
||||
# See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
|
||||
old=$(readlink -f ${wrapperDir})
|
||||
if [ -e "${wrapperDir}-tmp" ]; then
|
||||
rm --force --recursive "${wrapperDir}-tmp"
|
||||
fi
|
||||
ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
|
||||
mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
|
||||
rm --force --recursive "$old"
|
||||
else
|
||||
# For initial setup
|
||||
ln --symbolic "$wrapperDir" "${wrapperDir}"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
###### wrappers consistency checks
|
||||
system.checks = lib.singleton (
|
||||
pkgs.runCommand "ensure-all-wrappers-paths-exist"
|
||||
{
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
''
|
||||
# make sure we produce output
|
||||
mkdir -p $out
|
||||
|
||||
echo -n "Checking that Nix store paths of all wrapped programs exist... "
|
||||
|
||||
declare -A wrappers
|
||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: "wrappers['${n}']='${v.source}'") wrappers)}
|
||||
|
||||
for name in "''${!wrappers[@]}"; do
|
||||
path="''${wrappers[$name]}"
|
||||
if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then
|
||||
test -t 1 && echo -ne '\033[1;31m'
|
||||
echo "FAIL"
|
||||
echo "The path $path does not exist!"
|
||||
echo 'Please, check the value of `security.wrappers."'$name'".source`.'
|
||||
test -t 1 && echo -ne '\033[0m'
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "OK"
|
||||
''
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -155,7 +155,8 @@ in
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DevicePolicy = "closed";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = !useYTMusic;
|
||||
# breaks pyopenssl's cffi calls, used in remote access feature
|
||||
MemoryDenyWriteExecute = false;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
|
||||
@@ -30,7 +30,8 @@ let
|
||||
|
||||
version = fileContents ../.version;
|
||||
versionSuffix =
|
||||
(if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
|
||||
(if stableBranch then "." else "beta")
|
||||
+ "${toString (nixpkgs.revCount - 1004291)}.${nixpkgs.shortRev}";
|
||||
|
||||
# Run the tests for each platform. You can run a test by doing
|
||||
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
|
||||
|
||||
@@ -7,7 +7,7 @@ in
|
||||
name = "evcc";
|
||||
meta.maintainers = with lib.maintainers; [ hexa ];
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
machine = {
|
||||
services.evcc = {
|
||||
enable = true;
|
||||
|
||||
@@ -58,11 +58,20 @@ import ../make-test-python.nix (
|
||||
UserNoticesEnabled = false;
|
||||
};
|
||||
};
|
||||
package = pkgs.mattermost.override {
|
||||
removeFreeBadge = true;
|
||||
removeUserLimit = true;
|
||||
};
|
||||
} mattermostConfig;
|
||||
|
||||
# Upgrade to the latest Mattermost.
|
||||
specialisation.latest.configuration = {
|
||||
services.mattermost.package = lib.mkForce pkgs.mattermostLatest;
|
||||
services.mattermost.package = lib.mkForce (
|
||||
pkgs.mattermostLatest.override {
|
||||
removeFreeBadge = true;
|
||||
removeUserLimit = true;
|
||||
}
|
||||
);
|
||||
system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ in
|
||||
{ ... }:
|
||||
{
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.forceImportRoot = false;
|
||||
|
||||
networking.hostId = "12345678";
|
||||
|
||||
@@ -42,10 +43,10 @@ in
|
||||
machine.succeed("truncate -s 64M /testpool.img")
|
||||
machine.succeed("zpool create -O canmount=off '${pool}' /testpool.img")
|
||||
machine.succeed("zfs create -o canmount=off -p '${homes}'")
|
||||
machine.succeed("echo ${userPassword} | zfs create -o canmount=noauto -o encryption=on -o keyformat=passphrase '${homes}/alice'")
|
||||
machine.succeed("zfs unload-key '${homes}/alice'")
|
||||
machine.succeed("echo ${mismatchPass} | zfs create -o canmount=noauto -o encryption=on -o keyformat=passphrase '${homes}/bob'")
|
||||
machine.succeed("zfs unload-key '${homes}/bob'")
|
||||
machine.succeed("echo ${userPassword} | zfs create -o encryption=on -o keyformat=passphrase '${homes}/alice'")
|
||||
machine.succeed("zfs unmount '${homes}/alice' && zfs unload-key '${homes}/alice'")
|
||||
machine.succeed("echo ${mismatchPass} | zfs create -o encryption=on -o keyformat=passphrase '${homes}/bob'")
|
||||
machine.succeed("zfs unmount '${homes}/bob' && zfs unload-key '${homes}/bob'")
|
||||
|
||||
with subtest("Switch to tty2"):
|
||||
machine.fail("pgrep -f 'agetty.*tty2'")
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
maintainers = [ hexa ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
containers = {
|
||||
server =
|
||||
{ config, ... }:
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ hexa ];
|
||||
|
||||
nodes.machine = {
|
||||
containers.machine = {
|
||||
services.postfix.enable = true;
|
||||
services.postfix-tlspol.enable = true;
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
nodes = {
|
||||
server = {
|
||||
security.pam.services.vsftpd.enable = true;
|
||||
|
||||
services.vsftpd = {
|
||||
enable = true;
|
||||
userlistDeny = false;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
{
|
||||
name = "zigbee2mqtt";
|
||||
nodes.machine = {
|
||||
containers.machine = {
|
||||
systemd.services.dummy-serial = {
|
||||
wantedBy = [
|
||||
"multi-user.target"
|
||||
|
||||
@@ -21,14 +21,14 @@ let
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.7/android-studio-panda4-patch1-linux.tar.gz";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2025.3.4.5"; # "Android Studio Panda 4 | 2025.3.4 RC 1"
|
||||
sha256Hash = "sha256-NiNq1j+rzPU4KsLKYymfi5/Vx2Bn3hK8I3OVIUFloX0=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
|
||||
version = "2026.1.1.6"; # "Android Studio Quail 1 | 2026.1.1 RC 1"
|
||||
sha256Hash = "sha256-b6PVgBTTjIgm6BI171RL7T6GJD9ApnTWGOTqvt703PQ=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.6/android-studio-quail1-rc1-linux.tar.gz";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.1.1.5"; # "Android Studio Quail 1 | 2026.1.1 Canary 5"
|
||||
sha256Hash = "sha256-k4rM0MyTh0wnpsK8m6Hs1nSdwYpqUiQ+z7oiO6hn9YQ=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.5/android-studio-quail1-canary5-linux.tar.gz";
|
||||
version = "2026.1.2.2"; # "Android Studio Quail 2 | 2026.1.2 Canary 2"
|
||||
sha256Hash = "sha256-+FmW72k48GF71yzCdpIAl//qi6w26Qg8gZUW5/Nuh58=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.2/android-studio-quail2-canary2-linux.tar.gz";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,84 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
libspnav,
|
||||
jq,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
self = {
|
||||
|
||||
octoprint = stdenv.mkDerivation {
|
||||
pname = "Cura-OctoPrintPlugin";
|
||||
version = "3.5.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fieldOfView";
|
||||
repo = "Cura-OctoPrintPlugin";
|
||||
rev = "7bd73946fbf22d18337dc900a81a011ece26bee0";
|
||||
sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
netifaces
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/cura/plugins/OctoPrintPlugin
|
||||
cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Enables printing directly to OctoPrint and monitoring the process";
|
||||
homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
rawmouse = stdenv.mkDerivation rec {
|
||||
pname = "RawMouse";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smartavionics";
|
||||
repo = "RawMouse";
|
||||
rev = version;
|
||||
sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jq ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
hidapi
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \
|
||||
<RawMouse/config.json >RawMouse/config.json.new
|
||||
mv RawMouse/config.json.new RawMouse/config.json
|
||||
|
||||
# remove prebuilt binaries
|
||||
rm -r RawMouse/hidapi
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/cura/plugins/RawMouse
|
||||
cp -rv . $out/lib/cura/plugins/RawMouse/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Cura plugin for HID mice such as 3Dconnexion spacemouse";
|
||||
homepage = "https://github.com/smartavionics/RawMouse";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
in
|
||||
self
|
||||
@@ -1,49 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libarcus,
|
||||
stb,
|
||||
protobuf,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "curaengine";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "CuraEngine";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
libarcus
|
||||
stb
|
||||
protobuf
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DCURA_ENGINE_VERSION=${finalAttrs.version}" ];
|
||||
|
||||
# TODO already fixed in master, remove in next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Ultimaker/CuraEngine/commit/de60e86a6ea11cb7d121471b5dd192e5deac0f3d.patch";
|
||||
hash = "sha256-/gT9yErIDDYAXvZ6vX5TGlwljy31K563+sqkm1UGljQ=";
|
||||
includes = [ "src/utils/math.h" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Powerful, fast and robust engine for processing 3D models into 3D printing instruction";
|
||||
homepage = "https://github.com/Ultimaker/CuraEngine";
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
mainProgram = "CuraEngine";
|
||||
};
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "151.0.1";
|
||||
version = "151.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "8492a1bb956b38373153938bd18b0e18e3a4ad0d2abc2017b45e02bc2768c8f468d5c06329a32485a03a67bb9c22102e6abff1e73080c77764735d430dc77277";
|
||||
sha512 = "87308953ed354a2799a9a45be40033bf9ff8d80fa220f034aacfbd6e754716901d4164c37fa56032c659b259116603e0ba2b566c1f3651ab9cc0835d502cd739";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
enableRST ? true,
|
||||
docutils,
|
||||
enableSpelling ? true,
|
||||
gspell,
|
||||
libspelling,
|
||||
enableUPnP ? true,
|
||||
gupnp-igd,
|
||||
enableAppIndicator ? true,
|
||||
@@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
libnice
|
||||
]
|
||||
++ lib.optional enableSecrets libsecret
|
||||
++ lib.optional enableSpelling gspell
|
||||
++ lib.optional enableSpelling libspelling
|
||||
++ lib.optional enableUPnP gupnp-igd
|
||||
++ lib.optional enableAppIndicator libappindicator-gtk3
|
||||
++ lib.optional enableSoundNotifications gsound;
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
diff --git a/aw_notify/main.py b/aw_notify/main.py
|
||||
index c749725..44dce5a 100644
|
||||
--- a/aw_notify/main.py
|
||||
+++ b/aw_notify/main.py
|
||||
@@ -3,6 +3,7 @@
|
||||
and send notifications to the user on predefined conditions.
|
||||
"""
|
||||
|
||||
+import asyncio
|
||||
import logging
|
||||
import sys
|
||||
import threading
|
||||
@@ -23,7 +24,7 @@
|
||||
import aw_client.queries
|
||||
import click
|
||||
from aw_core.log import setup_logging
|
||||
-from desktop_notifier import DesktopNotifier
|
||||
+from desktop_notifier import DesktopNotifier, Icon
|
||||
from typing_extensions import TypeAlias
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -149,11 +150,20 @@ def notify(title: str, msg: str):
|
||||
if notifier is None:
|
||||
notifier = DesktopNotifier(
|
||||
app_name="AW",
|
||||
- app_icon=f"file://{icon_path}",
|
||||
+ app_icon=Icon(uri=f"file://{icon_path}"),
|
||||
notification_limit=10,
|
||||
)
|
||||
|
||||
logger.info(f'Showing: "{title} - {msg}"')
|
||||
- notifier.send_sync(title=title, message=msg)
|
||||
+
|
||||
+ # Get or create event loop
|
||||
+ try:
|
||||
+ loop = asyncio.get_running_loop()
|
||||
+ except RuntimeError:
|
||||
+ loop = asyncio.new_event_loop()
|
||||
+ asyncio.set_event_loop(loop)
|
||||
+
|
||||
+ # Send notification
|
||||
+ loop.run_until_complete(notifier.send(title=title, message=msg))
|
||||
|
||||
|
||||
class CategoryAlert:
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 314fe2f..0d6d5a9 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -13,15 +13,15 @@ packages = [{include = "aw_notify"}]
|
||||
aw-notify = "aw_notify.main:main"
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
-python = "^3.9,<3.12"
|
||||
-aw-client = "^0.5.13"
|
||||
-desktop-notifier = "^3.4.2"
|
||||
-rubicon-objc = { version = "^0.4.0", platform = "darwin" }
|
||||
+python = ">=3.9,<3.14"
|
||||
+aw-client = "^0.5.15"
|
||||
+desktop-notifier = "^6.0.0"
|
||||
+rubicon-objc = { version = "^0.5.0", platform = "darwin" }
|
||||
|
||||
[tool.poetry.group.dev.dependencies]
|
||||
black = "*"
|
||||
mypy = "*"
|
||||
-pyinstaller = "^6.6"
|
||||
-pytest = "^7.4"
|
||||
+pyinstaller = "^6.12.0"
|
||||
+pytest = "*"
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry-core"]
|
||||
@@ -159,6 +159,12 @@ rec {
|
||||
pyproject = true;
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
|
||||
patches = [
|
||||
# Backport desktop-notifier 6 / rubicon-objc 0.5 support.
|
||||
# https://github.com/ActivityWatch/aw-notify/pull/10
|
||||
./aw-notify-desktop-notifier-6.patch
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
aw-client
|
||||
desktop-notifier
|
||||
|
||||
@@ -54,10 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://abella-prover.org";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [
|
||||
bcdarwin
|
||||
ciil
|
||||
];
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
perl,
|
||||
readline,
|
||||
tcl,
|
||||
texlive,
|
||||
texliveSmall,
|
||||
tk,
|
||||
xz,
|
||||
@@ -198,23 +197,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
# make tex output available to texlive.combine
|
||||
passthru.pkgs = [ finalAttrs.finalPackage.tex ];
|
||||
passthru.tlType = "run";
|
||||
# dependencies (based on \RequirePackage in jss.cls, Rd.sty, Sweave.sty)
|
||||
passthru.tlDeps = with texlive; [
|
||||
amsfonts
|
||||
amsmath
|
||||
fancyvrb
|
||||
graphics
|
||||
hyperref
|
||||
iftex
|
||||
jknapltx
|
||||
latex
|
||||
lm
|
||||
tools
|
||||
upquote
|
||||
url
|
||||
passthru.tlDeps = ps: [
|
||||
ps.amsfonts
|
||||
ps.amsmath
|
||||
ps.fancyvrb
|
||||
ps.graphics
|
||||
ps.hyperref
|
||||
ps.iftex
|
||||
ps.jknapltx
|
||||
ps.latex
|
||||
ps.lm
|
||||
ps.tools
|
||||
ps.upquote
|
||||
ps.url
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.74";
|
||||
version = "0.107.76";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = "AdGuardHome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cAuthACY/rBVRTSv/UIarhScm+EoTUhnkQ0RUtvhAFg=";
|
||||
hash = "sha256-CF1Ieu7oCnzvXwoHzX5126gQGcgXL+giMtUciKBZ2ZU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o4hpiqQEt8gkYFeAkxPDisvLWbi7WOBZ7xMXrPt6Cdo=";
|
||||
vendorHash = "sha256-tHabP5I7PZtDkVucF95StRyXGEsfbuc6Z3AhQZ/g2f8=";
|
||||
|
||||
dashboard = buildNpmPackage {
|
||||
inherit (finalAttrs) src version;
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
postPatch = ''
|
||||
cd client
|
||||
'';
|
||||
npmDepsHash = "sha256-SOHmXvGLpjs8h0X+AJ6/jAYpxzoizhwRjIzx4SqJOCo=";
|
||||
npmDepsHash = "sha256-Yyv8dTKhZ9IlIW/x/57cl/+cpvjjycaFLSyOR0IiIPk=";
|
||||
npmBuildScript = "build-prod";
|
||||
postBuild = ''
|
||||
mkdir -p $out/build/
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
libfido2,
|
||||
@@ -26,6 +27,24 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
buildInputs = [ libfido2 ];
|
||||
|
||||
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
chmod -R +w vendor/github.com/keys-pub/go-libfido2
|
||||
substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_arm64.go \
|
||||
--replace-fail \
|
||||
'/opt/homebrew/opt/libfido2/lib/libfido2.a /opt/homebrew/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/arm64/lib/libcbor.a' \
|
||||
'-lfido2' \
|
||||
--replace-fail \
|
||||
'-I/opt/homebrew/opt/libfido2/include -I/opt/homebrew/opt/openssl@3/include' \
|
||||
'-I${libfido2.dev}/include'
|
||||
substituteInPlace vendor/github.com/keys-pub/go-libfido2/fido2_static_amd64.go \
|
||||
--replace-fail \
|
||||
'/usr/local/lib/libfido2.a /usr/local/opt/openssl@3/lib/libcrypto.a ''${SRCDIR}/darwin/amd64/lib/libcbor.a' \
|
||||
'-lfido2' \
|
||||
--replace-fail \
|
||||
'-I/usr/local/opt/libfido2/include -I/usr/local/opt/openssl@3/include' \
|
||||
'-I${libfido2.dev}/include'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Age plugin to encrypt files with FIDO2 tokens in a way compatible to typage";
|
||||
homepage = "https://github.com/FiloSottile/typage/";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitea,
|
||||
cctools,
|
||||
yarn-berry_3,
|
||||
nodejs,
|
||||
python311,
|
||||
@@ -42,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python311
|
||||
libsass
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
cctools.libtool
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
6
pkgs/by-name/ap/applgrid/TFileStringLinkDef.h
Normal file
6
pkgs/by-name/ap/applgrid/TFileStringLinkDef.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifdef __CLING__
|
||||
#pragma link off all globals;
|
||||
#pragma link off all classes;
|
||||
#pragma link off all functions;
|
||||
#pragma link C++ class TFileString+;
|
||||
#endif
|
||||
6
pkgs/by-name/ap/applgrid/TFileVectorLinkDef.h
Normal file
6
pkgs/by-name/ap/applgrid/TFileVectorLinkDef.h
Normal file
@@ -0,0 +1,6 @@
|
||||
#ifdef __CLING__
|
||||
#pragma link off all globals;
|
||||
#pragma link off all classes;
|
||||
#pragma link off all functions;
|
||||
#pragma link C++ class TFileVector+;
|
||||
#endif
|
||||
10
pkgs/by-name/ap/applgrid/no-m64.patch
Normal file
10
pkgs/by-name/ap/applgrid/no-m64.patch
Normal file
@@ -0,0 +1,10 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16130,7 +16130,6 @@
|
||||
$as_echo "$as_me: WARNING: ****************************************************************" >&2;}
|
||||
fi
|
||||
|
||||
-( echo $CXXFLAGS | grep -q "m64" ) || CXXFLAGS+=" -m64 "
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-h+ZNGj33FIwg4fOCyfGJrUKM2vDDQl76JcLhtboAOtc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream's configure unconditionally injects `-m64` into CXXFLAGS, which is
|
||||
# invalid on aarch64 (and redundant on x86_64). The line was added in r1946
|
||||
# for applgrid 1.6.17 with the commit message "add default m64 compilation".
|
||||
# There is no public bug tracker upstream, and the line is still present in
|
||||
# trunk. We patch only the generated `configure` (not `configure.ac`) so
|
||||
# that make doesn't try to re-run autotools during the build.
|
||||
./no-m64.patch
|
||||
|
||||
# ROOT 6.40 made rootcling fail when no selection rules are provided
|
||||
# (https://root.cern/doc/v640/release-notes.html#core-libraries). The patch
|
||||
# appends $*LinkDef.h to the dictionary pattern rule so rootcint picks up
|
||||
# the LinkDef.h files we drop into src/ in postPatch.
|
||||
./rootcling-linkdef.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./TFileStringLinkDef.h} src/TFileStringLinkDef.h
|
||||
cp ${./TFileVectorLinkDef.h} src/TFileVectorLinkDef.h
|
||||
|
||||
sed -i appl_grid/serialise_base.h -e '1i#include <cstdint>'
|
||||
'';
|
||||
|
||||
|
||||
11
pkgs/by-name/ap/applgrid/rootcling-linkdef.patch
Normal file
11
pkgs/by-name/ap/applgrid/rootcling-linkdef.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -1027,7 +1027,7 @@
|
||||
$(CC) $(AM_CFLAGS) -c $<
|
||||
|
||||
@USE_ROOT_TRUE@%Dict.cxx : %.h %.cxx
|
||||
-@USE_ROOT_TRUE@ $(CINT) -f $@ -c $< -I..
|
||||
+@USE_ROOT_TRUE@ $(CINT) -f $@ -c $< -I.. $*LinkDef.h
|
||||
|
||||
#../appl_grid/$*LinkDef.h
|
||||
|
||||
@@ -7,50 +7,43 @@
|
||||
ghostscript,
|
||||
}:
|
||||
|
||||
let
|
||||
auctex = stdenv.mkDerivation rec {
|
||||
# Make this a valid tex(live-new) package;
|
||||
# the pkgs attribute is provided with a hack below.
|
||||
pname = "auctex";
|
||||
version = "13.2";
|
||||
tlType = "run";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "auctex";
|
||||
version = "13.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"tex"
|
||||
];
|
||||
outputs = [
|
||||
"out"
|
||||
"tex"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/auctex/auctex-${version}.tar.gz";
|
||||
hash = "sha256-Hn5AKrz4RmlOuncZklvwlcI+8zpeZgIgHHS2ymCUQDU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
emacs
|
||||
ghostscript
|
||||
(texliveBasic.withPackages (ps: [
|
||||
ps.etoolbox
|
||||
ps.hypdoc
|
||||
]))
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p "$tex"
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-lispdir=\${out}/share/emacs/site-lisp"
|
||||
"--with-texmf-dir=\${tex}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/auctex";
|
||||
description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/auctex/auctex-${version}.tar.gz";
|
||||
hash = "sha256-Hn5AKrz4RmlOuncZklvwlcI+8zpeZgIgHHS2ymCUQDU=";
|
||||
};
|
||||
|
||||
in
|
||||
auctex // { pkgs = [ auctex.tex ]; }
|
||||
buildInputs = [
|
||||
emacs
|
||||
ghostscript
|
||||
(texliveBasic.withPackages (ps: [
|
||||
ps.etoolbox
|
||||
ps.hypdoc
|
||||
]))
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p "$tex"
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-lispdir=\${out}/share/emacs/site-lisp"
|
||||
"--with-texmf-dir=\${tex}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/auctex";
|
||||
description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
let
|
||||
nodejs = nodejs_24;
|
||||
|
||||
version = "2025.12.4";
|
||||
version = "2025.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goauthentik";
|
||||
repo = "authentik";
|
||||
tag = "version/${version}";
|
||||
hash = "sha256-alTyrMBbjZbw4jhEna8saabf93sqSrZCu+Z5xH3pZ7M=";
|
||||
hash = "sha256-LPGAhbtmuztDQ4CVhUXb+vBU5HjvNZ7JicI5r3lr1QQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -52,7 +52,7 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "goauthentik";
|
||||
repo = "client-go";
|
||||
tag = "v3.${version}";
|
||||
tag = "v3.2025.12.4";
|
||||
hash = "sha256-+/CfOE2HkBU+ZddvdXGenB/z8xNFk8cujpZpMXyh3cY=";
|
||||
};
|
||||
|
||||
@@ -137,8 +137,8 @@ let
|
||||
|
||||
outputHash =
|
||||
{
|
||||
"aarch64-linux" = "sha256-GL5FPIBnoEXYtw8DPJpRPe3tT3qioN4AdoeOmCoiYsM=";
|
||||
"x86_64-linux" = "sha256-AnceTipq6uUvTbOAZanVshAbAJ9LS1kwImbttTOcWxc=";
|
||||
"aarch64-linux" = "sha256-smm9x29z7gOI7Wq0NvP45KHtBbT6p1lH6IjEf9LRuGs=";
|
||||
"x86_64-linux" = "sha256-K86wnn50svP+QG3i0mggH8RQgfoIqEmyQTouz35xzw8=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
|
||||
|
||||
@@ -208,8 +208,8 @@ let
|
||||
|
||||
outputHash =
|
||||
{
|
||||
"aarch64-linux" = "sha256-eZZ5Ynj81KwFsU5emPtYZ2CxO8MFvWbJnCHs+L88KQQ=";
|
||||
"x86_64-linux" = "sha256-yUAyyO1NFav1EptrRYGSzC8dxCxYVj0FmzHk8IckFZM=";
|
||||
"aarch64-linux" = "sha256-J9wGQe7iMfKznNk3woqi0VNVNA/dE6TGi2f44DOlG1c=";
|
||||
"x86_64-linux" = "sha256-9Q590Rw0mk3q5osxOKGWU7+XtKwkTyA+CLC2LxAA/3g=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform");
|
||||
outputHashMode = "recursive";
|
||||
|
||||
@@ -145,11 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
perlWithPackages
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tlType = "run";
|
||||
pkgs = [ finalAttrs.finalPackage ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Create and manage multiple choice questionnaires with automated marking";
|
||||
mainProgram = "auto-multiple-choice";
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-codspeed";
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodSpeedHQ";
|
||||
repo = "codspeed-rust";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Hfqh9kKTiRTWhKbsdXAK/DqBeAKxXQaYdWoZN55lcLo=";
|
||||
hash = "sha256-6XSKAPLcxgnshkMuiSmw13tsE4keJ9h5DpxwidqMLbg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ix8Q+GbazKC5HIIUUVYjLTlufOQLxppqmVGznbTAXEI=";
|
||||
cargoHash = "sha256-1AjODDI114CL/L8ZDFWDfPwxxxY9vgT/miSVsMLLSgE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc
|
||||
index df98e2b..59f2572 100644
|
||||
--- a/cccc/cccc_tbl.cc
|
||||
+++ b/cccc/cccc_tbl.cc
|
||||
@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_ptr)
|
||||
typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
|
||||
if(value_iterator!=map_t::end())
|
||||
{
|
||||
- erase(value_iterator);
|
||||
+ map_t::erase(value_iterator);
|
||||
retval=true;
|
||||
}
|
||||
return retval;
|
||||
diff --git a/makefile b/makefile
|
||||
index 23ad004..2cca469 100644
|
||||
--- a/makefile
|
||||
+++ b/makefile
|
||||
@@ -20,5 +20,5 @@ test :
|
||||
cd test ; make -f posix.mak
|
||||
|
||||
install :
|
||||
- cd install ; su root -c "make -f install.mak"
|
||||
+ cd install ; make -f install.mak
|
||||
|
||||
@@ -1,31 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cccc";
|
||||
version = "3.1.4";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz";
|
||||
sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sarnold";
|
||||
repo = "cccc";
|
||||
tag = finalAttrs.version;
|
||||
sha256 = "sha256-5UgCz9zURD+LsMB3kLSdkS1zFOTCuU16hK253GFu9HU";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
patches = [ ./cccc.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace install/install.mak --replace /usr/local/bin $out/bin
|
||||
substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p"
|
||||
'';
|
||||
buildFlags = [
|
||||
"CCC=c++"
|
||||
"LD=c++"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp cccc/cccc $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-register " + lib.optionalString stdenv.cc.isGNU "-std=gnu17";
|
||||
|
||||
meta = {
|
||||
description = "C and C++ Code Counter";
|
||||
mainProgram = "cccc";
|
||||
@@ -34,13 +41,9 @@ stdenv.mkDerivation rec {
|
||||
on various metrics of the code. Metrics supported include lines of code, McCabe's
|
||||
complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura.
|
||||
'';
|
||||
homepage = "https://cccc.sourceforge.net/";
|
||||
homepage = "https://github.com/sarnold/cccc";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
# The last successful Darwin Hydra build was in 2023
|
||||
# On linux fails to build on gcc-15, needs porting to c23, but
|
||||
# the upstream code did not update since 2006.
|
||||
broken = true;
|
||||
maintainers = with lib.maintainers; [ tbutter ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "clorinde";
|
||||
version = "1.4.1";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halcyonnouveau";
|
||||
repo = "clorinde";
|
||||
tag = "clorinde-v${finalAttrs.version}";
|
||||
hash = "sha256-eqLY3iOunTdTZn7lfM8lLYk2e6EI1jW81BnRg/NaGuY=";
|
||||
hash = "sha256-eWgFcyr9shcgUU4DlXl6SThbbRTMuvYOjY6hA4CCnQo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OacfUdCtRyewr8OZFBh6NphccDwQ6diWA5JqPhtMi54=";
|
||||
cargoHash = "sha256-p/ZqG1syI6ujgNbNnSSwUz7XpvHK7ua2zH0p3P3Ngec=";
|
||||
|
||||
cargoBuildFlags = [ "--package=clorinde" ];
|
||||
|
||||
|
||||
@@ -17,6 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DANSI_FUNC";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/bryanpkc/corkscrew";
|
||||
description = "Tool for tunneling SSH through HTTP proxies";
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
python3,
|
||||
libsForQt5,
|
||||
curaengine,
|
||||
plugins ? [ ],
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cura";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "Cura";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-R88SdAxx3tkQCDInrFTKad1tPSDTSYaVAPUVmdk94Xk=";
|
||||
};
|
||||
|
||||
materials = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "fdm_materials";
|
||||
rev = "4.13.2";
|
||||
sha256 = "sha256-7y4OcbeQHv+loJ4cMgPU0e818Zsv90EwARdztNWS8zM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtgraphicaleffects
|
||||
];
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
[
|
||||
libsavitar
|
||||
numpy-stl
|
||||
pyserial
|
||||
requests
|
||||
uranium
|
||||
zeroconf
|
||||
pynest2d
|
||||
sentry-sdk
|
||||
trimesh
|
||||
keyring
|
||||
]
|
||||
++ plugins;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3.pkgs.wrapPython
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DURANIUM_DIR=${python3.pkgs.uranium.src}"
|
||||
"-DCURA_VERSION=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
# hacky workaround for https://github.com/NixOS/nixpkgs/issues/59901
|
||||
"--set OMP_NUM_THREADS 1"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
|
||||
sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/cura/resources/materials
|
||||
cp ${finalAttrs.materials}/*.fdm_material $out/share/cura/resources/materials/
|
||||
mkdir -p $out/lib/cura/plugins
|
||||
for plugin in ${toString plugins}; do
|
||||
ln -s $plugin/lib/cura/plugins/* $out/lib/cura/plugins
|
||||
done
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
wrapQtApp $out/bin/cura
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "3D printer / slicing GUI built on top of the Uranium framework";
|
||||
mainProgram = "cura";
|
||||
homepage = "https://github.com/Ultimaker/Cura";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cvc5";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cvc5";
|
||||
repo = "cvc5";
|
||||
tag = "cvc5-${finalAttrs.version}";
|
||||
hash = "sha256-tXhOMrf/sZwEZFWB2Amp9lApWEsfuPqaj9H7RmI733o=";
|
||||
hash = "sha256-PZcOArSTyJzyd2DKT8K0aFC4RlVXgTCnkoU0f08KPfY=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -61,13 +61,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "easyeffects";
|
||||
version = "8.2.2";
|
||||
version = "8.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rdg7XvrJU7HH9aGd/TwMqqexmFeLOMBldh1XQakQSeM=";
|
||||
hash = "sha256-hhQVfUXjobQmrSYFquxbkIuCdBYaExAtjtwbyVqyVUg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -114,8 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
speexdsp'
|
||||
onetbb
|
||||
webrtc-audio-processing
|
||||
x42-plugins
|
||||
zita-convolver
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86 [
|
||||
x42-plugins
|
||||
];
|
||||
|
||||
preFixup =
|
||||
@@ -124,8 +126,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
calf # compressor exciter, bass enhancer and others
|
||||
lsp-plugins # delay, limiter, multiband compressor
|
||||
mda_lv2 # loudness
|
||||
x42-plugins # autotune
|
||||
zam-plugins # maximizer
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isx86 [
|
||||
x42-plugins # autotune
|
||||
];
|
||||
|
||||
ladspaPlugins = [
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "esphome";
|
||||
version = "2026.5.0";
|
||||
version = "2026.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oWlzpBzDOSrXv+gOnFSL7TQqDZJc3oN2RoAW2ywFCGo=";
|
||||
hash = "sha256-faW44FhAymqGQG4khAUEcv6QoAn49KPSghi3YcXttNk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
getopt,
|
||||
readline,
|
||||
texinfo,
|
||||
texlive,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -91,17 +90,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"tex"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tlType = "run";
|
||||
# packages needed by euktoeps, euktopdf and eukleides.sty
|
||||
tlDeps = with texlive; [
|
||||
collection-pstricks
|
||||
epstopdf
|
||||
iftex
|
||||
moreverb
|
||||
];
|
||||
pkgs = [ finalAttrs.finalPackage.tex ];
|
||||
};
|
||||
# packages needed by euktoeps, euktopdf and eukleides.sty
|
||||
passthru.tlDeps = ps: [
|
||||
ps.collection-pstricks
|
||||
ps.epstopdf
|
||||
ps.iftex
|
||||
ps.moreverb
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.307.0";
|
||||
version = "0.307.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-G6+8cJF+So9kePDpNlFGuvsTU5+KXg9dlgaMnElWwL8=";
|
||||
hash = "sha256-ED+mRcnkerdPFjEhxH3fBr8GcH0geLVnjnejpNqNBdI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ie5wCRgGj8DeotYD/GrDP9qTnonTJsMqj1fBqHNR84M=";
|
||||
vendorHash = "sha256-sOyx1Ev0UfoI6mOQAWide19Sg/MWJ8VUVftN9psNq5U=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -40,7 +40,7 @@ buildGo126Module rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-CtZoPtpENUfaVvs2zozBWsMYD8ZJFAXig7sYcNNLwzY=";
|
||||
hash = "sha256-U7gcAkfw7a0skM91mSAZJIPUPBRfSkyJYVjjVyEyZ4E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,154 +0,0 @@
|
||||
diff --git i/package-lock.json w/package-lock.json
|
||||
index 07428d0..4901a94 100644
|
||||
--- i/package-lock.json
|
||||
+++ w/package-lock.json
|
||||
@@ -3 +3 @@
|
||||
- "version": "4.0.0-beta",
|
||||
+ "version": "4.0.0",
|
||||
@@ -9 +9 @@
|
||||
- "version": "4.0.0-beta",
|
||||
+ "version": "4.0.0",
|
||||
@@ -131,0 +132,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
|
||||
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
|
||||
@@ -144,0 +147,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
|
||||
+ "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
|
||||
@@ -154,0 +159,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
|
||||
+ "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
|
||||
@@ -161,0 +168,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
|
||||
+ "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
|
||||
@@ -173,0 +182,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
|
||||
+ "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
|
||||
@@ -180,0 +191,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
|
||||
+ "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
|
||||
@@ -223,0 +236,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
|
||||
+ "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
|
||||
@@ -260,0 +275,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
|
||||
+ "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==",
|
||||
@@ -267,0 +284,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz",
|
||||
+ "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==",
|
||||
@@ -304,0 +323,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.0.tgz",
|
||||
+ "integrity": "sha512-TNd+u1fAG8vf8YMgXzK2BI0u0xsphFv//T5rpF1eZ+8AAXby5Ll1qptr4/XVS45dvWDIzuBmmWIpVJRvnaNqzQ==",
|
||||
@@ -318,0 +339,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.0.0.tgz",
|
||||
+ "integrity": "sha512-6QEzj6bZg8atviRIL+pR0tODC854cYSjvZxkyCarr8DVaOJPEyuGys7GmEG3W0Rb8kKSQec7P6okt0sJvNneFw==",
|
||||
@@ -329,0 +352,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.0.0.tgz",
|
||||
+ "integrity": "sha512-7dwoKCGvgZGHWTZfOj2KLmbIAIdiXP9NTrwGaTO/XDfKMEmyBahZpnombiG6JDHmiOrmK3GLEJRXrWExXCDLmQ==",
|
||||
@@ -373,0 +398,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.0.0.tgz",
|
||||
+ "integrity": "sha512-bhHAP7hIOxUjiTZrpjyAYD+2RFRa+PNutWeW7JdDPcWWG3GVRiFsu3pBGw9kN2PktoiilDWFGSR0dwXBzGQang==",
|
||||
@@ -385,0 +412,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.0.tgz",
|
||||
+ "integrity": "sha512-mR7JHNIvCB4o12f75KN42he7s1O9tmcSN4wJ6l04oymfXKLn+lYJFI7z9lbe4/Ald6fm8nuF38fuY5hNPl3B+A==",
|
||||
@@ -397,0 +426,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.7.tgz",
|
||||
+ "integrity": "sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==",
|
||||
@@ -404,0 +435,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.0.0.tgz",
|
||||
+ "integrity": "sha512-LD7MNzaX+q2OpU4Fn0i/SedhnnBCAnEzRr6L0MP6ohofFFlx9kp5EXX7flbRZlUnh8icOwC3NFmXTyP76hvo0g==",
|
||||
@@ -415,0 +448,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.0.tgz",
|
||||
+ "integrity": "sha512-DUYfROyQNWm3q+JXL3S6s1/y/cOWRstnmt5zDXhdYNJ5N8TgCnHcDXKwW/dRZL7eBZupmDVHxdKCWZDUYUqmeg==",
|
||||
@@ -426,0 +461,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.0.tgz",
|
||||
+ "integrity": "sha512-W4QRSzJDMKIvWSvQWOIhs6qba1MJ6yIoy+sazSFhl2QIwn58B0Yw3iZ/zLk3QqVcCsTmKcyrSNVWUJ5RVDLStw==",
|
||||
@@ -438,0 +475,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.0.0.tgz",
|
||||
+ "integrity": "sha512-y8kX/TmyBqV0H1i3cWbhiTljcuBtgVgyVXAVub3ba1j5/G+dxhYohK1JLRkaosPGKKf3LnEJsYK+GPabpfnaHw==",
|
||||
@@ -457,0 +496,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.0.tgz",
|
||||
+ "integrity": "sha512-frzJNoMsQBO1fxLXrtpxt2c8hUy/ASEmBpIOEnXY2CjylPnLsVyxrEq7hcOIqVJKHn1tIPfplfiSPowOTrrUDg==",
|
||||
@@ -469,0 +510,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.0.tgz",
|
||||
+ "integrity": "sha512-AT9vkC2KD/PLHZZXIW5Tn/FnJzEU3xEZMLxNo9OggKoreDEKfTOKVM1LkYbDg6UQUOOjntXd0SsrvoHfCzS8cw==",
|
||||
@@ -482,0 +525,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.0.tgz",
|
||||
+ "integrity": "sha512-XTN4AIFusWbNCBU1Xm2YDxbtH94e/FOrC27U3QargSsoDT1mRm+aLfqE+oOZnUuxwtTnInRT8UHRU3MVOu52wg==",
|
||||
@@ -496,0 +541,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/testing/-/testing-2.1.35.tgz",
|
||||
+ "integrity": "sha512-DUMxGJP6Y7QTrjk4hE6kunQUfMDxCphJaO0xCsH+AmaTPbvIW2HV+7ZQTCFQXrOTFuvLssF9lbbnC0keGYbVgA==",
|
||||
@@ -523,0 +570,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.0.tgz",
|
||||
+ "integrity": "sha512-YYykfbw/lefC7yKj7nanzQXILM7r3suIvyFlCcMskc99axmsSewXWkAfXKwMbgxL76iAFVmRwmYdwNZNc8gjog==",
|
||||
@@ -728,0 +777,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.2.tgz",
|
||||
+ "integrity": "sha512-4Bb+oqXZTSTZ1q27Izly9lv8B9dlV61CROxPiVtywwzv5SnytJqhvYe6FclHYuXml4cd1VHPo1zd5PmTeJozvA==",
|
||||
@@ -765,0 +816,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.0.tgz",
|
||||
+ "integrity": "sha512-+DwhEHAaFPPdJ2ral3kNHFQXnTfscEEFsUxzD+d7nlcLrFK23JtNjH71RGasTcHb88b4vVi4mTyfpf8u2L8bdA==",
|
||||
@@ -828,0 +881,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.9.tgz",
|
||||
+ "integrity": "sha512-sicdRoWtYevwxjOHNMPTl3vSfJM6oyW8o1wXeI7uww6b6xHg8eBznQDNSGBCDJmsE8UMxP05JgZRtsKbTqt//Q==",
|
||||
@@ -833,0 +888,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
|
||||
+ "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
|
||||
@@ -886,0 +943,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
|
||||
+ "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
|
||||
@@ -1049,0 +1108,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/awilix/-/awilix-12.0.2.tgz",
|
||||
+ "integrity": "sha512-BoXlUZmTJc2j+uCDAMglNnWNf1b9KDEGmrgYs3vnOldK+bkiAiJnisgbIJWvGC1MFt/uYd3tG+Esd/0VmLreKw==",
|
||||
@@ -1293,0 +1354,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
|
||||
+ "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
|
||||
@@ -1569,0 +1632,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
|
||||
+ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
|
||||
@@ -1851,0 +1916,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.12.0.tgz",
|
||||
+ "integrity": "sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==",
|
||||
@@ -1932,0 +1999,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
|
||||
+ "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
|
||||
@@ -1946,0 +2015,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz",
|
||||
+ "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==",
|
||||
@@ -1993,0 +2064,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz",
|
||||
+ "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==",
|
||||
@@ -2227,0 +2300,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
|
||||
+ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
|
||||
@@ -2367,0 +2442,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz",
|
||||
+ "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==",
|
||||
@@ -2581,0 +2658,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-12.0.0.tgz",
|
||||
+ "integrity": "sha512-W3mwgzLtWIqHndtAb82zCHbRfdPit3jcqEyYkAjM/4p15g/1tOoduYydx6IJ3sh31FHT82YoqYZB8RoTwoMy7w==",
|
||||
@@ -2874,0 +2953,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.2.tgz",
|
||||
+ "integrity": "sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==",
|
||||
@@ -3210,0 +3291,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz",
|
||||
+ "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==",
|
||||
@@ -3707,0 +3790,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
|
||||
+ "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
|
||||
@@ -3899,0 +3984,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz",
|
||||
+ "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==",
|
||||
@@ -4319,0 +4406,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
|
||||
+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
|
||||
@@ -4373,0 +4462,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
|
||||
+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
|
||||
@@ -4405,0 +4496,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.1.tgz",
|
||||
+ "integrity": "sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==",
|
||||
@@ -4415,0 +4508,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
|
||||
+ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
|
||||
@@ -4427,0 +4522,2 @@
|
||||
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
|
||||
+ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
|
||||
5392
pkgs/by-name/fa/fauna-shell/package-lock.json
generated
Normal file
5392
pkgs/by-name/fa/fauna-shell/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
esbuild,
|
||||
buildGoModule,
|
||||
nodejs_22,
|
||||
}:
|
||||
let
|
||||
esbuild' = esbuild.override {
|
||||
@@ -36,19 +37,22 @@ buildNpmPackage (finalAttrs: {
|
||||
hash = "sha256-JbTS54e1pNxoqTAlEdOqKqkEyAzFJLI6he7/jivVPzI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./package-lock-fix.patch
|
||||
];
|
||||
# upstream's package-lock.json is missing entries needed by npm >= 11
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-RNgx3Oorc/+nHHZHdOmyA9Q3fCW7yaAzX0DqHbCMqt0=";
|
||||
npmDepsHash = "sha256-OH/ippCHRy7glq+wXBwnHIVCO6yL5CItng/vCKv+0fQ=";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
|
||||
|
||||
# While this errors, it makes the build complete successfully. Therefore, ????
|
||||
# ssh2's optional cpu-features native module needs node-gyp building to satisfy esbuild's bundler
|
||||
preBuild = ''
|
||||
npm rebuild --verbose cpu-features
|
||||
npm rebuild cpu-features
|
||||
'';
|
||||
|
||||
npmBuildScript = "build:app";
|
||||
|
||||
@@ -19,9 +19,10 @@ fi
|
||||
git clone "https://github.com/fauna/fauna-shell" -b "v$NEW_VERSION" "$WORKDIR/src"
|
||||
pushd "$WORKDIR/src"
|
||||
npx --yes npm-package-lock-add-resolved
|
||||
npm install --package-lock-only --ignore-scripts
|
||||
|
||||
# Update package-lock patch
|
||||
git diff -U0 >"$PACKAGE_DIR/package-lock-fix.patch"
|
||||
# Update vendored lock file
|
||||
cp package-lock.json "$PACKAGE_DIR/package-lock.json"
|
||||
popd
|
||||
|
||||
# Run nix-update
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "field-monitor";
|
||||
version = "50.0";
|
||||
version = "50.1";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "theCapypara";
|
||||
repo = "field-monitor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IVHzMUjjVZHDTI6Jjq7i8wrENPerKzEiDT15otPFx9A=";
|
||||
hash = "sha256-waMa70oLKvIoljvE+MjWWKVL1Cd0xnasVeB17tfMQW8=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-c4ANjQ1OoDMMifAUpU8iNE9lSBamAR+XbEmYrYphixU=";
|
||||
hash = "sha256-fsrczFhoIilxgZRH2PVXC67YdkMsIjA6zTfix57TTzo=";
|
||||
};
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
@@ -25,27 +25,26 @@ let
|
||||
];
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
libwebrtc = fetchzip {
|
||||
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.3.0/libwebrtc.zip";
|
||||
sha256 = "sha256-lGvWAicdKbNdMZAQS9Qyxv737G/sBI/hKbge/Xw5bDM=";
|
||||
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.4.0/libwebrtc.zip";
|
||||
sha256 = "sha256-OvqUF6RuytDorJE+C58EnIxPHfcphs8iPiPjt7SDrU0=";
|
||||
};
|
||||
in
|
||||
flutter341.buildFlutterApplication (
|
||||
rec {
|
||||
pname = "fluffychat-${targetFlutterPlatform}";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krille-chan";
|
||||
repo = "fluffychat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8iMSfF5K/9bQot7Tzc2XuuiQnquLZmS0ucC5t2T/HEA=";
|
||||
hash = "sha256-iAHJjpDd2RNYPtEqyotFNvW/nybW1ozNtvMTT+wQVVY=";
|
||||
};
|
||||
|
||||
inherit pubspecLock;
|
||||
|
||||
gitHashes = {
|
||||
flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=";
|
||||
flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
|
||||
webcrypto = "sha256-yPhL0LoSIaJ9e9wrLtdPuTBRvXft1DQM9KR7WdNcj68=";
|
||||
};
|
||||
|
||||
inherit targetFlutterPlatform;
|
||||
|
||||
@@ -4,31 +4,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
|
||||
"sha256": "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "91.0.0"
|
||||
"version": "93.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
|
||||
"sha256": "de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.4.1"
|
||||
"version": "10.0.1"
|
||||
},
|
||||
"analyzer_plugin": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer_plugin",
|
||||
"sha256": "825071d553c4aef2252196d46a665fbd8e0cb06de07725f25d1b29bd18d65fff",
|
||||
"sha256": "7df504f0c9d6891bacc9f73a5a8c5f6fe4fc49c90ec8e3379916372906ba0b32",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.13.6"
|
||||
"version": "0.14.1"
|
||||
},
|
||||
"ansicolor": {
|
||||
"dependency": "transitive",
|
||||
@@ -64,11 +64,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "async",
|
||||
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
|
||||
"sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.13.0"
|
||||
"version": "2.13.1"
|
||||
},
|
||||
"audio_session": {
|
||||
"dependency": "transitive",
|
||||
@@ -84,11 +84,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "badges",
|
||||
"sha256": "a7b6bbd60dce418df0db3058b53f9d083c22cdb5132a052145dc267494df0b84",
|
||||
"sha256": "cf1c88fb3777df69ccd630b80de5267f54efa4a39381b0404a7c03d56cb7c041",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.2"
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"barbecue": {
|
||||
"dependency": "transitive",
|
||||
@@ -184,11 +184,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "chewie",
|
||||
"sha256": "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca",
|
||||
"sha256": "53dadd2c5b6748742d7744072b38a417ad22691ca55715850300ee793dc7cb27",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.13.0"
|
||||
"version": "1.13.1"
|
||||
},
|
||||
"cli_config": {
|
||||
"dependency": "transitive",
|
||||
@@ -314,11 +314,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "dart_code_linter",
|
||||
"sha256": "1b53722d9933a5f5d4580acc29c7f16b1fde66d21d1ecf7bb2a811caf3a42b42",
|
||||
"sha256": "f0a63317198a495d04cccf98643fa6c2e8838805e370808b11b883a3efee0380",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.1"
|
||||
"version": "4.0.3"
|
||||
},
|
||||
"dart_earcut": {
|
||||
"dependency": "transitive",
|
||||
@@ -344,21 +344,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
|
||||
"sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.3"
|
||||
"version": "3.1.7"
|
||||
},
|
||||
"dart_webrtc": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_webrtc",
|
||||
"sha256": "4ed7b9fa9924e5a81eb39271e2c2356739dd1039d60a13b86ba6c5f448625086",
|
||||
"sha256": "f6d615bddea5e458ce180a914f3055c234ffb52fb7397a51b3491e76d6d7edb2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.7.0"
|
||||
"version": "1.8.1"
|
||||
},
|
||||
"dbus": {
|
||||
"dependency": "transitive",
|
||||
@@ -374,21 +374,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "desktop_drop",
|
||||
"sha256": "e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8",
|
||||
"sha256": "aa1e797255bfbc76f9eb5aa4f61e5b68dbf69962ab1be6495816d2f251bc0d1f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.0"
|
||||
},
|
||||
"desktop_notifications": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "desktop_notifications",
|
||||
"sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.3"
|
||||
"version": "0.7.1"
|
||||
},
|
||||
"desktop_webview_window": {
|
||||
"dependency": "transitive",
|
||||
@@ -404,11 +394,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "device_info_plus",
|
||||
"sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
|
||||
"sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.3.0"
|
||||
"version": "12.4.0"
|
||||
},
|
||||
"device_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -474,11 +464,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
|
||||
"sha256": "f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.3.10"
|
||||
"version": "11.0.2"
|
||||
},
|
||||
"file_selector": {
|
||||
"dependency": "direct main",
|
||||
@@ -586,11 +576,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_foreground_task",
|
||||
"sha256": "1903697944a31f596622e51a6af55e3a9dfb27762f9763ab2841184098c6b0ba",
|
||||
"sha256": "fc5c01a5e1b8f7bb51d0c737714f0c50440dbdf1aeddc5f8cbba313aa6fd4856",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.2.1"
|
||||
"version": "9.2.2"
|
||||
},
|
||||
"flutter_linkify": {
|
||||
"dependency": "direct main",
|
||||
@@ -662,11 +652,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_map",
|
||||
"sha256": "391e7dc95cc3f5190748210a69d4cfeb5d8f84dcdfa9c3235d0a9d7742ccb3f8",
|
||||
"sha256": "03b71c02806ff20c3718d108cbbb3638142ebafe368d8ce2dd22a33344bcb02b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.2.2"
|
||||
"version": "8.3.0"
|
||||
},
|
||||
"flutter_native_splash": {
|
||||
"dependency": "direct dev",
|
||||
@@ -712,21 +702,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_secure_storage",
|
||||
"sha256": "da922f2aab2d733db7e011a6bcc4a825b844892d4edd6df83ff156b09a9b2e40",
|
||||
"sha256": "6848263f9744072d0977347c383fb8b57d9780319a6bf5238b5a2866a029de62",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.0"
|
||||
"version": "10.2.0"
|
||||
},
|
||||
"flutter_secure_storage_darwin": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_secure_storage_darwin",
|
||||
"sha256": "8878c25136a79def1668c75985e8e193d9d7d095453ec28730da0315dc69aee3",
|
||||
"sha256": "67cd1ff671add31dc13e45194398187a04bb63804b37fa47866afae296d73fcb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.0"
|
||||
"version": "0.3.1"
|
||||
},
|
||||
"flutter_secure_storage_linux": {
|
||||
"dependency": "transitive",
|
||||
@@ -752,11 +742,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_secure_storage_web",
|
||||
"sha256": "6a1137df62b84b54261dca582c1c09ea72f4f9a4b2fcee21b025964132d5d0c3",
|
||||
"sha256": "073a62b3aeb866ab4ce795f960413948e51e5a42a9b0c8333b6daf5bb3208a1c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"flutter_secure_storage_windows": {
|
||||
"dependency": "transitive",
|
||||
@@ -798,11 +788,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_web_auth_2",
|
||||
"sha256": "432ff8c7b2834eaeec3378d99e24a0210b9ac2f453b3f7a7d739a5c09069fba3",
|
||||
"sha256": "d354998934ddc338e69b999b2abaeb33c6fd09999d3a5f92ead1a6b49b49712e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.1"
|
||||
"version": "5.0.2"
|
||||
},
|
||||
"flutter_web_auth_2_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -824,11 +814,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_webrtc",
|
||||
"sha256": "c549ea8ffb20167110ad0a28e5f17a2650b5bea8837d984898cd9b0ffd5fa78b",
|
||||
"sha256": "c7b0a67ca2c878575fc5c146d801cd874f58f5f1ef5fa6e8eb0c93d413beb948",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.1"
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"frontend_server_client": {
|
||||
"dependency": "transitive",
|
||||
@@ -940,11 +930,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "go_router",
|
||||
"sha256": "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896",
|
||||
"sha256": "92d8cee7c57dff0a6c409c05597b460002434eccf7424a712283225b3962d03f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "17.1.0"
|
||||
"version": "17.2.3"
|
||||
},
|
||||
"gsettings": {
|
||||
"dependency": "transitive",
|
||||
@@ -1050,11 +1040,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "image_picker",
|
||||
"sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320",
|
||||
"sha256": "91c025426c2881c551100bce834e201c835a170151545f58d17da5180ca7d9ac",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"image_picker_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -1336,11 +1326,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "matrix",
|
||||
"sha256": "5bb38e98212bc4c3244c762a1af787f7239a38d2cfdf44488258283ff899f77c",
|
||||
"sha256": "734eae63fa4b707999ee9165e0fc7e1205d1fcb37fef9727bb4f79cda460e1ab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.2.0"
|
||||
"version": "7.1.2"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "transitive",
|
||||
@@ -1446,11 +1436,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "package_info_plus",
|
||||
"sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
|
||||
"sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.0.0"
|
||||
"version": "9.0.1"
|
||||
},
|
||||
"package_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1476,11 +1466,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "particles_network",
|
||||
"sha256": "fbaead7961925946ff83e5b441bdbc8628139ea161ce901547e6f1190a6161de",
|
||||
"sha256": "f35f4e2bbd6872c6cff1d13628853d2fb2df6cc83b88c4f4757afe70333f5c6a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.9.3"
|
||||
"version": "1.9.4"
|
||||
},
|
||||
"pasteboard": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "pasteboard",
|
||||
"sha256": "fedbe8da188d2f713aa8b01260737342e6e1087534a3ab26e1a719f8d3e8f32f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.0"
|
||||
},
|
||||
"path": {
|
||||
"dependency": "direct main",
|
||||
@@ -1736,61 +1736,61 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "record",
|
||||
"sha256": "d5b6b334f3ab02460db6544e08583c942dbf23e3504bf1e14fd4cbe3d9409277",
|
||||
"sha256": "10911465138fafacef459a780564e883e01bd48eabf87ab20543684884492870",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.2.0"
|
||||
"version": "6.2.1"
|
||||
},
|
||||
"record_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_android",
|
||||
"sha256": "94783f08403aed33ffb68797bf0715b0812eb852f3c7985644c945faea462ba1",
|
||||
"sha256": "eb1732e42d0d2a1895b8db86e4fc917287e6d8491b6ed59918aea8bed6c69de4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.1"
|
||||
"version": "1.5.2"
|
||||
},
|
||||
"record_ios": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_ios",
|
||||
"sha256": "8df7c136131bd05efc19256af29b2ba6ccc000ccc2c80d4b6b6d7a8d21a3b5a9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"record_linux": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_linux",
|
||||
"sha256": "c31a35cc158cd666fc6395f7f56fc054f31685571684be6b97670a27649ce5c7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"record_macos": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_macos",
|
||||
"sha256": "084902e63fc9c0c224c29203d6c75f0bdf9b6a40536c9d916393c8f4c4256488",
|
||||
"sha256": "c051fb48edd7a0e265daafb9108730dc827c27b551728a3fdfb3ef69efd89c73",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"record_linux": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_linux",
|
||||
"sha256": "31181787bf7eccb0e298835836b69b3cd0a903863b75d70e937de3dec71cd8f3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.1"
|
||||
},
|
||||
"record_macos": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_macos",
|
||||
"sha256": "cfe1b61435e27db418bf513dc36820d10c9f7eb1843786c2c9a52e07e2f4f627",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.2"
|
||||
},
|
||||
"record_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "record_platform_interface",
|
||||
"sha256": "8a81dbc4e14e1272a285bbfef6c9136d070a47d9b0d1f40aa6193516253ee2f6",
|
||||
"sha256": "8e56cbe06c6984137fb86132ff03459f29938d927496d9b2d0962e2d6345d488",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.0"
|
||||
"version": "1.6.0"
|
||||
},
|
||||
"record_web": {
|
||||
"dependency": "transitive",
|
||||
@@ -1916,11 +1916,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "share_plus",
|
||||
"sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
|
||||
"sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.0.1"
|
||||
"version": "12.0.2"
|
||||
},
|
||||
"share_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1936,11 +1936,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "shared_preferences",
|
||||
"sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
|
||||
"sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.5.4"
|
||||
"version": "2.5.5"
|
||||
},
|
||||
"shared_preferences_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2562,11 +2562,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "wakelock_plus",
|
||||
"sha256": "e4e125b7c1a2f0e491e5452afdc0e25ab77b2d2775a7caa231fcc1c1f2162c47",
|
||||
"sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.0"
|
||||
"version": "1.5.2"
|
||||
},
|
||||
"wakelock_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -2619,13 +2619,14 @@
|
||||
"version": "3.0.3"
|
||||
},
|
||||
"webcrypto": {
|
||||
"dependency": "transitive",
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"name": "webcrypto",
|
||||
"sha256": "sha256-a0MAHEEQhW/3+l5eZeey1EvsHYtUpNhNX6LHYiJnxcE=",
|
||||
"url": "https://pub.dev"
|
||||
"path": ".",
|
||||
"ref": "master",
|
||||
"resolved-ref": "dcc7ba78c9721de56a800fda9a9e2bc759b9cad3",
|
||||
"url": "https://github.com/google/webcrypto.dart.git"
|
||||
},
|
||||
"source": "hosted",
|
||||
"source": "git",
|
||||
"version": "0.6.0"
|
||||
},
|
||||
"webdriver": {
|
||||
@@ -2662,11 +2663,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "webrtc_interface",
|
||||
"sha256": "ad0e5786b2acd3be72a3219ef1dde9e1cac071cf4604c685f11b61d63cdd6eb3",
|
||||
"sha256": "c6f100eac5057d9a817a60473126f9828c796d42884d498af4f339c97b21014f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
"version": "1.5.1"
|
||||
},
|
||||
"win32": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fluxcd-operator-mcp";
|
||||
version = "0.48.0";
|
||||
version = "0.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8=";
|
||||
hash = "sha256-4FIsad3/57KtyTVQE0T4jhQGEvuEw9/ZFWsriLyc6Ok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg=";
|
||||
vendorHash = "sha256-DxXTepwTjgc+Xy3MAIFcYZ/XZZ3zGgyStmXN2/BqM74=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fluxcd-operator";
|
||||
version = "0.48.0";
|
||||
version = "0.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "controlplaneio-fluxcd";
|
||||
repo = "fluxcd-operator";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ggx38aF9o7dMFcQxYbx5hSXCE2oRRTgvUvXCAJJN6V8=";
|
||||
hash = "sha256-hWMXoJ47+kDmMGkGV9GOJ9ssdK6RVvcmxf3fiQYhvgM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xG4mJQfww/pMIg9zK2XpDw7XGCLHvJPXLvBspdSRAcg=";
|
||||
vendorHash = "sha256-UANjDzaYJ5t10ZzG0a7oftKQVqj1HcE6/LmlnLapCPY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.8.7";
|
||||
srcHash = "sha256-aA4DA/uG/YZ/9cUWAhhVZJme8Cj7OWFWqXce8n5InfM=";
|
||||
vendorHash = "sha256-kn0S5tycL6tpgy/0YrHSFM0WpUluugSy87rh1FArnO8=";
|
||||
manifestsHash = "sha256-pYz+UNYnBYSIFdWbK9bcckJhgCMGm8EZDC/DXtXNwDE=";
|
||||
version = "2.8.8";
|
||||
srcHash = "sha256-ECFEzYhnhse2yrfWYaeN5dE+HUvCy5RKZ2OceCb5+sA=";
|
||||
vendorHash = "sha256-pV7eoiGhWk6KYZbK8bamXJY/NdK7ZYqrVcCTX9ccLJc=";
|
||||
manifestsHash = "sha256-fF21nDstKUrlW6fgm0DrDtntR/0cnHMEzRltjBm9nwA=";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
doctest,
|
||||
}:
|
||||
@@ -21,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# do not download doctest, use the system doctest instead
|
||||
# originally from: https://sources.debian.org/data/main/f/foonathan-memory/0.7.3-2/debian/patches/0001-Use-system-doctest.patch
|
||||
./0001-Use-system-doctest.patch.patch
|
||||
|
||||
(fetchpatch2 {
|
||||
# Fix build under clang on Darwin
|
||||
# https://github.com/foonathan/memory/pull/192
|
||||
name = "size-suffixes-cannot-have-a-space.patch";
|
||||
url = "https://github.com/foonathan/memory/commit/0f5ebe9f4ac2d2ad106d596c993d13e107b27820.patch?full_index=1";
|
||||
hash = "sha256-RtLGDe6ZQ4CQD25pjS20+SZLhxGSrm/A7cO6VUgPbfo=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
|
||||
4
pkgs/by-name/ga/garnet/deps.json
generated
4
pkgs/by-name/ga/garnet/deps.json
generated
@@ -31,8 +31,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "diskann-garnet",
|
||||
"version": "1.0.26",
|
||||
"hash": "sha256-xKcv20olcK/0HBKsiaB+gNXqz6YyKHEdvYVjqssIjy0="
|
||||
"version": "1.0.27",
|
||||
"hash": "sha256-z1kj3LbJGVk0X4SDocHO9SaS/b5bMhRIvHNhjTEObi8="
|
||||
},
|
||||
{
|
||||
"pname": "KeraLua",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.1.6";
|
||||
version = "1.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OUCztqeE8oHaO0Cz/4Oz6bsp8GKszxwTjpbMLFvkCTE=";
|
||||
hash = "sha256-8oZrUb3ed/M3juchn6OSRQAX6tfplekwmLLjHURtms8=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
@@ -18,16 +18,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gelly";
|
||||
version = "1.1.2";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fingel";
|
||||
repo = "gelly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oEDpfpOkA0J9fSF+haEvhmZGSZIRCaN2qHa2pHUujBs=";
|
||||
hash = "sha256-BnBfz9gE3pz6cL7uAnzSEdI0h7rXCcsFZ8oB5uw5zjY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YpFeu5re+kYjjv6Id9kvus3oGmz3qExD8ofLFObAZdI=";
|
||||
cargoHash = "sha256-2gkW+GJQ5TjOP4Me/g3le4/bxLgOoFlHOl/cVk/2lpM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -38,45 +38,27 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
|
||||
version = "1.9.0-993"; # TODO try to remove preCheck phase on upgrade
|
||||
version = "2.0.0-19"; # TODO try to remove preCheck phase on upgrade
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-pqytFWrSWfEwQqRdRbaigGCq68s8mdgj2j8M+kclslE=";
|
||||
url = "https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source/giac_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-7fuKV8xNlDyN9ha1+NNHUjFPhEP0NZ3thwRXL1kcA5E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-old-functional-patterns.patch
|
||||
./fix-fltk-guard.patch
|
||||
|
||||
(fetchpatch {
|
||||
name = "pari_2_15.patch";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/07a2afd65fb4b0a1c9cbc43ede7d4a18c921a000/build/pkgs/giac/patches/pari_2_15.patch";
|
||||
sha256 = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "infinity.patch";
|
||||
url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch";
|
||||
sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM=";
|
||||
stripLen = 5;
|
||||
extraPrefix = "/src/";
|
||||
excludes = [ "src/kdisplay.cc" ];
|
||||
})
|
||||
|
||||
# giac calls scanf/printf with non-constant first arguments, which
|
||||
# the compiler rightfully warns about (with an error nowadays).
|
||||
(fetchpatch {
|
||||
name = "fix-string-compiler-error.patch";
|
||||
url = "https://salsa.debian.org/science-team/giac/-/raw/9ca8dbf4bb16d9d96948aa4024326d32485d7917/debian/patches/fix-string-compiler-error.patch";
|
||||
sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk=";
|
||||
hash = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE=";
|
||||
})
|
||||
|
||||
# issue with include path precedence
|
||||
(fetchpatch {
|
||||
name = "fix_implicit_declaration.patch";
|
||||
url = "https://salsa.debian.org/science-team/giac/-/raw/c05ae9b9e74d3c6ee6411d391071989426a76201/debian/patches/fix_implicit_declaration.patch";
|
||||
sha256 = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY=";
|
||||
hash = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (!enableGUI) [
|
||||
@@ -85,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(fetchpatch {
|
||||
name = "nofltk-check.patch";
|
||||
url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";
|
||||
sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
|
||||
hash = "sha256-eA0S+pEgllv77+KIpMvZgjz99jlbnreVvtNqNXs2HvI=";
|
||||
postFetch = ''
|
||||
substituteInPlace "$out" --replace-quiet periode Periode
|
||||
'';
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -1,294 +0,0 @@
|
||||
From f1c5309d5b815acc2616cd9fbb5182b1e64d225f Mon Sep 17 00:00:00 2001
|
||||
From: George Huebner <george@feyor.sh>
|
||||
Date: Wed, 17 Jul 2024 18:12:36 -0500
|
||||
Subject: [PATCH 1/4] remove old <functional> patterns
|
||||
|
||||
pointer_to_binary_function and ptr_fun are holdovers from pre c++11,
|
||||
and can be replaced or entirely removed. This allows Giac to compile
|
||||
with Clang 16>=.
|
||||
---
|
||||
src/all_global_var | 2 +-
|
||||
src/gausspol.cc | 2 +-
|
||||
src/gausspol.h | 2 +-
|
||||
src/gen.cc | 2 +-
|
||||
src/gen.h | 4 ++--
|
||||
src/maple.cc | 2 +-
|
||||
src/monomial.h | 16 ++++++++--------
|
||||
src/plot.cc | 2 +-
|
||||
src/poly.h | 17 +++++++++--------
|
||||
src/solve.cc | 18 +++++++++---------
|
||||
src/usual.cc | 2 +-
|
||||
11 files changed, 35 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/src/all_global_var b/src/all_global_var
|
||||
index 7d75d73..55f4782 100644
|
||||
--- a/src/all_global_var
|
||||
+++ b/src/all_global_var
|
||||
@@ -16,7 +16,7 @@ Relatif a l'evaluation du tableur
|
||||
// File Eqw.cc
|
||||
vector<string> completion_tab;
|
||||
// File alg_ext.cc
|
||||
- rootmap symbolic_rootof_list(ptr_fun(islesscomplex));
|
||||
+ rootmap symbolic_rootof_list(islesscomplex);
|
||||
// File derive.cc
|
||||
// File desolve.cc
|
||||
identificateur laplace_var(" s");
|
||||
diff --git a/src/gausspol.cc b/src/gausspol.cc
|
||||
index 8fbd581..2f2121f 100644
|
||||
--- a/src/gausspol.cc
|
||||
+++ b/src/gausspol.cc
|
||||
@@ -855,7 +855,7 @@ namespace giac {
|
||||
std::vector< monomial<gen> >::const_iterator & itb_end,
|
||||
std::vector< monomial<gen> > & new_coord,
|
||||
bool (* is_strictly_greater)( const index_m &, const index_m &),
|
||||
- const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_strictly_greater
|
||||
+ const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_strictly_greater
|
||||
) {
|
||||
if (ita==ita_end || itb==itb_end){
|
||||
new_coord.clear();
|
||||
diff --git a/src/gausspol.h b/src/gausspol.h
|
||||
index b5d214b..e6c7e0c 100644
|
||||
--- a/src/gausspol.h
|
||||
+++ b/src/gausspol.h
|
||||
@@ -93,7 +93,7 @@ namespace giac {
|
||||
std::vector< monomial<gen> >::const_iterator & itb_end,
|
||||
std::vector< monomial<gen> > & new_coord,
|
||||
bool (* is_strictly_greater)( const index_t &, const index_t &),
|
||||
- const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_greater
|
||||
+ const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_greater
|
||||
) ;
|
||||
void mulpoly(const polynome & th,const gen & fact,polynome & res);
|
||||
polynome operator * (const polynome & th, const gen & fact) ;
|
||||
diff --git a/src/gen.cc b/src/gen.cc
|
||||
index 7d4874c..0b64afe 100644
|
||||
--- a/src/gen.cc
|
||||
+++ b/src/gen.cc
|
||||
@@ -1126,7 +1126,7 @@ namespace giac {
|
||||
#if 1 // def NSPIRE
|
||||
g.__MAPptr = new ref_gen_map;
|
||||
#else
|
||||
- g.__MAPptr = new ref_gen_map(ptr_fun(islesscomplexthanf));
|
||||
+ g.__MAPptr = new ref_gen_map(islesscomplexthanf);
|
||||
#endif
|
||||
#endif
|
||||
g.type=_MAP;
|
||||
diff --git a/src/gen.h b/src/gen.h
|
||||
index 04d70af..496b25d 100644
|
||||
--- a/src/gen.h
|
||||
+++ b/src/gen.h
|
||||
@@ -443,7 +443,7 @@ namespace giac {
|
||||
};
|
||||
typedef std::map<gen,gen,comparegen> gen_map;
|
||||
#else
|
||||
- typedef std::map<gen,gen,const std::pointer_to_binary_function < const gen &, const gen &, bool> > gen_map;
|
||||
+ typedef std::map<gen,gen,const std::function<bool(const gen &, const gen &)> > gen_map;
|
||||
#endif
|
||||
struct ref_gen_map;
|
||||
|
||||
@@ -902,7 +902,7 @@ namespace giac {
|
||||
#if 1 // def NSPIRE
|
||||
ref_gen_map(): ref_count(1),m() {}
|
||||
#else
|
||||
- ref_gen_map(const std::pointer_to_binary_function < const gen &, const gen &, bool> & p): ref_count(1),m(p) {}
|
||||
+ ref_gen_map(const std::function<bool(const gen &, const gen &)> & p): ref_count(1),m(p) {}
|
||||
#endif
|
||||
ref_gen_map(const gen_map & M):ref_count(1),m(M) {}
|
||||
};
|
||||
diff --git a/src/maple.cc b/src/maple.cc
|
||||
index 3b33da8..d57a170 100644
|
||||
--- a/src/maple.cc
|
||||
+++ b/src/maple.cc
|
||||
@@ -3626,7 +3626,7 @@ namespace giac {
|
||||
#if 1 // def NSPIRE
|
||||
gen_map m;
|
||||
#else
|
||||
- gen_map m(ptr_fun(islessthanf));
|
||||
+ gen_map m(islessthanf);
|
||||
#endif
|
||||
int s=int(args.size());
|
||||
vector<int> indexbegin,indexsize;
|
||||
diff --git a/src/monomial.h b/src/monomial.h
|
||||
index 6e606d0..637a76c 100644
|
||||
--- a/src/monomial.h
|
||||
+++ b/src/monomial.h
|
||||
@@ -338,9 +338,9 @@ namespace giac {
|
||||
|
||||
template<class T> class sort_helper {
|
||||
public:
|
||||
- std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> strictly_greater ;
|
||||
- sort_helper(const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> is_strictly_greater):strictly_greater(is_strictly_greater) {};
|
||||
- sort_helper():strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {};
|
||||
+ std::function<bool(const monomial<T> &, const monomial<T> &)> strictly_greater ;
|
||||
+ sort_helper(const std::function<bool(const monomial<T> &, const monomial<T> &)> is_strictly_greater):strictly_greater(is_strictly_greater) {};
|
||||
+ sort_helper():strictly_greater(m_lex_is_strictly_greater<T>) {};
|
||||
bool operator () (const monomial<T> & a, const monomial<T> & b){ return strictly_greater(a,b);}
|
||||
};
|
||||
|
||||
@@ -677,7 +677,7 @@ namespace giac {
|
||||
typename std::vector< monomial<T> >::const_iterator & itb_end,
|
||||
std::vector< monomial<T> > & new_coord,
|
||||
bool (* is_strictly_greater)( const index_m &, const index_m &),
|
||||
- const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater
|
||||
+ const std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater
|
||||
) {
|
||||
if (ita==ita_end || itb==itb_end){
|
||||
new_coord.clear();
|
||||
@@ -726,8 +726,8 @@ namespace giac {
|
||||
#endif
|
||||
#ifndef NSPIRE
|
||||
/* other algorithm using a map to avoid reserving too much space */
|
||||
- typedef std::map< index_t,T,const std::pointer_to_binary_function < const index_m &, const index_m &, bool> > application;
|
||||
- application produit(std::ptr_fun(is_strictly_greater));
|
||||
+ typedef std::map< index_t,T,const std::function<bool(const index_m &, const index_m &)> > application;
|
||||
+ application produit(is_strictly_greater);
|
||||
// typedef std::map<index_t,T> application;
|
||||
// application produit;
|
||||
index_t somme(ita->index.size());
|
||||
@@ -848,7 +848,7 @@ namespace giac {
|
||||
typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end();
|
||||
typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end();
|
||||
std::vector< monomial<T> > res;
|
||||
- Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>)));
|
||||
+ Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>);
|
||||
return res ;
|
||||
}
|
||||
|
||||
@@ -856,7 +856,7 @@ namespace giac {
|
||||
std::vector< monomial<T> > & operator *= (std::vector< monomial<T> > & v,const std::vector< monomial<T> > & w){
|
||||
typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end();
|
||||
typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end();
|
||||
- Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>)));
|
||||
+ Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>);
|
||||
return v;
|
||||
}
|
||||
|
||||
diff --git a/src/plot.cc b/src/plot.cc
|
||||
index 288a1b5..ac85c9a 100755
|
||||
--- a/src/plot.cc
|
||||
+++ b/src/plot.cc
|
||||
@@ -11886,7 +11886,7 @@ static vecteur densityscale(double xmin,double xmax,double ymin,double ymax,doub
|
||||
#if 1 // def NSPIRE
|
||||
gen_map m;
|
||||
#else
|
||||
- gen_map m(ptr_fun(islesscomplexthanf));
|
||||
+ gen_map m(islesscomplexthanf);
|
||||
#endif
|
||||
int taille;
|
||||
is >> taille;
|
||||
diff --git a/src/poly.h b/src/poly.h
|
||||
index 7d64e2c..d9ff991 100644
|
||||
--- a/src/poly.h
|
||||
+++ b/src/poly.h
|
||||
@@ -40,23 +40,24 @@ namespace giac {
|
||||
// T zero;
|
||||
// functional object sorting function for monomial ordering
|
||||
bool (* is_strictly_greater)( const index_m &, const index_m &);
|
||||
- std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater ;
|
||||
+ std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater ;
|
||||
// constructors
|
||||
tensor(const tensor<T> & t) : dim(t.dim), coord(t.coord), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { }
|
||||
tensor(const tensor<T> & t, const std::vector< monomial<T> > & v) : dim(t.dim), coord(v), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { }
|
||||
// warning: this constructor prohibits construction of tensor from a value
|
||||
// of type T if this value is an int, except by using tensor<T>(T(int))
|
||||
- tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { }
|
||||
- explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { }
|
||||
+ // DANGER
|
||||
+ tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { }
|
||||
+ explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { }
|
||||
explicit tensor(int d,const tensor<T> & t) : dim(d),is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { }
|
||||
- tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {
|
||||
+ tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) {
|
||||
coord.push_back(v);
|
||||
}
|
||||
- tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {
|
||||
+ tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) {
|
||||
if (!is_zero(v))
|
||||
coord.push_back(monomial<T>(v,0,d));
|
||||
}
|
||||
- tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { }
|
||||
+ tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(m_lex_is_strictly_greater<T>) { }
|
||||
~tensor() { coord.clear(); }
|
||||
// member functions
|
||||
// ordering monomials in the tensor
|
||||
@@ -519,10 +520,10 @@ namespace giac {
|
||||
template <class T>
|
||||
void lexsort(std::vector < monomial<T> > & v){
|
||||
#if 1 // def NSPIRE
|
||||
- sort_helper<T> M(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>));
|
||||
+ sort_helper<T> M(m_lex_is_strictly_greater<T>);
|
||||
sort(v.begin(),v.end(),M);
|
||||
#else
|
||||
- sort(v.begin(),v.end(),std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>));
|
||||
+ sort(v.begin(),v.end(),m_lex_is_strictly_greater<T>);
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/src/solve.cc b/src/solve.cc
|
||||
index 889f824..2a51ab8 100755
|
||||
--- a/src/solve.cc
|
||||
+++ b/src/solve.cc
|
||||
@@ -8684,39 +8684,39 @@ namespace giac {
|
||||
switch (order.val){
|
||||
case _PLEX_ORDER:
|
||||
p.is_strictly_greater=i_lex_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_lex_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_lex_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _REVLEX_ORDER:
|
||||
p.is_strictly_greater=i_total_revlex_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_total_revlex_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_total_revlex_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _TDEG_ORDER:
|
||||
p.is_strictly_greater=i_total_lex_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_total_lex_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_total_lex_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _3VAR_ORDER:
|
||||
p.is_strictly_greater=i_3var_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_3var_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_3var_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _7VAR_ORDER:
|
||||
p.is_strictly_greater=i_7var_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_7var_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_7var_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _11VAR_ORDER:
|
||||
p.is_strictly_greater=i_11var_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_11var_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_11var_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _16VAR_ORDER:
|
||||
p.is_strictly_greater=i_16var_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_16var_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_16var_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _32VAR_ORDER:
|
||||
p.is_strictly_greater=i_32var_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_32var_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_32var_is_strictly_greater<gen>;
|
||||
break;
|
||||
case _64VAR_ORDER:
|
||||
p.is_strictly_greater=i_64var_is_strictly_greater;
|
||||
- p.m_is_strictly_greater=std::ptr_fun(m_64var_is_strictly_greater<gen>);
|
||||
+ p.m_is_strictly_greater=m_64var_is_strictly_greater<gen>;
|
||||
break;
|
||||
}
|
||||
p.tsort();
|
||||
diff --git a/src/usual.cc b/src/usual.cc
|
||||
index fddede6..eb7ae5e 100755
|
||||
--- a/src/usual.cc
|
||||
+++ b/src/usual.cc
|
||||
@@ -5950,7 +5950,7 @@ namespace giac {
|
||||
#if 1 // def NSPIRE
|
||||
gen_map m;
|
||||
#else
|
||||
- gen_map m(ptr_fun(islesscomplexthanf));
|
||||
+ gen_map m(islesscomplexthanf);
|
||||
#endif
|
||||
for (;it!=itend;++it){
|
||||
if (is_equal(*it) || it->is_symb_of_sommet(at_deuxpoints)){
|
||||
--
|
||||
2.44.1
|
||||
|
||||
495
pkgs/by-name/gi/git-run/package-lock.json
generated
Normal file
495
pkgs/by-name/gi/git-run/package-lock.json
generated
Normal file
@@ -0,0 +1,495 @@
|
||||
{
|
||||
"name": "git-run",
|
||||
"version": "0.5.5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "git-run",
|
||||
"version": "0.5.5",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"async": "^2.1.4",
|
||||
"lodash.groupby": "^4.6.0",
|
||||
"minilog": "~3.1.0",
|
||||
"simple-git": "^1.65.0",
|
||||
"tabtab": "git+https://github.com/mixu/node-tabtab.git"
|
||||
},
|
||||
"bin": {
|
||||
"gr": "bin/gr"
|
||||
},
|
||||
"devDependencies": {
|
||||
"file-fixture": "0.0.2",
|
||||
"mocha": "~3.5.3"
|
||||
}
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "2.6.4",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
|
||||
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash": "^4.17.14"
|
||||
}
|
||||
},
|
||||
"node_modules/balanced-match": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
|
||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.14",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
|
||||
"integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"balanced-match": "^1.0.0",
|
||||
"concat-map": "0.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/browser-stdout": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
|
||||
"integrity": "sha512-7Rfk377tpSM9TWBEeHs0FlDZGoAIei2V/4MdZJoFMBFAK6BqLpxAIUepGRHGdPFgGsLb02PXovC4qddyHvQqTg==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/commander": {
|
||||
"version": "2.9.0",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
|
||||
"integrity": "sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"graceful-readlink": ">= 1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.6.x"
|
||||
}
|
||||
},
|
||||
"node_modules/concat-map": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
|
||||
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/debug": {
|
||||
"version": "2.6.8",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
|
||||
"integrity": "sha512-E22fsyWPt/lr4/UgQLt/pXqerGMDsanhbnmqIS3VAXuDi1v3IpiwXe2oncEIondHSBuPDWRoK/pMjlvi8FuOXQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/diff": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
|
||||
"integrity": "sha512-597ykPFhtJYaXqPq6fF7Vl1fXTKgPdLOntyxpmdzUOKiYGqK7zcnbplj5088+8qJnWdzXhyeau5iVr8HVo9dgg==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"engines": {
|
||||
"node": ">=0.3.1"
|
||||
}
|
||||
},
|
||||
"node_modules/escape-string-regexp": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
|
||||
"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/file-fixture": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "https://registry.npmjs.org/file-fixture/-/file-fixture-0.0.2.tgz",
|
||||
"integrity": "sha512-0UmczA38JP6gD6206HzQMyySA6gBdGlBh/2YIRfx8c1ZEe7jhCyIdr05EdR/KETEup4DnxMxUq5JOjpDzvK7TA==",
|
||||
"dev": true,
|
||||
"license": "BSD",
|
||||
"dependencies": {
|
||||
"mkdirp": "0.5.x",
|
||||
"rimraf": "2.2.x"
|
||||
}
|
||||
},
|
||||
"node_modules/fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
|
||||
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/glob": {
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
|
||||
"integrity": "sha512-mRyN/EsN2SyNhKWykF3eEGhDpeNplMWaW18Bmh76tnOqk5TbELAVwFAYOCmKVssOYFrYvvLMguiA+NXO3ZTuVA==",
|
||||
"deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"fs.realpath": "^1.0.0",
|
||||
"inflight": "^1.0.4",
|
||||
"inherits": "2",
|
||||
"minimatch": "^3.0.2",
|
||||
"once": "^1.3.0",
|
||||
"path-is-absolute": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/graceful-readlink": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
|
||||
"integrity": "sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/growl": {
|
||||
"version": "1.9.2",
|
||||
"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
|
||||
"integrity": "sha512-RTBwDHhNuOx4F0hqzItc/siXCasGfC4DeWcBamclWd+6jWtBaeB/SGbMkGf0eiQoW7ib8JpvOgnUsmgMHI3Mfw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/has-flag": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
|
||||
"integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/he": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
|
||||
"integrity": "sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"he": "bin/he"
|
||||
}
|
||||
},
|
||||
"node_modules/inflight": {
|
||||
"version": "1.0.6",
|
||||
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
|
||||
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
|
||||
"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"once": "^1.3.0",
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/inherits": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/json3": {
|
||||
"version": "3.3.2",
|
||||
"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
|
||||
"integrity": "sha512-I5YLeauH3rIaE99EE++UeH2M2gSYo8/2TqDac7oZEH6D/DSQ4Woa628Qrfj1X9/OY5Mk5VvIDQaKCDchXaKrmA==",
|
||||
"deprecated": "Please use the native JSON object instead of JSON 3",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.18.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
|
||||
"integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._baseassign": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
|
||||
"integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash._basecopy": "^3.0.0",
|
||||
"lodash.keys": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash._basecopy": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
|
||||
"integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._basecreate": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
|
||||
"integrity": "sha512-EDem6C9iQpn7fxnGdmhXmqYGjCkStmDXT4AeyB2Ph8WKbglg4aJZczNkQglj+zWXcOEEkViK8THuV2JvugW47g==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._getnative": {
|
||||
"version": "3.9.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
|
||||
"integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash._isiterateecall": {
|
||||
"version": "3.0.9",
|
||||
"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
|
||||
"integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.create": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
|
||||
"integrity": "sha512-IUfOYwDEbI8JbhW6psW+Ig01BOVK67dTSCUAbS58M0HBkPcAv/jHuxD+oJVP2tUCo3H9L6f/8GM6rxwY+oc7/w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash._baseassign": "^3.0.0",
|
||||
"lodash._basecreate": "^3.0.0",
|
||||
"lodash._isiterateecall": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/lodash.groupby": {
|
||||
"version": "4.6.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
|
||||
"integrity": "sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.isarguments": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
|
||||
"integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.isarray": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
|
||||
"integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.keys": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
|
||||
"integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"lodash._getnative": "^3.0.0",
|
||||
"lodash.isarguments": "^3.0.0",
|
||||
"lodash.isarray": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/microee": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz",
|
||||
"integrity": "sha512-/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A==",
|
||||
"license": "BSD"
|
||||
},
|
||||
"node_modules/minilog": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz",
|
||||
"integrity": "sha512-Xfm4jWjWzSAduvEWtuZX/8TMkxfJlCfH7XvikCZe3ptojYTBq1eoEs3rh9/3LNLOckUP86m+8l8+Iw5NU/pBww==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"microee": "0.0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/minimatch": {
|
||||
"version": "3.1.5",
|
||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
|
||||
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"brace-expansion": "^1.1.7"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
|
||||
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/mkdirp": {
|
||||
"version": "0.5.6",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
|
||||
"integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"minimist": "^1.2.6"
|
||||
},
|
||||
"bin": {
|
||||
"mkdirp": "bin/cmd.js"
|
||||
}
|
||||
},
|
||||
"node_modules/mocha": {
|
||||
"version": "3.5.3",
|
||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
|
||||
"integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"browser-stdout": "1.3.0",
|
||||
"commander": "2.9.0",
|
||||
"debug": "2.6.8",
|
||||
"diff": "3.2.0",
|
||||
"escape-string-regexp": "1.0.5",
|
||||
"glob": "7.1.1",
|
||||
"growl": "1.9.2",
|
||||
"he": "1.1.1",
|
||||
"json3": "3.3.2",
|
||||
"lodash.create": "3.1.1",
|
||||
"mkdirp": "0.5.1",
|
||||
"supports-color": "3.1.2"
|
||||
},
|
||||
"bin": {
|
||||
"_mocha": "bin/_mocha",
|
||||
"mocha": "bin/mocha"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.10.x",
|
||||
"npm": ">= 1.4.x"
|
||||
}
|
||||
},
|
||||
"node_modules/mocha/node_modules/minimist": {
|
||||
"version": "0.0.8",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
|
||||
"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/mocha/node_modules/mkdirp": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
|
||||
"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
|
||||
"deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"minimist": "0.0.8"
|
||||
},
|
||||
"bin": {
|
||||
"mkdirp": "bin/cmd.js"
|
||||
}
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/once": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
||||
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/path-is-absolute": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
|
||||
"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/rimraf": {
|
||||
"version": "2.2.8",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
|
||||
"integrity": "sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==",
|
||||
"deprecated": "Rimraf versions prior to v4 are no longer supported",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"rimraf": "bin.js"
|
||||
}
|
||||
},
|
||||
"node_modules/simple-git": {
|
||||
"version": "1.132.0",
|
||||
"resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz",
|
||||
"integrity": "sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"debug": "^4.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/simple-git/node_modules/debug": {
|
||||
"version": "4.4.3",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
|
||||
"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ms": "^2.1.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"supports-color": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/simple-git/node_modules/ms": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/supports-color": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
|
||||
"integrity": "sha512-F8dvPrZJtNzvDRX26eNXT4a7AecAvTGljmmnI39xEgSpbHKhQ7N0dO/NTxUExd0wuLHp4zbwYY7lvHq0aKpwrA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"has-flag": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/tabtab": {
|
||||
"version": "0.0.2",
|
||||
"resolved": "git+ssh://git@github.com/mixu/node-tabtab.git#94af2b878b174527b6636aec88acd46979247755",
|
||||
"engines": {
|
||||
"node": "> 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/wrappy": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
|
||||
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,11 @@ buildNpmPackage rec {
|
||||
hash = "sha256-WPnar87p0GYf6ehhVEUeZd2pTjS95Zl6NpiJuIOQ5Tc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-PdxKFopmuNRWkSwPDX1wcNTvRtbVScl1WsZi7sdkKMw=";
|
||||
npmDepsHash = "sha256-nHFkkGovO+kCxRlV02PxmKZ0GXYTqqOZd2MBspk59Ew=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
'';
|
||||
|
||||
makeCacheWritable = true;
|
||||
dontBuild = true;
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-runner";
|
||||
version = "18.11.2";
|
||||
version = "18.11.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TWpIu6LxFX5ssijlYQA/dmAiPrB0nrHtlS2MWEk6C30=";
|
||||
hash = "sha256-/QMmBDZz6nWmc9hODS3yVe9iyNERbebGysZ1Z4B5Gw8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE=";
|
||||
@@ -123,6 +123,7 @@ buildGoModule (finalAttrs: {
|
||||
meta = {
|
||||
description = "GitLab Runner the continuous integration executor of GitLab";
|
||||
homepage = "https://docs.gitlab.com/runner";
|
||||
changelog = "https://gitlab.com/gitlab-org/gitlab-runner/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "gitlab-runner";
|
||||
maintainers = with lib.maintainers; [ zimbatm ];
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "gnushogi";
|
||||
homepage = "https://www.gnu.org/software/gnushogi/";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.ciil ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "goperf";
|
||||
version = "0-unstable-2026-04-09";
|
||||
version = "0-unstable-2026-05-12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://go.googlesource.com/perf";
|
||||
rev = "8e83ce0f7b1c6c5d6eab4763f10b9322cbe4cecb";
|
||||
hash = "sha256-JIR+ytMsZaiQ5w4vTmLG4JHg6tz3/sAs24C3m5//hy4=";
|
||||
rev = "3cf34090a3db6bb64df2259e30021db7ff5d9595";
|
||||
hash = "sha256-2dz8GCzmyS8LkN1zzyCO8cn/NBKmPhIqFRfILc9/lVo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5WnH49NE1OUaTFuan3DZYhm0uJxIf7i5pgXK1PuqhA0=";
|
||||
vendorHash = "sha256-H9aP7PGzq5gmFvlYrkrOFfqCSdlpoQkIkTwKMgwr2hs=";
|
||||
|
||||
passthru.updateScript = writeShellScript "update-goperf" ''
|
||||
export UPDATE_NIX_ATTR_PATH=goperf
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gram";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "GramEditor";
|
||||
repo = "gram";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9MfNGl0bk8RBkYutHFMnAEiAQVnUBQguQUkyt+O0vnY=";
|
||||
hash = "sha256-7FzAvC/JMMIFcuTGkL2Ju644UAIsneOMhiDUFnQske4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-sUSkXYZ81CFwxzDiT0Va0VnWVKlVS683DVHLZeoSJ4w=";
|
||||
cargoHash = "sha256-feESY8ALSG3xa906HBc4pOKGerQ1jF7VUxzvUcsZbrY=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
mainProgram = "gshogi";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.ciil ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
crystal_1_16,
|
||||
crystal,
|
||||
fetchFromGitHub,
|
||||
librsvg,
|
||||
pkg-config,
|
||||
@@ -27,7 +27,6 @@
|
||||
let
|
||||
# normally video.js is downloaded at build time
|
||||
videojs = callPackage ./videojs.nix { inherit versions; };
|
||||
crystal = crystal_1_16;
|
||||
in
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "invidious";
|
||||
@@ -69,7 +68,7 @@ crystal.buildCrystalPackage rec {
|
||||
|
||||
# Patch the assets and locales paths to be absolute
|
||||
substituteInPlace src/invidious.cr \
|
||||
--replace-fail 'public_folder "assets"' 'public_folder "${placeholder "out"}/share/invidious/assets"'
|
||||
--replace-fail 'StaticAssetsHandler.new("assets"' 'StaticAssetsHandler.new("${placeholder "out"}/share/invidious/assets"'
|
||||
substituteInPlace src/invidious/helpers/i18n.cr \
|
||||
--replace-fail 'File.read("locales/' 'File.read("${placeholder "out"}/share/invidious/locales/'
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
eprover-ho,
|
||||
cvc5,
|
||||
libpoly,
|
||||
symfpu,
|
||||
csdp,
|
||||
rlwrap,
|
||||
perl,
|
||||
@@ -109,6 +110,10 @@ let
|
||||
version = "0.2.0";
|
||||
__intentionallyOverridingVersion = true;
|
||||
};
|
||||
symfpu = symfpu.overrideAttrs {
|
||||
version = "0-unstable-2019-05-17";
|
||||
__intentionallyOverridingVersion = true;
|
||||
};
|
||||
}).overrideAttrs
|
||||
{
|
||||
version = "1.2.0";
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.11.8";
|
||||
version = "10.11.10";
|
||||
|
||||
src =
|
||||
assert finalAttrs.version == jellyfin.version;
|
||||
@@ -21,7 +21,7 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Nrh4BNlhJyzj9cXQ6Yr7349r5H+4r9W3aldcg9+J6dU=";
|
||||
hash = "sha256-fSpzF6Arx0JfL9fuQHjzf3m82XZR2BZkV0lA37L4DN4=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
|
||||
--replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}"
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-oxytp6n/4X1bhpfFqpqMAji86sbjV669F324zY3hoK4=";
|
||||
npmDepsHash = "sha256-DCFgivbZrDufRaB+4PeFxO6ISbEM9lXhXmlzc/5GbVU=";
|
||||
|
||||
preBuild = ''
|
||||
# using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "jellyfin";
|
||||
version = "10.11.8"; # ensure that jellyfin-web has matching version
|
||||
version = "10.11.10"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wBf561mZvC65Hu4MHHSu8YeILQDp/WN9vGA+JxGXwE8=";
|
||||
hash = "sha256-bad532F8Ln5Y3TV4x5c7mgsiI+ZJGTZoahuSZhefMvQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
||||
@@ -1,28 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
xcbuild,
|
||||
|
||||
libpng,
|
||||
libx11,
|
||||
libxi,
|
||||
libxtst,
|
||||
zlib,
|
||||
electron,
|
||||
|
||||
electron_41,
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_41;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2025.2.0";
|
||||
version = "2026.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jitsi";
|
||||
repo = "jitsi-meet-electron";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pk62BpfXblRph3ktxy8eF9umRmPRZbZGjRWduy+3z+s=";
|
||||
hash = "sha256-yeYDft2d2RHNXYrmnHlBzsZ43bvBgwwsqxQr/Q+/AuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -30,6 +38,9 @@ buildNpmPackage rec {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
copyDesktopItems
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
];
|
||||
|
||||
# robotjs node-gyp dependencies
|
||||
@@ -41,14 +52,12 @@ buildNpmPackage rec {
|
||||
zlib
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-TckV91RJo06OKb8nIvxBCxu28qyHtA/ACDshOlaCQxA=";
|
||||
npmDepsHash = "sha256-5y7q6SnA9s85+HFOhqif1N8XRO7ekGJ4nfVbWZ/diuI=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
# disable code signing on Darwin
|
||||
CSC_IDENTITY_AUTO_DISCOVERY = "false";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
|
||||
};
|
||||
|
||||
@@ -66,6 +75,8 @@ buildNpmPackage rec {
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
export npm_config_nodedir=${electron.headers}
|
||||
|
||||
# npmRebuild is needed because robotjs won't be built on darwin otherwise
|
||||
# asarUnpack makes sure to unwrap binaries so that nix can see the RPATH
|
||||
npm exec electron-builder -- \
|
||||
@@ -73,7 +84,8 @@ buildNpmPackage rec {
|
||||
-c.npmRebuild=true \
|
||||
-c.asarUnpack="**/*.node" \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronVersion=${electron.version} \
|
||||
-c.mac.identity=null
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
texlive,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
@@ -47,9 +46,9 @@ stdenvNoCC.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tlDeps = with texlive; [
|
||||
xkeyval
|
||||
fontspec
|
||||
tlDeps = ps: [
|
||||
ps.xkeyval
|
||||
ps.fontspec
|
||||
];
|
||||
|
||||
tests = callPackage ./tests.nix { };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "kimai";
|
||||
version = "2.56.0";
|
||||
version = "2.57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimai";
|
||||
repo = "kimai";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-rax67E/Zr50ejSAjA4Aa1NDsAbJYuAAE4k8hji5UhOg=";
|
||||
hash = "sha256-WbZivDI5xU/pM52yFvG6vMK3LaCjbLoJGNFP3Exb8qc=";
|
||||
};
|
||||
|
||||
php = php.buildEnv {
|
||||
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XHicbYXOfCPFIMKrhyBpchd89anj6kG1/7prpER7aCo=";
|
||||
vendorHash = "sha256-6WthU0w8V69sDlBjtz2MIavkmyYXWQ+5NflZLGQCLJs=";
|
||||
|
||||
composerNoPlugins = false;
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
imake,
|
||||
gccmakedep,
|
||||
libx11,
|
||||
libxext,
|
||||
libxmu,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "larswm";
|
||||
version = "7.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/larswm/larswm-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
imake
|
||||
gccmakedep
|
||||
];
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxext
|
||||
libxmu
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"BINDIR=$(out)/bin"
|
||||
"MANPATH=$(out)/share/man"
|
||||
];
|
||||
installTargets = [
|
||||
"install"
|
||||
"install.man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.fnurt.net/larswm";
|
||||
description = "9wm-like tiling window manager";
|
||||
license = lib.licenses.free;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -48,9 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Breakout clone from the LGames series";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "lbreakout2";
|
||||
maintainers = with lib.maintainers; [
|
||||
ciil
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
glib,
|
||||
@@ -9,20 +10,54 @@
|
||||
cmake,
|
||||
python3,
|
||||
python3Packages,
|
||||
|
||||
# optionally specify a derivation containing the lens data as generated from the `generate_db.py` script
|
||||
lensfunDatabases ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.4";
|
||||
pname = "lensfun";
|
||||
|
||||
# Fetch a more recent version of the repo containing a more recent lens
|
||||
# database
|
||||
lensfunDatabase = fetchFromGitHub {
|
||||
owner = "lensfun";
|
||||
repo = "lensfun";
|
||||
rev = "a1510e6f33ce9bc8b5056a823c6d5bc6b8cba033";
|
||||
sha256 = "sha256-qdONyKk873Tq11M33JmznhJMAGd4dqp5KdXdVhfy/Ak=";
|
||||
};
|
||||
lensData =
|
||||
if lensfunDatabases != null then
|
||||
lensfunDatabases
|
||||
else
|
||||
# fetch a more recent version of the lens database
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "lensfun-databases";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lensfun";
|
||||
repo = "lensfun";
|
||||
rev = "201da1a7433626a2a1ecd67e1f21a42fb17aa4a5";
|
||||
sha256 = "sha256-64ZcupHA4oClPRCnG8KofGC46M/mZFermugzQ15B6k4=";
|
||||
|
||||
leaveDotGit = true;
|
||||
# generate timestamp based on the most recent commit
|
||||
postFetch = ''
|
||||
cd $out
|
||||
git log -1 --format=%at > $out/timestamp.txt
|
||||
rm -R .git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
python3Packages.setuptools
|
||||
python3Packages.lxml
|
||||
];
|
||||
|
||||
# generates versioned tarballs of lens data
|
||||
# patch applied so that we read the previously generated `timestamp.txt` instead
|
||||
# of trying to read from `.git` (which is deleted during `postFetch`)
|
||||
buildPhase = ''
|
||||
substituteInPlace tools/update_database/generate_db.py \
|
||||
--replace-fail '"git", "log", "-1", "--format=%ad", "--date=raw", "--", "*.xml"' '"cat", "timestamp.txt"'
|
||||
python3 tools/update_database/generate_db.py --input data/db --output $out
|
||||
cp timestamp.txt $out/timestamp.txt
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@@ -36,15 +71,13 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
# replace database with a more recent snapshot
|
||||
# the master branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
|
||||
# so we run the conversion tool the project provides,
|
||||
# then untar the version 1 profiles into the source dir before we build
|
||||
# the master branch uses version 2 profiles, while this version requires version 1 profiles
|
||||
# also copies in the required `timestamp.txt` file
|
||||
prePatch = ''
|
||||
rm -R data/db
|
||||
python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db
|
||||
mkdir -p data/db
|
||||
tar xvf $TMPDIR/db/version_1.tar -C data/db
|
||||
date +%s > data/db/timestamp.txt
|
||||
tar xvfj ${lensData}/version_1.tar.bz2 -C data/db
|
||||
cp ${lensData}/timestamp.txt data/db/timestamp.txt
|
||||
''
|
||||
# Backport CMake 4 support
|
||||
# This is already on master, but not yet in a stable release:
|
||||
@@ -60,9 +93,6 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
python3Packages.setuptools
|
||||
python3Packages.lxml # For the db converison
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -7,16 +7,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
pname = "libbraiding";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelmarco";
|
||||
repo = "libbraiding";
|
||||
# version 1.3.1 contains a typo in configure.ac, fixed in the next commit.
|
||||
# TODO: remove if on upgrade
|
||||
rev = if version == "1.3.1" then "b174832026c2412baec83277c461e4df71d8525c" else version;
|
||||
hash = "sha256-ar/EiaMZuQRa1lr0sZPLRuk5K00j63TqNf0q0iuiKjw=";
|
||||
rev = version;
|
||||
hash = "sha256-Vo4nwzChjrI4PeNB+adPwDeL3gb++DEc4isX4/iDHMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,16 +24,16 @@ let
|
||||
in
|
||||
phpPackage.buildComposerProject2 rec {
|
||||
pname = "librenms";
|
||||
version = "26.3.1";
|
||||
version = "26.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librenms";
|
||||
repo = "librenms";
|
||||
tag = version;
|
||||
hash = "sha256-wLmZHE7W1ulBvUBpwVatdR8etFVhdG/zpggUpNIb65s=";
|
||||
hash = "sha256-RCSM8wSe5JOajhn4ku42NxZHDqHJjril9bg5IcPhyoE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uJ7DBJGQ4D1UnZXSUnrO3Fy3xEFz6ZxcMQ12E2jKKSM=";
|
||||
vendorHash = "sha256-D7aPypNn5d/pDJMOeODLsnqU80m/swfXrIsqrRiPjCY=";
|
||||
|
||||
php = phpPackage;
|
||||
|
||||
@@ -82,6 +82,7 @@ phpPackage.buildComposerProject2 rec {
|
||||
--replace-fail '"default": "/usr/bin/snmpbulkwalk",' '"default": "${net-snmp}/bin/snmpbulkwalk",' \
|
||||
--replace-fail '"default": "/usr/bin/snmpget",' '"default": "${net-snmp}/bin/snmpget",' \
|
||||
--replace-fail '"default": "/usr/bin/snmptranslate",' '"default": "${net-snmp}/bin/snmptranslate",' \
|
||||
--replace-fail '"default": "/usr/bin/snmptrap",' '"default": "${net-snmp}/bin/snmptrap",' \
|
||||
--replace-fail '"default": "/usr/bin/snmpwalk",' '"default": "${net-snmp}/bin/snmpwalk",' \
|
||||
--replace-fail '"default": "/usr/bin/virsh",' '"default": "${libvirt}/bin/virsh",' \
|
||||
--replace-fail '"default": "/usr/lib/nagios/plugins",' '"default": "${monitoring-plugins}/bin",' \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ callPackage }:
|
||||
{ callPackage, runCommand }:
|
||||
let
|
||||
src = callPackage ./src.nix { };
|
||||
in
|
||||
@@ -32,10 +32,6 @@ rec {
|
||||
|
||||
sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild
|
||||
|
||||
# Temporary fix used with patches/rust-build.patch
|
||||
sed -i 's/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/60cd124908737068ab21c7773b3df71d00e186cd605f15bad9977232830aabc0/g' third_party/rust/encoding_rs/.cargo-checksum.json
|
||||
sed -i 's/d7405d2bcf99cf9729075473c45f677630f4c1947c8ba9757db607f2025a7da2/a066ad881d5a74386e666fc844f7fecbbd70021d0330c1b08a2d7a2a67437ccf/g' third_party/rust/encoding_rs/.cargo-checksum.json
|
||||
|
||||
cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences
|
||||
cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences
|
||||
cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences
|
||||
@@ -55,7 +51,16 @@ rec {
|
||||
done
|
||||
'';
|
||||
|
||||
extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ];
|
||||
localSettingsPrefs = runCommand "local-settings.js" { } ''
|
||||
# Import of `librewolf.cfg` file is already being done manually.
|
||||
substitute ${source}/settings/defaults/pref/local-settings.js $out \
|
||||
--replace-fail 'pref("general.config.filename", "librewolf.cfg");' ""
|
||||
'';
|
||||
|
||||
extraPrefsFiles = [
|
||||
"${source}/settings/librewolf.cfg"
|
||||
localSettingsPrefs
|
||||
];
|
||||
|
||||
extraPoliciesFiles = [ "${source}/settings/distribution/policies.json" ];
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "150.0.3-1",
|
||||
"packageVersion": "151.0.1-2",
|
||||
"source": {
|
||||
"rev": "150.0.3-1",
|
||||
"hash": "sha256-ScwnfmK2zUFQLoy1Z9P9xQ2iTss2ufbzji/IHJSri9U="
|
||||
"rev": "151.0.1-2",
|
||||
"hash": "sha256-6C048VV6NECGTcdGla4qIa88z677ZTjORf5FM0a4xMM="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "150.0.3",
|
||||
"hash": "sha512-hFLaYSAPjuZnkNP/8jDKhLKskpGvK1fgGEhsUPk4xTxvtJQ/5s/h6ZuXg0ZvsAv3B/oAYpN1OsaYYY/B47cKSg=="
|
||||
"version": "151.0.1",
|
||||
"hash": "sha512-hJKhu5VrODcxU5OL0YsOGOOkrQ0qvCAXtF4CvCdoyPRo1cBjKaMkhaA6Z7ucIhAuar/x5zCAx3dkc11DDcdydw=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-linux = "0.4.13-1";
|
||||
hash_aarch64-linux = "sha256-3Z+wt8H8QdFiz190Pa+33fkKHf1Df7nzWoUNYz2TrYw=";
|
||||
version_aarch64-darwin = "0.4.13-1";
|
||||
hash_aarch64-darwin = "sha256-cj1KqM55iyJzg7O6SuQmUn2RHUZpE9fzljft8tYWHUE=";
|
||||
version_x86_64-linux = "0.4.13-1";
|
||||
hash_x86_64-linux = "sha256-IHhqAsYVi1XCaryxrEyhakDyye2vehbsJ77eF68KaIg=";
|
||||
version_aarch64-linux = "0.4.14-4";
|
||||
hash_aarch64-linux = "sha256-mlPeSTPUVJ8C7zheuX7ZJnDFQtg9oTg/LBqXJrbPfMs=";
|
||||
version_aarch64-darwin = "0.4.14-4";
|
||||
hash_aarch64-darwin = "sha256-9Kcj+IA5DhJuxSetKCHCPJ5GECCpnjnZlYPXD9jafy0=";
|
||||
version_x86_64-linux = "0.4.14-4";
|
||||
hash_x86_64-linux = "sha256-oDPL/m1Ghutxmi3iumsy2/Hs6Bp8UDWsJeup1Vlu/i8=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mago";
|
||||
version = "1.23.0";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carthage-software";
|
||||
repo = "mago";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5rdmDbAqqHZU65C+lFHxV7T8//Tw8v8gQKSNbVHSlno=";
|
||||
hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ=";
|
||||
forceFetchGit = true; # Does not download all files otherwise
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fOxfQTacb3ap5soCVtJnlFPSl3IH+Ju1pPs8xrFBVCw=";
|
||||
cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "manifold";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elalish";
|
||||
repo = "manifold";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QcsyX1YwjqNaPAMJy6LtfHxocbBrqVGaRpZ2kxE4xXQ=";
|
||||
hash = "sha256-4TFS4toHzZsNO/vf3r2dW9QCpnHi2p0BAGSCZVswlYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user