Merge 1de85f4c80 into haskell-updates
This commit is contained in:
@@ -192,7 +192,7 @@ following are specific to `buildPythonPackage`:
|
||||
When `__structuredAttrs = false`, the attribute `makeWrapperArgs` is passed as a space-separated string to the build script. Developers should use `prependToVar` or `appendToVar` to add arguments to it in build phases, or use `__structuredAttrs = true` to ensure that `makeWrapperArgs` is passed as a Bash array.
|
||||
|
||||
For compatibility purposes,
|
||||
when `makeWrapperArgs` shell variable is specified as a space-separated string (instead of a Bash array) in the build script, the string content is Bash-expanded before concatenated into the `wrapProgram` command. Still, developers should not rely on such behaviours, but use `__structuredAttrs = true` to specify flags containing spaces (e.g. `makeWrapperArgs = [ "--set" "GREETING" "Hello, world!" ]`), or use -pre and -post phases to specify flags with Bash-expansions (e.g. `preFixup = ''makeWrapperArgs+=(--prefix PATH : "$SOME_PATH")`'').
|
||||
when `makeWrapperArgs` shell variable is specified as a space-separated string (instead of a Bash array) in the build script, the string content is Bash-expanded before concatenated into the `wrapProgram` command. Still, developers should not rely on such behaviours, but use `__structuredAttrs = true` to specify flags containing spaces (e.g. `makeWrapperArgs = [ "--set" "GREETING" "Hello, world!" ]`), or use -pre and -post phases to specify flags with Bash-expansions (e.g. `preFixup = ''makeWrapperArgs+=(--prefix PATH : "$SOME_PATH")''`).
|
||||
:::
|
||||
|
||||
* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this
|
||||
|
||||
@@ -1542,6 +1542,11 @@ lib.mapAttrs mkLicense (
|
||||
fullName = "X11 License";
|
||||
};
|
||||
|
||||
x11BsdClause = {
|
||||
fullName = "X11 License with third BSD clause";
|
||||
url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/blob/d147c3f1b6907ae9db6f12853cedd450537d99d2/COPYING";
|
||||
};
|
||||
|
||||
x11NoPermitPersons = {
|
||||
spdxId = "X11-no-permit-persons";
|
||||
fullName = "X11 no permit persons clause";
|
||||
|
||||
@@ -12,48 +12,65 @@ let
|
||||
];
|
||||
|
||||
maintainerSetToList =
|
||||
githubTeam:
|
||||
lib.mapAttrsToList (
|
||||
login: id:
|
||||
maintainersById.${toString id}
|
||||
or (throw "lib.teams: No maintainer entry for GitHub user @${login} who's part of the @NixOS/${githubTeam} team")
|
||||
);
|
||||
|
||||
in
|
||||
# TODO: Consider automatically exposing all GitHub teams under `lib.teams`,
|
||||
# so that no manual PRs are necessary to add such teams anymore
|
||||
lib.mapAttrs (
|
||||
name: attrs:
|
||||
if attrs ? github then
|
||||
githubTeam: users:
|
||||
let
|
||||
githubTeam =
|
||||
githubTeams.${attrs.github}
|
||||
or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
|
||||
missingUsers = lib.filter (login: !maintainersById ? ${toString users.${login}}) (
|
||||
lib.attrNames users
|
||||
);
|
||||
in
|
||||
# TODO: Consider specifying `githubId` in team-list.nix and inferring `github` from it (or even dropping it)
|
||||
# This would make renames easier because no additional place needs to keep track of them.
|
||||
# Though in a future where all Nixpkgs GitHub teams are automatically exposed under `lib.teams`,
|
||||
# this would also not be an issue anymore.
|
||||
assert lib.assertMsg (!attrs ? githubId)
|
||||
"lib.teams.${name}: Both `githubId` and `github` is set, but the former is synced from the latter";
|
||||
assert lib.assertMsg (!attrs ? shortName)
|
||||
"lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
|
||||
assert lib.assertMsg (
|
||||
!attrs ? scope
|
||||
) "lib.teams.${name}: Both `scope` and `github` is set, but the former is synced from the latter";
|
||||
assert lib.assertMsg (
|
||||
!attrs ? members
|
||||
) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
|
||||
attrs
|
||||
// {
|
||||
githubId = githubTeam.id;
|
||||
shortName = githubTeam.name;
|
||||
scope = githubTeam.description;
|
||||
members =
|
||||
maintainerSetToList attrs.github githubTeam.maintainers
|
||||
++ maintainerSetToList attrs.github githubTeam.members;
|
||||
githubMaintainers = maintainerSetToList attrs.github githubTeam.maintainers;
|
||||
}
|
||||
else
|
||||
attrs
|
||||
) teams
|
||||
if missingUsers == [ ] then
|
||||
lib.mapAttrsToList (login: id: maintainersById.${toString id}) users
|
||||
else
|
||||
{
|
||||
errors = map (
|
||||
login:
|
||||
"\n- No maintainer entry for GitHub user @${login} who's part of the @NixOS/${githubTeam} team"
|
||||
) missingUsers;
|
||||
};
|
||||
|
||||
# TODO: Consider automatically exposing all GitHub teams under `lib.teams`,
|
||||
# so that no manual PRs are necessary to add such teams anymore
|
||||
result = lib.mapAttrs (
|
||||
name: attrs:
|
||||
if attrs ? github then
|
||||
let
|
||||
githubTeam =
|
||||
githubTeams.${attrs.github}
|
||||
or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
|
||||
maintainers = maintainerSetToList attrs.github githubTeam.maintainers;
|
||||
nonMaintainers = maintainerSetToList attrs.github githubTeam.members;
|
||||
in
|
||||
# TODO: Consider specifying `githubId` in team-list.nix and inferring `github` from it (or even dropping it)
|
||||
# This would make renames easier because no additional place needs to keep track of them.
|
||||
# Though in a future where all Nixpkgs GitHub teams are automatically exposed under `lib.teams`,
|
||||
# this would also not be an issue anymore.
|
||||
assert lib.assertMsg (!attrs ? githubId)
|
||||
"lib.teams.${name}: Both `githubId` and `github` is set, but the former is synced from the latter";
|
||||
assert lib.assertMsg (!attrs ? shortName)
|
||||
"lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
|
||||
assert lib.assertMsg (
|
||||
!attrs ? scope
|
||||
) "lib.teams.${name}: Both `scope` and `github` is set, but the former is synced from the latter";
|
||||
assert lib.assertMsg (
|
||||
!attrs ? members
|
||||
) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
|
||||
if !maintainers ? errors && !nonMaintainers ? errors then
|
||||
attrs
|
||||
// {
|
||||
githubId = githubTeam.id;
|
||||
shortName = githubTeam.name;
|
||||
scope = githubTeam.description;
|
||||
members = maintainers ++ nonMaintainers;
|
||||
githubMaintainers = maintainers;
|
||||
}
|
||||
else
|
||||
maintainers.errors or [ ] ++ nonMaintainers.errors or [ ]
|
||||
else
|
||||
attrs
|
||||
) teams;
|
||||
|
||||
errors = lib.concatLists (
|
||||
lib.mapAttrsToList (name: value: value) (lib.filterAttrs (name: lib.isList) result)
|
||||
);
|
||||
in
|
||||
if errors == [ ] then result else throw ("lib.teams:" + lib.concatStrings errors)
|
||||
|
||||
@@ -1832,6 +1832,13 @@
|
||||
githubId = 6091755;
|
||||
name = "Anirrudh Krishnan";
|
||||
};
|
||||
anish = {
|
||||
email = "i@anish.land";
|
||||
github = "ap-1";
|
||||
githubId = 67872951;
|
||||
name = "Anish Pallati";
|
||||
keys = [ { fingerprint = "2A0A 16F5 E026 BE3B A47F B7A6 841A FB68 9A5B ACCB"; } ];
|
||||
};
|
||||
ankhers = {
|
||||
email = "me@ankhers.dev";
|
||||
github = "ankhers";
|
||||
@@ -18730,6 +18737,20 @@
|
||||
githubId = 115494;
|
||||
name = "Nick Lewis";
|
||||
};
|
||||
nicknb = {
|
||||
name = "nicknb";
|
||||
email = "nicknb@posteo.com";
|
||||
github = "fk29g";
|
||||
githubId = 205353326;
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "8FF0 1BEE BCBF 1D20 ECD3 5FFA D903 84C8 07BC 1FE6";
|
||||
}
|
||||
{
|
||||
fingerprint = "6F9B 47B6 FFB0 823D 2ACF 9ED8 2BF0 FBB4 05AD 6A7C";
|
||||
}
|
||||
];
|
||||
};
|
||||
nicknovitski = {
|
||||
email = "nixpkgs@nicknovitski.com";
|
||||
github = "nicknovitski";
|
||||
|
||||
@@ -97,6 +97,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Cinnamon has been updated to 6.6, please check the [upstream announcement](https://www.linuxmint.com/rel_zena_whatsnew.php) for more details.
|
||||
|
||||
- `services.frp` now supports multiple instances through `services.frp.instances` to make it possible to run multiple frp clients or servers at the same time.
|
||||
|
||||
- `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled. This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.
|
||||
|
||||
@@ -172,6 +172,12 @@ in
|
||||
# won't fail due to the save dir not existing.
|
||||
serviceConfig.StateDirectory = "tlp";
|
||||
};
|
||||
|
||||
services.tlp-pd = lib.mkIf cfg.pd.enable {
|
||||
# have to define again because [Install] in included file not honored
|
||||
# https://github.com/NixOS/nixpkgs/issues/81138
|
||||
wantedBy = [ "graphical.target" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -83,13 +83,13 @@ in
|
||||
pkgs.writeText "expected.rules" (import ./makeExpectedPolicies.nix { inherit pkgs; })
|
||||
} ${
|
||||
pkgs.runCommand "actual.rules" { preferLocalBuild = true; } ''
|
||||
${getExe pkgs.gnused} -e 's:^[^ ]* ${builtins.storeDir}/[^,/-]*-\([^/,]*\):\1 \0:' ${
|
||||
${getExe pkgs.gnused} -e 's:^${builtins.storeDir}/[^,/-]*-\([^/, ]*\):\1 \0:' ${
|
||||
pkgs.apparmorRulesFromClosure {
|
||||
name = "ping";
|
||||
additionalRules = [ "x $path/foo/**" ];
|
||||
additionalRules = [ "$path/foo/** x" ];
|
||||
} [ pkgs.libcap ]
|
||||
} |
|
||||
${getExe' pkgs.coreutils "sort"} -n -k1 |
|
||||
LC_ALL=C ${getExe' pkgs.coreutils "sort"} |
|
||||
${getExe pkgs.gnused} -e 's:^[^ ]* ::' >$out
|
||||
''
|
||||
}"
|
||||
|
||||
@@ -1,75 +1,75 @@
|
||||
{ pkgs }:
|
||||
''
|
||||
ixr ${pkgs.bashNonInteractive}/libexec/**,
|
||||
mr ${pkgs.bashNonInteractive}/lib/**.so*,
|
||||
mr ${pkgs.bashNonInteractive}/lib64/**.so*,
|
||||
mr ${pkgs.bashNonInteractive}/share/**,
|
||||
r ${pkgs.bashNonInteractive},
|
||||
r ${pkgs.bashNonInteractive}/etc/**,
|
||||
r ${pkgs.bashNonInteractive}/lib/**,
|
||||
r ${pkgs.bashNonInteractive}/lib64/**,
|
||||
x ${pkgs.bashNonInteractive}/foo/**,
|
||||
ixr ${pkgs.glibc}/libexec/**,
|
||||
mr ${pkgs.glibc}/lib/**.so*,
|
||||
mr ${pkgs.glibc}/lib64/**.so*,
|
||||
mr ${pkgs.glibc}/share/**,
|
||||
r ${pkgs.glibc},
|
||||
r ${pkgs.glibc}/etc/**,
|
||||
r ${pkgs.glibc}/lib/**,
|
||||
r ${pkgs.glibc}/lib64/**,
|
||||
x ${pkgs.glibc}/foo/**,
|
||||
ixr ${pkgs.libcap}/libexec/**,
|
||||
mr ${pkgs.libcap}/lib/**.so*,
|
||||
mr ${pkgs.libcap}/lib64/**.so*,
|
||||
mr ${pkgs.libcap}/share/**,
|
||||
r ${pkgs.libcap},
|
||||
r ${pkgs.libcap}/etc/**,
|
||||
r ${pkgs.libcap}/lib/**,
|
||||
r ${pkgs.libcap}/lib64/**,
|
||||
x ${pkgs.libcap}/foo/**,
|
||||
ixr ${pkgs.libcap.lib}/libexec/**,
|
||||
mr ${pkgs.libcap.lib}/lib/**.so*,
|
||||
mr ${pkgs.libcap.lib}/lib64/**.so*,
|
||||
mr ${pkgs.libcap.lib}/share/**,
|
||||
r ${pkgs.libcap.lib},
|
||||
r ${pkgs.libcap.lib}/etc/**,
|
||||
r ${pkgs.libcap.lib}/lib/**,
|
||||
r ${pkgs.libcap.lib}/lib64/**,
|
||||
x ${pkgs.libcap.lib}/foo/**,
|
||||
ixr ${pkgs.libidn2.out}/libexec/**,
|
||||
mr ${pkgs.libidn2.out}/lib/**.so*,
|
||||
mr ${pkgs.libidn2.out}/lib64/**.so*,
|
||||
mr ${pkgs.libidn2.out}/share/**,
|
||||
r ${pkgs.libidn2.out},
|
||||
r ${pkgs.libidn2.out}/etc/**,
|
||||
r ${pkgs.libidn2.out}/lib/**,
|
||||
r ${pkgs.libidn2.out}/lib64/**,
|
||||
x ${pkgs.libidn2.out}/foo/**,
|
||||
ixr ${pkgs.libunistring}/libexec/**,
|
||||
mr ${pkgs.libunistring}/lib/**.so*,
|
||||
mr ${pkgs.libunistring}/lib64/**.so*,
|
||||
mr ${pkgs.libunistring}/share/**,
|
||||
r ${pkgs.libunistring},
|
||||
r ${pkgs.libunistring}/etc/**,
|
||||
r ${pkgs.libunistring}/lib/**,
|
||||
r ${pkgs.libunistring}/lib64/**,
|
||||
x ${pkgs.libunistring}/foo/**,
|
||||
ixr ${pkgs.tzdata}/libexec/**,
|
||||
mr ${pkgs.tzdata}/lib/**.so*,
|
||||
mr ${pkgs.tzdata}/lib64/**.so*,
|
||||
mr ${pkgs.tzdata}/share/**,
|
||||
r ${pkgs.tzdata},
|
||||
r ${pkgs.tzdata}/etc/**,
|
||||
r ${pkgs.tzdata}/lib/**,
|
||||
r ${pkgs.tzdata}/lib64/**,
|
||||
x ${pkgs.tzdata}/foo/**,
|
||||
ixr ${pkgs.glibc.libgcc}/libexec/**,
|
||||
mr ${pkgs.glibc.libgcc}/lib/**.so*,
|
||||
mr ${pkgs.glibc.libgcc}/lib64/**.so*,
|
||||
mr ${pkgs.glibc.libgcc}/share/**,
|
||||
r ${pkgs.glibc.libgcc},
|
||||
r ${pkgs.glibc.libgcc}/etc/**,
|
||||
r ${pkgs.glibc.libgcc}/lib/**,
|
||||
r ${pkgs.glibc.libgcc}/lib64/**,
|
||||
x ${pkgs.glibc.libgcc}/foo/**,
|
||||
${pkgs.bashNonInteractive} r,
|
||||
${pkgs.bashNonInteractive}/etc/** r,
|
||||
${pkgs.bashNonInteractive}/foo/** x,
|
||||
${pkgs.bashNonInteractive}/lib/** r,
|
||||
${pkgs.bashNonInteractive}/lib/**.so* mr,
|
||||
${pkgs.bashNonInteractive}/lib64/** r,
|
||||
${pkgs.bashNonInteractive}/lib64/**.so* mr,
|
||||
${pkgs.bashNonInteractive}/libexec/** ixr,
|
||||
${pkgs.bashNonInteractive}/share/** mr,
|
||||
${pkgs.glibc} r,
|
||||
${pkgs.glibc}/etc/** r,
|
||||
${pkgs.glibc}/foo/** x,
|
||||
${pkgs.glibc}/lib/** r,
|
||||
${pkgs.glibc}/lib/**.so* mr,
|
||||
${pkgs.glibc}/lib64/** r,
|
||||
${pkgs.glibc}/lib64/**.so* mr,
|
||||
${pkgs.glibc}/libexec/** ixr,
|
||||
${pkgs.glibc}/share/** mr,
|
||||
${pkgs.libcap} r,
|
||||
${pkgs.libcap}/etc/** r,
|
||||
${pkgs.libcap}/foo/** x,
|
||||
${pkgs.libcap}/lib/** r,
|
||||
${pkgs.libcap}/lib/**.so* mr,
|
||||
${pkgs.libcap}/lib64/** r,
|
||||
${pkgs.libcap}/lib64/**.so* mr,
|
||||
${pkgs.libcap}/libexec/** ixr,
|
||||
${pkgs.libcap}/share/** mr,
|
||||
${pkgs.libcap.lib} r,
|
||||
${pkgs.libcap.lib}/etc/** r,
|
||||
${pkgs.libcap.lib}/foo/** x,
|
||||
${pkgs.libcap.lib}/lib/** r,
|
||||
${pkgs.libcap.lib}/lib/**.so* mr,
|
||||
${pkgs.libcap.lib}/lib64/** r,
|
||||
${pkgs.libcap.lib}/lib64/**.so* mr,
|
||||
${pkgs.libcap.lib}/libexec/** ixr,
|
||||
${pkgs.libcap.lib}/share/** mr,
|
||||
${pkgs.libidn2.out} r,
|
||||
${pkgs.libidn2.out}/etc/** r,
|
||||
${pkgs.libidn2.out}/foo/** x,
|
||||
${pkgs.libidn2.out}/lib/** r,
|
||||
${pkgs.libidn2.out}/lib/**.so* mr,
|
||||
${pkgs.libidn2.out}/lib64/** r,
|
||||
${pkgs.libidn2.out}/lib64/**.so* mr,
|
||||
${pkgs.libidn2.out}/libexec/** ixr,
|
||||
${pkgs.libidn2.out}/share/** mr,
|
||||
${pkgs.libunistring} r,
|
||||
${pkgs.libunistring}/etc/** r,
|
||||
${pkgs.libunistring}/foo/** x,
|
||||
${pkgs.libunistring}/lib/** r,
|
||||
${pkgs.libunistring}/lib/**.so* mr,
|
||||
${pkgs.libunistring}/lib64/** r,
|
||||
${pkgs.libunistring}/lib64/**.so* mr,
|
||||
${pkgs.libunistring}/libexec/** ixr,
|
||||
${pkgs.libunistring}/share/** mr,
|
||||
${pkgs.tzdata} r,
|
||||
${pkgs.tzdata}/etc/** r,
|
||||
${pkgs.tzdata}/foo/** x,
|
||||
${pkgs.tzdata}/lib/** r,
|
||||
${pkgs.tzdata}/lib/**.so* mr,
|
||||
${pkgs.tzdata}/lib64/** r,
|
||||
${pkgs.tzdata}/lib64/**.so* mr,
|
||||
${pkgs.tzdata}/libexec/** ixr,
|
||||
${pkgs.tzdata}/share/** mr,
|
||||
${pkgs.glibc.libgcc} r,
|
||||
${pkgs.glibc.libgcc}/etc/** r,
|
||||
${pkgs.glibc.libgcc}/foo/** x,
|
||||
${pkgs.glibc.libgcc}/lib/** r,
|
||||
${pkgs.glibc.libgcc}/lib/**.so* mr,
|
||||
${pkgs.glibc.libgcc}/lib64/** r,
|
||||
${pkgs.glibc.libgcc}/lib64/**.so* mr,
|
||||
${pkgs.glibc.libgcc}/libexec/** ixr,
|
||||
${pkgs.glibc.libgcc}/share/** mr,
|
||||
''
|
||||
|
||||
@@ -55,6 +55,10 @@ in
|
||||
llama-server = lib.getExe' llama-cpp "llama-server";
|
||||
in
|
||||
{
|
||||
# more useful logging output
|
||||
logLevel = "debug";
|
||||
logToStdout = "both";
|
||||
|
||||
hooks.on_startup.preload = [
|
||||
"smollm2"
|
||||
];
|
||||
@@ -62,14 +66,14 @@ in
|
||||
models = {
|
||||
"smollm2" = {
|
||||
ttl = 10;
|
||||
cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --no-webui --temp 0.2 --top-k 9";
|
||||
cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2 --no-webui --temp 0.2 --top-k 9";
|
||||
};
|
||||
"smollm2-group-1" = {
|
||||
cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --no-webui --temp 0.2 --top-k 9 -c 1024";
|
||||
cmd = "${llama-server} --port \${PORT} -m ${smollm2-135m} --alias smollm2-group-1 --no-webui --temp 0.2 --top-k 9 -c 1024";
|
||||
};
|
||||
"smollm2-group-2" = {
|
||||
proxy = "http://127.0.0.1:5802";
|
||||
cmd = "${llama-server} --port 5802 -m ${smollm2-135m} --no-webui --temp 0.2 --top-k 9 -c 1024";
|
||||
cmd = "${llama-server} --port 5802 -m ${smollm2-135m} --alias smollm2-group-2 --no-webui --temp 0.2 --top-k 9 -c 1024";
|
||||
};
|
||||
};
|
||||
groups = {
|
||||
@@ -115,7 +119,6 @@ in
|
||||
'-s',
|
||||
'--fail',
|
||||
'-H "Content-Type: application/json"',
|
||||
'-H "Authorization: Bearer no-key"',
|
||||
"-d '{d}'".format(d=json.dumps(data))
|
||||
]
|
||||
return json.loads(machine.succeed('curl {args} http://localhost:8080{route}'.format(args=" ".join(args), route=route)))
|
||||
@@ -127,7 +130,8 @@ in
|
||||
machine.succeed('curl --fail http:/localhost:8080/ui/')
|
||||
|
||||
with subtest('check is healthy'):
|
||||
machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/health | grep "OK"')
|
||||
response_healthy = machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/health')
|
||||
assert 'OK' in response_healthy, '/health was not OK'
|
||||
|
||||
''
|
||||
+ lib.optionalString useSmollm2-135m ''
|
||||
@@ -135,10 +139,10 @@ in
|
||||
with subtest('check `/running` for preloaded smollm2'):
|
||||
machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep "smollm2"')
|
||||
running_response = get_json('/running')
|
||||
assert len(running_response['running']) == 1
|
||||
assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}'
|
||||
running_model = running_response['running'][0]
|
||||
assert running_model['model'] == 'smollm2'
|
||||
assert running_model['state'] == 'ready'
|
||||
assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}'
|
||||
assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}'
|
||||
|
||||
with subtest('runs smollm2'):
|
||||
response = None
|
||||
@@ -155,31 +159,30 @@ in
|
||||
response = post_json('/v1/chat/completions', data)
|
||||
|
||||
with subtest('response is from smollm2'):
|
||||
assert response['model'] == 'smollm2'
|
||||
assert response['model'] == 'smollm2', f'response was not from smollm2: {response['model']}'
|
||||
|
||||
with subtest('response contains at least one item in "choices"'):
|
||||
assert len(response['choices']) >= 1
|
||||
assert len(response['choices']) >= 1, f'response had no choices: {response}'
|
||||
|
||||
assistant_choices = None
|
||||
with subtest('response contains at least one "assistant" message'):
|
||||
assistant_choices = [c for c in response['choices'] if c['message']['role'] == 'assistant']
|
||||
assert len(assistant_choices) >= 1
|
||||
assert len(assistant_choices) >= 1, f'response had no assistant message: {response}'
|
||||
|
||||
with subtest('first message (lowercase) starts with "hello"'):
|
||||
assert assistant_choices[0]['message']['content'].lower()[:5] == 'hello'
|
||||
assert assistant_choices[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response}'
|
||||
|
||||
with subtest('check `/running` for just smollm2'):
|
||||
running_response = get_json('/running')
|
||||
assert len(running_response['running']) == 1
|
||||
assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}'
|
||||
running_model = running_response['running'][0]
|
||||
assert running_model['model'] == 'smollm2'
|
||||
assert running_model['state'] == 'ready'
|
||||
assert running_model['model'] == 'smollm2', f'running model is not smollm2: {running_response}'
|
||||
assert running_model['state'] == 'ready', f'running smollm2 is not ready: {running_response}'
|
||||
|
||||
with subtest('check `/running` for smollm2 to timeout'):
|
||||
machine.succeed('curl --silent --fail http://localhost:8080/running | grep "smollm2"')
|
||||
machine.wait_until_succeeds('curl --silent --fail http://localhost:8080/running | grep -v "smollm2"', timeout=11)
|
||||
running_response = get_json('/running')
|
||||
assert len(running_response['running']) == 0
|
||||
assert len(running_response['running']) == 0, "smollm2 was still running after timeout"
|
||||
|
||||
with subtest('runs smollm2-group-1 and smollm2-group-2'):
|
||||
response_1 = None
|
||||
@@ -196,25 +199,25 @@ in
|
||||
response_1 = post_json('/v1/chat/completions', data)
|
||||
|
||||
with subtest('response 1 is from smollm2-group-1'):
|
||||
assert response_1['model'] == 'smollm2-group-1'
|
||||
assert response_1['model'] == 'smollm2-group-1', f'response was not from smollm2-group-1: {response_1['model']}'
|
||||
|
||||
with subtest('response 1 contains at least one item in "choices"'):
|
||||
assert len(response['choices']) >= 1
|
||||
assert len(response_1['choices']) >= 1, f'response had no choices: {response_1}'
|
||||
|
||||
assistant_choices_1 = None
|
||||
with subtest('response 1 contains at least one "assistant" message'):
|
||||
assistant_choices_1 = [c for c in response_1['choices'] if c['message']['role'] == 'assistant']
|
||||
assert len(assistant_choices_1) >= 1
|
||||
assert len(assistant_choices_1) >= 1, f'response had no assistant message: {response_1}'
|
||||
|
||||
with subtest('first message (lowercase) in response 1 starts with "hello"'):
|
||||
assert assistant_choices_1[0]['message']['content'].lower()[:5] == 'hello'
|
||||
assert assistant_choices_1[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_1}'
|
||||
|
||||
with subtest('check `/running` for just smollm2-group-1'):
|
||||
running_response = get_json('/running')
|
||||
assert len(running_response['running']) == 1
|
||||
assert len(running_response['running']) == 1, f'running doesn\'t have one entry as expected: {running_response}'
|
||||
running_model = running_response['running'][0]
|
||||
assert running_model['model'] == 'smollm2-group-1'
|
||||
assert running_model['state'] == 'ready'
|
||||
assert running_model['model'] == 'smollm2-group-1', f'running model is not smollm2-group-1: {running_response}'
|
||||
assert running_model['state'] == 'ready', f'running smollm2-group-1 is not ready: {running_response}'
|
||||
|
||||
response_2 = None
|
||||
with subtest('send request to smollm2-group-2'):
|
||||
@@ -230,29 +233,29 @@ in
|
||||
response_2 = post_json('/v1/chat/completions', data)
|
||||
|
||||
with subtest('response 2 is from smollm2-group-2'):
|
||||
assert response_2['model'] == 'smollm2-group-2'
|
||||
assert response_2['model'] == 'smollm2-group-2', f'response was not from smollm2-group-2: {response_2['model']}'
|
||||
|
||||
with subtest('response 2 contains at least one item in "choices"'):
|
||||
assert len(response['choices']) >= 1
|
||||
assert len(response_2['choices']) >= 1, f'response had no choices: {response_2}'
|
||||
|
||||
assistant_choices_2 = None
|
||||
with subtest('response 2 contains at least one "assistant" message'):
|
||||
assistant_choices_2 = [c for c in response_2['choices'] if c['message']['role'] == 'assistant']
|
||||
assert len(assistant_choices_2) >= 1
|
||||
assert len(assistant_choices_2) >= 1, f'response had no assistant message: {response_2}'
|
||||
|
||||
with subtest('first message (lowercase) in response 1 starts with "hello"'):
|
||||
assert assistant_choices_2[0]['message']['content'].lower()[:5] == 'hello'
|
||||
assert assistant_choices_2[0]['message']['content'].lower()[:5] == 'hello', f'response didn\'t start with hello: {response_2}'
|
||||
|
||||
with subtest('check `/running` for both smollm2-group-1 and smollm2-group-2'):
|
||||
running_response = get_json('/running')['running']
|
||||
assert len(running_response) == 2
|
||||
assert len(running_response) == 2, 'expected both in smollm2 group to be running'
|
||||
assert len([
|
||||
rm for rm in running_response
|
||||
if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-1'
|
||||
]) == 1
|
||||
]) == 1, f'smollm2-group-1 not in running group and ready {running_response}'
|
||||
assert len([
|
||||
rm for rm in running_response
|
||||
if rm['state'] == 'ready' and rm['model'] == 'smollm2-group-2'
|
||||
]) == 1
|
||||
]) == 1, f'smollm2-group-2 not in running group and ready {running_response}'
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 58ab5c2..4f56a25 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
include(GoogleTest)
|
||||
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
+
|
||||
function(add_gmock_test target)
|
||||
add_executable(${target} ${ARGN})
|
||||
target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread)
|
||||
diff --git a/tests/bookmarks_test.cpp b/tests/bookmarks_test.cpp
|
||||
index 2d72356..97f898a 100644
|
||||
--- a/tests/bookmarks_test.cpp
|
||||
+++ b/tests/bookmarks_test.cpp
|
||||
@@ -215,7 +215,7 @@ TEST(Bookmarks, test_that_stations_are_added_and_removed_from_a_group_and_moved)
|
||||
ASSERT_FALSE(bm[0].stations[0].notifications);
|
||||
|
||||
// vector only throws when using at()
|
||||
- EXPECT_THROW(bm[0].stations.at(100), std::out_of_range);
|
||||
+ EXPECT_THROW(static_cast<void>(bm[0].stations.at(100)), std::out_of_range);
|
||||
EXPECT_THROW(bm[1], std::out_of_range);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "timeshift";
|
||||
version = "25.12.3";
|
||||
version = "25.12.4";
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "linuxmint";
|
||||
repo = "timeshift";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yrPeaGdt32bmP8lV+eYZb2H3OmVl3G5AH7eeGZ3LM3k=";
|
||||
hash = "sha256-4iK9RngcqwR0sYo9AXcTwEQ1eoPQPbAmwM5k/rcgU9s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
binaryName = "firefox-beta";
|
||||
version = "146.0b9";
|
||||
version = "147.0b9";
|
||||
applicationName = "Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "77a9a4617f3d24f7eff77289e03e53373998ae617f601893be255a1eba85dd81fea5a26976159a25187aada7401ad8da6cbb0b5a3650c4936a7445a3a7f55d42";
|
||||
sha512 = "346beb18a5012349da2f87c82080bf5fa605339db27644bdce4474bd63246dcfa9369e7d95620ee336649ff9c1d28677ff892d2309662a9b6f7ef0f055648c81";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
binaryName = "firefox-devedition";
|
||||
version = "146.0b9";
|
||||
version = "147.0b9";
|
||||
applicationName = "Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "6fac88325150620388f49ffe1ba0385216184b98e0faa54e01804292563798a032a8cef375dbc78a41b9ba3e18d1e9258aca5e090bc827f2e7e842f76ee34c25";
|
||||
sha512 = "66aad9dd7dc427d628fc7994a0e85997d6df0af4e0542f4bbd48dfdfe923e3b10ad6d6322c1eaed40bf30b61dfa5849785e46f7453b9fc6c478a2bb0fed6b93c";
|
||||
};
|
||||
|
||||
# buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
buildMozillaMach,
|
||||
callPackage,
|
||||
fetchurl,
|
||||
icu73,
|
||||
icu77,
|
||||
icu78,
|
||||
fetchpatch2,
|
||||
config,
|
||||
}:
|
||||
@@ -25,8 +25,8 @@ let
|
||||
})
|
||||
];
|
||||
});
|
||||
icu73' = patchICU icu73;
|
||||
icu77' = patchICU icu77;
|
||||
icu78' = patchICU icu78;
|
||||
|
||||
common =
|
||||
{
|
||||
@@ -49,8 +49,8 @@ let
|
||||
(if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
|
||||
];
|
||||
extraPassthru = {
|
||||
icu73 = icu73';
|
||||
icu77 = icu77';
|
||||
icu78 = icu78';
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -77,8 +77,8 @@ let
|
||||
|
||||
pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
|
||||
|
||||
icu73 = icu73';
|
||||
icu77 = icu77';
|
||||
icu78 = icu78';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@@ -4,24 +4,10 @@
|
||||
# reference guide: https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide
|
||||
|
||||
let
|
||||
inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions;
|
||||
supportedVersions = callPackage ./sources.nix { };
|
||||
|
||||
toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}";
|
||||
|
||||
unsupported = lib.listToAttrs (
|
||||
map (
|
||||
x:
|
||||
lib.nameValuePair (toAttrName x) (throw ''
|
||||
Citrix Workspace at version ${x} is not supported anymore!
|
||||
|
||||
Actively supported releases are listed here:
|
||||
https://www.citrix.com/support/product-lifecycle/workspace-app.html
|
||||
'')
|
||||
) unsupportedVersions
|
||||
);
|
||||
|
||||
supported = lib.mapAttrs' (
|
||||
attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo)
|
||||
) supportedVersions;
|
||||
in
|
||||
supported // unsupported
|
||||
lib.mapAttrs' (
|
||||
attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo)
|
||||
) supportedVersions
|
||||
|
||||
@@ -10,10 +10,11 @@
|
||||
cacert,
|
||||
cairo,
|
||||
dconf,
|
||||
fetchurl,
|
||||
enchant2,
|
||||
file,
|
||||
fontconfig,
|
||||
freetype,
|
||||
fuse3,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
glib-networking,
|
||||
@@ -22,8 +23,11 @@
|
||||
gtk2-x11,
|
||||
gtk3,
|
||||
gtk_engines,
|
||||
harfbuzzFull,
|
||||
heimdal,
|
||||
hyphen,
|
||||
krb5,
|
||||
lcms2,
|
||||
libGL,
|
||||
libappindicator-gtk3,
|
||||
libcanberra-gtk3,
|
||||
@@ -32,15 +36,19 @@
|
||||
libfaketime,
|
||||
libgbm,
|
||||
libinput,
|
||||
libjpeg,
|
||||
libjpeg8,
|
||||
libjson,
|
||||
libmanette,
|
||||
libnotify,
|
||||
libpng12,
|
||||
libpulseaudio,
|
||||
libredirect,
|
||||
libseccomp,
|
||||
libsecret,
|
||||
libsoup_2_4,
|
||||
libvorbis,
|
||||
libxml2_13,
|
||||
libxslt,
|
||||
llvmPackages,
|
||||
more,
|
||||
nspr,
|
||||
@@ -49,25 +57,33 @@
|
||||
openssl,
|
||||
pango,
|
||||
pcsclite,
|
||||
perl,
|
||||
sane-backends,
|
||||
speex,
|
||||
symlinkJoin,
|
||||
systemd,
|
||||
tzdata,
|
||||
# webkitgtk_4_0,
|
||||
which,
|
||||
woff2,
|
||||
xorg,
|
||||
zlib,
|
||||
|
||||
homepage,
|
||||
version,
|
||||
prefix,
|
||||
hash,
|
||||
|
||||
extraCerts ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
fuse3' = symlinkJoin {
|
||||
name = "fuse3-backwards-compat";
|
||||
paths = [ (lib.getLib fuse3) ];
|
||||
postBuild = ''
|
||||
ln -sf $out/lib/libfuse3.so.3.17.4 $out/lib/libfuse3.so.3
|
||||
'';
|
||||
};
|
||||
|
||||
openssl' = symlinkJoin {
|
||||
name = "openssl-backwards-compat";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -97,12 +113,12 @@ stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
|
||||
src = requireFile rec {
|
||||
name = "${prefix}-${version}.tar.gz";
|
||||
name = "linuxx64-${version}.tar.gz";
|
||||
sha256 = hash;
|
||||
|
||||
message = ''
|
||||
In order to use Citrix Workspace, you need to comply with the Citrix EULA and download
|
||||
the ${if stdenv.hostPlatform.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
|
||||
the 64-bit binaries, .tar.gz from:
|
||||
|
||||
${homepage}
|
||||
|
||||
@@ -137,8 +153,10 @@ stdenv.mkDerivation rec {
|
||||
atk
|
||||
cairo
|
||||
dconf
|
||||
enchant2
|
||||
fontconfig
|
||||
freetype
|
||||
fuse3'
|
||||
gdk-pixbuf
|
||||
glib-networking
|
||||
gnome2.gtkglext
|
||||
@@ -146,22 +164,29 @@ stdenv.mkDerivation rec {
|
||||
gtk2-x11
|
||||
gtk3
|
||||
gtk_engines
|
||||
harfbuzzFull
|
||||
heimdal
|
||||
hyphen
|
||||
krb5
|
||||
lcms2
|
||||
libGL
|
||||
libcanberra-gtk3
|
||||
libcap
|
||||
libcxx
|
||||
libgbm
|
||||
libinput
|
||||
libjpeg
|
||||
libjpeg8
|
||||
libjson
|
||||
libmanette
|
||||
libnotify
|
||||
libpng12
|
||||
libpulseaudio
|
||||
libseccomp
|
||||
libsecret
|
||||
libsoup_2_4
|
||||
libvorbis
|
||||
libxml2_13
|
||||
libxslt
|
||||
llvmPackages.libunwind
|
||||
nspr
|
||||
nss
|
||||
@@ -173,7 +198,7 @@ stdenv.mkDerivation rec {
|
||||
speex
|
||||
stdenv.cc.cc
|
||||
(lib.getLib systemd)
|
||||
# webkitgtk_4_0
|
||||
woff2
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXaw
|
||||
xorg.libXmu
|
||||
@@ -216,9 +241,9 @@ stdenv.mkDerivation rec {
|
||||
${lib.optionalString (icaFlag program != null) ''--add-flags "${icaFlag program} $ICAInstDir"''} \
|
||||
--set ICAROOT "$ICAInstDir" \
|
||||
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
|
||||
--prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib" \
|
||||
--prefix LD_LIBRARY_PATH : "$ICAInstDir:$ICAInstDir/lib:$ICAInstDir/usr/lib/x86_64-linux-gnu:$ICAInstDir/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle" \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so" \
|
||||
--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
|
||||
--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone:/usr/lib/x86_64-linux-gnu=$ICAInstDir/usr/lib/x86_64-linux-gnu"
|
||||
'';
|
||||
wrapLink = program: ''
|
||||
${wrap program}
|
||||
@@ -247,9 +272,9 @@ stdenv.mkDerivation rec {
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# Run upstream installer in the store-path.
|
||||
sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' ./${prefix}/hinst
|
||||
sed -i -e 's,^ANSWER="",ANSWER="$INSTALLER_YES",g' -e 's,/bin/true,true,g' -e 's, -C / , -C . ,g' ./linuxx64/hinst
|
||||
source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
|
||||
faketime -f "$source_date" ${stdenv.shell} ${prefix}/hinst CDROM "$(pwd)"
|
||||
faketime -f "$source_date" ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)"
|
||||
|
||||
if [ -f "$ICAInstDir/util/setlog" ]; then
|
||||
chmod +x "$ICAInstDir/util/setlog"
|
||||
@@ -274,11 +299,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
${mkWrappers copyCert extraCerts}
|
||||
|
||||
# See https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide/reference-information/#library-files
|
||||
# Those files are fallbacks to support older libwekit.so and libjpeg.so
|
||||
rm $out/opt/citrix-icaclient/lib/ctxjpeg_fb_8.so || true
|
||||
rm $out/opt/citrix-icaclient/lib/UIDialogLibWebKit.so || true
|
||||
|
||||
# We support only Gstreamer 1.0
|
||||
rm $ICAInstDir/util/{gst_aud_{play,read},gst_*0.10,libgstflatstm0.10.so} || true
|
||||
ln -sf $ICAInstDir/util/gst_play1.0 $ICAInstDir/util/gst_play
|
||||
@@ -299,26 +319,24 @@ stdenv.mkDerivation rec {
|
||||
# Make sure that `autoPatchelfHook` is executed before
|
||||
# running `ctx_rehash`.
|
||||
dontAutoPatchelf = true;
|
||||
preFixup = ''
|
||||
find $out/opt/citrix-icaclient/lib -name "libopencv_imgcodecs.so.*" | while read -r fname; do
|
||||
# lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
|
||||
patchelf --replace-needed libtiff.so.5 libtiff.so $fname
|
||||
# lib needs libjpeg.so.8, but nixpkgs provides libjpeg.so.9
|
||||
patchelf --replace-needed libjpeg.so.8 libjpeg.so $fname
|
||||
done
|
||||
'';
|
||||
# Null out hardcoded webkit bundle path so it falls back to LD_LIBRARY_PATH
|
||||
postFixup = ''
|
||||
${lib.getExe perl} -0777 -pi -e 's{/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle/}{"\0" x length($&)}e' \
|
||||
$out/opt/citrix-icaclient/usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.0.so.37.56.4
|
||||
|
||||
autoPatchelf -- "$out"
|
||||
|
||||
$out/opt/citrix-icaclient/util/ctx_rehash
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# webkitgtk_4_0 was removed
|
||||
broken = true;
|
||||
# Older versions need webkitgtk_4_0 which was removed.
|
||||
# 25.08 bundles the same.
|
||||
broken = lib.versionOlder version "25.08";
|
||||
license = lib.licenses.unfree;
|
||||
description = "Citrix Workspace";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ] ++ lib.optional (lib.versionOlder version "24") "i686-linux";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ flacks ];
|
||||
inherit homepage;
|
||||
};
|
||||
|
||||
@@ -7,117 +7,28 @@ let
|
||||
major,
|
||||
minor,
|
||||
patch,
|
||||
x64hash,
|
||||
x86hash,
|
||||
x64suffix,
|
||||
x86suffix,
|
||||
hash,
|
||||
suffix,
|
||||
homepage,
|
||||
}:
|
||||
{
|
||||
inherit homepage;
|
||||
version = "${major}.${minor}.${patch}.${
|
||||
if stdenv.hostPlatform.is64bit then x64suffix else x86suffix
|
||||
}";
|
||||
prefix = "linuxx${if stdenv.hostPlatform.is64bit then "64" else "86"}";
|
||||
hash = if stdenv.hostPlatform.is64bit then x64hash else x86hash;
|
||||
inherit hash homepage;
|
||||
version = "${major}.${minor}.${patch}.${suffix}";
|
||||
};
|
||||
|
||||
# Attribute-set with all actively supported versions of the Citrix workspace app
|
||||
# for Linux.
|
||||
#
|
||||
# The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
|
||||
# x86 is unsupported past 23.11, see https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/deprecation
|
||||
supportedVersions = lib.mapAttrs mkVersionInfo {
|
||||
|
||||
"23.11.0" = {
|
||||
major = "23";
|
||||
minor = "11";
|
||||
patch = "0";
|
||||
x64hash = "d3dde64baa6db7675a025eff546d552544d3523f4f3047621884f7830a9e2822";
|
||||
x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6";
|
||||
x64suffix = "82";
|
||||
x86suffix = "82";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest10.html";
|
||||
};
|
||||
|
||||
"24.02.0" = {
|
||||
major = "24";
|
||||
minor = "2";
|
||||
patch = "0";
|
||||
x64hash = "eaeb5d3bd079d4e5c9707da67f5f7a25cb765e19c36d01861290655dbf2aaee4";
|
||||
x86hash = "";
|
||||
x64suffix = "65";
|
||||
x86suffix = "";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest12.html";
|
||||
};
|
||||
|
||||
"24.05.0" = {
|
||||
major = "24";
|
||||
minor = "5";
|
||||
patch = "0";
|
||||
x64hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE=";
|
||||
x86hash = "";
|
||||
x64suffix = "76";
|
||||
x86suffix = "";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html";
|
||||
};
|
||||
|
||||
"24.08.0" = {
|
||||
major = "24";
|
||||
minor = "8";
|
||||
patch = "0";
|
||||
x64hash = "1jb22n6gcv4pv8khg98sv663yfpi47dpkvqgifbhps98iw5zrkbp";
|
||||
x86hash = "";
|
||||
x64suffix = "98";
|
||||
x86suffix = "";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2408.html";
|
||||
};
|
||||
|
||||
"24.11.0" = {
|
||||
major = "24";
|
||||
minor = "11";
|
||||
patch = "0";
|
||||
x64hash = "0kylvqdzkw0635mbb6r5k1lamdjf1hr9pk5rxcff63z4f8q0g3zf";
|
||||
x86hash = "";
|
||||
x64suffix = "85";
|
||||
x86suffix = "";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest13.html";
|
||||
};
|
||||
|
||||
"25.03.0" = {
|
||||
"25.08.10" = {
|
||||
major = "25";
|
||||
minor = "03";
|
||||
patch = "0";
|
||||
x64hash = "052zibykhig9091xl76z2x9vn4f74w5q8i9frlpc473pvfplsczk";
|
||||
x86hash = "";
|
||||
x64suffix = "66";
|
||||
x86suffix = "";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-2503.html";
|
||||
};
|
||||
|
||||
"25.05.0" = {
|
||||
major = "25";
|
||||
minor = "05";
|
||||
patch = "0";
|
||||
x64hash = "0fwqsxggswms40b5k8saxpm1ghkxppl27x19w8jcslq1f0i1fwqx";
|
||||
x86hash = "";
|
||||
x64suffix = "44";
|
||||
x86suffix = "";
|
||||
minor = "08";
|
||||
patch = "10";
|
||||
hash = "06hdwi5rd8z43nlpvym6yrw3snfz8jh6ic3g4pihn9ji22bw5pbd";
|
||||
suffix = "111";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
};
|
||||
};
|
||||
|
||||
# Retain attribute-names for abandoned versions of Citrix workspace to
|
||||
# provide a meaningful error-message if it's attempted to use such an old one.
|
||||
#
|
||||
# The lifespans of Citrix products can be found here:
|
||||
# https://www.citrix.com/support/product-lifecycle/workspace-app.html
|
||||
unsupportedVersions = [
|
||||
"23.02.0"
|
||||
"23.07.0"
|
||||
"23.09.0"
|
||||
];
|
||||
in
|
||||
{
|
||||
inherit supportedVersions unsupportedVersions;
|
||||
}
|
||||
supportedVersions
|
||||
|
||||
@@ -76,8 +76,8 @@ in
|
||||
glib,
|
||||
gnum4,
|
||||
gtk3,
|
||||
icu73,
|
||||
icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides
|
||||
icu78,
|
||||
libGL,
|
||||
libGLU,
|
||||
libevent,
|
||||
@@ -581,7 +581,7 @@ buildStdenv.mkDerivation {
|
||||
libdrm
|
||||
]
|
||||
))
|
||||
++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ]
|
||||
++ [ (if (lib.versionAtLeast version "147") then icu78 else icu77) ]
|
||||
++ lib.optional gssSupport libkrb5
|
||||
++ lib.optional jemallocSupport jemalloc
|
||||
++ extraBuildInputs;
|
||||
|
||||
@@ -1603,6 +1603,7 @@ in
|
||||
makeImageTestScript
|
||||
modulesClosure
|
||||
qemu
|
||||
qemuCommandLinux
|
||||
rpmClosureGenerator
|
||||
rpmDistros
|
||||
runInLinuxImage
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
patchelf,
|
||||
}:
|
||||
let
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
# Patch for airshipper to install veloren
|
||||
patch =
|
||||
let
|
||||
@@ -65,10 +65,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "Veloren";
|
||||
repo = "airshipper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8=";
|
||||
hash = "sha256-M89RswC08MZnNfk2T1+rtDajTpDGTnJoZ2U8bU5U2+0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TkeB939zV5VvqICFqJd/7uX+ydXyEQOJ3sYQbHbZhP0=";
|
||||
cargoHash = "sha256-ry0hFvMDnotDQu6mqgyt+6hKOvGRJLmZKs3SxEVtDRg=";
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "algia";
|
||||
version = "0.0.97";
|
||||
version = "0.0.98";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vja/l0zLoqTDog32YvkSya4wnMCNj/H93xzwipP2msQ=";
|
||||
hash = "sha256-Xd0WhXvEPt1VLIdsswk91hTb2UK6ikqhKMR3l/D0/jk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2315";
|
||||
version = "2.0.2321";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kVTwrxvNBRVuovgnfjBktgBXgP9tYfl+ivYyS10bPdM=";
|
||||
hash = "sha256-wkgVhmzfI15GFZ1YDI0MYGdfFIzyfd3ob949kyWA8N4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-iizozowyq1mVJWLKIC8EPoRX4c1YdyVVWuhLtadNDYI=";
|
||||
npmDepsHash = "sha256-mikgLEfjusRvmOMjdeENRtC+Vi+yV9zwBIqu3IbLY8A=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "15.2.2";
|
||||
version = "15.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
hash = "sha256-juAc1NpVvAe3vH08unAqxugTfThNfnGF8/SuHwx5cE8=";
|
||||
hash = "sha256-AYLWfWlJ5DR6C8YvyMJ5O+frIDxx8Z7f+T+MRf1KgZA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
|
||||
let
|
||||
mavenGroupIdUrl = "https://packages.atlassian.com/maven/public/com/atlassian/amps";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-plugin-sdk";
|
||||
version = "9.1.1";
|
||||
version = "9.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-${version}.tar.gz";
|
||||
hash = "sha256-sEAe1eif9qXvIOu8RfZ4MWngEO5yCjU74g4Crd85J3Y=";
|
||||
hash = "sha256-6svtGwk9d+/ipPHy/1kCQ5kyt1v9uaTwjYv6/ncCStc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
}:$PATH"
|
||||
|
||||
NEW_VERSION=$(curl -s ${mavenGroupIdUrl}/atlassian-plugin-sdk/maven-metadata.xml | xq -r '.metadata.versioning.latest')
|
||||
NEW_VERSION=$(curl -sL ${mavenGroupIdUrl}/atlassian-plugin-sdk/maven-metadata.xml | xq -r '.metadata.versioning.latest')
|
||||
|
||||
if [[ "${version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
|
||||
@@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
openpyxl
|
||||
paho-mqtt
|
||||
panzi-json-logic
|
||||
playwright
|
||||
pluggy
|
||||
price-parser
|
||||
psutil
|
||||
|
||||
@@ -6,26 +6,32 @@
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "changelogger";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarkusFreitag";
|
||||
repo = "changelogger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Glup2Y3sGO2hNKFeZXOrffHct2F4Ebn9+f6yOy3pekY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM=";
|
||||
vendorHash = "sha256-f6ojMri3m3pwLXbLnNbS/Xl2lqo0eEHLGbbT5KR1Clc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/MarkusFreitag/changelogger/cmd.BuildVersion=${version}"
|
||||
"-X github.com/MarkusFreitag/changelogger/cmd.BuildVersion=${finalAttrs.version}"
|
||||
"-X github.com/MarkusFreitag/changelogger/cmd.BuildDate=1970-01-01T00:00:00"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Test needs gitconfig
|
||||
substituteInPlace pkg/gitconfig/gitconfig_test.go \
|
||||
--replace-fail "TestGetGitAuthor" "SkipGetGitAuthor"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
@@ -36,11 +42,11 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
description = "Tool to manage your changelog file in Markdown";
|
||||
homepage = "https://github.com/MarkusFreitag/changelogger";
|
||||
changelog = "https://github.com/MarkusFreitag/changelogger/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "changelogger";
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chroma";
|
||||
version = "2.20.0";
|
||||
version = "2.22.0";
|
||||
|
||||
# To update:
|
||||
# nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
|
||||
@@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
inherit (srcInfo) sha256;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GiaVgqhhrexSnBWVtQ+/cwdykHVDxR95BFMkrH1s+8Q=";
|
||||
vendorHash = "sha256-kzlXrIMSa5C4UFt+BiMh6NedelQG49OxYbreeWhCb80=";
|
||||
|
||||
modRoot = "./cmd/chroma";
|
||||
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
{
|
||||
"url": "https://github.com/alecthomas/chroma.git",
|
||||
"rev": "303b65df3f2d2151cee24bcf9f9b625db474ef51",
|
||||
"date": "2025-08-04T13:55:06+10:00",
|
||||
"path": "/nix/store/1f8p33h1srs9knj6sn6mc5rf0wcybf4g-chroma",
|
||||
"sha256": "05w4hnfcxqdlsz7mkc0m3jbp1aj67wzyhq5jh8ldfgnyjnlafia3",
|
||||
"hash": "sha256-Q0WnqJXePtcogrJg6D8/RqpwlxwVsFnP17ThzpyFhBc=",
|
||||
"rev": "467c878aa553cdb4b0d486a534ea744f6ac7ef5e",
|
||||
"date": "2026-01-10T09:37:30+11:00",
|
||||
"path": "/nix/store/qkfgjvpw8j5rkfgh687kxzkv8ac9apba-chroma",
|
||||
"sha256": "1wlvxxlbwaq963rkr9fwxc6qwa77m49icq2gdzf46w7wdc3cygpm",
|
||||
"hash": "sha256-9T7PBmv8cEPcb09gFhOp5yiODevcpTzzMAkrvmjvm/I=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
"fetchTags": false,
|
||||
"leaveDotGit": false
|
||||
"leaveDotGit": false,
|
||||
"rootDir": ""
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/lgmon3/src/common/libcnnet2_type.h
|
||||
+++ b/lgmon3/src/common/libcnnet2_type.h
|
||||
@@ -48,7 +48,7 @@
|
||||
} CNNET2_SETTING_FLAGS;
|
||||
|
||||
#ifndef __cplusplus
|
||||
-typedef char bool;
|
||||
+#include <stdbool.h>
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
@@ -1,174 +1,161 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchzip,
|
||||
autoconf,
|
||||
automake,
|
||||
autoPatchelfHook,
|
||||
cups,
|
||||
fetchpatch2,
|
||||
fetchzip,
|
||||
glib,
|
||||
libxml2,
|
||||
libusb1,
|
||||
lib,
|
||||
libtool,
|
||||
withDebug ? false,
|
||||
libusb1,
|
||||
libxml2,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
blobDir = "com/libs_bin_${stdenv.hostPlatform.uname.processor}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cnijfilter2";
|
||||
|
||||
version = "6.40";
|
||||
version = "6.90-1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gdlp01.c-wss.com/gds/1/0100011381/01/cnijfilter2-source-6.40-1.tar.gz";
|
||||
sha256 = "3RoG83jLOsdTEmvUkkxb7wa8oBrJA4v1mGtxTGwSowU=";
|
||||
url = "https://gdlp01.c-wss.com/gds/9/0100012819/01/cnijfilter2-source-6.90-1.tar.gz";
|
||||
hash = "sha256-kvMEC2IR448JAM8unoLzF01GDlWhTSk/gi6giHI0u0E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./stdlib.patch
|
||||
./bool.patch
|
||||
|
||||
# See:
|
||||
# - https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711
|
||||
# - https://bugs.gentoo.org/723186
|
||||
(fetchpatch2 {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch?id=24688d64544b43f2c14be54531ad8764419dde09";
|
||||
hash = "sha256-ygAfS68100ducWsxeA2Q2eoE8cBFMVO7KiXn/RGIHFw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
autoconf
|
||||
];
|
||||
buildInputs = [
|
||||
cups
|
||||
autoPatchelfHook
|
||||
glib
|
||||
libxml2
|
||||
libusb1
|
||||
libtool
|
||||
];
|
||||
|
||||
patches = [
|
||||
./patches/get_protocol.patch
|
||||
./patches/add_missing_import.patch
|
||||
buildInputs = [
|
||||
cups
|
||||
libusb1
|
||||
libxml2
|
||||
];
|
||||
|
||||
# lgmon3's --enable-libdir flag is used solely for specifying in which
|
||||
# directory the cnnnet.ini cache file should reside.
|
||||
# NixOS uses /var/cache/cups, and given the name, it seems like a reasonable
|
||||
# place to put the cnnet.ini file, and thus we do so.
|
||||
#
|
||||
# Note that the drivers attempt to dlopen
|
||||
# $out/lib/cups/filter/libcnbpcnclapicom2.so
|
||||
postPatch = ''
|
||||
substituteInPlace lgmon3/src/Makefile.am \
|
||||
--replace-fail /usr/include/libusb-1.0 ${lib.getDev libusb1}/include/libusb-1.0
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
|
||||
cd $i
|
||||
env NOCONFIGURE=1 ./autogen.sh
|
||||
cd ..
|
||||
done
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
|
||||
cd $i
|
||||
configureFlags="--build=${stdenv.buildPlatform.config}"
|
||||
configureFlags="$configureFlags --host=${stdenv.hostPlatform.config}"
|
||||
configureFlags="$configureFlags --target=${stdenv.targetPlatform.config}"
|
||||
configureFlags="$configureFlags --prefix=$out --disable-dependency-tracking --disable-static"
|
||||
if [ $i = cnijbe2 -o $i = lgmon3 -o $i = rastertocanonij ]; then
|
||||
configureFlags="$configureFlags --enable-progpath=$out/bin"
|
||||
fi
|
||||
if [ $i = lgmon3 ]; then
|
||||
# lgmon3's --enable-libdir flag is used solely for specifying in which
|
||||
# directory the cnnnet.ini cache file should reside.
|
||||
# NixOS uses /var/cache/cups, and given the name, it seems like a reasonable
|
||||
# place to put the cnnet.ini file, and thus we do so.
|
||||
configureFlags="$configureFlags --enable-libpath=/var/cache/cups"
|
||||
fi
|
||||
./configure $configureFlags
|
||||
cd ..
|
||||
done
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp com/libs_bin_x86_64/* $out/lib
|
||||
mkdir -p $out/lib/cups/filter
|
||||
ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter
|
||||
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"
|
||||
''
|
||||
+ lib.optionalString withDebug ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__DEBUG__ -DDEBUG_LOG"
|
||||
''
|
||||
+ ''
|
||||
|
||||
(
|
||||
cd lgmon3
|
||||
substituteInPlace src/Makefile.am \
|
||||
--replace /usr/include/libusb-1.0 \
|
||||
${libusb1.dev}/include/libusb-1.0
|
||||
./autogen.sh --prefix=$out --enable-progpath=$out/bin \
|
||||
--datadir=$out/share \
|
||||
--enable-libdir=/var/cache/cups
|
||||
runHook preBuild
|
||||
for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
|
||||
cd $i
|
||||
make
|
||||
)
|
||||
|
||||
(
|
||||
cd cmdtocanonij2
|
||||
./autogen.sh --prefix=$out
|
||||
make
|
||||
)
|
||||
|
||||
(
|
||||
cd cmdtocanonij3
|
||||
./autogen.sh --prefix=$out
|
||||
make
|
||||
)
|
||||
|
||||
(
|
||||
cd cnijbe2
|
||||
substituteInPlace src/Makefile.am \
|
||||
--replace "/usr/lib/cups/backend" \
|
||||
"$out/lib/cups/backend"
|
||||
./autogen.sh --prefix=$out --enable-progpath=$out/bin
|
||||
make
|
||||
)
|
||||
|
||||
(
|
||||
cd rastertocanonij
|
||||
./autogen.sh --prefix=$out --enable-progpath=$out/bin
|
||||
make
|
||||
)
|
||||
|
||||
(
|
||||
cd tocanonij
|
||||
./autogen.sh --prefix=$out --enable-progpath=$out/bin
|
||||
make
|
||||
)
|
||||
|
||||
(
|
||||
cd tocnpwg
|
||||
./autogen.sh --prefix=$out --enable-progpath=$out/bin
|
||||
make
|
||||
)
|
||||
cd ..
|
||||
done
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
(
|
||||
cd lgmon3
|
||||
runHook preInstall
|
||||
for i in cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg; do
|
||||
cd $i
|
||||
make install
|
||||
)
|
||||
|
||||
(
|
||||
cd cmdtocanonij2
|
||||
make install
|
||||
)
|
||||
|
||||
(
|
||||
cd cmdtocanonij3
|
||||
make install
|
||||
)
|
||||
|
||||
(
|
||||
cd cnijbe2
|
||||
make install
|
||||
)
|
||||
|
||||
(
|
||||
cd rastertocanonij
|
||||
make install
|
||||
)
|
||||
|
||||
(
|
||||
cd tocanonij
|
||||
make install
|
||||
)
|
||||
|
||||
(
|
||||
cd tocnpwg
|
||||
make install
|
||||
)
|
||||
|
||||
mkdir -p $out/share/cups/model
|
||||
cp ppd/*.ppd $out/share/cups/model
|
||||
cd ..
|
||||
done
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm755 -t $out/lib ${blobDir}/*
|
||||
install -Dm644 -t $out/share/cups/model ppd/*.ppd
|
||||
'';
|
||||
|
||||
runtimeDependencies = [ (placeholder "out") ];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-I${lib.getDev libxml2}/include/libxml2";
|
||||
NIX_LDFLAGS = "-L../../${blobDir}";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Canon InkJet printer drivers for many Pixma series printers";
|
||||
longDescription = ''
|
||||
Canon InjKet printer drivers for series E200, E300, E3100, E3300, E4200, E450, E470, E480,
|
||||
G3000, G3010, G4000, G4010, G5000, G5080, G6000, G6050, G6080, G7000, G7050, G7080, GM2000,
|
||||
GM2080, GM4000, GM4080, iB4000, iB4100, iP110, MB2000, MB2100, MB2300, MB2700, MB5000,
|
||||
MB5100, MB5300, MB5400, MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800,
|
||||
MG6900, MG7500, MG7700, MX490, TR4500, TR703, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530,
|
||||
TS200, TS300, TS3100, TS3300, TS5000, TS5100, TS5300, TS5380, TS6000, TS6100, TS6130, TS6180,
|
||||
TS6200, TS6230, TS6280, TS6300, TS6330, TS6380, TS700, TS708, TS7330, TS8000, TS8100, TS8130,
|
||||
TS8180, TS8200, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000, TS9100, TS9180, TS9500,
|
||||
TS9580, XK50, XK60, XK70, XK80.
|
||||
Canon InkJet printer drivers for series BX110, E200, E300, E460, E470,
|
||||
E480, E3100, E3300, E3400, E3600, E4200, E4500, G500, G600, G1020, G1030,
|
||||
G2020, G2030, G2060, G2070, G3000, G3010, G3020, G3030, G3060, G3070,
|
||||
G3080, G3090, G4000, G4010, G4070, G4080, G4090, G5000, G5080, G6000,
|
||||
G6080, G7000, G7080, GM2000, GM2080, GM4000, GM4080, GX1000, GX2000,
|
||||
GX3000, GX4000, GX4000i, GX5000, GX5100, GX5500, GX6000, GX6100, GX6500,
|
||||
GX7000, GX7100, GX7100i, iB4000, iB4100, iP110, MB2000, MB2100, MB2300,
|
||||
MB2700, MB5000, MB5100, MB5300, MB5400, MG2900, MG3000, MG3600, MG5600,
|
||||
MG5700, MG6600, MG6800, MG6900, MG7500, MG7700, MX490, TR150, TR160,
|
||||
TR703, TR4500, TR4600, TR4700, TR7000, TR7100, TR7500, TR7530, TR7600,
|
||||
TR7800, TR8500, TR8530, TR8580, TR8600, TR8630, TR9530, TS200, TS300,
|
||||
TS700, TS708, TS2400, TS2600, TS3100, TS3300, TS3400, TS3500, TS3600,
|
||||
TS3700, TS4000, TS4100i, TS4300, TS5000, TS5100, TS5300, TS5350i, TS5380,
|
||||
TS5400, TS5500, TS5630, TS6000, TS6100, TS6130, TS6180, TS6200, TS6230,
|
||||
TS6280, TS6300, TS6330, TS6380, TS6400, TS6500, TS6500i, TS6630, TS6730,
|
||||
TS7330, TS7400, TS7430, TS7450i, TS7500i, TS7530, TS7600i, TS7630, TS7700,
|
||||
TS7700A, TS7700i, TS8000, TS8100, TS8130, TS8180, TS8200, TS8230, TS8280,
|
||||
TS8300, TS8330, TS8380, TS8430, TS8530, TS8630, TS8700, TS8800, TS8930,
|
||||
TS9000, TS9100, TS9180, TS9500, TS9580, XK50, XK60, XK70, XK80, XK90,
|
||||
XK100, XK110, XK120, XK130, XK140, XK500, XK510.
|
||||
'';
|
||||
homepage = "https://hk.canon/en/support/0101048401/1";
|
||||
downloadPage = "https://hk.canon/en/support/0101281901";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode
|
||||
];
|
||||
maintainers = with lib.maintainers; [ prince213 ];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
"mips64el-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
# Resolves the compilation issue reported at https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711
|
||||
# An identical issue was previously reported in Gentoo: https://bugs.gentoo.org/723186
|
||||
# This patch is taken from the solution of Alfredo Tupone (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09)
|
||||
--- a/lgmon3/src/cnijlgmon3.c 2022-07-22 12:44:32.194641628 +0100
|
||||
+++ b/lgmon3/src/cnijlgmon3.c 2022-07-22 12:43:53.954817724 +0100
|
||||
@@ -55,7 +55,7 @@
|
||||
int (*GET_STATUS)(char *, int, int *, int * , char *);
|
||||
int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
|
||||
int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *);
|
||||
-int (*GET_PROTOCOL)(char *, size_t);
|
||||
+static int (*GET_PROTOCOL)(char *, size_t);
|
||||
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
-2
@@ -1,5 +1,3 @@
|
||||
diff --git a/lgmon3/src/keytext.c b/lgmon3/src/keytext.c
|
||||
index 8c15ff8..b80bbe5 100644
|
||||
--- a/lgmon3/src/keytext.c
|
||||
+++ b/lgmon3/src/keytext.c
|
||||
@@ -37,6 +37,7 @@
|
||||
@@ -14,38 +14,23 @@ let
|
||||
inherit (stdenv) hostPlatform;
|
||||
finalCommandLineArgs = "--update=false " + commandLineArgs;
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/x64/Cursor-2.2.44-x86_64.AppImage";
|
||||
hash = "sha256-hit0L6vE893jPq4QQqteT6T08hghX5hE/NZLUWTqqvY=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/linux/arm64/Cursor-2.2.44-aarch64.AppImage";
|
||||
hash = "sha256-D2pcfwzRED/TYGABCo83YI4g77tu3xgvqjOo8XsteSA=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/x64/Cursor-darwin-x64.dmg";
|
||||
hash = "sha256-/BD2PMcP20/SDGPCsnkv3PQW7u0FEXuORfDeG/KV0MQ=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/production/20adc1003928b0f1b99305dbaf845656ff81f5d4/darwin/arm64/Cursor-darwin-arm64.dmg";
|
||||
hash = "sha256-qehVIZipBbWOYbf6Zo3GBStS8dp+c4EtgDTGAQz1mzE=";
|
||||
};
|
||||
};
|
||||
sourcesJson = lib.importJSON ./sources.json;
|
||||
sources = lib.mapAttrs (
|
||||
_: info:
|
||||
fetchurl {
|
||||
inherit (info) url hash;
|
||||
}
|
||||
) sourcesJson.sources;
|
||||
|
||||
source = sources.${hostPlatform.system};
|
||||
in
|
||||
(callPackage vscode-generic rec {
|
||||
inherit useVSCodeRipgrep;
|
||||
inherit (sourcesJson) version vscodeVersion;
|
||||
commandLineArgs = finalCommandLineArgs;
|
||||
|
||||
version = "2.2.44";
|
||||
pname = "cursor";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
# workbench.action.showAboutDialog (Help: About)
|
||||
vscodeVersion = "1.105.1";
|
||||
|
||||
executableName = "cursor";
|
||||
longName = "Cursor";
|
||||
shortName = "cursor";
|
||||
@@ -85,6 +70,7 @@ in
|
||||
maintainers = with lib.maintainers; [
|
||||
aspauldingcode
|
||||
prince213
|
||||
qweered
|
||||
];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
"version": "2.3.29",
|
||||
"vscodeVersion": "1.105.1",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/x64/Cursor-2.3.29-x86_64.AppImage",
|
||||
"hash": "sha256-uWgUCXo0MHNyiigiymr0LoMoATePp0dksI7JyR/5bRY="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/arm64/Cursor-2.3.29-aarch64.AppImage",
|
||||
"hash": "sha256-/oUz5wNRtPKYkEIKpHhcjWZNAAhTMvNdJLm+sXE9pDg="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-A93Glr2bOL6zSu0XTgNj0Pmt6G2ufRgf4lPJ0xcGhow="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-cp/aTNapbwRXxdUU0fWs3HliV7rCmT/2CbNXqZPMpEs="
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,39 +1,44 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl jq coreutils common-updater-scripts
|
||||
set -eu -o pipefail
|
||||
#!nix-shell -i bash -p curl jq coreutils nix _7zz
|
||||
# shellcheck shell=bash
|
||||
set -euo pipefail
|
||||
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; code-cursor.version or (lib.getVersion code-cursor)" | tr -d '"')
|
||||
cd -- "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
declare -A platforms=( [x86_64-linux]='linux-x64' [aarch64-linux]='linux-arm64' [x86_64-darwin]='darwin-x64' [aarch64-darwin]='darwin-arm64' )
|
||||
declare -A updates=( )
|
||||
first_version=""
|
||||
META=$(curl -fsSL "https://api2.cursor.sh/updates/api/download/stable/linux-x64/cursor")
|
||||
VERSION=$(jq -r '.version' <<< "$META")
|
||||
CURRENT=$(jq -r '.version' sources.json)
|
||||
|
||||
for platform in ${!platforms[@]}; do
|
||||
api_platform=${platforms[$platform]}
|
||||
result=$(curl -s "https://api2.cursor.sh/updates/api/download/stable/$api_platform/cursor")
|
||||
version=$(echo $result | jq -r '.version')
|
||||
if [[ "$version" == "$currentVersion" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
if [[ -z "$first_version" ]]; then
|
||||
first_version=$version
|
||||
first_platform=$platform
|
||||
elif [[ "$version" != "$first_version" ]]; then
|
||||
>&2 echo "Multiple versions found: $first_version ($first_platform) and $version ($platform)"
|
||||
exit 1
|
||||
fi
|
||||
url=$(echo $result | jq -r '.downloadUrl')
|
||||
# Exits with code 22 if not downloadable
|
||||
curl --output /dev/null --silent --head --fail "$url"
|
||||
updates+=( [$platform]="$result" )
|
||||
[[ "$VERSION" == "$CURRENT" ]] && { echo "Already up to date ($VERSION)"; exit 0; }
|
||||
|
||||
SOURCES="{}"
|
||||
VSCODE=""
|
||||
|
||||
for pair in \
|
||||
x86_64-linux:linux-x64 \
|
||||
aarch64-linux:linux-arm64 \
|
||||
x86_64-darwin:darwin-x64 \
|
||||
aarch64-darwin:darwin-arm64
|
||||
do
|
||||
IFS=: read -r sys platform <<< "$pair"
|
||||
meta=$(curl -fsSL "https://api2.cursor.sh/updates/api/download/stable/$platform/cursor")
|
||||
version=$(jq -r '.version' <<< "$meta")
|
||||
|
||||
[[ "$version" != "$VERSION" ]] && { echo "Version mismatch: $sys has $version, expected $VERSION"; exit 1; }
|
||||
|
||||
url=$(jq -r '.downloadUrl' <<< "$meta")
|
||||
|
||||
{ read -r hash; read -r path; } < <(nix-prefetch-url --print-path "$url")
|
||||
|
||||
sri=$(nix-hash --type sha256 --to-sri "$hash")
|
||||
|
||||
if [[ "$sys" == "x86_64-linux" ]]; then
|
||||
VSCODE=$(7zz x -so "$path" "usr/share/cursor/resources/app/product.json" 2>/dev/null | jq -r '.vscodeVersion')
|
||||
fi
|
||||
|
||||
SOURCES=$(jq -n --argjson src "$SOURCES" --arg sys "$sys" --arg url "$url" --arg hash "$sri" \
|
||||
'$src + {($sys): {url: $url, hash: $hash}}')
|
||||
done
|
||||
|
||||
# Install updates
|
||||
for platform in ${!updates[@]}; do
|
||||
result=${updates[$platform]}
|
||||
version=$(echo $result | jq -r '.version')
|
||||
url=$(echo $result | jq -r '.downloadUrl')
|
||||
source=$(nix-prefetch-url "$url" --name "cursor-$version")
|
||||
hash=$(nix-hash --to-sri --type sha256 "$source")
|
||||
update-source-version code-cursor $version $hash "$url" --system=$platform --ignore-same-version --source-key="sources.$platform"
|
||||
done
|
||||
jq -n --arg v "$VERSION" --arg vs "$VSCODE" --argjson s "$SOURCES" \
|
||||
'{version: $v, vscodeVersion: $vs, sources: $s}' > sources.json
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cosign";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = "cosign";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2cCeSG3ELkSWL1ZJ/bMGm4Nj7OZgewyUwu8lblRjCh4=";
|
||||
hash = "sha256-Ddq9MJNRZ+ywJwxIUP4nhag8UZIH/hOYnF71P3+gI/0=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-LTJoEEOGrmgQi+8T++wNMfs+jdWI+R+Xo1vBXuoLBMM=";
|
||||
vendorHash = "sha256-TuA3LwZFAKjZ4aoX92tYd7eziG5N1vDOTsEgwhg5n6w=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/cosign"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "diffnav";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "diffnav";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-admPiEKyatdUkR89vZP8RYHTqtZVSJ8KSvtpnsBViBw=";
|
||||
hash = "sha256-uaEqnlA34EagOjmnK2U9+vOIIRupSDrSd4hrM1jaNlM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2JjQF+fwl8+Xoq9T3jCvngRAOa3935zpi9qbF4w4hEI=";
|
||||
vendorHash = "sha256-cDA5qstTRApt4DXcakNLR5nsyh9i7z2Qrvp6q/OoYhY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
cacert,
|
||||
openssl,
|
||||
rustfmt,
|
||||
nix-update-script,
|
||||
makeWrapper,
|
||||
wasm-bindgen-cli_0_2_106,
|
||||
testers,
|
||||
dioxus-cli,
|
||||
withTelemetry ? false,
|
||||
@@ -35,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cacert
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -53,7 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = dioxus-cli;
|
||||
@@ -65,6 +66,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/dx \
|
||||
--prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_106 ]}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "CLI for building fullstack web, desktop, and mobile apps with a single codebase.";
|
||||
homepage = "https://dioxus.dev";
|
||||
@@ -75,6 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
cathalmullan
|
||||
anish
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "dx";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dix";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "faukah";
|
||||
repo = "dix";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-X+yFRLorfq9jvyMCvVCYUCh1pVN207XqTDr2FM1C+QE=";
|
||||
hash = "sha256-p02luVvo02zFTpXUoIK86xIiLKdnhjzGaLJkZ3RSUdw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Y9cTncgTfv+mr5izioLF3wb6ZRBWe0eKAZ2iqcsf/Tk=";
|
||||
cargoHash = "sha256-DBswUOoUMvTy9CijUJF2VGLTkx9WiT1ebdntl9+ytY4=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -23,8 +23,7 @@ python3Packages.buildPythonPackage {
|
||||
pyusb
|
||||
pyserial
|
||||
docopt
|
||||
pylzma
|
||||
pycryptodome
|
||||
pycryptodomex
|
||||
lxml
|
||||
colorama
|
||||
capstone
|
||||
|
||||
@@ -46,8 +46,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "BlazorSortable",
|
||||
"version": "5.1.6",
|
||||
"hash": "sha256-aRw6nbwi8LnS2I7jlt75cH0ECnmhQkU7o8JoUKNpOns="
|
||||
"version": "5.2.1",
|
||||
"hash": "sha256-T+0zzQOq81NJUtER+9Ag5DQvn1v3+rbA5AOu/zqWFVg="
|
||||
},
|
||||
{
|
||||
"pname": "Blurhash.Core",
|
||||
@@ -136,13 +136,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "ExtendedNumerics.BigDecimal",
|
||||
"version": "3001.1.0.233",
|
||||
"hash": "sha256-XP9qmY+lYNWQ4NVvhZ4wPrIXS0Dj6DTaS9wkTfQdryc="
|
||||
"version": "3003.0.0.346",
|
||||
"hash": "sha256-tAGqjmLbUYak5D2CKb1AOzzOJt4MFlR4zT8MyIuXqmw="
|
||||
},
|
||||
{
|
||||
"pname": "FluentValidation",
|
||||
"version": "12.1.0",
|
||||
"hash": "sha256-9I30avP9CoS1usoqOuGrpJW/OuSa6b2M5/z935182kQ="
|
||||
"version": "12.1.1",
|
||||
"hash": "sha256-lyAUmtH266O3GsYQUwNKjeDM2Fq3vs8EsQRxT5AxVRs="
|
||||
},
|
||||
{
|
||||
"pname": "FluentValidation.AspNetCore",
|
||||
@@ -186,8 +186,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Heron.MudCalendar",
|
||||
"version": "3.3.0",
|
||||
"hash": "sha256-1QVTu7VuJeBNqf0wBc9wPJBQ352Ko7neC+4iL5Tiolw="
|
||||
"version": "3.4.0",
|
||||
"hash": "sha256-QVrlIlO35o2LElr+Ac3F6UZHlI9fosIjheucWBF+QZU="
|
||||
},
|
||||
{
|
||||
"pname": "HtmlSanitizer",
|
||||
@@ -216,18 +216,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Json.More.Net",
|
||||
"version": "2.1.1",
|
||||
"hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU="
|
||||
"version": "2.2.0",
|
||||
"hash": "sha256-Hb4ylcT/6bLHVADpnjoBJKyTR3cU+WjYlblO79A+SSU="
|
||||
},
|
||||
{
|
||||
"pname": "JsonPointer.Net",
|
||||
"version": "5.3.1",
|
||||
"hash": "sha256-nV1r0doxPiApc2sEI4AulBz+arLWF2VSnHm9tymBJzE="
|
||||
"version": "6.0.1",
|
||||
"hash": "sha256-iIvOHz6jjTsGnXyxOK71z2F8gh21TmQS4A9SLB4u93A="
|
||||
},
|
||||
{
|
||||
"pname": "JsonSchema.Net",
|
||||
"version": "7.4.0",
|
||||
"hash": "sha256-j6QMakexHXNAsf7emMnYgjTvnXSj0xCHgYLs184Z0p0="
|
||||
"version": "8.0.5",
|
||||
"hash": "sha256-zFSEmqckius1fa/vxhJEMoNC/RU25kF3AStyMwxHCPM="
|
||||
},
|
||||
{
|
||||
"pname": "LanguageExt.Core",
|
||||
@@ -316,33 +316,33 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Authentication.JwtBearer",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-uz9t6volHVoUM0j1GFXXfWU157ba05TvZBnres47roA="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-x30FL5t31tGtbgTTHZlIEIky+J2Slba5YuLqytt56l4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-RhcnttgtQtLpNkX+yqrKu8wqlrS9muxSA0GLGAfRMJI="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-fMLVW4xy3tU2pXbd/hX/JxxCRO02eGEuccc7uv9r+UE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.JsonPatch",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-MeQFvZt5GIEs9IQILjDwC72GlgyIMUH52nxsJbKCNdo="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-bbX3CGoxG5E8RPUBeEvG9Us8l8WxBHRcjxPR3mJLnbg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-+WtuaFv9zL11yQpFDYv87BeXulu63UkqvH+cNJa3EY4="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-E1ciFt7uy39aKRDfmXrHJ6e4SsaWm+C3inQqTzQEC2U="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.OpenApi",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-FvIqXjGE0RqejaBu43zcdCA3toYLTELPCRpnJp4kYuk="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-O31K6+++fM7XWd0JGrzmzLrtydYGiI4efzv+WqAdnQA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.SpaServices.Extensions",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-xD0gi4AGjRnIALAUC+YbugVHEmt9sa4m9JOlf2/NuUs="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-8n3nq/eDMGxthVnYXCMud8+F0h5Y9ZelF53KXNuZ8gk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
@@ -506,13 +506,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.ApiDescription.Server",
|
||||
"version": "9.0.11",
|
||||
"hash": "sha256-6+v6bVecvv1q47FscMLdEuMYJmpwonIWmMXGo5td5Sg="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-v+YRzli27wGy5Oh6PqSMGtRiFcCTcT4xBFLHhUNFWvQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Caching.Abstractions",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-IciARPnXx/S6HZc4t2ED06UyUwfZI9LKSzwKSGdpsfI="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-qVLAEqxPK/dNq+z1a6D9NqdcSg/18sfzZhlBWMkqV/A="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Caching.Abstractions",
|
||||
@@ -521,8 +521,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Caching.Memory",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-AMgDSm1k6q0s17spGtyR5q8nAqUFDOxl/Fe38f9M+d4="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-Qb7xK6VEZDas0lJFaW1suKdFjtkSYwLHHxkQEfWIU2A="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Caching.Memory",
|
||||
@@ -541,34 +541,24 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-7xdHie4uHwoGZz5yUT4vWg2EWvkLvsSzItWCoqm4dTM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-GcgrnTAieCV7AVT13zyOjfwwL86e99iiO/MiMOxPGG0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-s4PDp+vtzdxKIxnOT3+dDRoTDopyl8kqmmw4KDnkOtQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Abstractions",
|
||||
"version": "9.0.11",
|
||||
@@ -586,13 +576,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Binder",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration.Binder",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-fiqTHE6EfaUXICaVrWzQEU/K6GjQNac6yRNErig6wRk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
@@ -601,8 +586,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-RKOB+zPrtQNUbJY/1jR54rKOM8KHPgynPExxugku3I8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
@@ -611,8 +596,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-zNUpau51ds7iQTaSUTFtyTHIUoinYc129W50CnufMdQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
@@ -624,11 +609,6 @@
|
||||
"version": "8.0.2",
|
||||
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "9.0.11",
|
||||
@@ -636,8 +616,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyModel",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-oCcIjmwH8H0n9bT3wQBWdotMvYuoiazfiKrXAs2bLiI="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyModel",
|
||||
@@ -656,8 +636,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-o7QkCisEcFIh227qBUfWFci2ns4cgEpLqpX7YvHGToQ="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-MoBF0X5AVT0xORvhNvpc9DA5dSOJhjrfGeWDvEJQOoc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
|
||||
@@ -666,8 +646,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-tEt6VaaDR7bICKHiCp0l2Cmz8u+FCYORLVNAaJymGM8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
|
||||
@@ -676,8 +656,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.FileProviders.Abstractions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-IYtaZ5nssj9RPHL+DODXt9Z2IvTtj8rKuLQuyoMqo+w="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Hosting.Abstractions",
|
||||
@@ -686,13 +666,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Hosting.Abstractions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-2t+yF23Ac9MvytZK8hym+aUYynuAFZVdKdcRVvVsdXo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Http",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-gnsO9erEi7xLS3QwYukcrzPDpcUgRkNFnGzPARHVjrs="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-Kme3514XmxnZ6Ke+itb/b/bgc9allgOAfwHulPNfYO8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
@@ -701,13 +681,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-zuLP3SIpCToMOlIPOEv3Kq8y/minecd8k8GSkxFo13E="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
@@ -724,6 +699,11 @@
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-BnhgGZc01HwTSxogavq7Ueq4V7iMA3wPnbfRwQ4RhGk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-NRk0feNE1fgi/hyO0AVDbSGJQRT+9yte6Lpm4Hz/2Bs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.2",
|
||||
@@ -734,16 +714,6 @@
|
||||
"version": "8.0.3",
|
||||
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "9.0.11",
|
||||
@@ -751,18 +721,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Configuration",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-/7ywcFsEmmQzWEcIvxoGAYHF0oDSXV/LTDAiW/MNQtg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Console",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-m/E02c5NSCYyH4THNKxpnsi3Kp8gqOi2aPrfXx7sQ9s="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.TraceSource",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-VrOfGKu31ySmSAPq0A+bE+ZfQytKGEe2A8dfKq1idK0="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-NS7P5jo7dtiH7DmyyipTIfaRf4ZwEJLU2UVG+4hlFSE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
@@ -771,13 +741,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-vBiSS1vqAC7eDrpJNT4H3A9qLikCSAepnNRbry0mKnk="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
@@ -786,13 +751,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-XGAs5DxMvWnmjX8dqRwKY0vsuS40SHvsfJqB1rO4L7k="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
|
||||
"version": "9.0.10",
|
||||
"hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-1CNSVXZ3RAH4vzbYDqcQHl9c/YBhuSfrFUXCLIx5/rY="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
@@ -801,13 +761,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
|
||||
"version": "10.0.1",
|
||||
"hash": "sha256-EXmukq09erT4s+miQpBSYy3IY4HxxKlwEPL43/KoyEc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
@@ -901,8 +861,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.OpenApi",
|
||||
"version": "1.6.17",
|
||||
"hash": "sha256-Wx9PwlEJPNMq1kp59nJJnLHQ+yNhqCTudcokmlP+tSk="
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-8eiM3Mx4Hx1etx52RlczoHG2z9XIpWgu2LQtWSt086k="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.SqlServer.Server",
|
||||
@@ -914,11 +874,6 @@
|
||||
"version": "160.1000.6",
|
||||
"hash": "sha256-XU5s3iwz8JIwIrG5Xe8wZJ8cuCUx7q3fOLYzNHmA9jg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.Threading.Analyzers",
|
||||
"version": "17.14.15",
|
||||
"hash": "sha256-wv0Hi7pjPYeSwDFyaa8baIOyiUraVfudmVtpm0okoYU="
|
||||
},
|
||||
{
|
||||
"pname": "Mono.TextTemplating",
|
||||
"version": "3.0.0",
|
||||
@@ -941,13 +896,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "NCalc.Core",
|
||||
"version": "5.8.0",
|
||||
"hash": "sha256-gLexewkgetT42BHiJv5O62TKMYP/fmJlwmH2fdEyyTk="
|
||||
"version": "5.11.0",
|
||||
"hash": "sha256-THgAix81mZxztHNMf5JlTPUGbcs1ZuRS3EVM7eFHseg="
|
||||
},
|
||||
{
|
||||
"pname": "NCalcSync",
|
||||
"version": "5.8.0",
|
||||
"hash": "sha256-vq+eXmt1ykzTiyUCF/NHtbLQ+3x0soarZfJH2h6neEM="
|
||||
"version": "5.11.0",
|
||||
"hash": "sha256-Kui0K2WuLS0filTnpdcA3/H/XqqDOjtKms97WqbulEw="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
@@ -1021,8 +976,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Parlot",
|
||||
"version": "1.5.2",
|
||||
"hash": "sha256-gMKHhCNJTqjzZRGfXDTSUkJsqDCMY5TnJge0pAha4pE="
|
||||
"version": "1.5.6",
|
||||
"hash": "sha256-Ffbs7IpgN0aOKScBe64PGySnzWxapVSuM73fQmt+2nU="
|
||||
},
|
||||
{
|
||||
"pname": "Pomelo.EntityFrameworkCore.MySql",
|
||||
@@ -1031,23 +986,23 @@
|
||||
},
|
||||
{
|
||||
"pname": "Refit",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-YORvtZtDy0+wlUoJTur1lO5wJMovFY/jxoIvfkEkObI="
|
||||
"version": "9.0.2",
|
||||
"hash": "sha256-FTq+jJLV9ow3hTrzTBEYwuAibxY6m0XgExNeIGoAAK4="
|
||||
},
|
||||
{
|
||||
"pname": "Refit.HttpClientFactory",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-VNVCqzq3HwPSRK/GrcBkbdhb2iRYrqoeDBvGnPNyrbA="
|
||||
"version": "9.0.2",
|
||||
"hash": "sha256-qxUm0NlJqoOPFRTu7ArdcSR696t5zCB+BniJv1+Xdkc="
|
||||
},
|
||||
{
|
||||
"pname": "Refit.Newtonsoft.Json",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-KOZbdzoV/DBYgSNRzrDZOKhcKD1qQWZcakhTpVXBy08="
|
||||
"version": "9.0.2",
|
||||
"hash": "sha256-cxZtCv7gecMVIVzDrgjMBg81dEAq6DT9ccR10SKuFV4="
|
||||
},
|
||||
{
|
||||
"pname": "Refit.Xml",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-Dy/5KaJ/Nq5p/T126Zj7gECEg7232uA+cWlKB+Y+OxQ="
|
||||
"version": "9.0.2",
|
||||
"hash": "sha256-FNP7WAnsjncwdSvj4j7mxP2I+O3TNiYzlaTYVBlMWEo="
|
||||
},
|
||||
{
|
||||
"pname": "RichTextKit.Stbear",
|
||||
@@ -1056,8 +1011,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Scalar.AspNetCore",
|
||||
"version": "2.11.0",
|
||||
"hash": "sha256-9tJSfcbv2ECnH0ZQb2ovQWsgYzMoVIgSOmctKiQUzp0="
|
||||
"version": "2.11.10",
|
||||
"hash": "sha256-zSBsHjGTdwgia+v95wAdhNL7X1OuQKUd+CbkKKf/T90="
|
||||
},
|
||||
{
|
||||
"pname": "Scriban.Signed",
|
||||
@@ -1081,18 +1036,18 @@
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.AspNetCore",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ="
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-z7dY6pY2Kkns20mpzZN2GOfV172gDWpamKDXHyLhEJs="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Extensions.Hosting",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw="
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-zFQMZkAPqg+j2ZI0oBN07hO+9MFiyy5YECRbz7msxeU="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Extensions.Logging",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw="
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-MgfWK/SJWUPxPzrnCUnxn6Sy+SBVmP3dYd60uy80NdE="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Formatting.Compact",
|
||||
@@ -1106,13 +1061,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Settings.Configuration",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Console",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
|
||||
"version": "10.0.0",
|
||||
"hash": "sha256-WJK+wR7XPGAtD+vO+pjF5mn4qy8tO5uWIqHhovL0lAs="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.Console",
|
||||
@@ -1124,11 +1074,6 @@
|
||||
"version": "3.0.0",
|
||||
"hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.File",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
|
||||
},
|
||||
{
|
||||
"pname": "Serilog.Sinks.File",
|
||||
"version": "7.0.0",
|
||||
@@ -1216,8 +1161,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.CommandLine",
|
||||
"version": "2.0.0",
|
||||
"hash": "sha256-cUJTPCLcnA6959PGdwWw8zsjFxhYGI+SZeIxnMC/Cwc="
|
||||
"version": "2.0.1",
|
||||
"hash": "sha256-NDBiPUt/ZZIMBcLHpF/6IMX/UpfsC/XnH3p4i4MHCFw="
|
||||
},
|
||||
{
|
||||
"pname": "System.Composition",
|
||||
@@ -1361,8 +1306,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "WebMarkupMin.Core",
|
||||
"version": "2.20.0",
|
||||
"hash": "sha256-v0CpbncKPK7G7dnS0HQrdm+TXMJKhm8KK4T/eqNEeTI="
|
||||
"version": "2.20.1",
|
||||
"hash": "sha256-6ze4MOSfIKdvMJsroQRtESB8KG5XogO3xk4qOSkHpXQ="
|
||||
},
|
||||
{
|
||||
"pname": "Winista.MimeDetect",
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ersatztv";
|
||||
version = "25.9.0";
|
||||
version = "26.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErsatzTV";
|
||||
repo = "ErsatzTV";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+ZMDMKrJN+nX9FeSZ8RTFGRf161Mhpqd7jY9FLZWNqM=";
|
||||
sha256 = "sha256-KWgzJAH3LllR+RjEpXSHa+lId6fcZZiGs94IKDftLZo=";
|
||||
};
|
||||
postPatch = ''
|
||||
# Remove config of development tools that don't end up in
|
||||
|
||||
@@ -1,66 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
SDL2,
|
||||
cmake,
|
||||
curlMinimal,
|
||||
expat,
|
||||
fetchFromGitHub,
|
||||
jansson,
|
||||
libpng,
|
||||
libjpeg,
|
||||
libGLU,
|
||||
lib,
|
||||
libGL,
|
||||
libX11,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libsndfile,
|
||||
libXxf86vm,
|
||||
pcre,
|
||||
minizip,
|
||||
nix-update-script,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
SDL2,
|
||||
vim,
|
||||
speex,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ezquake";
|
||||
version = "3.6.3";
|
||||
version = "3.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QW-Group";
|
||||
repo = "ezquake" + "-source";
|
||||
tag = version;
|
||||
repo = "ezquake-source";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8=";
|
||||
hash = "sha256-BIkBl6ncwo0NljuqOHJ3yQeDTcClh5FGssdFsKUjN90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
expat
|
||||
curl
|
||||
jansson
|
||||
libpng
|
||||
libjpeg
|
||||
libGLU
|
||||
libGL
|
||||
libsndfile
|
||||
libX11
|
||||
libXxf86vm
|
||||
pcre
|
||||
SDL2
|
||||
vim
|
||||
speex
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
curlMinimal
|
||||
expat
|
||||
jansson
|
||||
libGL
|
||||
libX11
|
||||
libjpeg
|
||||
libpng
|
||||
libsndfile
|
||||
minizip
|
||||
pcre2
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase =
|
||||
let
|
||||
sys = lib.last (lib.splitString "-" stdenv.hostPlatform.system);
|
||||
arch = lib.head (lib.splitString "-" stdenv.hostPlatform.system);
|
||||
in
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
find .
|
||||
mv ezquake-${sys}-${arch} $out/bin/ezquake
|
||||
runHook preInstall
|
||||
|
||||
install -D \
|
||||
ezquake-${sys}-${arch} $out/bin/${finalAttrs.meta.mainProgram}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://ezquake.com/";
|
||||
@@ -70,4 +75,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ edwtjo ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "folder-color-switcher";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "folder-color-switcher";
|
||||
# They don't really do tags, this is just a named commit.
|
||||
rev = "c528788f05697d1e176df4f869d64bcebbab1528";
|
||||
hash = "sha256-RSIiNjoU2Qk+0ACirUeo+VSfpjQ8NNJqmKKASD7RZXs=";
|
||||
rev = "856f6f27dfa48ee1ac8d7ec40333e3f892458067";
|
||||
hash = "sha256-nNH8/MIgVk7Y9YyGfN1jjdGJ4DruXu2Lg8+GjQnIggM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+8
-4
@@ -1,19 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchPypi,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "fortran-language-server";
|
||||
version = "1.12.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
|
||||
hash = "sha256-7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
checkPhase = "$out/bin/fortls --help 1>/dev/null";
|
||||
pythonImportsCheck = [ "fortls" ];
|
||||
|
||||
@@ -10,24 +10,24 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "func";
|
||||
version = "1.16.2";
|
||||
version = "1.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "func";
|
||||
tag = "knative-v${finalAttrs.version}";
|
||||
hash = "sha256-nbS7X5WPu+WBtPUKShE5aWve5m2gw2naQQzNeG7pbGM=";
|
||||
hash = "sha256-SYqkWE7dVFy6stibcWayU2J+oIFIfwNDoK6TzchgBzo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Gn+nyck/VOwf8iKPeyLvsPWOpfdN/maUcQOLFAU0oic=";
|
||||
vendorHash = "sha256-F/TQ1QwfQfum1DOY2xrzpTlm7jvuJQUjtBLY6pZfTh8=";
|
||||
|
||||
subPackages = [ "cmd/func" ];
|
||||
|
||||
ldflags = [
|
||||
"-X knative.dev/func/pkg/app.vers=v${finalAttrs.version}"
|
||||
"-X knative.dev/func/pkg/version.Vers=v${finalAttrs.version}"
|
||||
"-X main.date=19700101T000000Z"
|
||||
"-X knative.dev/func/pkg/app.hash=${finalAttrs.version}"
|
||||
"-X knative.dev/func/pkg/app.kver=${finalAttrs.src.tag}"
|
||||
"-X knative.dev/func/pkg/version.Hash=${finalAttrs.version}"
|
||||
"-X knative.dev/func/pkg/version.Kver=${finalAttrs.src.tag}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "gh-gei";
|
||||
version = "1.23.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-gei";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9sTyxLs5ug1fKh2qvKkuhA9r0cmfdaPT+pWuc6hxyN4=";
|
||||
hash = "sha256-oyNnHEGOLQvxIoBnvH0rA6hYAx+BYY1+aG3qMx1RpX4=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.38.0";
|
||||
version = "3.38.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = "git-machete";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cn++U2Vy6LCEZvtmvDOTQydnAxapUZxLUE+6Kxg7Rq8=";
|
||||
hash = "sha256-m/GstZAxBi4Q8GRv2GRrJNzChV1Rzw1vNuNP0Ao+GIY=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
makeBinaryWrapper,
|
||||
git,
|
||||
}:
|
||||
|
||||
let
|
||||
wrapperPath = lib.makeBinPath [
|
||||
git
|
||||
];
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitnapped";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Solexma";
|
||||
repo = "gitnapped";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DkKei7PnQnF+0odsPwJJ/pwO/yqdZGRrJQcdIMQ/3uI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AIYDgjDYOwIi6KK5GzMF5UWYe9h7mGNONdwtlNygod4=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gitnapped \
|
||||
--prefix PATH : ${wrapperPath}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Git commit timeline analyzer";
|
||||
homepage = "https://site.gitnapped.dev";
|
||||
maintainers = with lib.maintainers; [
|
||||
nicknb
|
||||
];
|
||||
mainProgram = "gitnapped";
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-judge";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "criyle";
|
||||
repo = "go-judge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qSTtXLjtrwwp6ipnquzoDM6yzAtoE3WIAXqWFCuOI9s=";
|
||||
hash = "sha256-+NqBAxes9xnuyTN0ITrEDlRC8EvgUGBulF3EQx5XSDQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+KPbY63wF+zh7R7OVyfBI7Nuf8kAh35dxJIIRrP5Js0=";
|
||||
vendorHash = "sha256-2yuWsNa4jyJEFAox0KMfTYAnwVv622hHErEd2RtJgl4=";
|
||||
|
||||
tags = [
|
||||
"nomsgpack"
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomtree";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vbatts";
|
||||
repo = "go-mtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SCjmyvZZGI/vQg2Ok4vw6v4Om8pNgdWDBwWVB/LIKaA=";
|
||||
hash = "sha256-MLZybHyYxRxxRy0/pd1n8apcfzrNVu2joP2S2P4KRHU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -5,20 +5,21 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "google-chat-linux";
|
||||
version = "5.29.23-1";
|
||||
version = "5.39.24-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squalou";
|
||||
repo = "google-chat-linux";
|
||||
tag = version;
|
||||
hash = "sha256-JBjxZUs0HUgAkJJBYhNv2SHjpBtAcP09Ah4ATPwpZsQ=";
|
||||
hash = "sha256-yQBnqGyTCUr/t+PCCSTsUhKvlT5wV/F/OvCXrgeiceA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-7lKWbXyDpYh1sP9LAV/oA7rfpckSbIucwKT21vBrJ3Y=";
|
||||
npmDepsHash = "sha256-8eZAn8zIDcMDKi30AiG1di4T/3xVoCewJ/e4qf7n9nY=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -56,6 +57,8 @@ buildNpmPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Electron-base client for Google Hangouts Chat";
|
||||
homepage = "https://github.com/squalou/google-chat-linux";
|
||||
|
||||
@@ -31,6 +31,13 @@ let
|
||||
|
||||
vendorHash = "sha256-rIj4T+NEqWla6/+ofosTwagL4/VMovDp1NEYMuzbOrQ=";
|
||||
|
||||
# Fix C23 compat
|
||||
preBuild = ''
|
||||
chmod +w vendor/github.com/anacrolix/go-libutp/utp_types.h
|
||||
substituteInPlace vendor/github.com/anacrolix/go-libutp/utp_types.h \
|
||||
--replace-fail "typedef uint8 bool;" ""
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-bsnes";
|
||||
version = "0-unstable-2025-12-23";
|
||||
version = "0-unstable-2026-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "bsnes";
|
||||
rev = "df88234e314f97a2ca124df1982e4bd39f6fcea0";
|
||||
hash = "sha256-QI9mRvcsPkVBhUZlhchgGVPROj7HAqgtHHnbHVzIIBI=";
|
||||
rev = "7e26b2970c95404ef9a95bed6e509c8923f2815d";
|
||||
hash = "sha256-mOJPhhHqVrYIHYUZ7z1fA8AD6yjWcnUxecMorsaPvFg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/bsnes";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-mednafen";
|
||||
version = "0-unstable-2025-12-28";
|
||||
version = "0-unstable-2026-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "mednafen-highscore";
|
||||
rev = "58404782e3f69186c7be821a880cf1442b240f2f";
|
||||
hash = "sha256-FXSfBAPpi+Ch9vuPQf6nqLMKxvrbXG+6F5HHaU9fs2s=";
|
||||
rev = "fc1d23378594c5ed6aa1d89d555b4276214e1e11";
|
||||
hash = "sha256-YHVV6/8JTESLtGA5jFozE5IhXHB4RaUaT2yvFd7wGo8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/highscore";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-mupen64plus";
|
||||
version = "0-unstable-2025-12-28";
|
||||
version = "0-unstable-2026-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "mupen64plus-highscore";
|
||||
rev = "94ab5644e5363cf359b334ac057f3f36d24910be";
|
||||
hash = "sha256-Q+6iL7DGr62C2fVEP0EWCgm7S7AYAW1C2X1GPKbI7aY=";
|
||||
rev = "84f913ed4433f37b8a990cace2f9e1cfb641e2dc";
|
||||
hash = "sha256-Afrb7WUw5QeST/NRM06UIyUTzxvrGqayFneaXjAw6aM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "highscore-sameboy";
|
||||
version = "0-unstable-2026-01-04";
|
||||
version = "0-unstable-2026-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "highscore-emu";
|
||||
repo = "SameBoy";
|
||||
rev = "80578af6531ac2da2a9ba76318e8e1dab856fabe";
|
||||
hash = "sha256-LB0HTcTNEe9WlxTi8xwYsbas0SX6Cs2VNo/ljyrcxzQ=";
|
||||
rev = "8c9700abf0bbff49003540ddbe339110bf0b05a9";
|
||||
hash = "sha256-IEuqc2pTWHE5nwgANPcsuufE2U5VsqGQr63ikH47BO4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/highscore";
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "5.5";
|
||||
version = "5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
tag = version;
|
||||
hash = "sha256-/bFqPar/Ey48e+KG1EN0IuTF4HX+2jeMcFkqcEcOKMs=";
|
||||
hash = "sha256-7CPrRMoVM1FaU8aJlnZigTkHa97bDPdwcu4JY7sERJQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -214,7 +214,7 @@ customStdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
providedSessions = [ "hyprland" ];
|
||||
providedSessions = [ "hyprland" ] ++ optionals withSystemd [ "hyprland-uwsm" ];
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,20 +9,21 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "immich-kiosk";
|
||||
version = "0.28.1";
|
||||
version = "0.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "damongolding";
|
||||
repo = "immich-kiosk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9ZKjhCmOL2fjGOjdzgVG7/aq6SdBJCG/+bFrlHdkll4=";
|
||||
hash = "sha256-EuCRYLpfAFstoADPyC0d7CHcJgzwTx2iiRcQdbjuUD8=";
|
||||
};
|
||||
|
||||
# Delete vendor directory to regenerate it consistently across platforms
|
||||
postPatch = ''
|
||||
rm -rf vendor
|
||||
'';
|
||||
vendorHash = "sha256-5y//CdHgQjNJayNI/jzdD5WPa4XlIxMonqkPc/kJp8c=";
|
||||
vendorHash = "sha256-XZ49wYC+oUqEL0HXeqdRQAI2Y4zJAMgfqL/+6RrBWos=";
|
||||
proxyVendor = true;
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit
|
||||
@@ -32,7 +33,7 @@ buildGoModule rec {
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
hash = "sha256-FThVaNUUE3QCbq0iPRCet4SnlHCCQaw3N5PThKSM1ek=";
|
||||
hash = "sha256-ELIbM+tWOGntv8XmNvRZ/Q2iSRq0g9Kv5LnkwLPisPM=";
|
||||
fetcherVersion = 2;
|
||||
};
|
||||
|
||||
|
||||
@@ -30,11 +30,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intune-portal";
|
||||
version = "1.2503.10-noble";
|
||||
version = "1.2508.17-noble";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb";
|
||||
hash = "sha256-NlJ8m7V1yLErOntprHs3EagPtwSzYWd7NBH0jc72+i4=";
|
||||
hash = "sha256-UTP+Z6xsjr48deizuwVDb8GrpeeAf5RZwloXsZ7Um3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p curl gzip dpkg common-updater-scripts
|
||||
|
||||
index_file=$(curl -sL https://packages.microsoft.com/ubuntu/22.04/prod/dists/jammy/main/binary-amd64/Packages.gz | gzip -dc)
|
||||
index_file=$(curl -sL https://packages.microsoft.com/ubuntu/24.04/prod/dists/noble/main/binary-amd64/Packages.gz | gzip -dc)
|
||||
|
||||
latest_version="0"
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
}:
|
||||
let
|
||||
version = "1.45.0";
|
||||
version = "1.46.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@@ -34,10 +34,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "casey";
|
||||
repo = "just";
|
||||
tag = version;
|
||||
hash = "sha256-D+xMPpn8JLX88eIO9zY051K81KPGBhcFvhBIwuTDymk=";
|
||||
hash = "sha256-NE54LKS2bYBfQL+yLJPaG4iF7EiJfDqBfnsrlPo1+OE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zokI+mWyI/HmzP7GuO59usEsscl3tpeyhNT2tXmLny8=";
|
||||
cargoHash = "sha256-yyaJAWp6luizA/aQuUGhdxRX2Ofri4CeLIO3/ndSCzc=";
|
||||
|
||||
nativeBuildInputs =
|
||||
lib.optionals (installShellCompletions || installManPages) [ installShellFiles ]
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k6";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "k6";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-393Ld7V7KBW9ZnItqW9U/8XkDapwNh7T2ABeh2CikGc=";
|
||||
hash = "sha256-kgdJAmjk92xXBYJrfprYztBnTK4cqIpk9iwKULDVRl8=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"desktop_webview_window": "sha256-FSI/R9HvAJWQttY8oaAmBYygUliv/bw3hmwty7PRUjE=",
|
||||
"media_kit": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_libs_android_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_libs_ios_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_libs_linux": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_libs_macos_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_libs_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_libs_windows_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"media_kit_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=",
|
||||
"webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU="
|
||||
"desktop_webview_window": "sha256-kkBPJvPVAChzk9eDL5xwZvonWobChW0C5dGQYTlQ8qA=",
|
||||
"media_kit": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_libs_android_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_libs_ios_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_libs_linux": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_libs_macos_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_libs_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_libs_windows_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"media_kit_video": "sha256-jMfpfakselaBaQ6wxoHObTvclVPJg1WF3hbup+WdzLE=",
|
||||
"webview_windows": "sha256-pDnCv8tkeeaodMcNggHOyvPPkoCfd0hvopTg1Uvx0sM="
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Predidit";
|
||||
repo = "Kazumi";
|
||||
tag = version;
|
||||
hash = "sha256-ZAc8i7nsJ00rzrOevVd4apb+CJ43rnsTkWGXhsDvrdc=";
|
||||
hash = "sha256-xWbk81y+cA/iJCttZAKR1EfSkA7u9+aLFnty548Bv0g=";
|
||||
};
|
||||
in
|
||||
flutter338.buildFlutterApplication {
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
|
||||
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "67.0.0"
|
||||
"version": "91.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
|
||||
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.4.1"
|
||||
"version": "8.4.1"
|
||||
},
|
||||
"ansicolor": {
|
||||
"dependency": "transitive",
|
||||
@@ -104,21 +104,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build",
|
||||
"sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
|
||||
"sha256": "c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.1"
|
||||
"version": "4.0.3"
|
||||
},
|
||||
"build_config": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_config",
|
||||
"sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
|
||||
"sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.2"
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"build_daemon": {
|
||||
"dependency": "transitive",
|
||||
@@ -130,35 +130,15 @@
|
||||
"source": "hosted",
|
||||
"version": "4.0.4"
|
||||
},
|
||||
"build_resolvers": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_resolvers",
|
||||
"sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
},
|
||||
"build_runner": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
|
||||
"sha256": "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.13"
|
||||
},
|
||||
"build_runner_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_runner_core",
|
||||
"sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.3.2"
|
||||
"version": "2.10.4"
|
||||
},
|
||||
"built_collection": {
|
||||
"dependency": "transitive",
|
||||
@@ -330,16 +310,6 @@
|
||||
"source": "hosted",
|
||||
"version": "3.1.2"
|
||||
},
|
||||
"cookie_jar": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "cookie_jar",
|
||||
"sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.8"
|
||||
},
|
||||
"crypto": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -374,11 +344,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
|
||||
"sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.3.6"
|
||||
"version": "3.1.3"
|
||||
},
|
||||
"dbus": {
|
||||
"dependency": "transitive",
|
||||
@@ -394,33 +364,13 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "b107a03068b8c4249cec4a3b159d56f1326103c5",
|
||||
"resolved-ref": "b107a03068b8c4249cec4a3b159d56f1326103c5",
|
||||
"ref": "5a07358",
|
||||
"resolved-ref": "5a07358d2f52a0cd01a767ba6d998f5e32170426",
|
||||
"url": "https://github.com/Predidit/linux_webview_window.git"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "0.2.4"
|
||||
},
|
||||
"device_info_plus": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "device_info_plus",
|
||||
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "11.5.0"
|
||||
},
|
||||
"device_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "device_info_plus_platform_interface",
|
||||
"sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.3"
|
||||
},
|
||||
"dio": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -431,16 +381,6 @@
|
||||
"source": "hosted",
|
||||
"version": "5.8.0+1"
|
||||
},
|
||||
"dio_cookie_manager": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dio_cookie_manager",
|
||||
"sha256": "47cacbf6a783c263bfa7cd7d08101e93127d87760ddb003ba289162f7be0f679",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"dio_web_adapter": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -465,11 +405,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dynamic_color",
|
||||
"sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
|
||||
"sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.7.0"
|
||||
"version": "1.8.1"
|
||||
},
|
||||
"equatable": {
|
||||
"dependency": "transitive",
|
||||
@@ -535,11 +475,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "fl_chart",
|
||||
"sha256": "577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7",
|
||||
"sha256": "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
"version": "1.1.1"
|
||||
},
|
||||
"flutter": {
|
||||
"dependency": "direct main",
|
||||
@@ -631,11 +571,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_lints",
|
||||
"sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
|
||||
"sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.0"
|
||||
"version": "6.0.0"
|
||||
},
|
||||
"flutter_localizations": {
|
||||
"dependency": "direct main",
|
||||
@@ -697,11 +637,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_svg",
|
||||
"sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
|
||||
"sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.0"
|
||||
"version": "2.2.3"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
@@ -725,16 +665,6 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"frontend_server_client": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "frontend_server_client",
|
||||
"sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.0"
|
||||
},
|
||||
"get_it": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -765,35 +695,35 @@
|
||||
"source": "hosted",
|
||||
"version": "2.3.2"
|
||||
},
|
||||
"hive": {
|
||||
"hive_ce": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "hive",
|
||||
"sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
|
||||
"name": "hive_ce",
|
||||
"sha256": "412c638aeac0f003bba664884e3048b9547e541aaca13f10cc639da788184bed",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.3"
|
||||
"version": "2.16.0"
|
||||
},
|
||||
"hive_flutter": {
|
||||
"hive_ce_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "hive_flutter",
|
||||
"sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
|
||||
"name": "hive_ce_flutter",
|
||||
"sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.0"
|
||||
"version": "2.3.3"
|
||||
},
|
||||
"hive_generator": {
|
||||
"hive_ce_generator": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "hive_generator",
|
||||
"sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4",
|
||||
"name": "hive_ce_generator",
|
||||
"sha256": "b19ac263cb37529513508ba47352c41e6de72ba879952898d9c18c9c8a955921",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.1"
|
||||
"version": "1.10.0"
|
||||
},
|
||||
"html": {
|
||||
"dependency": "direct main",
|
||||
@@ -865,6 +795,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.5"
|
||||
},
|
||||
"isolate_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "isolate_channel",
|
||||
"sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.2+1"
|
||||
},
|
||||
"js": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -919,11 +859,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "lints",
|
||||
"sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
|
||||
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.1.1"
|
||||
"version": "6.0.0"
|
||||
},
|
||||
"logger": {
|
||||
"dependency": "direct main",
|
||||
@@ -969,8 +909,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "media_kit",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -980,8 +920,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/android/media_kit_libs_android_video",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -991,8 +931,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/ios/media_kit_libs_ios_video",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1002,8 +942,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/linux/media_kit_libs_linux",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1013,8 +953,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/macos/media_kit_libs_macos_video",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1024,8 +964,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "libs/universal/media_kit_libs_video",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1035,8 +975,8 @@
|
||||
"dependency": "direct overridden",
|
||||
"description": {
|
||||
"path": "libs/windows/media_kit_libs_windows_video",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1046,8 +986,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "media_kit_video",
|
||||
"ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f",
|
||||
"ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"resolved-ref": "7b248251fc274f986635876946130f2afc78c959",
|
||||
"url": "https://github.com/Predidit/media-kit.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1087,21 +1027,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "mobx",
|
||||
"sha256": "bf1a90e5bcfd2851fc6984e20eef69557c65d9e4d0a88f5be4cf72c9819ce6b0",
|
||||
"sha256": "25ea9a3ee69243d578fb6288721d8eeb18550d0391c32f896d377d994154bff2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.5.0"
|
||||
"version": "2.6.0"
|
||||
},
|
||||
"mobx_codegen": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "mobx_codegen",
|
||||
"sha256": "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc",
|
||||
"sha256": "2dbad72338df5959ff80312bb6796ec7045ba3188996ef9512c281cbe6c962cc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.7.0"
|
||||
"version": "2.7.5"
|
||||
},
|
||||
"modular_core": {
|
||||
"dependency": "transitive",
|
||||
@@ -1407,11 +1347,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "saver_gallery",
|
||||
"sha256": "bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c",
|
||||
"sha256": "1d942bd7f4fedc162d9a751e156ebac592e4b81fc2e757af82de9077f3437003",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.1"
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"screen_brightness_android": {
|
||||
"dependency": "direct main",
|
||||
@@ -1607,11 +1547,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "skeletonizer",
|
||||
"sha256": "eebc03dc86b298e2d7f61e0ebce5713e9dbbc3e786f825909b4591756f196eb6",
|
||||
"sha256": "83157d8e2e41f0252079cfec496281c16e4c63660052dab8d4cd72a206bb7109",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0+1"
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"sky_engine": {
|
||||
"dependency": "transitive",
|
||||
@@ -1623,21 +1563,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_gen",
|
||||
"sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
|
||||
"sha256": "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.0"
|
||||
"version": "4.1.1"
|
||||
},
|
||||
"source_helper": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_helper",
|
||||
"sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
|
||||
"sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.5"
|
||||
"version": "1.3.8"
|
||||
},
|
||||
"source_span": {
|
||||
"dependency": "transitive",
|
||||
@@ -1779,16 +1719,6 @@
|
||||
"source": "hosted",
|
||||
"version": "0.7.7"
|
||||
},
|
||||
"timing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "timing",
|
||||
"sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.2"
|
||||
},
|
||||
"tray_manager": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1833,11 +1763,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "upgrader",
|
||||
"sha256": "60293b391f4146ce1e381ed6198b6374559a4aadf885d313e94e6c7d454d03ca",
|
||||
"sha256": "4ba3f840691ffa43c6d71a93a6ad3ae01590c7895c3eb33f9f683513f736a9f7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "11.4.0"
|
||||
"version": "12.3.0"
|
||||
},
|
||||
"uri_parser": {
|
||||
"dependency": "transitive",
|
||||
@@ -2073,11 +2003,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "webview_flutter",
|
||||
"sha256": "c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba",
|
||||
"sha256": "a3da219916aba44947d3a5478b1927876a09781174b5a2b67fa5be0555154bf9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.13.0"
|
||||
"version": "4.13.1"
|
||||
},
|
||||
"webview_flutter_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2113,8 +2043,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
|
||||
"resolved-ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
|
||||
"ref": "9962cb9416f867d9ce9f409ccd6784e78c5f72ca",
|
||||
"resolved-ref": "9962cb9416f867d9ce9f409ccd6784e78c5f72ca",
|
||||
"url": "https://github.com/Predidit/flutter-webview-windows.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -2130,16 +2060,6 @@
|
||||
"source": "hosted",
|
||||
"version": "5.14.0"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32_registry",
|
||||
"sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"window_manager": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -2199,10 +2119,20 @@
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.3"
|
||||
},
|
||||
"yaml_writer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "yaml_writer",
|
||||
"sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.8.0 <4.0.0",
|
||||
"flutter": ">=3.38.4"
|
||||
"dart": ">=3.9.0 <4.0.0",
|
||||
"flutter": ">=3.38.6"
|
||||
}
|
||||
}
|
||||
|
||||
+8
-10
@@ -1,13 +1,11 @@
|
||||
{
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
i3ipc,
|
||||
lib,
|
||||
poetry-core,
|
||||
writeScript,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "kitti3";
|
||||
version = "0.5.1-unstable-2021-09-10";
|
||||
pyproject = true;
|
||||
@@ -25,12 +23,12 @@ buildPythonApplication rec {
|
||||
./kitti3-fix-build-system.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
build-system = [
|
||||
python3Packages.poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
i3ipc
|
||||
dependencies = [
|
||||
python3Packages.i3ipc
|
||||
];
|
||||
|
||||
passthru.updateScript = writeScript "update-kitti3" ''
|
||||
@@ -38,7 +36,7 @@ buildPythonApplication rec {
|
||||
#!nix-shell -i bash -p git common-updater-scripts perl tomlq
|
||||
tmpdir="$(mktemp -d)"
|
||||
trap "rm -rf $tmpdir" EXIT
|
||||
git clone --depth=1 "${src.gitRepoUrl}" "$tmpdir"
|
||||
git clone --depth=1 "${finalAttrs.src.gitRepoUrl}" "$tmpdir"
|
||||
pushd "$tmpdir"
|
||||
newVersionNumber=$(perl -ne 'print if s/version = "([\d.]+)"/$1/' pyproject.toml)
|
||||
newRevision=$(git show -s --pretty='format:%H')
|
||||
@@ -59,4 +57,4 @@ buildPythonApplication rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/driver/usb/usb_device_interface.h b/driver/usb/usb_device_interface.h
|
||||
index 238bca9..54f2f6e 100644
|
||||
--- a/driver/usb/usb_device_interface.h
|
||||
+++ b/driver/usb/usb_device_interface.h
|
||||
@@ -15,6 +15,8 @@
|
||||
#ifndef DARWINN_DRIVER_USB_USB_DEVICE_INTERFACE_H_
|
||||
#define DARWINN_DRIVER_USB_USB_DEVICE_INTERFACE_H_
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "port/array_slice.h"
|
||||
#include "port/integral_types.h"
|
||||
#include "port/status.h"
|
||||
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-mMODpQmikfXtsQvtgh26cy97EiykYNLngSjidOBt/3I=";
|
||||
})
|
||||
./fix-abseil-20250512.0.patch
|
||||
./cstdint.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,41 +2,47 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
libICE,
|
||||
libjpeg,
|
||||
libpng,
|
||||
libX11,
|
||||
libXext,
|
||||
libpng,
|
||||
libXft,
|
||||
libICE,
|
||||
pango,
|
||||
libjpeg,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmatchbox";
|
||||
version = "1.11";
|
||||
version = "1.14";
|
||||
|
||||
buildInputs = [
|
||||
libXft
|
||||
libICE
|
||||
pango
|
||||
libjpeg
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libICE
|
||||
libjpeg
|
||||
libpng
|
||||
libX11
|
||||
libXext
|
||||
libpng
|
||||
libXft
|
||||
pango
|
||||
];
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";
|
||||
sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15";
|
||||
url = "https://git.yoctoproject.org/libmatchbox/snapshot/libmatchbox-${version}.tar.gz";
|
||||
sha256 = "1b66jl178pkwmswf1gqcyrpy15rll1znz38n07l9b3ybga13w31d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Library of the matchbox X window manager";
|
||||
homepage = "http://matchbox-project.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
license = with lib.licenses; [
|
||||
lgpl2Plus
|
||||
hpnd
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,16 +27,16 @@ let
|
||||
in
|
||||
phpPackage.buildComposerProject2 rec {
|
||||
pname = "librenms";
|
||||
version = "25.10.0";
|
||||
version = "25.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librenms";
|
||||
repo = "librenms";
|
||||
tag = version;
|
||||
hash = "sha256-SzDSeWTnsXy274H2mkGIHOsW26EoL7aony7Xcb+e+h4=";
|
||||
hash = "sha256-d73izEdLWviOp0XcMbQ3goLWgLZupO4QtQv7WUxdfk8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lCDBz0+VUTlvH371WRCPBh8NFWn6BTVS6BPMQM621dE=";
|
||||
vendorHash = "sha256-34+srnXDto82xuITDSPEiNnbCgmZbijvpqpmwlszCEg=";
|
||||
|
||||
php = phpPackage;
|
||||
|
||||
@@ -103,7 +103,8 @@ phpPackage.buildComposerProject2 rec {
|
||||
substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
|
||||
substituteInPlace $out/snmp-scan.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
|
||||
|
||||
substituteInPlace $out/app/Listeners/CommandStartingListener.php --replace-fail '\App\Checks::runningUser();' '//\App\Checks::runningUser(); //removed as nix forces ownership to root'
|
||||
substituteInPlace $out/app/Listeners/CommandStartingListener.php \
|
||||
--replace-fail "! function_exists('posix_getpwuid') || ! function_exists('posix_geteuid')" "true"
|
||||
|
||||
wrapProgram $out/daily.sh --prefix PATH : ${phpPackage}/bin
|
||||
|
||||
|
||||
@@ -84,6 +84,8 @@ let
|
||||
"arm64"
|
||||
else if stdenv.hostPlatform.isx86_32 then
|
||||
"x86"
|
||||
else if (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) then
|
||||
"ppc64le"
|
||||
else
|
||||
stdenv.hostPlatform.parsed.cpu.name;
|
||||
|
||||
@@ -97,7 +99,10 @@ let
|
||||
stdenv.hostPlatform.parsed.kernel.name;
|
||||
|
||||
isGeneric =
|
||||
(stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian)
|
||||
(
|
||||
stdenv.hostPlatform.isPower
|
||||
&& !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)
|
||||
)
|
||||
|| stdenv.hostPlatform.parsed.cpu.name == "armv6l"
|
||||
|| stdenv.hostPlatform.isLoongArch64
|
||||
|| stdenv.hostPlatform.isRiscV;
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "llama-swap";
|
||||
version = "176";
|
||||
version = "182";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "mostlygeek";
|
||||
repo = "llama-swap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nfkuaiEITOmpkiLft3iNW1VUexHwZ36c8gwcQKGANbQ=";
|
||||
hash = "sha256-w/VQS8uCpgniwLiJsH/8IG/AGasRxjCv7fADTfpvWLw=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/EbFyuCVFxHTTO0UwSV3B/6PYUpudxB2FD8nNx1Bb+M=";
|
||||
vendorHash = "sha256-XiDYlw/byu8CWvg4KSPC7m8PGCZXtp08Y1velx4BR8U=";
|
||||
|
||||
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
lutris,
|
||||
}:
|
||||
|
||||
lutris.override {
|
||||
steamSupport = false;
|
||||
}
|
||||
+4
-23
@@ -1,5 +1,5 @@
|
||||
{
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
|
||||
@@ -20,25 +20,6 @@
|
||||
meson,
|
||||
ninja,
|
||||
|
||||
# check inputs
|
||||
xvfb-run,
|
||||
nose2,
|
||||
flake8,
|
||||
|
||||
# python dependencies
|
||||
certifi,
|
||||
dbus-python,
|
||||
distro,
|
||||
evdev,
|
||||
lxml,
|
||||
pillow,
|
||||
pygobject3,
|
||||
pypresence,
|
||||
pyyaml,
|
||||
requests,
|
||||
protobuf,
|
||||
moddb,
|
||||
|
||||
# commands that lutris needs
|
||||
xrandr,
|
||||
pciutils,
|
||||
@@ -79,14 +60,14 @@ let
|
||||
util-linux
|
||||
];
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lutris-unwrapped";
|
||||
version = "0.5.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
|
||||
};
|
||||
|
||||
@@ -123,7 +104,7 @@ buildPythonApplication rec {
|
||||
]);
|
||||
|
||||
# See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
certifi
|
||||
dbus-python
|
||||
distro
|
||||
@@ -87,7 +87,8 @@ stdenv.mkDerivation rec {
|
||||
install_name_tool -add_rpath ${mesa_glu.out}/lib $out/lib/magic/tcl/magicexec
|
||||
'';
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
|
||||
# gnu89 is needed for GCC 15 that is more strict about K&R style prototypes
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-implicit-function-declaration";
|
||||
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-variables";
|
||||
version = "0.2.4";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "tglman";
|
||||
repo = "mdbook-variables";
|
||||
rev = version;
|
||||
hash = "sha256-whvRCV1g2avKegfQpMgYi+E6ETxT2tQqVS2SWRpAqF8=";
|
||||
hash = "sha256-zverdL4Mrnn/8pxQk6qVyidPJNxnrmaETt+XTp64Rns=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WLHXeYNfALa7GfFAHEO9PAlFKB2lbDefgAYCn6G0U6Y=";
|
||||
cargoHash = "sha256-/zp5Qj2NUVpQqKAFgQP4QatYzg/hMJQE08ANacvNPko=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
silver-searcher,
|
||||
tree,
|
||||
man,
|
||||
lib,
|
||||
stdenv,
|
||||
git,
|
||||
pandocSupport ? true,
|
||||
pandoc ? null,
|
||||
}:
|
||||
|
||||
assert pandocSupport -> pandoc != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "memo";
|
||||
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrVanDalo";
|
||||
repo = "memo";
|
||||
rev = version;
|
||||
sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
|
||||
};
|
||||
|
||||
installPhase =
|
||||
let
|
||||
pandocReplacement =
|
||||
if pandocSupport then "pandoc_cmd=${pandoc}/bin/pandoc" else "#pandoc_cmd=pandoc";
|
||||
in
|
||||
''
|
||||
mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions}
|
||||
substituteInPlace memo \
|
||||
--replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \
|
||||
--replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \
|
||||
--replace "man_cmd=man" "man_cmd=${man}/bin/man" \
|
||||
--replace "git_cmd=git" "git_cmd=${git}/bin/git" \
|
||||
--replace "pandoc_cmd=pandoc" "${pandocReplacement}"
|
||||
mv memo $out/bin/
|
||||
mv doc/memo.1 $out/share/man/man1/memo.1
|
||||
mv completion/bash/memo.sh $out/share/bash-completion/completions/memo.sh
|
||||
mv completion/zsh/_memo $out/share/zsh/site-functions/_memo
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple tool written in bash to memorize stuff";
|
||||
longDescription = ''
|
||||
A simple tool written in bash to memorize stuff.
|
||||
Memo organizes is structured through topics which are folders in ~/memo.
|
||||
'';
|
||||
homepage = "http://palovandalo.com/memo/";
|
||||
downloadPage = "https://github.com/mrVanDalo/memo/releases";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.mrVanDalo ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "memo";
|
||||
};
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
pkgsBuildTarget,
|
||||
python,
|
||||
pkgsBuildHost,
|
||||
minijail,
|
||||
}:
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc;
|
||||
in
|
||||
|
||||
buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
format = "setuptools";
|
||||
pname = "minijail-tools";
|
||||
inherit (minijail) version src;
|
||||
@@ -28,7 +28,7 @@ buildPythonApplication {
|
||||
make libconstants.gen.c libsyscalls.gen.c
|
||||
${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \
|
||||
libconstants.gen.c libsyscalls.gen.c
|
||||
${python.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \
|
||||
${pkgsBuildHost.python3.interpreter} tools/generate_constants_json.py \
|
||||
--output constants.json \
|
||||
libconstants.gen.ll libsyscalls.gen.ll
|
||||
'';
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "3.179.0",
|
||||
"version": "3.180.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-VStFqwOut1VnspK7963VvR5tnEEmASiWxHj8riiPUCg="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-hpmuMhN2HS+4zPlTOh87A1UQvlxVKlzqHKKDm1VBLhg="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-mK+b3oCCZ098MMYQtRoXo1BuAlxz+4rtdB7EN1vDO38="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-dGe0r7ckuKkMzVkGyWaYR2PVkDtGRRhC3ievXzKs5dU="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
|
||||
"hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal",
|
||||
"hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.179.0/mirrord_mac_universal",
|
||||
"hash": "sha256-TX4DolNZE0dqZj3DFzCyDOKSBcfHK2b8vjJQ07SOtIM="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal",
|
||||
"hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpv-mpris";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoyon";
|
||||
repo = "mpv-mpris";
|
||||
rev = version;
|
||||
hash = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=";
|
||||
hash = "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4=";
|
||||
};
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
|
||||
@@ -2,11 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
pyaes,
|
||||
pycrypto,
|
||||
uvloop,
|
||||
wrapPython,
|
||||
python3Packages,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapPython ];
|
||||
pythonPath = [
|
||||
nativeBuildInputs = with python3Packages; [ wrapPython ];
|
||||
pythonPath = with python3Packages; [
|
||||
pyaes
|
||||
pycrypto
|
||||
uvloop
|
||||
@@ -36,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Async MTProto proxy for Telegram";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/alexbers/mtprotoproxy";
|
||||
platforms = python.meta.platforms;
|
||||
platforms = python3.meta.platforms;
|
||||
maintainers = [ ];
|
||||
mainProgram = "mtprotoproxy";
|
||||
};
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mycli";
|
||||
version = "1.42.0";
|
||||
version = "1.43.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbcli";
|
||||
repo = "mycli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-V8HqrhC+bVEgXlRPAZEo5KI8Bpz8qWbqd0qyLzSbSEQ=";
|
||||
hash = "sha256-KybGpi9ZNkAiniZTnyzzjlUf+xISRk+k4kcIxU/iVSM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netbird-dashboard";
|
||||
version = "2.25.0";
|
||||
version = "2.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "dashboard";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P0qTxUdyM2Ect2+GSLC0vJbAxvaLXQi1ZMFujBnGKQ0=";
|
||||
hash = "sha256-8MC3sHKs7HmxzqFw7px+Q0zX9PzzZhb4I5gcJ/fQ4uc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-RIhVSRjqzFawXaRZHAUwGodnNerGz+I3GbPFsP5qESY=";
|
||||
|
||||
@@ -68,16 +68,16 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.61.0";
|
||||
version = "0.62.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hMg7KrD6vkpEEMQButhoVE8crEODUU01Pz+ifdQ10C4=";
|
||||
hash = "sha256-u5XzTUlGhOA++dgu0yrltQ6Cxkg+P7ghTRMvT0+2Dx4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-b3Wl9jsAdYC91JM/kDo4yIF05hqbivtrcn1aRuZzP3s=";
|
||||
vendorHash = "sha256-FsSio0gn3BBMkmQ5lSzYBkK2iU13wJKo4yWIxojvQaM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
|
||||
|
||||
|
||||
+4
-9
@@ -2,15 +2,10 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix,
|
||||
python,
|
||||
matplotlib,
|
||||
networkx,
|
||||
pandas,
|
||||
pygraphviz,
|
||||
setuptools,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python.pkgs.buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
version = "1.0.5-unstable-2024-01-17";
|
||||
pname = "nix-visualize";
|
||||
pyproject = true;
|
||||
@@ -27,9 +22,9 @@ python.pkgs.buildPythonApplication {
|
||||
--prefix PATH : ${lib.makeBinPath [ nix ]}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
matplotlib
|
||||
networkx
|
||||
pandas
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nixpkgs-track";
|
||||
version = "0.3.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uncenter";
|
||||
repo = "nixpkgs-track";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NXEX2C2UhXmzyhN8jfqkv3d028axR1KIuXU94EPUmrU=";
|
||||
hash = "sha256-HycVA5Eln/9w4PC3FnULvpVXlN1HLOcWsokVLN6ReKQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AbT0r6T2+ag70zEMjN3/2AMK1DfVkLfLAbG9puchD58=";
|
||||
cargoHash = "sha256-DOQSRRY/ZR4VcHN666Sk8MhJgED61IYzBZTlc37O/M0=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
buildInputs = [ qt5.qtx11extras ];
|
||||
|
||||
# Fix build with GCC 14+: Scintilla needs cstdint for intptr_t/uintptr_t types
|
||||
# https://github.com/dail8859/NotepadNext/issues/752
|
||||
postPatch = ''
|
||||
sed -i '1i #include <cstdint>' src/scintilla/include/ScintillaTypes.h
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"src/NotepadNext.pro"
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
dnspython,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nxdomain";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0va7nkbdjgzrf7fnbxkh1140pbc62wyj86rdrrh5wmg3phiziqkb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dnspython ];
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
dependencies = with python3Packages; [ dnspython ];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
||||
postCheck = ''
|
||||
echo example.org > simple.list
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.6.43";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gkCG2SIYCF89IFi6neslvZNFyoC6PrMM2Vda/a3mc0k=";
|
||||
hash = "sha256-pjrzZhY886LjkUnbG58r9j/ynq1fjTNCCqLmCPKoeek=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-bw0f6jlA09s7Ptd8+q8RHRFZgnyE+ecsfY30XdKlyRM=";
|
||||
npmDepsHash = "sha256-useP5o3Hx9I7WY0j+idKaa4KHx2w69/Us5ezN/v2+Ns=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "opencode";
|
||||
version = "1.1.8";
|
||||
version = "1.1.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i0PYcI3qM52jcl72dqHxiBUQH5n4oBXTlxJqvWNS8CQ=";
|
||||
hash = "sha256-PZB9XsuUr8EzXDhlzM3tKANFAXc19RheIyxSXjLuZrM=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -71,7 +71,7 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-NbKp1XXTirox/UnBSn/VfLtPXnjrDJxU94MaAh22wk4=";
|
||||
outputHash = "sha256-vRIWQt02VljcoYG3mwJy8uCihSTB/OLypyw+vt8LuL8=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
dbus,
|
||||
fetchFromGitHub,
|
||||
gamescope,
|
||||
godot_4_4,
|
||||
godot_4_5,
|
||||
hwdata,
|
||||
lib,
|
||||
libGL,
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengamepadui";
|
||||
version = "0.42.3";
|
||||
version = "0.44.0";
|
||||
|
||||
buildType = if withDebug then "debug" else "release";
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ShadowBlip";
|
||||
repo = "OpenGamepadUI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sqzCGGrMxOjepi9GxJFCAY+tzuIwOgs5qYeIYKb7Y1U=";
|
||||
hash = "sha256-hVOoo6YHgGJMksVbn9PqDNQedw7Zxxrmydwxh6qVebo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
godot_4_4
|
||||
godot_4_5
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
@@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env =
|
||||
let
|
||||
versionAndRelease = lib.splitString "-" godot_4_4.version;
|
||||
versionAndRelease = lib.splitString "-" godot_4_5.version;
|
||||
in
|
||||
{
|
||||
GODOT = lib.getExe godot_4_4;
|
||||
GODOT = lib.getExe godot_4_5;
|
||||
GODOT_VERSION = lib.elemAt versionAndRelease 0;
|
||||
GODOT_RELEASE = lib.elemAt versionAndRelease 1;
|
||||
EXPORT_TEMPLATE = "${godot_4_4.export-template}/share/godot/export_templates";
|
||||
EXPORT_TEMPLATE = "${godot_4_5.export-template}/share/godot/export_templates";
|
||||
BUILD_TYPE = "${finalAttrs.buildType}";
|
||||
};
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.70.4";
|
||||
version = "2.70.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-cdaYD6PyOjgBo83eWD2+YWQj5uJzmeHDo67dlA7Pj1g=";
|
||||
hash = "sha256-w2t3IxWB8F2QXB0caTP/kTGum6zec5BRxK9+kYwAcDY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -10,29 +10,22 @@
|
||||
libpulseaudio,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
openldap,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "outfox";
|
||||
version = "0.5.0-pre042";
|
||||
version = "0.5.0-pre043";
|
||||
|
||||
src =
|
||||
{
|
||||
i686-linux = fetchurl {
|
||||
url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-14.04-32bit-i386-i386-legacy-date-20231227.tar.gz";
|
||||
hash = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-22.04-amd64-current-date-20231224.tar.gz";
|
||||
hash = "sha256-dW+g/JYav3rUuI+nHDi6rXu/O5KYiEdk/HH82jgOUnI=";
|
||||
url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-043/OutFox-alpha-0.5.0-pre-043-Final-24.04-amd64-current-date-20250907.tar.gz";
|
||||
hash = "sha256-1YN3YCcSluHBUpNRQdh0pJ9R9hTHKBuTSULTKL28OO0=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-18.04-arm64-arm64v8-modern-date-20231225.tar.gz";
|
||||
hash = "sha256-7Qrq6t8KmUSIK4Rskkxw5l4UZ2vsb9/orzPegHySaJ4=";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-14.04-arm32-arm32v7-legacy-date-20231227.tar.gz";
|
||||
hash = "sha256-PRp7kuqFBRy7nextTCB+/poc+A9AX2EiQphx6aUfT8E=";
|
||||
url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-043/OutFox-alpha-0.5.0-pre-043-Final-RaspberryPi-debian12-arm64-aarch64-current-date-20250927.tar.gz";
|
||||
hash = "sha256-/E4Keh1J3iytqaq0ziJy9F1mRR3mPbjlGto1Dbct3JM=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
@@ -48,6 +41,7 @@ stdenv.mkDerivation rec {
|
||||
libjack2
|
||||
libglvnd
|
||||
libpulseaudio
|
||||
openldap
|
||||
];
|
||||
|
||||
desktop = makeDesktopItem {
|
||||
@@ -73,14 +67,12 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Rhythm game engine forked from StepMania";
|
||||
homepage = "https://projectoutfox.com";
|
||||
changelog = "https://projectoutfox.com/releases/${version}";
|
||||
changelog = "https://github.com/TeamRizu/OutFox/releases/tag/OF5.0.0-043";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
"aarch64-linux"
|
||||
"armv7l-linux"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ maxwell-lt ];
|
||||
mainProgram = "OutFox";
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
qt6Packages,
|
||||
# nativeBuildInputs
|
||||
pkg-config,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
kdePackages,
|
||||
# buildInputs
|
||||
sqlite,
|
||||
libsecret,
|
||||
@@ -19,19 +20,26 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "5.3.2";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owncloud";
|
||||
repo = "client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HEnjtedmdNJTpc/PmEyoEsLGUydFkVF3UAsSdzQ4L1Q=";
|
||||
hash = "sha256-cqnDe9q7+qQ0MNrt48zTw6TcNYCEFgQmwXkmQCjR1Uc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/owncloud/client/commit/ef0791a727051191f0c0ff7bca78b10d5dd97e1e.patch";
|
||||
hash = "sha256-r/TlRjmnZdPWXZ8Kn/9GgcisWiF/qOO5X8m2ReooKWo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
kdePackages.extra-cmake-modules
|
||||
qt6Packages.qttools
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "photoqt";
|
||||
version = "4.9.2";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
|
||||
hash = "sha256-kPhxWekecE57wY45qLy/EnfmjFLn0cEmZ+4qWHGbL4U=";
|
||||
url = "https://photoqt.org/downloads/source/photoqt-${version}.tar.gz";
|
||||
hash = "sha256-BSe95dwzBCVp5jHIX6xh9BZ4OgPl88YUxt0iTSTnx18=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -35,13 +35,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pix";
|
||||
version = "3.4.9";
|
||||
version = "3.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "pix";
|
||||
rev = version;
|
||||
hash = "sha256-cuNggVsNNqACWttPy1Tt8MfPFQKiuYhaMnh8TTHCi74=";
|
||||
hash = "sha256-IrRE2Bv2+DZMLI48at7npcAd3TSJRuZNzU/YbNK8x3k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user