mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-30 20:00:10 +00:00
Merge staging-next into staging
This commit is contained in:
@@ -341,9 +341,8 @@ rec {
|
||||
f: g: final: prev:
|
||||
let
|
||||
fApplied = f final prev;
|
||||
prev' = prev // fApplied;
|
||||
in
|
||||
fApplied // g final prev';
|
||||
fApplied // g final (prev // fApplied);
|
||||
|
||||
/**
|
||||
Composes a list of [`overlays`](#chap-overlays) and returns a single overlay function that combines them.
|
||||
@@ -409,7 +408,7 @@ rec {
|
||||
```
|
||||
:::
|
||||
*/
|
||||
composeManyExtensions = lib.foldr (x: y: composeExtensions x y) (final: prev: { });
|
||||
composeManyExtensions = lib.foldr composeExtensions (final: prev: { });
|
||||
|
||||
/**
|
||||
Create an overridable, recursive attribute set. For example:
|
||||
@@ -510,13 +509,16 @@ rec {
|
||||
:::
|
||||
*/
|
||||
toExtension =
|
||||
let
|
||||
inherit (lib) isFunction;
|
||||
in
|
||||
f:
|
||||
if lib.isFunction f then
|
||||
if isFunction f then
|
||||
final: prev:
|
||||
let
|
||||
fPrev = f prev;
|
||||
in
|
||||
if lib.isFunction fPrev then
|
||||
if isFunction fPrev then
|
||||
# f is (final: prev: { ... })
|
||||
f final prev
|
||||
else
|
||||
|
||||
@@ -13191,6 +13191,13 @@
|
||||
githubId = 2377;
|
||||
name = "Jonathan del Strother";
|
||||
};
|
||||
jderrac = {
|
||||
email = "jeremy@derrac.fr";
|
||||
github = "jderrac";
|
||||
githubId = 1788613;
|
||||
name = "Jérémy Derrac";
|
||||
keys = [ { fingerprint = "7B18 DA58 169F AEB8 6826 D1D6 BED4 91C6 40AB 31DD"; } ];
|
||||
};
|
||||
jdev082 = {
|
||||
email = "jdev0894@gmail.com";
|
||||
github = "jdev082";
|
||||
@@ -17638,6 +17645,12 @@
|
||||
githubId = 85435692;
|
||||
name = "Maxwell Berg";
|
||||
};
|
||||
Mahdi-zarei = {
|
||||
email = "mahdi.zrei@gmail.com";
|
||||
github = "Mahdi-zarei";
|
||||
githubId = 80265960;
|
||||
name = "Mahdi";
|
||||
};
|
||||
mahe = {
|
||||
email = "matthias.mh.herrmann@gmail.com";
|
||||
github = "2chilled";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# CLIProxyAPI {#module-services-cliproxyapi}
|
||||
|
||||
[CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) exposes OAuth-based subscription CLIs (Claude Code, Codex, Gemini, Qwen, Grok, Antigravity) behind OpenAI/Gemini/Anthropic-compatible HTTP APIs.
|
||||
[CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) exposes OAuth-based subscription CLIs (Claude Code, Codex, Grok, Antigravity, Kimi, Devin, Meta) behind OpenAI/Gemini/Anthropic-compatible HTTP APIs.
|
||||
|
||||
Enable it with:
|
||||
|
||||
@@ -10,11 +10,11 @@ Enable it with:
|
||||
}
|
||||
```
|
||||
|
||||
The service runs as a dedicated `cliproxyapi` user and keeps its configuration and OAuth tokens under `/var/lib/cliproxyapi`.
|
||||
The service runs as a dedicated `cliproxyapi` user and keeps its configuration and OAuth tokens under `/var/lib/cliproxyapi`. The configuration file is regenerated from [](#opt-services.cliproxyapi.settings) at startup, which overwrites any changes made through the management API.
|
||||
|
||||
## Authentication {#module-services-cliproxyapi-authentication}
|
||||
|
||||
Provider logins use OAuth and must land in the service's `auth-dir` (`/var/lib/cliproxyapi`), which is owned by the `cliproxyapi` user. Either of the approaches below writes the token with the correct ownership, and the running service picks it up without a restart.
|
||||
Provider logins use OAuth and must land in the service's `oauth.auth-dir` (`/var/lib/cliproxyapi`), which is owned by the `cliproxyapi` user. Either of the approaches below writes the token with the correct ownership, and the running service picks it up without a restart.
|
||||
|
||||
### Management API {#module-services-cliproxyapi-authentication-management-api}
|
||||
|
||||
@@ -22,19 +22,31 @@ Set a management key in [](#opt-services.cliproxyapi.settings):
|
||||
|
||||
```nix
|
||||
{
|
||||
services.cliproxyapi.settings.remote-management.secret-key._secret =
|
||||
"/run/secrets/cliproxyapi-mgmt-key";
|
||||
services.cliproxyapi.settings.management.secret-key._secret = "/run/secrets/cliproxyapi-mgmt-key";
|
||||
}
|
||||
```
|
||||
|
||||
Then request an authentication URL for the desired provider and open it in a browser:
|
||||
Request a login URL and open it in a browser:
|
||||
|
||||
```bash
|
||||
curl -H "Authorization: Bearer <management-key>" \
|
||||
http://127.0.0.1:8317/v0/management/anthropic-auth-url
|
||||
"http://127.0.0.1:8317/v8/management/oauth/auth-url?provider=claude"
|
||||
```
|
||||
|
||||
The daemon completes the OAuth flow itself and stores the token in its `auth-dir`. Authentication endpoints are available for the `anthropic`, `codex`, `xai`, `antigravity`, and `kimi` providers.
|
||||
Other values for `provider` are `codex`, `antigravity`, `kimi`, `kimi-ai`, `xai`, `devin` and `meta`. `kimi`, `kimi-ai`, `xai` and `meta` use a device code, so the login finishes once it is approved in the browser.
|
||||
|
||||
For `claude`, `codex` and `antigravity`, the browser ends up on a `localhost` page that fails to load. Send that URL to the daemon to finish the login:
|
||||
|
||||
```bash
|
||||
curl -H "Authorization: Bearer <management-key>" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"redirect_url": "<url>"}' \
|
||||
http://127.0.0.1:8317/v8/management/oauth/callback
|
||||
```
|
||||
|
||||
Alternatively, add `is_webui=true` to the login URL request, and the daemon will listen on the callback port and finish the login itself.
|
||||
|
||||
To check on a login, query `/v8/management/oauth/status?state=<state>` with the `state` from the login URL response. It returns `wait` while the login is pending, `ok` once the token is saved and `error` if it failed.
|
||||
|
||||
### Command-line login {#module-services-cliproxyapi-authentication-cli}
|
||||
|
||||
@@ -52,4 +64,4 @@ Then run the login as the service user, pointing at the managed configuration:
|
||||
sudo -u cliproxyapi cliproxyapi -config /var/lib/cliproxyapi/config.yaml --claude-login
|
||||
```
|
||||
|
||||
Other providers use their matching flags, for example `--codex-login` or `--xai-login`. On a headless host, pass `-no-browser` to print the OAuth URL instead of launching a browser.
|
||||
Other providers have their own flags, such as `--codex-login` or `--xai-login`; see `cliproxyapi -help`. On a headless host, add `-no-browser` to print the login URL. The Claude, Codex, Antigravity and Devin logins then ask you to paste the `localhost` URL you were redirected to.
|
||||
|
||||
@@ -10,14 +10,9 @@ let
|
||||
format = pkgs.formats.yaml { };
|
||||
stateDir = "/var/lib/cliproxyapi";
|
||||
configPath = "${stateDir}/config.yaml";
|
||||
settings = {
|
||||
auth-dir = stateDir;
|
||||
}
|
||||
// cfg.settings;
|
||||
secretsReplacement = utils.genJqSecretsReplacement {
|
||||
loadCredential = true;
|
||||
} settings configPath;
|
||||
port = cfg.settings.port or 8317;
|
||||
} cfg.settings configPath;
|
||||
in
|
||||
{
|
||||
options.services.cliproxyapi = {
|
||||
@@ -26,14 +21,30 @@ in
|
||||
package = lib.mkPackageOption pkgs "cliproxyapi" { };
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = format.type;
|
||||
type = lib.types.submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
server.port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 8317;
|
||||
description = "Port on which CLIProxyAPI listens.";
|
||||
};
|
||||
oauth.auth-dir = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = stateDir;
|
||||
description = "Directory where OAuth tokens are stored.";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
host = "127.0.0.1";
|
||||
port = 8317;
|
||||
api-keys = [ { _secret = "/run/secrets/cliproxyapi-api-key"; } ];
|
||||
remote-management.secret-key._secret = "/run/secrets/cliproxyapi-management-key";
|
||||
server = {
|
||||
host = "127.0.0.1";
|
||||
port = 8317;
|
||||
};
|
||||
access.api-keys = [ { _secret = "/run/secrets/cliproxyapi-api-key"; } ];
|
||||
management.secret-key._secret = "/run/secrets/cliproxyapi-management-key";
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
@@ -54,7 +65,7 @@ in
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to open the firewall for the specified port.";
|
||||
description = "Whether to open the firewall for {option}`services.cliproxyapi.settings.server.port`.";
|
||||
};
|
||||
|
||||
user = lib.mkOption {
|
||||
@@ -142,7 +153,7 @@ in
|
||||
};
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ port ];
|
||||
allowedTCPPorts = [ cfg.settings.server.port ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -10,9 +10,11 @@
|
||||
services.cliproxyapi = {
|
||||
enable = true;
|
||||
settings = {
|
||||
host = "127.0.0.1";
|
||||
port = 8317;
|
||||
api-keys = [ { _secret = "/etc/cliproxyapi-api-key"; } ];
|
||||
server = {
|
||||
host = "127.0.0.1";
|
||||
port = 8317;
|
||||
};
|
||||
access.api-keys = [ { _secret = "/etc/cliproxyapi-api-key"; } ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -3183,7 +3183,7 @@ assertNoAdditions {
|
||||
};
|
||||
});
|
||||
|
||||
notmuch-nvim = super.notmuch-nvim.overrideAttrs {
|
||||
notmuch-nvim = super.notmuch-nvim.overrideAttrs (old: {
|
||||
checkInputs = [
|
||||
notmuch
|
||||
];
|
||||
@@ -3206,8 +3206,10 @@ assertNoAdditions {
|
||||
--replace-fail 'ffi.load("notmuch")' 'ffi.load("${notmuchLib}")'
|
||||
'';
|
||||
|
||||
meta.license = lib.licenses.mit;
|
||||
};
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
});
|
||||
|
||||
NrrwRgn = super.NrrwRgn.overrideAttrs (old: {
|
||||
meta = old.meta // {
|
||||
|
||||
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-yUrFhJa/DkAQXH/0EZ3N0axloCNtrPvaFfmJ5/bnqRg=";
|
||||
hash = "sha256-CftijAYW4hoMryxPSXfq/GffTZahAn8FeCParZcRHdM=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-2L5+MZNnBraXmX4npH1/aLlU+uBRsGEKdpAZ6kh7krc=";
|
||||
hash = "sha256-qaE5dSnOFECIK7PoJOgOYAuEqH7wEcewL5XhFaxyPu0=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-Ztzy6ZrqdhCy/bd+zAxGaq07KZBKHS4GMGTAe62Dxk8=";
|
||||
hash = "sha256-rOTO8zbsL+YrsrPhj1TN5PhQWp8y6XoJqn7z1ZJh5pw=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.283";
|
||||
version = "2.1.285";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "adscan";
|
||||
version = "13.0.0";
|
||||
version = "13.1.0";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "ADScanPro";
|
||||
repo = "adscan";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FcsxW30xmAODVvi7YUPwp+0+ETA/W4e/JrA5jZ+RXE8=";
|
||||
hash = "sha256-BmzXsbgS4gE5osU5Vt2GZrSYKOgKRkiPPoK2gurAk0I=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "credsweeper" ];
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ezratweaver";
|
||||
repo = "adw-bluetooth";
|
||||
tag = version;
|
||||
hash = "sha256-0rySzx03KeKeqtl0yrbnj/tVbpVPBAKDz+1qLQ5kZRc=";
|
||||
hash = "sha256-UQg2pEmRfTOt6QKdiL1Z86SeGYJ/zZ4XM09l7F/4+UU=";
|
||||
};
|
||||
|
||||
daemon = buildGoModule {
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
perl,
|
||||
rustPlatform,
|
||||
go,
|
||||
typescript_5,
|
||||
typescript_7,
|
||||
makeSetupHook,
|
||||
writeShellScript,
|
||||
}:
|
||||
@@ -102,7 +102,7 @@ let
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
openapi-generator-cli
|
||||
typescript_5
|
||||
typescript_7
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -1,17 +1,5 @@
|
||||
{
|
||||
"depends": [
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/63sp165yl6is029c8g5cn3550vq8pp1x-source",
|
||||
"rev": "e9f0c49b234fd4a2038b752ab02703288346ce98",
|
||||
"sha256": "1rwr4d150l0v14ccmwr13zi6fr8din1h8spivmxwkcfa66jm73j1",
|
||||
"url": "https://github.com/WyattBlue/csort/archive/e9f0c49b234fd4a2038b752ab02703288346ce98.tar.gz",
|
||||
"ref": "1.0.0",
|
||||
"packages": [
|
||||
"csort"
|
||||
],
|
||||
"srcDir": "src"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/f2xp1v0vnplwfjnk8nqsi7gd9pnb9gcv-source",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNimPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
@@ -10,6 +11,7 @@
|
||||
x264,
|
||||
dav1d,
|
||||
zlib,
|
||||
alsa-lib,
|
||||
|
||||
python3,
|
||||
python3Packages,
|
||||
@@ -17,25 +19,26 @@
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "auto-editor";
|
||||
version = "31.0.0";
|
||||
version = "31.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WyattBlue";
|
||||
repo = "auto-editor";
|
||||
tag = version;
|
||||
hash = "sha256-25xzVaG9seu4hE5rc776lvNucf8lsEDvjkQPbFzjgII=";
|
||||
hash = "sha256-N7pQQD6SVl566z3ud3yY/EFiSbIVRFWwNtlJPTPSgsI=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg-full
|
||||
lame
|
||||
lame # Upstream uses a minimal, unpackaged fork of `lame` named `lamer`.
|
||||
libopus
|
||||
x264
|
||||
dav1d
|
||||
zlib
|
||||
];
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
|
||||
|
||||
env = {
|
||||
# Nothing should be dynamically linked, as ffmpeg should already link it.
|
||||
|
||||
@@ -39,6 +39,7 @@ let
|
||||
libxcursor
|
||||
libxdmcp
|
||||
libxext
|
||||
libxfixes
|
||||
libxi
|
||||
libxinerama
|
||||
libxmu
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "certgraph";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lanrat";
|
||||
repo = "certgraph";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WlNrKmny4fODnSEkP8HUF+VzMX1/LKYMdSnm7DON8Po=";
|
||||
hash = "sha256-76OqwLGg+ZMLvY281XvRTSpOq6iLPAnLRjDs/Xee2hQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4wj96eDibGB3oX56yIr01CYLZCYMFnfoaPWaNdFH7IE=";
|
||||
vendorHash = "sha256-AvwoQffkiaK3QsV5UXO0EwFM/Y3DxVMp0brKiFD+N7I=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
4862
pkgs/by-name/ch/chuckya/gemset.nix
generated
Normal file
4862
pkgs/by-name/ch/chuckya/gemset.nix
generated
Normal file
File diff suppressed because it is too large
Load Diff
146
pkgs/by-name/ch/chuckya/missing-hashes.json
Normal file
146
pkgs/by-name/ch/chuckya/missing-hashes.json
Normal file
@@ -0,0 +1,146 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.27.7": "ff8c15b43770c8df995a7274efdb1df5553a3264bff0a42a66bc96a07fc0733a6825b4a339972d2d49fc9be9bec4ac2f4f3f072730fdedc879ce4f9cbf0b242d",
|
||||
"@esbuild/android-arm64@npm:0.27.7": "c340fffda73dfcdf3513f900403d582cbcd8a5fc4cf7abd71aa0d4945391b4c0289e4389f51616cebaac63ec652457941e3e2eefe408230521227ae128c35c9f",
|
||||
"@esbuild/android-arm@npm:0.27.7": "4abbbcb6b0f38d345b530148ebf883d3b1b7321a5c31f9c492bf645813e85afb8984c9d75295d779dbe602807b85995d9ff47ab8e8b22fa1bc67b1cbab9c45db",
|
||||
"@esbuild/android-x64@npm:0.27.7": "719956b9b7eb922a2bf92cc3df93f7f476ae37ad2976bc2185c97b93d63bd1f17b031aec41e9d9a7c3d75c83d6df8daa68191bdfa0d02f4dc39b6fafa6999fd7",
|
||||
"@esbuild/darwin-arm64@npm:0.27.7": "aefb157b95bb749ebf0cd70dd39d20c00825565a0fcc248b775b4cce6252adf694bf3e4894b25368652252139bfdc0d08b75d1139a78f197ee58ed8972cdb28d",
|
||||
"@esbuild/darwin-x64@npm:0.27.7": "898b6b02589dccb0a51655c57c407866bdb2ae5202dacce33e7d9b2f35dd117b3245f6393ffd6726373616147c3d12a462830f51da2a5cfd06e0f60cc252373e",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.7": "aaf8ebcd359f1228f5dd9d90ceca51eaa06d91570b27fa8be9da858ee124e37d45a5fed2aa4849320eb256215acf39b98623cf770ae87f0a0d50323d1acc7fbc",
|
||||
"@esbuild/freebsd-x64@npm:0.27.7": "cc7fa741cebc7041643f1fbfe45d99ce870b8ea42e9a67f4d1cf2fddeb991623619d00865427b3d6aa63ae7618f10c5635c4d047859eaba8d5c7f317d7138d44",
|
||||
"@esbuild/linux-arm64@npm:0.27.7": "b1aea26033d1de82966141b350405e1205ea04fa24707084b50992bfc9d0fbf99e0ad83a31ecd8f8cbc01101f3d92f648ce2cc24273c1e8ced573726393f9c68",
|
||||
"@esbuild/linux-arm@npm:0.27.7": "0950f67b72af73de69483363f046d6a50fc85f6491adcfeadcb6014bdc8a1731e2575fc58d6c68d6834cd6be45e0b247a23f128162864e7686accda1ada3a9d6",
|
||||
"@esbuild/linux-ia32@npm:0.27.7": "6247a3b2658de166c69099208c72ba65d8ddc5ce1575f5e8fd05d4570f3a59bfbd6a5570cfbd890e19a24258edd1b7e91cebe75e2acf182c6087297f26bba29c",
|
||||
"@esbuild/linux-loong64@npm:0.27.7": "0d7f9b60a46e95d09889365b54ea0e2fd6e471e9ceeef27a0cc6b77616b1abe275456b50eae94bed3322dc6ee17fedebc3258dcc88a5522bd5318f6def0d0642",
|
||||
"@esbuild/linux-mips64el@npm:0.27.7": "f3732fa442590b2219d2ec7de1d5086cd31682831dfc25516f2805326b4bd9f68a9fdbf3cce876ee764bf47765b85fdf22290b6a09f87a29c9d0c2d4af0a83c3",
|
||||
"@esbuild/linux-ppc64@npm:0.27.7": "df156f801042116c438c9259451e716533adec6b7d7af5c75cf27feec09ee4d941281049bf979dc0bb7a5b73b955d3974ecac4391a97600a4440a4a003b820e4",
|
||||
"@esbuild/linux-riscv64@npm:0.27.7": "76eccec1c7f047075353ef1f908998a0723f367a39aae39608f7978e5e231ea51ae25fd5258d16345567b94b77e28524cba45bc76afa5eda350adc5bda672142",
|
||||
"@esbuild/linux-s390x@npm:0.27.7": "788799f3e6e61efe6ec0a4a5e2d413dcfe57b27518d679a3d5f82265672fe53604a348658bc09b958cedaead008b63ef02e700469aed2a725e79361458901808",
|
||||
"@esbuild/linux-x64@npm:0.27.7": "77c8cc00c2f647f5a04ca6640711c6e83214a8c619aeb3de52fee36c51709d5f44becaff095ffa2d1d40d53d1a792e80a1702193c155614350cc14de23a48e81",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.7": "cffa469f49165446e82f3031d6601e977131fcf619204370b3fad1b2a4a7dbf57d52e26e146cd1550c80af27470fb016d4b519fb74e3e6947a50391f84b87935",
|
||||
"@esbuild/netbsd-x64@npm:0.27.7": "123b51f84b61f13ae916c0d7b1fa057181ded0e510f762acca178fe7fb679041a30df4f740db381afe8919d41877630ccef0a16ded46248820da0af4b967c29d",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.7": "cca5a166f47d125703451c4369bd337f08516e17aa69db17ff6822c229fcd9beb9bd29b2856c0f13d9d441178011e8c081879418f376c002f72c6aeab83576ed",
|
||||
"@esbuild/openbsd-x64@npm:0.27.7": "d9c2ca562e27331124fcddb230f5b204adfadfd87b746d8369c1c3a72fc6f6e7375684cded7ffadab6f785228d80c4a4ff2c6f593f7ce354f6d57f5b4e43c3c3",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.7": "6566b08b37e3faee6577ae43253f163ce5af22e872e30a93c08fc41e5b3525d742366b1049ba87de16c75c77abd6fce002b49b52a5a1898efb8be5eb18d8dcf3",
|
||||
"@esbuild/sunos-x64@npm:0.27.7": "589389cd4be3de5c24bb5820e4fd1f15f665b3be6b0ab6167f435776bb367e32209d6bf477bdba481195fbe515e1999c1e73adf321a8fb8400fe72052a4aef48",
|
||||
"@esbuild/win32-arm64@npm:0.27.7": "519a2c68186c2cd9f548d89f00f5aa3b5f2fa481fd03908d7b1c922de03bf20236d9fc21a3b4e83915d3611471843b41536c97d74273fb3369b2525767c278be",
|
||||
"@esbuild/win32-ia32@npm:0.27.7": "76470f36efe5290ac694e675a799a46a364aeba9a734cf10869769094b8b9022adc51fdea5869c45a8fdbfcb60ef8d787ae652c264468cdc0f4afb3869157b9c",
|
||||
"@esbuild/win32-x64@npm:0.27.7": "b4df3d0c4024f0daf0891075822718dc31d35aeb91c18c4e8ee750be69f35ebd840d184006746dd88eca0e44574e438d5ab81c614605cc707fb79cf45cf76cba",
|
||||
"@oxc-parser/binding-android-arm-eabi@npm:0.150.0": "73863947453369f2f9b7983986cda8d292dbaaa6881c216a3e2d3c12aa6e8b51df71371f32b81b748eecb31a0c81c513f8fbaacf2a268d143564d931a8b9a777",
|
||||
"@oxc-parser/binding-android-arm64@npm:0.150.0": "c41de7e4fd68441f538371e624cf753745e69b6e1e3574e761511ff5f4afe41241d75c0cc19a0677ac8bb31ef629b584b21151244a83717c7eef58357964c966",
|
||||
"@oxc-parser/binding-darwin-arm64@npm:0.150.0": "136b1ce9ff08e613d32442c50d6bd0ee6b45fc2601091664ae70c53539a2a5fac61f12b35a29cc2482e1d98e733fb325f02f6769c7cbc5e51d4a83225644e412",
|
||||
"@oxc-parser/binding-darwin-x64@npm:0.150.0": "f4fd874c15c9a6f37b4d0acc9a3ffd37813e69ecbc35a33e41db3d24c791c6302860bcce3de6f855c17d3cc7f55e71204b6fa5089fb3305332286171060892fc",
|
||||
"@oxc-parser/binding-freebsd-x64@npm:0.150.0": "504a549e48e73bc5e054eb4a16c82df38a6f1ba35e33fbf1f676cf3e3b51c1fd11f80ed9fdea9bd6d026426bdda9a962e2afbea9f79e2aa56342d180a7bd9f95",
|
||||
"@oxc-parser/binding-linux-arm-gnueabihf@npm:0.150.0": "c852755046a4fb78658e1c4d1c3e28b3ffd77fee0aea554807f00a982ca0a06fa4df4518e4719bbe2765b10bc99892e44e83dc4658b0d0261cd561ed1a6699aa",
|
||||
"@oxc-parser/binding-linux-arm-musleabihf@npm:0.150.0": "470423574411979ec017d5bcef31b8be2e35861ac239ece84c56f2183f1bf2d314f5e6d7744d42ca1257eafd1eec644f23c4d08a2782785774741cbf31ae8d61",
|
||||
"@oxc-parser/binding-linux-arm64-gnu@npm:0.150.0": "0756f92ff8c7934b21e67d72d8c1216aed04d50fd61b46e762406890550bc3497c021a1f982f9e86b5c36ca766a77361eb435efb8e6db04bb989258a874fecef",
|
||||
"@oxc-parser/binding-linux-arm64-musl@npm:0.150.0": "a7a2ddd8cf4b875368d1973893fbb44ad1f286236ddd941fadc786647c62cb32a80cfeb40905380ca5e67b33e489307de23446dfc6d87aff349f1c57ad05d184",
|
||||
"@oxc-parser/binding-linux-ppc64-gnu@npm:0.150.0": "818cd990bac1f8ad807f44ea0b9ea1fc80452633e463d57dc2ddf90177e36c95ed8e563e4bd8cfeff57e5e03ea43f004fb5f25d3fcbaa092852c5b18a643a0cc",
|
||||
"@oxc-parser/binding-linux-riscv64-gnu@npm:0.150.0": "fdd10a4ddf18b17c890c9dc72357b2a599f65220573d41c766cad5bf98ed8ee73479d2aae213d9b6eafb24792fe7e413f907666629edcc93310e3f3321f85e68",
|
||||
"@oxc-parser/binding-linux-riscv64-musl@npm:0.150.0": "1ecaa11c67b95a14d7f02275c19999d5fe050fad4604d3a44305b7e65320d5154fb1303e3f5c875fbc9b9e1153175f37d24d8287fc40a1d006d26bd00abe6d58",
|
||||
"@oxc-parser/binding-linux-s390x-gnu@npm:0.150.0": "580bd97104958737f8aca2da96fac85c4cfdaec11a54ff0a7bcf6f730cf5f166fd1d2d995150aa65de58e02612c5554a58b8b82bdf2a4a17cf902d7fb6849824",
|
||||
"@oxc-parser/binding-linux-x64-gnu@npm:0.150.0": "7c007911e43953af3a5aa9d90cc3e01e1f4451893095d1ac3f74d333725d33f0a07011de8fad321f0cba1e8be720e22a64ec24ae51bde8ab0a7f65a17f6bc40d",
|
||||
"@oxc-parser/binding-linux-x64-musl@npm:0.150.0": "01cf7f33997dfa0aa235d4adaed8e3520e5e12dfad10cd1945af7238ef69708653666ffc57358c55b3e7bb5241a64a306370cfbe218918f7b0d44b6e150023b1",
|
||||
"@oxc-parser/binding-openharmony-arm64@npm:0.150.0": "32123a8ce29efcf1711f55b4241924a3f4bdb55c6e80689a719a30d9a8b3f926e8aa1666a347a1958a5e2c2dcca0e5c672e01001cd1ae3cd5055593a2929d5fa",
|
||||
"@oxc-parser/binding-win32-arm64-msvc@npm:0.150.0": "8cc96ec818e9723cfc6c7bb485fe1cbdb33e4535fbf7b5154f6bc663a659d0b63fbeece1e1d6e7762db2dea2f69fb5488142ee6823f73410d354c2d513965efe",
|
||||
"@oxc-parser/binding-win32-ia32-msvc@npm:0.150.0": "02479fb963ebe4343e21b72dcfdf510cc24bd80f3000437a5cc1b3fcfcdd8f143cfce6d69cbe6f68add6d93a1727cd36ecb50a484a4e02625c5a576439bf26cc",
|
||||
"@oxc-parser/binding-win32-x64-msvc@npm:0.150.0": "9359c4a5c007347c3bb7173ddae628dc3b078dcb96a08bde35433d355185e3dbea154de74e8939fb07910eb5103a4c7993260e311846d98e2782711eb8f69fd6",
|
||||
"@oxfmt/binding-android-arm-eabi@npm:0.70.0": "f3aae5cb2dfb814af4dd09fbc2efcdbeb60a5d69570fe121871eed5b620f5d5fdedeea9086442835e0598ad3f36670f949c1169d42bcedf0f0fd2775dca72c81",
|
||||
"@oxfmt/binding-android-arm64@npm:0.70.0": "d0b3e1c7930f0d7da8e654a2c19e5ee87d36ea1403522380426527d840992336090d4276eff7cb4dd3f7d4abaae614a35784fe801bfdee938f50a2744eb344fc",
|
||||
"@oxfmt/binding-darwin-arm64@npm:0.70.0": "2955b64f114f31418a59df0f71f56c5251b081e28462f94490e3a1580ba2e12e9d30e2dbc4c5b94ce2c87f0395fa912aa0225831ee2b72b0d55c74edefc67941",
|
||||
"@oxfmt/binding-darwin-x64@npm:0.70.0": "a7dac0504dc44c47a1a27c98d6941fbca7f71c94ceb8c8f71f8bfcbbcdbfe112dd18eeb8c2ce8aee333dee28b30481fc6a412ea20323a75502b0ee76473e9cb5",
|
||||
"@oxfmt/binding-freebsd-x64@npm:0.70.0": "8b67a0a46c4f2f6afd3f55213e904ecddb1c1395ea6efa85c2c26c647c94fd9744ec8be102cefbc7298e721e3680465d4df83d783d59350355bdea893d1cab9f",
|
||||
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.70.0": "1630fdb3abe56983caead781f9e43e3c222b9287b0484df3b45d806d163e542294e2d261a7024f8661b10344ce0612d64ed8d2bdb803653e35ae5b60f7e7161e",
|
||||
"@oxfmt/binding-linux-arm-musleabihf@npm:0.70.0": "24bed9de838faa4f4d3e5af04174d7c0682e37934f73219dfa0750c697545ce20b53d67da7dc67d5a9d3844e61fbbd3b280bbedae45d21a731a61c52d7315ac6",
|
||||
"@oxfmt/binding-linux-arm64-gnu@npm:0.70.0": "4f4031cec1ba423d011fe5188e6fd4b8728485b8ede2825de1a7148c1e1b452e2afe5b16d1d278991d6dc126912ede4089a8be2b1343e9a9c6c041e3fc7e9525",
|
||||
"@oxfmt/binding-linux-arm64-musl@npm:0.70.0": "41d2987412f8019352815f3e8976fc84bd9573097450ae84eca646ebd305d0d93d89b8ea9e3d78fd515ad175d8cff88c49b1975f1b5b162ba4b69984dc47c043",
|
||||
"@oxfmt/binding-linux-ppc64-gnu@npm:0.70.0": "3ee0a4807da901e976a98d382247c63ff88c88fe6cafc5390bc08103c557bd2b8b844e47c99a8cbd0d06035c7ae08895fefd52f0725b4b352313253b81ae45ab",
|
||||
"@oxfmt/binding-linux-riscv64-gnu@npm:0.70.0": "d3db2e3bece08cc4f73f8d029fe3829d4f456b79195dc0e6b5b6d3bf8e2e0ab8c7faeb62d2e9e23484f168cd9dbf7498b16cad9fc6c17e87e7cf8ca76fbc251d",
|
||||
"@oxfmt/binding-linux-riscv64-musl@npm:0.70.0": "9a37759241f480602af345a6023bb81c4fc999578b099271c5b27086dea892fe3fcc141561dbda5d85b3f8e91896af766411b52cdc8dbf705cb2844b2327007c",
|
||||
"@oxfmt/binding-linux-s390x-gnu@npm:0.70.0": "83989c86afbc69646c7ecc92e3027344bf0fed55bac0086e311dd52c30ba2567546ab3d5cd5814cdf5d492963cad1ff1df7ad35f5675e3c5b8235ff791082717",
|
||||
"@oxfmt/binding-linux-x64-gnu@npm:0.70.0": "401355d3f2963632a8d8de9906cc58a96f9bd7a7fcb951f62e12da26f8197fb3a6bf9fb4f721cbd677a4242dfb0af98f2cd8e592f607d97f30cb7dd24a10c493",
|
||||
"@oxfmt/binding-linux-x64-musl@npm:0.70.0": "55202881323a5e919d8bdfe103f7b5f98cbf02932e026c77d7b1478d1d7462c1ddb0204a4d840fc5e2133848ded563b08975bca28e3e1e0bf5491a03f3ccd38b",
|
||||
"@oxfmt/binding-openharmony-arm64@npm:0.70.0": "2f113f422edd7d9925d7c494b9d99df308242247783424e72c0ffb7a575bb18cb3130697d39131729af8c3fc3b79e33e1470f4d3ac4e036adf1e30561b8f7094",
|
||||
"@oxfmt/binding-win32-arm64-msvc@npm:0.70.0": "e8df6ed14da24fdc05eaed88a75d47216d8b24d4763c08c8589e877e6528fef936024e182cb09ef5fe8908f7e8e7617f0b0cc9edeb53a2ccb007c8237595b902",
|
||||
"@oxfmt/binding-win32-ia32-msvc@npm:0.70.0": "accfc38c5dc7758e183ba8936f27fd76ac20b6f5df4f1cfb9e7d15d2beef73b04a1c331102f4be1ff1a72bced14103689dfb6c8f88580488d9bc53053ada9ff7",
|
||||
"@oxfmt/binding-win32-x64-msvc@npm:0.70.0": "808c18af1e4075f74c3d2b20f9357885a42c626b2924b3dda67f010ede59f4c2997e00040a97e9f4e8e2a459dbfba3d842cd5006162acfdab955bf279b297169",
|
||||
"@parcel/watcher-android-arm64@npm:2.6.0": "0f640015f902d28cb333c52a7c0c0dde0fd77aeaa989ca1ddd3038f408f80ea9c2a21cf180ec044ae8599e6ec6c772f853b53d8ec952992f1ba281e7db05a5b6",
|
||||
"@parcel/watcher-darwin-arm64@npm:2.6.0": "8c18d0692f64c209d61a70f054cb8dd9502519ef698730b9aaf8dc975aacc5bbc6c47f84b6ba0da1fd140aa5446673b2cfcaf79a2395951cd7889d900a37fe56",
|
||||
"@parcel/watcher-darwin-x64@npm:2.6.0": "0de8694d4f2c4c99176bbc18f667ebf3971b628306ee62b68b11df00b9aacdf1ecc54ea8ed6b54278d6dc291f1585a416c6732e8f6e696d6a6590c266a5c3c16",
|
||||
"@parcel/watcher-freebsd-x64@npm:2.6.0": "8fcfcb967b8f8116c29854cc537747fd1eaa3fe1d40e8db7bf0907ce676c8adcd3deb9272f52d46a89f5a28cd15b720fe31dc015fb638fdfe144a972dd1b3321",
|
||||
"@parcel/watcher-linux-arm-glibc@npm:2.6.0": "16af495deaf97aea2976f1c239230493f84b54bf8c9ea9a68cf163570cd342d4536eaec198e10a895c011125f3bf2c74b38a304f8d814aa78dc39a3dd462f980",
|
||||
"@parcel/watcher-linux-arm-musl@npm:2.6.0": "1df94801c5444292a30298578ae4defbd02b26a0f35354c3281159d53021f14a7a9f8f43de9e807a43fc94d847c0bbf0c2ba9651d8e04cf75f00f86417af3fcf",
|
||||
"@parcel/watcher-linux-arm64-glibc@npm:2.6.0": "c64940c318524258bb2306c00300dab263d1e0fcd63bbcde804fc048290461e8cfd1b845337c96dbfcc7f865a81f67aa1cb2ffeb61abebbba8e1fcc7c97f2b93",
|
||||
"@parcel/watcher-linux-arm64-musl@npm:2.6.0": "79d294928efe057522c8dd86ca76b13be39474830461d130e5b935acfe9262744f3e8b7995b3efc5705ec511c7b2553e7d7d226e11b00ccca942a53242782df9",
|
||||
"@parcel/watcher-linux-x64-glibc@npm:2.6.0": "b91af444351fcd8cba668326139b62e4698f0414c1882df671ce026c261d96c3de04b242787bb0f33888e81f90ceb543b35a2ec98ffc6b042be20388db224cba",
|
||||
"@parcel/watcher-linux-x64-musl@npm:2.6.0": "9aa3a06af35f81d02936b8d5ed58aa82512e2d9e1883cf45af9948dabc004cc36be8041af6948b6956dff7dded2f82459a18c7ff12e02cbc55ef63df92c96785",
|
||||
"@parcel/watcher-win32-arm64@npm:2.6.0": "36deb76930e491a58781a74ea5e2286926161cceb7087504a9d117488ca0616e70c3061d690d18a7d0b597e8c2f3714063921c1bc4b59678d8b27742e4d51c1f",
|
||||
"@parcel/watcher-win32-x64@npm:2.6.0": "6e6646f910898d13792a02e81beed0e2f09125a4ed3e6545521e9475fd672a163f020d61af4a6d3c936acf773fadeba7d3edc3fd0e75ecd47527cf0c14bc77c1",
|
||||
"@rolldown/binding-android-arm-eabi@npm:1.2.9": "1ce723761c6f6909e9f7657f3d0c157d11ab0397662679cecc46f87a5493754b05a5eacbbff8c0f21ca9f6bf6f18afb7914999e85dad926852ff6e63f98985ba",
|
||||
"@rolldown/binding-android-arm64@npm:1.2.9": "1d597c83de815f2cb2375b8c6bb291ba34fdb6cc4fbbe7ad109f0b6a41d7434f5072655b143349ec81c9bd765f130475b0895d6d0fbf5addb51a0016aa8de015",
|
||||
"@rolldown/binding-darwin-arm64@npm:1.2.9": "9be017bac93b93c0d4211cc87180a6cc00cca2e68b3857677f030fb37ba3cd9530b33f706a523c85625cfcf1121613353d392bb11ca5e841c72f7baec04ab1b7",
|
||||
"@rolldown/binding-darwin-x64@npm:1.2.9": "2c6af58173c4177145db94fc210e56c32f20255ebe6df782647e39fc4811071d03e7a25b52412ffa24bc67178c800af53fbadce92f3dfd62da901672e46c9c19",
|
||||
"@rolldown/binding-freebsd-x64@npm:1.2.9": "d6c2a208797defebe61e56b1a462a6bef90200253950f9b24f970b93cf91f7b3b0d591f5cf5f4426079cf5c9a6e5051a20d789ae2b837b1c680c2c47260aec4a",
|
||||
"@rolldown/binding-linux-arm-gnueabihf@npm:1.2.9": "99a39c7958ef1a7ba6764b288f2d9295a682d38d280ceb401165643c83c659db766ce1185d86646c84396a9acfad25b48c7e11302adc8cd53bf629c106b45a26",
|
||||
"@rolldown/binding-linux-arm64-gnu@npm:1.2.9": "9e84c6c18dde65e53fa4e8aba5d4855806b423df2453b28bc8dd15f0e48c46b7b1cd3c9992a9b88e173efca5f12283f1650468a327fe5dee968d2b1187ea66aa",
|
||||
"@rolldown/binding-linux-arm64-musl@npm:1.2.9": "7fedfcaaac962bec943e7b4da51b176aadd02631d1fcaf4880ae72365d4d868f409799cbe3f7025672bb2007a0004dd33729d986404ac1c7cc8b88215716adc2",
|
||||
"@rolldown/binding-linux-ppc64-gnu@npm:1.2.9": "dcd54975afc4f736e2b736a37158bb8eeadc58801fb40c0f3bf177d504fcea455209dd527151da7ffc818ae83327017cbd8549aee5d1eb07286049a652d79503",
|
||||
"@rolldown/binding-linux-s390x-gnu@npm:1.2.9": "a3187e4309c9a3765f83e92e099baaf978581351d9e14f9ba6cd087ceb71010c9d807c08649ddfdffc0d93ac4530abdcbfa2611cb00198fa49a1fe16ba706d7e",
|
||||
"@rolldown/binding-linux-x64-gnu@npm:1.2.9": "9fed0b83539a4e7d9ddc84d2a43194f4d3f697649a0856f342f947291ba21e7730f89f333960f0229e559f75cf752a4ea4632060b448f7a405602dd216d5035d",
|
||||
"@rolldown/binding-linux-x64-musl@npm:1.2.9": "f8fa1d238157f5c397a8426696d2907f846e3c38e9dc4eadd2d841f84cda5966c3975864cd460c3ce3a0564ab212e329cfe923d911177efe14aef612a8174c26",
|
||||
"@rolldown/binding-openharmony-arm64@npm:1.2.9": "13ac71327a28246eb9c38b458617d01ed93835ff8e17122606e718fc06e99fba4805e051b8d3786f0674ed95c0a98ec79431144e72d7452942dc17d8af4a14fc",
|
||||
"@rolldown/binding-win32-arm64-msvc@npm:1.2.9": "a2f65e085ab4c6859361b97120a8298d2edeed0650ea6f3f70cb2a1e81f0b7f4ae7a0cb002af68d68c24f0706a9a3d55fdd8d4d96d4e8f7d5b73711abdf6e5d9",
|
||||
"@rolldown/binding-win32-x64-msvc@npm:1.2.9": "6a8c186b5b9b9031bb870470f5da7fd4c9272c0e8602ceb77b6a0da78c46f82b4be6e9c34fc3723211d229e13f92d7bb30523f8195715299cee23fcf5dbd18e2",
|
||||
"@typescript/typescript-aix-ppc64@npm:7.0.2": "6135266f6e9c5928a8efd220b2ec972ecd6fa8c771dea432d2b8ffcec606aedd57b949db98ccb2a216e3fb87d4c6d42fd449258e0ee4cbda3d5994c69c5e84d2",
|
||||
"@typescript/typescript-darwin-arm64@npm:7.0.2": "c859259821baf9d7a8c1811bc1d0c0cb67b0d7fa9f99f1a3b50aa0e656a2df35c6142f77a9d2b1cd200874fd33bc3bf7ffb5cb5491d57be8e0522319ee3453f8",
|
||||
"@typescript/typescript-darwin-x64@npm:7.0.2": "4c689effd4a83b881b993903901f58d13aded3c61b2a9b6a0f8f591eeab595dbfab82930b1b2af3b1595829ead0e86c9278ea7b7f8fad47c8c76dd6b0e7fec4c",
|
||||
"@typescript/typescript-freebsd-arm64@npm:7.0.2": "3339e5cbf127f689cdd977133f903e9549afbf1c85fd12d2b61944bc8cb9cca2c18f45070066476273cb8af992591e340e9b661cbbe62c5bd4882615c2a62892",
|
||||
"@typescript/typescript-freebsd-x64@npm:7.0.2": "52b1180545def7206ac4a944b3a4bf38809b22b3816e9b0f553e87a4ecbf8e61a6039bb6bcc3a353ad0c16f90195e7ff86f25874ada409dcbbf4c4a587e40c2d",
|
||||
"@typescript/typescript-linux-arm64@npm:7.0.2": "b3873b9c64ff950230eb1d087eb2f46f7102cbf0f483b5280cb76221626833a1065e4e4dfdd99777151d03c0abde157fde73b605829343a022f3fcc6862490dc",
|
||||
"@typescript/typescript-linux-arm@npm:7.0.2": "ff6a5f61931a97dd4555c2055001c4720cd0c44e3f102ecb79998799cdf156f39884c87f096036c7a57a09a132b4b545b3830c0ca952292661170a7c10c7ae73",
|
||||
"@typescript/typescript-linux-loong64@npm:7.0.2": "7cdf90b48bf0792e6cd6f9c151bbfd1963980e50f20e73f75c27fa210ba8de65c8b69092b1dd4c6db5d86396cbe8fb5473ca2986ad45be0afc42e7dc863e5ac6",
|
||||
"@typescript/typescript-linux-mips64el@npm:7.0.2": "6c669e865878a186249631ac720126ea9a71637170cf14cf6d0aef3dfa0f496cdf8fc1a71db1ed24064b1aa612e9b902c64e53689995a0671e6b6146cc68d156",
|
||||
"@typescript/typescript-linux-ppc64@npm:7.0.2": "702ac3a57ed2e9932185b2b6a3aaeb12d50152d78b453ced55f936d442d9fd7669a5c8a81c76b44ec60201f96533aa38ad2ca80f70ea8b3e6dcbc5cc4a200208",
|
||||
"@typescript/typescript-linux-riscv64@npm:7.0.2": "ea92265112cf9320f09fcaef847c8612421cc0a907b50bbc8aa928de1a6306cdf7f4d0c1426c3e475923c99f490dc4469042b2edab3c2eff3afef8c14456650d",
|
||||
"@typescript/typescript-linux-s390x@npm:7.0.2": "dc6b678125ee4c1b81a91c64076490ec985b84e9dde9c017fbc50ec34808aefe45bf90e04c57bf9d0146ea453d71cd1543ac7c47f7a7ef77635758317d0b2173",
|
||||
"@typescript/typescript-linux-x64@npm:7.0.2": "93d1142b9099dce38f9f2b25a7c4800289c72699e93e695aba5a6923f3661720b336cdd437f4cb3d49324226b7288c606f24f32a85c8e4be5f97c523f5b27b0a",
|
||||
"@typescript/typescript-netbsd-arm64@npm:7.0.2": "b3274f1c526a20f4436b0f1167dc0e60dac5606f31491429c61439519a3f6a68fcee3a3f7f26f2fafb6557d918af75795b37d2fb6ede7b857bab772eb529140d",
|
||||
"@typescript/typescript-netbsd-x64@npm:7.0.2": "d3c15af4176791e21927d35afe4935c8a98d21509db7ecb4dd7769a02c2f983500ef6d0f1646ad614a59a748269d517604af98cbd7c3c0450bb57a12cccd7270",
|
||||
"@typescript/typescript-openbsd-arm64@npm:7.0.2": "09feda2dcbe2e3f9d31f2e98b09477158da1bb9509fe42dda2ce0b12a33b43bd31bb0caee24c6bde4c735c9d33662bcf65593ee762a2a5fee225798b5d674692",
|
||||
"@typescript/typescript-openbsd-x64@npm:7.0.2": "e29ffc0538c2843b1e731b90626b5d2855345627fbb6b2ad7ee40b8f88ed1df6f91b03cf5c227645c4fc35a18fb6ff1612de98a9b449da25042f66478e671875",
|
||||
"@typescript/typescript-sunos-x64@npm:7.0.2": "1647e487c452504c646c01e9e4a504e41c180bc09c9af7ccd2a6db23b6fedad436861de2681674793baccbbfc8970dccc85fce59a4da3d802dd67966774fc188",
|
||||
"@typescript/typescript-win32-arm64@npm:7.0.2": "26cf8934a58378a2e8467914407f2d06028ca0e211bd68403994f9b27353439d8b0935ebeb7b9a03d8768a64e444285f87756a77ce72211efeecf5239af52bc5",
|
||||
"@typescript/typescript-win32-x64@npm:7.0.2": "7f8408c4b3a58a2ef8851103c0575b97654e34c5aa0658e32be5584030f395f8a8e8a7fa87eb3afe2c794a01a0eb2e77db743c6025af57ed2915605b8e0a7c82",
|
||||
"@unrs/resolver-binding-android-arm-eabi@npm:1.12.2": "78d31e85fbbb97d43947e0dab41409de1345d1f9eb5a40b3a291ec05c50de1414a0022ec91c9934330d196f9338106bc49ca837715e9eae8c229dc30c2421984",
|
||||
"@unrs/resolver-binding-android-arm64@npm:1.12.2": "f8ef84285392f922833e60ae781fce0e0d606ddb7d9f7b673b1046ae7e341dd1f5cda5baa7e0ed41ebaa7d1125f46a52058a942e66a936609363627fb6ba1d06",
|
||||
"@unrs/resolver-binding-darwin-arm64@npm:1.12.2": "608dbb1a2a3ea564d50e12634c77cd2fa245790f3ab0682dd55cefd9458bab6297bc5afe6528028e2072381e07f4b65a6ede6466c9dbf70aecd9d8d03bf0ce58",
|
||||
"@unrs/resolver-binding-darwin-x64@npm:1.12.2": "eca4288f053800dd40036ff23f2cc138e4e48058f72893e7a41af2a37927ae4a497476afda16c32d82e88979b643f68da4bda7d4e17cd53faf56de0d28ccf032",
|
||||
"@unrs/resolver-binding-freebsd-x64@npm:1.12.2": "1b6a38ef89c642f85c86d6fdbc93074562b4db8f486ba3f623ef3e108949f7ee62b5e237054560e71acbe1d661915747c74824f0d79eecc3f08526bdd103efc5",
|
||||
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.12.2": "94e87415c3e335595ee9f73ed7fb7ba03878e84515f656a72d039806a23801749406172e886bce06d6ad2af4fa49aa328f96608b5bf1fa345a96f5b4b6b0c63d",
|
||||
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.12.2": "3270d2c551fb3364db42a1ea1d215c226923904957ea793a4e10f8fae7609446581714e1c624ffe22d59af8309d0ebe50fc5b3c2388c502215e354dd7a50bc86",
|
||||
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.12.2": "28008225537106ba502ff38eaf140edd1eb96f6a5c580cb608f66f13454c588511686118894d507aa4f8311d35a68f44e0e28a31be51d5ace82cd899a5023f7f",
|
||||
"@unrs/resolver-binding-linux-arm64-musl@npm:1.12.2": "f904329e483fd29a69f9ce45b240b39cb9dcb0eed85ca730ea47b029ffe0f45d366a69f0ede28a9fa310e9c8ebd714f90e0de041a685801727a85ae73c0e2977",
|
||||
"@unrs/resolver-binding-linux-loong64-gnu@npm:1.12.2": "a70e01e9a1661b379710e12cb7a1bf66e47b0bacfeb28ec98d41446e3e622a22d7bafcc7a79bcfdba232d02ef4fa6d6d70023782fc0429b8e69d5fb2a45b851e",
|
||||
"@unrs/resolver-binding-linux-loong64-musl@npm:1.12.2": "7d479e515449b9ee3e315ed752f742f43d73308ab173e625fdca46b5c5f74db4c934fda1d71471b1160ac6899c095ca9e9b77934755130900bc49288c7b094c6",
|
||||
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.12.2": "27fca56c2ba1c3e83186a5e5fb25294acfec8236ec87ebe92ca558047483d0c54760cf8571e0680081abfa395e8fcde177bd40eb1c86ec71cce08e6cf339f801",
|
||||
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.12.2": "b72c979acfedfb9f3dfe4127754d8e385a4358eb1277372b253be82e30b14723e6b0125cca298027c2a5cadda79a58259c7ba99466e2a85ae2b44537549f0b29",
|
||||
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.12.2": "ebd42e17022db356ed79aa9ef654b4943704abb7493d341c20f97aad14ac95d0dc754dcfa7d44309a41215963178aa5e7ab3853c4873847d02cdc931e392dc0d",
|
||||
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.12.2": "4d3b19693df4864087791b815cfee10bbfe81078744fd9f69c07b2420053828264b541ac66c4d5665be866dfda9f365d6fe65664c77208e79467cee3624ed6ab",
|
||||
"@unrs/resolver-binding-linux-x64-gnu@npm:1.12.2": "290e0c59a96cc7e940fd203828027953c6bf5f946bc2961526fae68a839d41595bf0232d31271d54cb2c2427f2eefa12dbbe06d5fc294f289d471b8ee481fd99",
|
||||
"@unrs/resolver-binding-linux-x64-musl@npm:1.12.2": "c466cc2f1687acc8aebf6e34b83bb32c18d0a3c15321724c1547f9543ba4ad89282c2fdb44afe878ff4061e5321dbd760ba0161b06a17cead498209a8e7cbbd1",
|
||||
"@unrs/resolver-binding-openharmony-arm64@npm:1.12.2": "87aaeb0aa1a62cc4dc1cbe5f1cf05902870eda80bb10f0dae65dd341dbad782dd5fb79430cc4a5140e4d0b4ced6828310bc97a28527fa89243f736c7685b3b38",
|
||||
"@unrs/resolver-binding-wasm32-wasi@npm:1.12.2": "b9ecd9336f631c1664589e0a354e71b3747ec4d7efba1382967e10cc56750aeac8a12db133d3992286de9fbbd1c26df581651a52c4e597f33b21b3eb2fcc634a",
|
||||
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.12.2": "ba009d8326e6712b539fb7357eb5fbdbfff55d100c06f65c0af5880f3928a1707f3cf7ac8d55eb75adb5ae6811de77eff7cd50c8f8b59bd48766b1137fadc33e",
|
||||
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.12.2": "467322fec2622b9b89ccd744bc66cab7931e15d44b933f972238b034d4f3cf1b4aa7584a74f865bfd2a87201ce401fadbcd0ecf0670e76ca5f14feb148db3475",
|
||||
"@unrs/resolver-binding-win32-x64-msvc@npm:1.12.2": "4fb01c3d900099b0a4a8367c4d6084b7ac493746682a6284c713d188eee628c7fba856e46a893f50c012b5c7ad6bcc7d49dc3c97fb7ae14dc49bfbaa0ccbdf35",
|
||||
"lightningcss-android-arm64@npm:1.33.0": "46c40a0474a7a9ddcdc33e0ea634912894a9360b6ba6f2bc42f1a817d16992784d2fe6f421d293a90ea94fb481503e27fdc54f0540de0b41d7028fe9e9c9e56a",
|
||||
"lightningcss-darwin-arm64@npm:1.33.0": "398b770e33f66db9e4c14e4a45d0e93fa59644bd29ce5082de79ee9560a5946321ac55e896aa7fb3f177d218bef3f2dca530e209a857f0f066bf3296f5dc0742",
|
||||
"lightningcss-darwin-x64@npm:1.33.0": "132bdab8f7b66dc99730f1ccfcb882880e411420e3f9ca764c348c686112d75962d5d7e928f3bbce7088c1be168d00ea8d722fd909033b807eef191b5a2832c0",
|
||||
"lightningcss-freebsd-x64@npm:1.33.0": "05001395776e994ea1254dcc2613f06b44458ba33769e3a1679a0f577e43632af378cc1582f3bd1cb36e480d237066a371bc04233d6c84f8e2fe9979ab4a4032",
|
||||
"lightningcss-linux-arm-gnueabihf@npm:1.33.0": "d0f6d993846992cf6db80f2992d0b89ffddd65a8260bbe6a1534bde28510bcfa214e8831df9ccfef5ede006a6368de1649e1d96a3e122169286647b704e08f5f",
|
||||
"lightningcss-linux-arm64-gnu@npm:1.33.0": "278a5c553e15ed7645d3e83a3b1515060e98a8742b7008af28d610d6495a09368e73ed8b90bcb537b37249bfc2446ef5b9614b3626222f25153c538909488548",
|
||||
"lightningcss-linux-arm64-musl@npm:1.33.0": "7aa2a2ef42e8c713e6e8eb947bf64d5272c6fdbfca7b4eb3adde555357652be27cc0d84d6fef6266543c2d303943a4c4472679d1e258458119b159f0ca868ffe",
|
||||
"lightningcss-linux-x64-gnu@npm:1.33.0": "fa57a09af3340dc5f11fdbff820fbb7b08e306e69350a500b523c88f54c1e3a40b3785fed6043d69e2e18bacd4b72410518c9b817ee987c704a80851d9201e45",
|
||||
"lightningcss-linux-x64-musl@npm:1.33.0": "4b0cad846f8fbe4ec321a45ef9c0d02cf4277980ac34dcfc7b422b34381e7cb11512819401b01bf029d10aa0fb8a35906ce850ba38d9f43605917ccc9b0b5d4a",
|
||||
"lightningcss-win32-arm64-msvc@npm:1.33.0": "5e4b58d7a41fe3c37ce2af7b1a95c3722a6064a84fb6286ba2cf1106651223403b5a5863ecd3eb8fb9732480e612e30d786b859329391b0197dffc88ca18c953",
|
||||
"lightningcss-win32-x64-msvc@npm:1.33.0": "7beb4c8580f9ea45fea6d92a8de42f706c4935b2ca68f4f5163a2bd9f6ed1574f7e53686e4927883078b07a4063a9fffdc4b41968568354259066c7a70c156a4"
|
||||
}
|
||||
47
pkgs/by-name/ch/chuckya/package.nix
Normal file
47
pkgs/by-name/ch/chuckya/package.nix
Normal file
@@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
applyPatches,
|
||||
mastodon,
|
||||
|
||||
patches ? [ ],
|
||||
gemset ? ./gemset.nix,
|
||||
yarnMissingHashes ? ./missing-hashes.json,
|
||||
yarnHash ? "sha256-1kdslAHO6goCo6GwU3zPpaN6Zx9nXEXuxF3E35Xzcac=",
|
||||
}:
|
||||
|
||||
let
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheEssem";
|
||||
repo = "mastodon";
|
||||
rev = "a7610aa2b86ffdcabc86008cca4234f135f642bd";
|
||||
hash = "sha256-c786uMkC0fEj3h4FKTGzz+GADUOfWCfTziLOCM0xWSI=";
|
||||
};
|
||||
inherit patches;
|
||||
};
|
||||
in
|
||||
|
||||
(mastodon.override {
|
||||
pname = "chuckya";
|
||||
version = "0-unstable-2026-09-25";
|
||||
|
||||
srcOverride = src;
|
||||
|
||||
inherit gemset yarnMissingHashes yarnHash;
|
||||
}).overrideAttrs
|
||||
{
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
|
||||
# needed for nix-update
|
||||
inherit src;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Close-to-upstream soft fork of Mastodon Glitch Edition";
|
||||
homepage = "https://github.com/TheEssem/mastodon";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ defelo ];
|
||||
};
|
||||
}
|
||||
17
pkgs/by-name/ch/chuckya/update.sh
Executable file
17
pkgs/by-name/ch/chuckya/update.sh
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update common-updater-scripts gnused bundix yarn-berry_4.yarn-berry-fetcher nixfmt
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
pkgdir="pkgs/by-name/ch/chuckya"
|
||||
|
||||
nix-update chuckya --src-only --version=branch --override-filename "$pkgdir/package.nix"
|
||||
|
||||
# tags haven't been created since 2017, so it doesn't make sense to use this one as the base version
|
||||
sed -i -E 's/version = "1\.2\.2-unstable/version = "0-unstable/' "$pkgdir/package.nix"
|
||||
|
||||
src="$(nix-build --no-out-link -A chuckya.src)"
|
||||
bundix --lockfile="$src/Gemfile.lock" --gemfile="$src/Gemfile" --gemset="$pkgdir/gemset.nix"
|
||||
nixfmt "$pkgdir/gemset.nix"
|
||||
yarn-berry-fetcher missing-hashes "$src/yarn.lock" > "$pkgdir/missing-hashes.json"
|
||||
update-source-version chuckya --source-key=mastodonModules.yarnOfflineCache --ignore-same-version --file="$pkgdir/package.nix"
|
||||
@@ -9,11 +9,9 @@
|
||||
ninja,
|
||||
lit,
|
||||
z3,
|
||||
sv-lang_10, # update sv-lang version here according to upstream requirements
|
||||
fmt,
|
||||
boost,
|
||||
mimalloc,
|
||||
gitUpdater,
|
||||
callPackage,
|
||||
versionCheckHook,
|
||||
|
||||
@@ -24,15 +22,16 @@
|
||||
let
|
||||
pythonEnv = python3.withPackages (ps: [ ps.psutil ]);
|
||||
circt-llvm = callPackage ./circt-llvm.nix { };
|
||||
circt-sv-lang = callPackage ./sv-lang.nix { };
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "circt";
|
||||
version = "1.147.0";
|
||||
version = "1.160.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
tag = "firtool-${finalAttrs.version}";
|
||||
hash = "sha256-rtnvahI7EzUJXE80X3XPWjjDD/6f9BPmZ7S97Lstuhw=";
|
||||
hash = "sha256-KWh1z2Pvf+BVyzv6+ruaQRAULrIX9T1WjnIhpuTjzNc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -55,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
fmt
|
||||
mimalloc
|
||||
sv-lang_10
|
||||
circt-sv-lang
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -112,6 +111,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
patchShebangs tools/circt-test
|
||||
|
||||
# Keep the self-contained TableGen tests compatible with nixpkgs' lit.
|
||||
substituteInPlace test/Tools/circt-tblgen/self-contained/self_contained_td_format.py \
|
||||
--replace-fail \
|
||||
'timeout = test.config.maxIndividualTestTime or None' \
|
||||
'timeout = getattr(test.config, "maxIndividualTestTime", None)'
|
||||
|
||||
# Replace slang references to match the package in nixpkgs
|
||||
substituteInPlace \
|
||||
lib/Tools/circt-verilog-lsp-server/VerilogServerImpl/CMakeLists.txt \
|
||||
@@ -169,10 +174,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "firtool-";
|
||||
};
|
||||
updateScript = ./update.sh;
|
||||
llvm = circt-llvm;
|
||||
sv-lang = circt-sv-lang;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
68
pkgs/by-name/ci/circt/sv-lang.nix
Normal file
68
pkgs/by-name/ci/circt/sv-lang.nix
Normal file
@@ -0,0 +1,68 @@
|
||||
# CIRCT depends on a specific sv-lang revision, so pin it separately from nixpkgs' sv-lang.
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
boost,
|
||||
catch2_3,
|
||||
cmake,
|
||||
ninja,
|
||||
fmt,
|
||||
llvmPackages,
|
||||
mimalloc,
|
||||
python3,
|
||||
tomlplusplus,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "circt-sv-lang";
|
||||
version = "11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MikePopoloski";
|
||||
repo = "slang";
|
||||
rev = "44dc55f99b9c64971893013e7931e643fbedcf23";
|
||||
hash = "sha256-tKse5rV5kHZmCOb8Zb8k4bOw4wN3pDfY5exdpva57bU=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
python3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Needed for the wrapped clang-scan-deps to find the C++20 module headers.
|
||||
llvmPackages.clang-tools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
catch2_3
|
||||
fmt
|
||||
mimalloc
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tomlplusplus
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Keep installation paths compatible with the CIRCT build.
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
|
||||
(lib.cmakeBool "SLANG_INCLUDE_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "SLANG_USE_SYSTEM_TOMLPLUSPLUS" true)
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "SystemVerilog compiler and language services pinned for CIRCT";
|
||||
homepage = "https://github.com/MikePopoloski/slang";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
71
pkgs/by-name/ci/circt/update.sh
Executable file
71
pkgs/by-name/ci/circt/update.sh
Executable file
@@ -0,0 +1,71 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=. -i bash -p bash coreutils gnugrep jq gnused nix nix-prefetch-git nix-prefetch-github common-updater-scripts
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
REPO_ROOT="$(realpath "$ROOT/../../../..")"
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
# Make the checkout available to the nested Nix invocations as well.
|
||||
export NIX_PATH="nixpkgs=$REPO_ROOT${NIX_PATH:+:$NIX_PATH}"
|
||||
|
||||
attrPath="${UPDATE_NIX_ATTR_PATH:-circt}"
|
||||
|
||||
# CIRCT publishes firtool releases as firtool-<version> Git tags. Find the
|
||||
# highest version rather than relying on the ordering returned by GitHub.
|
||||
latestVersion=$(
|
||||
list-git-tags --url=https://github.com/llvm/circt.git |
|
||||
sed -n 's/^firtool-//p' |
|
||||
sort --version-sort |
|
||||
tail -n1
|
||||
)
|
||||
currentVersion="${UPDATE_NIX_OLD_VERSION:-$(nix-instantiate --eval --strict --raw -A "$attrPath.version" .)}"
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "CIRCT is up to date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "updating CIRCT from $currentVersion to $latestVersion"
|
||||
update-source-version "$attrPath" "$latestVersion"
|
||||
|
||||
# Build only the updated source derivation so its CMakeLists.txt can tell us
|
||||
# which exact slang revision this CIRCT release expects.
|
||||
src=$(nix-build --no-out-link -A "$attrPath.src")
|
||||
|
||||
# CMakeLists.txt contains several FetchContent declarations and therefore
|
||||
# several GIT_TAG lines. First isolate the declaration for the slang repository,
|
||||
# then extract its nearby GIT_TAG. The tag may be followed by a comment or end
|
||||
# immediately after the revision.
|
||||
slangRev=$(
|
||||
grep -A5 "https://github.com/MikePopoloski/slang" "$src/CMakeLists.txt" |
|
||||
sed -nE 's/.*GIT_TAG[[:space:]]+([0-9a-f]{40}).*/\1/p' |
|
||||
head -n1
|
||||
)
|
||||
if [[ -z "$slangRev" ]]; then
|
||||
echo "failed to find slang GIT_TAG in $src/CMakeLists.txt" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Prefetch slang independently because CIRCT's source hash does not cover
|
||||
# FetchContent dependencies when CIRCT uses a system-provided slang package.
|
||||
slangHash=$(
|
||||
nix-prefetch-github MikePopoloski slang --rev "$slangRev" |
|
||||
jq --exit-status --raw-output .hash
|
||||
)
|
||||
currentSlangRev=$(nix-instantiate --eval --strict --raw -A "$attrPath.passthru.sv-lang.src.rev" .)
|
||||
currentSlangHash=$(nix-instantiate --eval --strict --raw -A "$attrPath.passthru.sv-lang.src.outputHash" .)
|
||||
|
||||
# Keep the private sv-lang override synchronized with the revision declared by
|
||||
# CIRCT without changing the version of nixpkgs' general sv-lang package.
|
||||
if [[ "$currentSlangRev" != "$slangRev" || "$currentSlangHash" != "$slangHash" ]]; then
|
||||
echo "updating slang from $currentSlangRev to $slangRev"
|
||||
sed -i \
|
||||
-e "s|$currentSlangRev|$slangRev|" \
|
||||
-e "s|$currentSlangHash|$slangHash|" \
|
||||
"$ROOT/sv-lang.nix"
|
||||
else
|
||||
echo "slang is up to date: $slangRev"
|
||||
fi
|
||||
@@ -1,62 +1,61 @@
|
||||
{
|
||||
"version": "2.1.283",
|
||||
"version": "2.1.285",
|
||||
"manifestSignatureEnforcement": "flag",
|
||||
"commit": "4631ccd7cfe41e69bc72d3b5b9dc7282536e4985",
|
||||
"modsCommit": "684ffc4da0eaaddcafa61842dc719c6a8febc5c2",
|
||||
"buildDate": "2026-09-25T01:40:44Z",
|
||||
"commit": "afb212976052ab038df25d5e871f6c049e094d3b",
|
||||
"modsCommit": "dec92bc87ab6fe9c7be0fcba1f97966f902dd243",
|
||||
"buildDate": "2026-09-29T01:46:59Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude.zst",
|
||||
"checksum": "485d6883c023368800626e0d1f2e4382c3e1bdc760fae12cb2f6e3054f218eec",
|
||||
"size": 75461598,
|
||||
"checksum": "37ef7ca4ef6486c44b8f88b41af4f269ba8322c7dd8a62261e54e3271f56a6a0",
|
||||
"size": 74510936,
|
||||
"bundle": {
|
||||
"checksum": "f22ac793e83fbaa4ec74a1194c98c4f9c8cd808cfa2a238aecb561a342420b3e",
|
||||
"size": 75465975
|
||||
"checksum": "c793e6a936a0afe77ee4b0b36abb463e7a54c696cf6f27ef3aa10e2ead33f806",
|
||||
"size": 74521855
|
||||
}
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude.zst",
|
||||
"checksum": "2ac2ccd98433c2727de1b7142dd808f355e7764fa573ab891666f496a3a669ee",
|
||||
"size": 79614241,
|
||||
"checksum": "cd31b4ba8368bac728fdf75de6654df8f47d2023cd3cd16da49b429ae4d24648",
|
||||
"size": 78669066,
|
||||
"bundle": {
|
||||
"checksum": "7a9ef7b6b7ccdb343c3c2c160efc1984bda9f9f446bca97603008cfdfe99835f",
|
||||
"size": 79613206
|
||||
"checksum": "59130413242ea7f3290ac59919cf9586473d8bc9837fc4928c204ae30b83cc12",
|
||||
"size": 78670967
|
||||
}
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude.zst",
|
||||
"checksum": "7ff80952f5cf74fa593432ec19fc7bef1b4461b365092fe2b6c6060d4fbad1ec",
|
||||
"size": 84571156
|
||||
"checksum": "df8bb286ad870d8db316fc6c8b34932598c1127d14f739d1fc995610204eb4d2",
|
||||
"size": 83619189
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude.zst",
|
||||
"checksum": "94345861e88be3d67a8393494f98f5b1c67604c14ccd4ef3c7a51e3643fa25eb",
|
||||
"size": 85309419
|
||||
"checksum": "e88a8b40ed5a7e9213bf5047f5b12c360c33387b1bc36cf79ddbff0a3a40121c",
|
||||
"size": 84348572
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude.zst",
|
||||
"checksum": "12ab758aca002744a1364328536d0b30d510707262d9eb116390a14b269a3c79",
|
||||
"size": 82977461
|
||||
"checksum": "1e86f455cbd30439ec4a4a38768e2d84e5be327827e2ec7f5c9c87b04b8f53ab",
|
||||
"size": 82026156
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude.zst",
|
||||
"checksum": "118b07bbe50b9ca5ab303ed070fb5d065696c413ae62f9dc1c8f64f2c9d824ec",
|
||||
"size": 83744817
|
||||
"checksum": "c436b04d973f0db928dd2321f34206de90a48e6a23aa486a6b69e5cac574d5b1",
|
||||
"size": 82790392
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe.zst",
|
||||
"checksum": "b201734251f1d6470a65453192422d1b03d6f3a5c1365b43dc7d2b65cd135233",
|
||||
"size": 87607368
|
||||
"checksum": "5004d3bee5263ee011dcffcc28c837e40989808301f0b8bf64c3aa3d9b0ab8f1",
|
||||
"size": 86659568
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe.zst",
|
||||
"checksum": "302ac016e1f3487b87945596388d38cf9b2974597375ec24447278d5019e7c6e",
|
||||
"size": 83948914
|
||||
"checksum": "7067da6d07b9d78d2a75ae40f53c5764066953a853b83b8c1053dc35a9a6b323",
|
||||
"size": 82994951
|
||||
}
|
||||
},
|
||||
"sdkCompat": {
|
||||
"testedWrapperVersions": [
|
||||
"0.3.243",
|
||||
"0.3.245",
|
||||
"0.3.246",
|
||||
"0.3.247",
|
||||
@@ -85,7 +84,8 @@
|
||||
"0.3.277",
|
||||
"0.3.278",
|
||||
"0.3.280",
|
||||
"0.3.281"
|
||||
"0.3.281",
|
||||
"0.3.282"
|
||||
],
|
||||
"harnessSchema": 1
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -10,13 +11,13 @@ buildGoModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "cliproxyapi";
|
||||
version = "7.3.10";
|
||||
version = "8.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "router-for-me";
|
||||
repo = "CLIProxyAPI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pKguqvvQA1IVIE4f3qQbZ8VOWEcY4evkyacyYt36+T8=";
|
||||
hash = "sha256-CQ4kjO8XaGdVGFkO9MvbPMO9PrO3sTKCN706mbzOj9g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r3yWkdMcM40G9jV7MxW/qNv3E9WrHavFilW24quEf+8=";
|
||||
@@ -39,7 +40,10 @@ buildGoModule (finalAttrs: {
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) cliproxyapi; };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Proxy that provides OpenAI/Gemini/Claude/Codex/Grok compatible API interfaces";
|
||||
|
||||
107
pkgs/by-name/cu/cups-brother-hll2310d/package.nix
Normal file
107
pkgs/by-name/cu/cups-brother-hll2310d/package.nix
Normal file
@@ -0,0 +1,107 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
makeWrapper,
|
||||
perl,
|
||||
gnused,
|
||||
ghostscript,
|
||||
file,
|
||||
coreutils,
|
||||
gnugrep,
|
||||
which,
|
||||
}:
|
||||
|
||||
let
|
||||
arches = [
|
||||
"x86_64"
|
||||
"i686"
|
||||
"armv7l"
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
ghostscript
|
||||
file
|
||||
gnused
|
||||
gnugrep
|
||||
coreutils
|
||||
which
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cups-brother-hll2310d";
|
||||
version = "4.0.0-1";
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
makeWrapper
|
||||
autoPatchelfHook
|
||||
];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.brother.com/pub/com/linux/linux/packages/hll2310dpdrv-${finalAttrs.version}.i386.deb";
|
||||
hash = "sha256-g+ny6rTqiBXIPWEUnHqdXdXpRd4V8Ibs3VLmfsx1QbQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
dpkg-deb -x $src $out
|
||||
|
||||
# delete unnecessary files for the current architecture
|
||||
''
|
||||
+ lib.concatMapStrings (arch: ''
|
||||
echo Deleting files for ${arch}
|
||||
rm -r "$out/opt/brother/Printers/HLL2310D/lpd/${arch}"
|
||||
'') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches)
|
||||
+ ''
|
||||
|
||||
# bundled scripts don't understand the arch subdirectories for some reason
|
||||
ln -s \
|
||||
"$out/opt/brother/Printers/HLL2310D/lpd/${stdenv.hostPlatform.linuxArch}/"* \
|
||||
"$out/opt/brother/Printers/HLL2310D/lpd/"
|
||||
|
||||
# Fix global references and replace auto discovery mechanism with hardcoded values
|
||||
substituteInPlace $out/opt/brother/Printers/HLL2310D/lpd/lpdfilter \
|
||||
--replace /opt "$out/opt" \
|
||||
--replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/HLL2310D\"; #" \
|
||||
--replace "PRINTER =~" "PRINTER = \"HLL2310D\"; #"
|
||||
|
||||
# Make sure all executables have the necessary runtime dependencies available
|
||||
find "$out" -executable -and -type f | while read file; do
|
||||
wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}"
|
||||
done
|
||||
|
||||
# Symlink filter and ppd into a location where CUPS will discover it
|
||||
mkdir -p $out/lib/cups/filter
|
||||
mkdir -p $out/share/cups/model
|
||||
|
||||
ln -s \
|
||||
$out/opt/brother/Printers/HLL2310D/lpd/lpdfilter \
|
||||
$out/lib/cups/filter/brother_lpdwrapper_HLL2310D
|
||||
|
||||
ln -s \
|
||||
$out/opt/brother/Printers/HLL2310D/cupswrapper/brother-HLL2310D-cups-en.ppd \
|
||||
$out/share/cups/model/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother HL-L2310D printer driver";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = map (arch: "${arch}-linux") arches;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=fr&lang=fr&prod=hll2310d_us_eu_as&os=128";
|
||||
maintainers = [ lib.maintainers.jderrac ];
|
||||
};
|
||||
})
|
||||
@@ -17,6 +17,7 @@
|
||||
zstd,
|
||||
lcms2,
|
||||
lld,
|
||||
vulkan-loader,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
# Test deps
|
||||
@@ -177,10 +178,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=npm::lock_file_lock_write"
|
||||
"--skip=happy_eyeballs::tests::test_parallel_second_wins"
|
||||
|
||||
# GPU access
|
||||
"--skip=js_unit_tests::webgpu_test"
|
||||
"--skip=js_unit_tests::jupyter_test"
|
||||
|
||||
# Use of /usr/bin
|
||||
"--skip=specs::permission::proc_self_fd"
|
||||
|
||||
@@ -267,6 +264,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--zsh <($out/bin/deno completions zsh)
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} $out/bin/deno
|
||||
'';
|
||||
|
||||
doInstallCheck = canExecute;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "depot-cli";
|
||||
version = "2.102.9";
|
||||
version = "2.102.14";
|
||||
|
||||
__structuredAttrs = true;
|
||||
__darwinAllowLocalNetworking = true;
|
||||
@@ -19,7 +19,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "depot";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SBsNhg4r9FuqLvXBBg7AAX8rVrqGSc527GxwPG1r02Y=";
|
||||
hash = "sha256-9/XgZKG4amV04Mu9SPDVszsfAngDaCbRn+kZlu7fnKo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VCd0qdEmjuTB5HvQ9jEVoKKSKJpPxQ7iHOFQoifPIgY=";
|
||||
|
||||
@@ -51,17 +51,18 @@
|
||||
# passthru
|
||||
testers,
|
||||
nix-update-script,
|
||||
xvfb-run,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dolphin-emu";
|
||||
version = "2606a";
|
||||
version = "2609"; # Please backport to stable for netplay compat
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-TAIxBEGbbYvoOi+dukr2Hij0J/NL9Iy6pcgf2bhEgI8=";
|
||||
hash = "sha256-mylUTwDBIOIdGKCdA64RSqioTVc9f6oTP5WHAVtkH9w=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@@ -184,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "dolphin-emu-nogui --version";
|
||||
command = "${lib.getExe xvfb-run} dolphin-emu --version";
|
||||
inherit (finalAttrs) version;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -44,15 +44,15 @@ let
|
||||
hash = "sha256-xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5";
|
||||
version = "5.1.22";
|
||||
version = "5.1.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-t0Xn15su7nij9ll7EbQeIC75ScSwCoPOgPtTbuP4xN8=";
|
||||
repo = finalAttrs.pname;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5RDLAUqIOQiDt8CsMFXof8Y7F79Reyhpv7tcW57uw+Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.py;
|
||||
@@ -119,4 +120,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ poscat ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firecrawl-cli";
|
||||
version = "1.23.3";
|
||||
version = "1.24.6";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "firecrawl";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2BPD48hnJpUPppV57lDRjHQNh6t+QEsOU4tOepUtyc4=";
|
||||
hash = "sha256-5CULHaMxRq1HCZo37z8CGfkBQ5oQG/6fF77zQM8xv+E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-R59OM/4zZF3+JGMG3URe60I+Vs5x9WPeQfuZjuHDodc=";
|
||||
hash = "sha256-1FMIhCzAZqBOSWMbplsBswSlNwm8HPo2zWY7q3jGDJU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "forecast";
|
||||
version = "0-unstable-2026-07-17";
|
||||
version = "0-unstable-2026-09-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "forecast";
|
||||
rev = "22a7de05c4bdaa4a4fa33f51091eb681d021f90e";
|
||||
hash = "sha256-z0WYytAEZ1PaO5yyh+iDbJOSPZmnKV503HUZTpQPUXw=";
|
||||
rev = "5e4d33ebe06eae86612213c1cd153b3de0cbeb05";
|
||||
hash = "sha256-ESjZ1N/tZxJ44DE0YBOqxboU4QQCxYymzYmJ6J/DCxM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ=";
|
||||
cargoHash = "sha256-S27A8pn+mrbUmuo5Wd1C9R9r6UxGFAAL9od6tpsBWPY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
doxygen,
|
||||
eigen,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fmt,
|
||||
graphviz,
|
||||
gts,
|
||||
@@ -62,13 +61,13 @@ in
|
||||
freecad-utils.makeCustomizable (
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freecad";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeCAD";
|
||||
repo = "FreeCAD";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RP68rd19wX4gDD5PuRQ1J4Z9Qmp5HpEg6sC94RRMEdI=";
|
||||
hash = "sha256-VB2jxacRtpLeVaCMuHqGDzNZKx5wqOJXYlbJEpDXB70=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -106,16 +105,6 @@ freecad-utils.makeCustomizable (
|
||||
]
|
||||
++ pythonDeps;
|
||||
|
||||
patches = [
|
||||
./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
|
||||
(fetchpatch {
|
||||
# https://github.com/FreeCAD/FreeCAD/pull/30899
|
||||
# fix COIN3D_MICRO_VERSION regex for coin 4.0.10
|
||||
url = "https://github.com/FreeCAD/FreeCAD/commit/e3e56059865849c6b1c85161f69183ad872414e3.patch";
|
||||
hash = "sha256-qe0wn7DwvQT/pmrSCa44+orMetztpw8DZ+NhDJEYAMw=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \
|
||||
--replace-fail 'self.gmsh_bin = ""' 'self.gmsh_bin = "${lib.getExe gmsh}"'
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGo127Module (finalAttrs: {
|
||||
pname = "gh";
|
||||
version = "2.101.0";
|
||||
version = "2.102.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -18,10 +18,10 @@ buildGo127Module (finalAttrs: {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EoKF2m5sZP+uQ5AVOKkFqSCACfkeUc7vnH8PHWCO6FE=";
|
||||
hash = "sha256-txjOmo46nwRxIutYR/lnFgYEWZpkbWC/ilrMAfTaFZc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4KYQBgMNc/sI0mbcXSfJ7A/77VAS6NM8TOzQ3w7AlK8=";
|
||||
vendorHash = "sha256-hsG6wc7AfgPZhkWwO8Xzu4yR54Rp5+Z6yeTjwnI9S+o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gptcommit";
|
||||
version = "0.5.17";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zurawiki";
|
||||
repo = "gptcommit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw=";
|
||||
hash = "sha256-gMu59i/Gx6NINMnX2OMHjOsRnz6mE13dEci8YJFlm+M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PFpc9z45k0nlWEyjDDKG/U8V7EwR5b8rHPV4CmkRers=";
|
||||
cargoHash = "sha256-t+rlUBUndj1iM4Y7K03zfDEOC5Z0KEWcOcurv5SKJ3c=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
@@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-QUGDJyTnD5MuBUMlc4PZOZSAfevVUB6QbncVyXIAgb8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# GCC 16 moved `std::__throw_bad_alloc` to `<bits/new_throw.h>`
|
||||
(fetchpatch {
|
||||
url = "https://github.com/GrapheneOS/hardened_malloc/commit/04a25bd141efcd2c0d29ef7d868b205a844b3ad2.patch";
|
||||
hash = "sha256-+FBjnGnjs1nyN/zu0Gf0bIv7RHEDscevDsFkvb1/A20=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
# these tests cover use as a build-time-linked library
|
||||
checkTarget = "test";
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imgbrd-grabber";
|
||||
version = "7.13.0";
|
||||
version = "7.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bionus";
|
||||
repo = "imgbrd-grabber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7EIXmqfTADG95vxKU1cFGnzZD3NJJN28HOF71YZD6nI=";
|
||||
hash = "sha256-HvbbUZTyrT+3aZLSNk8I34gg7p4crfauHE3qC065+AI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -17,20 +17,20 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "iptvnator";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "4gray";
|
||||
repo = "iptvnator";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JHEiazpC4rbbUELn7m2koVFXr6XzNJCCZt/s+AVtc24=";
|
||||
hash = "sha256-WcWvMBpJWrQsqvI40YOocS1seEXyiGkXwH9RiTdTVog=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-Gs10M9mejtfKf/uBw+ojx726EMBRWQGByUQvjrUu3PM=";
|
||||
hash = "sha256-7Z6TyZ0krE/0okcURf8sVVO//4xxMj/11EZKS0IwNns=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
withOpenCL ? true,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
libxcrypt-legacy,
|
||||
# include non-free ClamAV unrar code
|
||||
enableUnfree ? false,
|
||||
replaceVars,
|
||||
@@ -65,6 +66,8 @@ stdenv.mkDerivation {
|
||||
configureFlags = [
|
||||
"--disable-native-tests"
|
||||
"--with-systemwide"
|
||||
"LDFLAGS=-L${libxcrypt-legacy}/lib"
|
||||
"CPPFLAGS=-I${libxcrypt-legacy}/include"
|
||||
]
|
||||
++ lib.optionals (!enableUnfree) [ "--without-unrar" ];
|
||||
|
||||
@@ -77,6 +80,7 @@ stdenv.mkDerivation {
|
||||
zlib
|
||||
libpcap
|
||||
re2
|
||||
libxcrypt-legacy
|
||||
]
|
||||
++ lib.optionals withOpenCL [
|
||||
opencl-headers
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kbld";
|
||||
version = "0.49.1";
|
||||
version = "0.49.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carvel-dev";
|
||||
repo = "kbld";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YjyBuB/CG/ocPOl2/P9fpXa1JTJPnRR5uRLyMbLrIJg=";
|
||||
hash = "sha256-BMiT/JNlny2Gla/6sw63nBSqqLvaBJ8Rvr11cj/4vDQ=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
3
pkgs/by-name/ln/lnkparse/package.nix
Normal file
3
pkgs/by-name/ln/lnkparse/package.nix
Normal file
@@ -0,0 +1,3 @@
|
||||
{ python3Packages }:
|
||||
|
||||
python3Packages.toPythonApplication python3Packages.lnkparse3
|
||||
@@ -30,6 +30,9 @@ in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = srcOverride;
|
||||
|
||||
mastodonGems = bundlerEnv {
|
||||
|
||||
@@ -14,16 +14,16 @@ buildGoLatestModule (finalAttrs: {
|
||||
__structuredAttrs = true;
|
||||
|
||||
pname = "matcha";
|
||||
version = "0.44.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "floatpane";
|
||||
repo = "matcha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y1YEnqTCmf+CMKpv3wN4SZsN+lUuv3T8pKmM+zu1Ipw=";
|
||||
hash = "sha256-3RBwPxSlyqiDzJQmvP09kQqF/l5CuyUogEDsBvsrps0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cg6R4WtDORwZlo+P16rN6qc0zZMOPtnr4VyQKV9Q2nM=";
|
||||
vendorHash = "sha256-InWPQrhWZ6Q/mtIed8eH2cp7sYbdxiWY+fxQ50D4UYg=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.161.0";
|
||||
version = "1.162.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gtTgILfGLYL0ASNz6m8MJhAidQ7kTGqdiMNP6R8bH5Q=";
|
||||
hash = "sha256-hDsbD0FU3fXR5mLRyoIP4qCC4pJKUu/js1Xe7je7DDo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-PHaFsLVUpeMSgHMg05blJUNgycDLbZUiZkWSPjDT1CM=";
|
||||
hash = "sha256-BYDW01vrtifxfrFw+bayhAkwXXqzOx7jMd7zHBPnHbA=";
|
||||
};
|
||||
|
||||
build-system =
|
||||
|
||||
@@ -23,6 +23,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-DioS90ecNOEryE7zVddu3ov2S3ylTRtLxe+Zmw2hkmM=";
|
||||
|
||||
# grammars generated by older tree-sitter bundle an array.h that breaks strict aliasing
|
||||
# https://codeberg.org/mergiraf/mergiraf/issues/761
|
||||
# https://github.com/tree-sitter/tree-sitter/commit/5177b3dc26f135d975add115ce4c6a206c5e6416
|
||||
env.NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
jujutsu
|
||||
|
||||
@@ -186,11 +186,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta;
|
||||
version = "154.0.4258.37";
|
||||
version = "154.0.4258.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-xvopdHM5kTIbRsQGS3hc3sWhTYzd0YK8X9oFfjfnYD0=";
|
||||
hash = "sha256-uaC6R/AjO04yZuYWMLJRFAZ/olNh32MYLIiqqKQiuY4=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -296,12 +296,12 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta;
|
||||
version = "154.0.4258.37";
|
||||
uuid = "f7dec597-801d-4c4b-ae51-c8a53c78925c";
|
||||
version = "154.0.4258.48";
|
||||
uuid = "1522ce6b-7a1f-4297-b0c5-b4b4da1e237e";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/${finalAttrs.uuid}/MicrosoftEdge-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-R385aGFby0WK64wxHGCbKnDymsUIG+lzTpQfVO2NBgA=";
|
||||
hash = "sha256-ByDzUQVSqmPp+Nc3bp1KV+P0IUOESs+Be/fymxR1o4E=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -18,13 +18,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpd-touch-screen-gui";
|
||||
version = "unstable-2022-12-30";
|
||||
version = "0-unstable-2022-12-30";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muesli4";
|
||||
repo = "mpd-touch-screen-gui";
|
||||
rev = "156eaebede89da2b83a98d8f9dfa46af12282fb4";
|
||||
sha256 = "sha256-vr/St4BghrndjUQ0nZI/uJq+F/MjEj6ulc4DYwQ/pgU=";
|
||||
hash = "sha256-vr/St4BghrndjUQ0nZI/uJq+F/MjEj6ulc4DYwQ/pgU=";
|
||||
};
|
||||
patches = [
|
||||
# Fixes build with gcc15. See: https://github.com/muesli4/mpd-touch-screen-gui/pull/15
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "msedgedriver";
|
||||
version = "154.0.4258.37";
|
||||
version = "154.0.4258.48";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -28,9 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_${driverArch}.zip";
|
||||
hash =
|
||||
{
|
||||
mac64_m1 = "sha256-6nwe/vRPh5MkQLTiZNXepfFsLtILwoK925mgLCUUVNg=";
|
||||
mac64 = "sha256-p/cnNKQub6sSEWPz2fJ+FoU7rgzeoZQMkv3PphvvHLw=";
|
||||
linux64 = "sha256-XbOQl9FyckF3Qybb+40474ImJDKahBkekPoydf/TxV0=";
|
||||
mac64_m1 = "sha256-qY3DxrmrM1QlOJC+PLX8jDO6Y2OOGoKxtKHOFygQop0=";
|
||||
mac64 = "sha256-Gwj0C+SLXnHFamG9iKYmBFgUtxzUmomcxuAW5G+O92Y=";
|
||||
linux64 = "sha256-anRg15o6RDWikhxIZtHGP08qyqsXeBln9SHkdj10ARg=";
|
||||
}
|
||||
.${driverArch};
|
||||
stripRoot = false;
|
||||
|
||||
48
pkgs/by-name/oc/octodns/providers/porkbun/package.nix
Normal file
48
pkgs/by-name/oc/octodns/providers/porkbun/package.nix
Normal file
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
octodns,
|
||||
oinker,
|
||||
pytest-cov-stub,
|
||||
pytest-randomly,
|
||||
pytestCheckHook,
|
||||
uv-build,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "octodns-porkbun";
|
||||
version = "0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "major";
|
||||
repo = "octodns-porkbun";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RDYP0hF8nnG8lzeaWxfLXiG+mNDt+wf7yDfNMl6kDE0=";
|
||||
};
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
dependencies = [
|
||||
octodns
|
||||
oinker
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytest-randomly
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "octodns_porkbun" ];
|
||||
|
||||
meta = {
|
||||
description = "Porkbun DNS provider for octoDNS";
|
||||
homepage = "https://github.com/major/octodns-porkbun";
|
||||
changelog = "https://github.com/major/octodns-porkbun/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ philocalyst ];
|
||||
platforms = lib.platforms.all;
|
||||
teams = [ lib.teams.octodns ];
|
||||
};
|
||||
})
|
||||
@@ -77,14 +77,14 @@ let
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-qWZuOpolZAr7EZlAgfVx8nw8axoOMauoXwcqiJUGu24=";
|
||||
outputHash = "sha256-3QJzASZSJfWqbFpbxzIQ/ZRRaFX8KAF4Jd2BI6v9e+s=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.18.31";
|
||||
version = "1.18.33";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q0DYH5GHQGZ6ICyMR5rWq86DvfWpQERGZeLYTJb7cj0=";
|
||||
hash = "sha256-x1ZG4/zsL1/EfpelNByRMi5mSHumXfmoq/LPQ3+jhrc=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pdfcpu";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdfcpu";
|
||||
repo = "pdfcpu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-thbm0QgIP5ANPz+Fp9At5zhTOsVOjUCvIGRltmEDjsI=";
|
||||
hash = "sha256-aOU4biSZObEr62FPvyr0RCYR4yEvbST132dbPHNNC5E=";
|
||||
# Apparently upstream requires that the compiled executable will know the
|
||||
# commit hash and the date of the commit. This information is also presented
|
||||
# in the output of `pdfcpu version` which we use as a sanity check in the
|
||||
@@ -38,7 +38,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Yc9wrsnExS6+bA9uqioEik2qFLiMJhsokD1LPwCqLY=";
|
||||
vendorHash = "sha256-OcS5pMV6dVx8VkDH4Lkks88OBRN/Rd8gjldtMnCl124=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
}:
|
||||
haskellPackages.mkDerivation rec {
|
||||
pname = "pshash";
|
||||
version = "0.1.21.0";
|
||||
version = "0.1.23.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thornoar";
|
||||
repo = "pshash";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EQBd1X0TpIjGPl7S7Vp15oK2L3LpAXoIrM1ezUWiRQA=";
|
||||
hash = "sha256-zGpJRv4KBo+LIGRKaUP5lt+RVg8yr7wVq3yqnXTr4wQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
810
pkgs/by-name/re/renode-unstable/deps.json
generated
810
pkgs/by-name/re/renode-unstable/deps.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,38 +1,35 @@
|
||||
{
|
||||
dotnetCorePackages,
|
||||
fetchFromGitHub,
|
||||
renode,
|
||||
lib,
|
||||
renode,
|
||||
writeShellScript,
|
||||
}:
|
||||
|
||||
let
|
||||
normalizedVersion =
|
||||
v:
|
||||
let
|
||||
parts = lib.splitString "-" v;
|
||||
result = builtins.head parts;
|
||||
in
|
||||
result;
|
||||
nugetDeps = map dotnetCorePackages.fetchNupkg (lib.importJSON ./deps.json);
|
||||
in
|
||||
renode.overrideAttrs (old: rec {
|
||||
pname = "renode-unstable";
|
||||
version = "1.16.1-unstable-2026-04-29";
|
||||
renode.overrideAttrs (
|
||||
finalAttrs: old: {
|
||||
pname = "renode-unstable";
|
||||
version = "1.17.0-unstable-2026-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renode";
|
||||
repo = "renode";
|
||||
rev = "67b2b9ce5e6162e60b4b46a21e0e5b696a3cdb45";
|
||||
hash = "sha256-MPcSEijyfC49l96G7y220eljpEdz03uv9LrDm/LXHA0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "renode";
|
||||
repo = "renode";
|
||||
rev = "c69f1a823e565d8f713ad669e48cc1e2ae7a2680";
|
||||
hash = "sha256-la+xH6a0sJPIPdqGQwPAH9TyW/NAo/CU3B0lyTrmlL0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
buildInputs = lib.subtractLists old.passthru.nugetDeps old.buildInputs ++ nugetDeps;
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's/AssemblyVersion("%VERSION%.*")/AssemblyVersion("${normalizedVersion version}.0")/g' src/Renode/Properties/AssemblyInfo.template
|
||||
sed -i 's/AssemblyInformationalVersion("%INFORMATIONAL_VERSION%")/AssemblyInformationalVersion("${src.rev}")/g' src/Renode/Properties/AssemblyInfo.template
|
||||
mv src/Renode/Properties/AssemblyInfo.template src/Renode/Properties/AssemblyInfo.cs
|
||||
'';
|
||||
|
||||
passthru = old.passthru // {
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
})
|
||||
passthru = old.passthru // {
|
||||
inherit nugetDeps;
|
||||
fetch-deps = writeShellScript "${finalAttrs.finalPackage.name}-fetch-deps" ''
|
||||
exec ${old.passthru.fetch-deps} "''${1:-${toString ./deps.json}}"
|
||||
'';
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
810
pkgs/by-name/re/renode/deps.json
generated
810
pkgs/by-name/re/renode/deps.json
generated
File diff suppressed because it is too large
Load Diff
@@ -22,12 +22,19 @@ let
|
||||
"aarch64"
|
||||
else
|
||||
throw "renode: unsupported host architecture ${stdenv.hostPlatform.system}";
|
||||
rid = dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system;
|
||||
llvmDisasLib =
|
||||
if stdenv.hostPlatform.isAarch64 then "libllvm-disas-aarch64.so" else "libllvm-disas.so";
|
||||
|
||||
targetFramework = "net10.0";
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_10_0;
|
||||
|
||||
resources = fetchFromGitHub {
|
||||
owner = "renode";
|
||||
repo = "renode-resources";
|
||||
rev = "d3d69f8f17ed164ee23e46f0c06844a69bf4c004";
|
||||
hash = "sha256-wR3heL58NOQLENwCzL4lPM4KuvT/ON7dlc/KUqrlRjg=";
|
||||
rev = "14b80cde0a136b684f316eb7f6a31aeaae0684bf";
|
||||
hash = "sha256-OdRNcvFnpAMGnxIYH9brmHKREVp3gICqGjM3sJC1SEI=";
|
||||
};
|
||||
|
||||
pythonLibs =
|
||||
@@ -38,6 +45,7 @@ let
|
||||
pyyaml
|
||||
requests
|
||||
tkinter
|
||||
telnetlib3
|
||||
|
||||
# from tools/csv2resd/requirements.txt
|
||||
construct
|
||||
@@ -65,15 +73,15 @@ let
|
||||
];
|
||||
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "renode";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renode";
|
||||
repo = "renode";
|
||||
rev = "d66b0c2aa3d420408eccecfd1d3bab0fd702a6db";
|
||||
hash = "sha256-HQaMo3qsZvD4uBIsGzyKpTO7gaxjVvurI91pm1UXvjc=";
|
||||
rev = "ab721d88e135a1bcb8ed2ecc5a38f51cbe61fdd2";
|
||||
hash = "sha256-vVd1ZTz5+iuKjZh7gxgVvX496+FrTxVSV+3neWUy9/Y=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -83,43 +91,51 @@ buildDotnetModule rec {
|
||||
dotnet-sdk
|
||||
];
|
||||
|
||||
projectFile = "Renode_NET.sln";
|
||||
projectFile = "src/Renode/Renode.csproj";
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_10_0;
|
||||
inherit dotnet-sdk dotnet-runtime;
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
patches = [ ./renode-test.patch ];
|
||||
|
||||
dotnetFlags = [ "-p:TargetFrameworks=net10.0" ];
|
||||
dotnetFlags = [
|
||||
"-p:Architecture=${hostArch}"
|
||||
"-p:Version=${lib.head (lib.splitString "-" finalAttrs.version)}"
|
||||
"-p:InformationalVersion=${finalAttrs.version}+git${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's/AssemblyVersion("%VERSION%.*")/AssemblyVersion("${version}.0")/g' src/Renode/Properties/AssemblyInfo.template
|
||||
sed -i 's/AssemblyInformationalVersion("%INFORMATIONAL_VERSION%")/AssemblyInformationalVersion("${src.rev}")/g' src/Renode/Properties/AssemblyInfo.template
|
||||
mv src/Renode/Properties/AssemblyInfo.template src/Renode/Properties/AssemblyInfo.cs
|
||||
'';
|
||||
dotnetInstallFlags = [ "-p:TargetFramework=${targetFramework}" ];
|
||||
|
||||
installPath = "${placeholder "out"}/lib/renode";
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/dotnet/roslyn/issues/37379#issuecomment-513371985
|
||||
cat << EOF > Directory.Build.props
|
||||
cat << 'EOF' > Directory.Build.props
|
||||
<Project>
|
||||
<ItemGroup>
|
||||
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
|
||||
</ItemGroup>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
EOF
|
||||
|
||||
cat << EOF > Directory.Build.targets
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>${targetFramework}</TargetFrameworks>
|
||||
<EnableWindowsTargeting>true</EnableWindowsTargeting>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
EOF
|
||||
|
||||
patchShebangs build.sh tools/
|
||||
|
||||
# Fixes determinism build error
|
||||
sed -i 's/AssemblyVersion("1.0.*")/AssemblyVersion("1.0.0.0")/g' lib/AntShell/AntShell/Properties/AssemblyInfo.cs lib/CxxDemangler/CxxDemangler/Properties/AssemblyInfo.cs
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gcc
|
||||
];
|
||||
|
||||
runtimeDeps = [
|
||||
gtk3
|
||||
];
|
||||
@@ -132,50 +148,61 @@ buildDotnetModule rec {
|
||||
mkdir -p lib/resources
|
||||
ln -s ${resources}/* lib/resources/
|
||||
|
||||
mkdir output
|
||||
mv src/Infrastructure/src/Emulator/Cores/linux-properties.csproj output/properties.csproj
|
||||
sed -i "s#/usr/bin/gcc#${gcc}/bin/gcc#g" output/properties.csproj
|
||||
sed -i "s#/usr/bin/ar#${gcc}/bin/ar#g" output/properties.csproj
|
||||
pushd tools/building
|
||||
./check_weak_implementations.sh
|
||||
popd
|
||||
|
||||
# To fix value "" error in element <Import>
|
||||
rm -rf src/Directory.Build.targets
|
||||
CORES_PATH="$PWD/src/Infrastructure/src/Emulator/Cores"
|
||||
NATIVE_CORES_BUILD_PATH="$CORES_PATH/obj/Release/${rid}"
|
||||
NATIVE_CORES_BIN_PATH="$CORES_PATH/bin/Release/${rid}"
|
||||
mkdir -p "$NATIVE_CORES_BIN_PATH"
|
||||
|
||||
CORES=(arm.le arm.be arm64.le arm-m.le arm-m.be ppc.le ppc.be ppc64.le ppc64.be i386.le x86_64.le riscv.le riscv64.le sparc.le sparc.be xtensa.le)
|
||||
for core_config in ''${CORES[@]}
|
||||
do
|
||||
''
|
||||
+ lib.optionalString (hostArch == "i386") ''
|
||||
mkdir -p "$NATIVE_CORES_BUILD_PATH/virt"
|
||||
pushd "$NATIVE_CORES_BUILD_PATH/virt"
|
||||
cmake -DCMAKE_BUILD_TYPE=Release "$CORES_PATH/virt"
|
||||
cmake --build . -j$NIX_BUILD_CORES
|
||||
cp -v *.so "$NATIVE_CORES_BIN_PATH/"
|
||||
popd
|
||||
|
||||
''
|
||||
+ ''
|
||||
CORES=(arm.le arm.be arm64.le arm-m.le arm-m.be ppc.le ppc.be ppc64.le ppc64.be i386.le x86_64.le riscv.le riscv64.le sparc.le sparc.be xtensa.le arm-experimental.le)
|
||||
for core_config in "''${CORES[@]}"; do
|
||||
CORE="$(echo $core_config | cut -d '.' -f 1)"
|
||||
ENDIAN="$(echo $core_config | cut -d '.' -f 2)"
|
||||
BITS=32
|
||||
|
||||
if [[ $CORE =~ "64" ]]; then
|
||||
if [[ $CORE =~ "64" || $CORE =~ ^arm-experimental ]]; then
|
||||
BITS=64
|
||||
fi
|
||||
|
||||
SOURCE="${src}/src/Infrastructure/src/Emulator/Cores"
|
||||
CMAKE_CONF_FLAGS="-DTARGET_ARCH=$CORE -DTARGET_WORD_SIZE=$BITS -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$out/lib"
|
||||
CORE_DIR=build/$CORE/$ENDIAN
|
||||
mkdir -p $CORE_DIR
|
||||
pushd $CORE_DIR
|
||||
|
||||
CMAKE_CONF_FLAGS="-DTARGET_ARCH=$CORE -DTARGET_WORD_SIZE=$BITS -DCMAKE_BUILD_TYPE=Release"
|
||||
if [[ $ENDIAN == "be" ]]; then
|
||||
CMAKE_CONF_FLAGS+=" -DTARGET_WORDS_BIGENDIAN=1"
|
||||
CMAKE_CONF_FLAGS+=" -DTARGET_WORDS_BIGENDIAN=1"
|
||||
fi
|
||||
|
||||
cmake $CMAKE_CONF_FLAGS -DHOST_ARCH=${hostArch} $SOURCE
|
||||
CORE_DIR="$NATIVE_CORES_BUILD_PATH/$CORE/$ENDIAN"
|
||||
mkdir -p "$CORE_DIR"
|
||||
pushd "$CORE_DIR"
|
||||
cmake $CMAKE_CONF_FLAGS -DHOST_ARCH=${hostArch} "$CORES_PATH"
|
||||
cmake --build . -j$NIX_BUILD_CORES
|
||||
cp -v tlib/*.so "$NATIVE_CORES_BIN_PATH/"
|
||||
popd
|
||||
done
|
||||
|
||||
mkdir -p src/Infrastructure/src/Emulator/Cores/bin/Release/lib
|
||||
ln -s $out/lib/*.so src/Infrastructure/src/Emulator/Cores/bin/Release/lib
|
||||
mkdir -p output/bin/Release/platform-lib
|
||||
cp -r "$CORES_PATH/bin/Release/." output/bin/Release/platform-lib
|
||||
cp lib/resources/llvm/${llvmDisasLib} output/bin/Release/platform-lib/${rid}/libllvm-disas.so
|
||||
|
||||
unset version versionForDotnet
|
||||
'';
|
||||
|
||||
dotnetInstallFlags = [ "-p:TargetFramework=net10.0" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf build output/properties.csproj
|
||||
find . -type d -name obj -exec rm -rf {} +
|
||||
mkdir -p $out/lib/renode
|
||||
cp -r output/bin/Release/platform-lib $out/lib/renode/
|
||||
|
||||
rm -rf output
|
||||
find . -type d \( -name bin -o -name obj \) -prune -exec rm -rf {} +
|
||||
mv * .renode-root $out/lib/renode
|
||||
|
||||
makeWrapper "$out/lib/renode/renode-test" "$out/bin/renode-test" \
|
||||
@@ -195,7 +222,7 @@ buildDotnetModule rec {
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/renode/renode/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/renode/renode/blob/${finalAttrs.src.rev}/CHANGELOG.rst";
|
||||
description = "Virtual development framework for complex embedded systems";
|
||||
downloadPage = "https://github.com/renode/renode";
|
||||
homepage = "https://renode.io";
|
||||
@@ -209,4 +236,4 @@ buildDotnetModule rec {
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,28 +1,18 @@
|
||||
diff --git a/renode-test b/renode-test
|
||||
index 0f8f8d0..1fdfe23 100755
|
||||
--- a/renode-test
|
||||
+++ b/renode-test
|
||||
@@ -5,22 +5,17 @@ set -u
|
||||
@@ -5,14 +5,11 @@
|
||||
# this is to support running renode-test from an external directory and via a symlink
|
||||
ROOT_PATH="$(cd $(dirname $(readlink -f $0 2>/dev/null || echo $0)); echo $PWD)"
|
||||
|
||||
-TESTS_FILE="$ROOT_PATH/tests/tests.yaml"
|
||||
-TESTS_RESULTS="$ROOT_PATH/output/tests"
|
||||
|
||||
-
|
||||
. "${ROOT_PATH}/tools/common.sh"
|
||||
|
||||
set +e
|
||||
STTY_CONFIG=`stty -g 2>/dev/null`
|
||||
-$PYTHON_RUNNER -u "`get_path "$ROOT_PATH/tests/run_tests.py"`" --exclude "skip_${DETECTED_OS}" --exclude "skip_host_${DETECTED_ARCH}" --properties-file "`get_path "$ROOT_PATH/output/properties.csproj"`" -r "`get_path "$TESTS_RESULTS"`" -t "`get_path "$TESTS_FILE"`" "$@"
|
||||
+$PYTHON_RUNNER -u "`get_path "$ROOT_PATH/tests/run_tests.py"`" --exclude "skip_${DETECTED_OS}" -r $(pwd) --runner=dotnet "$@"
|
||||
-$PYTHON_RUNNER -u "`get_path "$ROOT_PATH/tests/run_tests.py"`" --exclude "exclude_${DETECTED_OS}" --exclude "exclude_host_${DETECTED_ARCH}" --skip "skip_${DETECTED_OS}" -r "`get_path "$TESTS_RESULTS"`" -t "`get_path "$TESTS_FILE"`" "$@"
|
||||
+$PYTHON_RUNNER -u "`get_path "$ROOT_PATH/tests/run_tests.py"`" --exclude "exclude_${DETECTED_OS}" --exclude "exclude_host_${DETECTED_ARCH}" --skip "skip_${DETECTED_OS}" --robot-framework-remote-server-full-directory "`get_path "$ROOT_PATH"`" -r "`get_path "$PWD"`" "$@"
|
||||
RESULT_CODE=$?
|
||||
|
||||
set -e
|
||||
if [ -n "${STTY_CONFIG:-}" ]
|
||||
then
|
||||
- # SIGTTOU might be sent when trying to change the terminal settings when "renode-test" runs in the background so trap the signal.
|
||||
- trap "" SIGTTOU
|
||||
stty "$STTY_CONFIG"
|
||||
- trap - SIGTTOU
|
||||
fi
|
||||
exit $RESULT_CODE
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
# Pinned to Python 3.12 because future-1.0.0 is not supported for Python 3.13:
|
||||
# error: future-1.0.0 not supported for interpreter python3.13
|
||||
python312Packages,
|
||||
python3Packages,
|
||||
}:
|
||||
python312Packages.buildPythonApplication (finalAttrs: {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sccmhunter";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
@@ -17,11 +15,11 @@ python312Packages.buildPythonApplication (finalAttrs: {
|
||||
hash = "sha256-aWZx5KfsuhyT08OmYFHKVO8Sr9g5WHXpKLpijo2TAPI=";
|
||||
};
|
||||
|
||||
build-system = with python312Packages; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python312Packages; [
|
||||
dependencies = with python3Packages; [
|
||||
cmd2
|
||||
cryptography
|
||||
impacket
|
||||
@@ -44,7 +42,7 @@ python312Packages.buildPythonApplication (finalAttrs: {
|
||||
description = "Post exploitation tool to identify and attack SCCM related assets in an Active Directory domain";
|
||||
homepage = "https://github.com/garrettfoster13/sccmhunter";
|
||||
changelog = "https://github.com/garrettfoster13/sccmhunter/blob/${finalAttrs.src.tag}/changelog.md";
|
||||
license = lib.licenses.mit;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "sccmhunter.py";
|
||||
maintainers = with lib.maintainers; [ purpole ];
|
||||
};
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sonic-server";
|
||||
version = "1.7.4";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valeriansaliou";
|
||||
repo = "sonic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-T+t9zEOUZ/5yBG1M4sok+jXh9qiIeL1Rq8Dj7ppa3uk=";
|
||||
hash = "sha256-MCcYqA1Yoo9ntLISUpsf+3V9oIdcLVdSapEh8tlDLAE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dmmwklL+KTSgJzWPcKUmILA3fpZe4lW1Xq4plTtHf/o=";
|
||||
cargoHash = "sha256-+7tZZ6xVzpRIZPvZ8gpqFh/T8QWXGeSIPYuoj2BCjgI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
let
|
||||
pname = "steam-art-manager";
|
||||
version = "3.18.0";
|
||||
version = "3.19.2";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tormak9970/Steam-Art-Manager/releases/download/v${version}/steam-art-manager.AppImage";
|
||||
hash = "sha256-PgkBaHRAY9AldQbMkcv53ZNVU4CzstWqPC70Y34UCbk=";
|
||||
hash = "sha256-b5zUx16FSUNPfZxOGoGzd5mUSc6RbK7hLcfewsPx/vQ=";
|
||||
};
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -66,7 +66,10 @@ buildGo127Module (finalAttrs: {
|
||||
homepage = "https://github.com/tailscale/tailcat";
|
||||
changelog = "https://github.com/tailscale/tailcat/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ sophronesis ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sophronesis
|
||||
mfrw
|
||||
];
|
||||
mainProgram = "tailcat";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "talosctl";
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-55BnNQAUxzUbtYjvMAM6ExnDPNyl7XN7pASYBeMWt3Y=";
|
||||
hash = "sha256-mINL4C+w/9pqTo7oi64VG7TEMwo1rg+ajYNtJQ8+8Bc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2mhMSfw3YMO5Tg3b14DIFtJiGFdXaDSaJ4XoR6PXdHA=";
|
||||
vendorHash = "sha256-dHhHOorsWXYJpGcSob2b3IWy4yz2o7vqma9JsK3WThc=";
|
||||
|
||||
postPatch = lib.optionalString withQemu ''
|
||||
substituteInPlace pkg/provision/providers/qemu/arch.go \
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
diff --git a/core/server/server.go b/core/server/server.go
|
||||
index 4499a6d..4c14d1a 100644
|
||||
--- a/core/server/server.go
|
||||
+++ b/core/server/server.go
|
||||
@@ -24,6 +24,7 @@ import (
|
||||
"github.com/sagernet/sing-box/experimental/clashapi"
|
||||
"github.com/sagernet/sing/common"
|
||||
E "github.com/sagernet/sing/common/exceptions"
|
||||
+ "golang.org/x/sys/unix"
|
||||
"github.com/sagernet/sing/service"
|
||||
"github.com/xtls/xray-core/core"
|
||||
)
|
||||
@@ -462,6 +463,27 @@ func (s *server) IsPrivileged(ctx context.Context, _ *gen.EmptyReq) (*gen.IsPriv
|
||||
}, nil
|
||||
}
|
||||
|
||||
+ if runtime.GOOS == "linux" {
|
||||
+ caps := unix.CapUserHeader{
|
||||
+ Version: unix.LINUX_CAPABILITY_VERSION_3,
|
||||
+ Pid: 0, // current
|
||||
+ }
|
||||
+
|
||||
+ var data [2]unix.CapUserData
|
||||
+ err := unix.Capget(&caps, &data[0])
|
||||
+
|
||||
+ if err != nil {
|
||||
+ return &gen.IsPrivilegedResponse{
|
||||
+ HasPrivilege: To(false),
|
||||
+ }, nil
|
||||
+ }
|
||||
+
|
||||
+ // CAP_NET_ADMIN = 12
|
||||
+ return &gen.IsPrivilegedResponse{
|
||||
+ HasPrivilege: To((data[0].Effective & (1 << unix.CAP_NET_ADMIN)) != 0),
|
||||
+ }, nil
|
||||
+ }
|
||||
+
|
||||
return &gen.IsPrivilegedResponse{HasPrivilege: To(os.Geteuid() == 0)}, nil
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/core/server/parentcheck/parentcheck.go b/core/server/parentcheck/parentcheck.go
|
||||
index 0991a7f..58fd32f 100644
|
||||
--- a/core/server/parentcheck/parentcheck.go
|
||||
+++ b/core/server/parentcheck/parentcheck.go
|
||||
@@ -11,6 +11,8 @@ import (
|
||||
)
|
||||
|
||||
func CheckParentProcess() {
|
||||
+ return
|
||||
+
|
||||
parentPath, err := getParentExePath(ParentPID)
|
||||
if err != nil {
|
||||
log.Fatalf("parent check: cannot read parent executable: %v", err)
|
||||
@@ -1,39 +0,0 @@
|
||||
diff --git a/src/sys/linux/AutoRun.cpp b/src/sys/linux/AutoRun.cpp
|
||||
index 1fafe35..a32e7fe 100644
|
||||
--- a/src/sys/linux/AutoRun.cpp
|
||||
+++ b/src/sys/linux/AutoRun.cpp
|
||||
@@ -31,18 +31,9 @@ void AutoRun_SetEnabled(bool enable) {
|
||||
QString desktopFileLocation = userAutoStartPath + appName + QLatin1String(".desktop");
|
||||
QStringList appCmdList;
|
||||
|
||||
- if (QProcessEnvironment::systemEnvironment().contains("APPIMAGE")) {
|
||||
- appCmdList << QProcessEnvironment::systemEnvironment().value("APPIMAGE");
|
||||
- } else {
|
||||
- appCmdList << QApplication::applicationFilePath();
|
||||
- }
|
||||
-
|
||||
+ appCmdList << "Throne";
|
||||
appCmdList << "-tray";
|
||||
|
||||
- if (Configs::dataManager->settingsRepo->flag_use_appdata) {
|
||||
- appCmdList << "-appdata";
|
||||
- }
|
||||
-
|
||||
if (enable) {
|
||||
if (!QDir().exists(userAutoStartPath) && !QDir().mkpath(userAutoStartPath)) {
|
||||
// qCWarning(lcUtility) << "Could not create autostart folder"
|
||||
diff --git a/src/sys/linux/UrlScheme.cpp b/src/sys/linux/UrlScheme.cpp
|
||||
index 63e4118..a9d3a42 100644
|
||||
--- a/src/sys/linux/UrlScheme.cpp
|
||||
+++ b/src/sys/linux/UrlScheme.cpp
|
||||
@@ -14,9 +14,7 @@ static const QString kDesktopId = "throne-url-handler.desktop";
|
||||
// For AppImage the launcher must point at the outer image ($APPIMAGE), not the
|
||||
// extracted binary inside the mount, which disappears after exit.
|
||||
static QString execTarget() {
|
||||
- auto env = QProcessEnvironment::systemEnvironment();
|
||||
- if (env.contains("APPIMAGE")) return env.value("APPIMAGE");
|
||||
- return QApplication::applicationFilePath();
|
||||
+ return "Throne";
|
||||
}
|
||||
|
||||
static QString desktopFilePath() {
|
||||
@@ -1,51 +0,0 @@
|
||||
diff --git a/src/global/Configs.cpp b/src/global/Configs.cpp
|
||||
index 9600a95..ee38aaa 100644
|
||||
--- a/src/global/Configs.cpp
|
||||
+++ b/src/global/Configs.cpp
|
||||
@@ -45,6 +45,12 @@ namespace Configs {
|
||||
}
|
||||
|
||||
QString FindCoreRealPath() {
|
||||
+ // find in PATH first
|
||||
+ QString path_for_nixos = QStandardPaths::findExecutable("ThroneCore");
|
||||
+ if (!path_for_nixos.isEmpty()) {
|
||||
+ return path_for_nixos;
|
||||
+ }
|
||||
+
|
||||
auto fn = QApplication::applicationDirPath() + "/ThroneCore";
|
||||
#ifdef Q_OS_WIN
|
||||
fn += ".exe";
|
||||
diff --git a/src/ui/mainWindow/mainwindow_setup.cpp b/src/ui/mainWindow/mainwindow_setup.cpp
|
||||
index 7bec187..0f04cc8 100644
|
||||
--- a/src/ui/mainWindow/mainwindow_setup.cpp
|
||||
+++ b/src/ui/mainWindow/mainwindow_setup.cpp
|
||||
@@ -207,8 +207,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
|
||||
runOnNewThread([=, this] {GetDeviceDetails(); });
|
||||
|
||||
// Prepare core
|
||||
- auto core_path = QApplication::applicationDirPath() + "/";
|
||||
- core_path += "ThroneCore";
|
||||
+ auto core_path = Configs::FindCoreRealPath();
|
||||
|
||||
bool coreDebugMode = (Configs::dataManager->settingsRepo->log_level == "debug");
|
||||
|
||||
diff --git a/src/ui/mainWindow/mainwindow_system.cpp b/src/ui/mainWindow/mainwindow_system.cpp
|
||||
index f1a7504..efffd4a 100644
|
||||
--- a/src/ui/mainWindow/mainwindow_system.cpp
|
||||
+++ b/src/ui/mainWindow/mainwindow_system.cpp
|
||||
@@ -193,6 +193,15 @@ bool MainWindow::get_elevated_permissions(ExitReason reason) {
|
||||
return true;
|
||||
}
|
||||
if (Configs::IsAdmin()) return true;
|
||||
+ QMessageBox::critical(
|
||||
+ GetMessageBoxParent(),
|
||||
+ tr("Unable to elevate privileges when installed with Nix"),
|
||||
+ tr("Due to the read-only property of the Nix store, we cannot set suid for ThroneCore. If you are using NixOS, please install Throne via `programs.throne.enable` and then set the `programs.throne.tunMode.enable` option to elevate privileges."),
|
||||
+ QMessageBox::Ok
|
||||
+ );
|
||||
+ return false;
|
||||
+ // The following code isn't effective, preserve to avoid merge conflict
|
||||
+
|
||||
#ifdef Q_OS_LINUX
|
||||
if (!Linux_HavePkexec()) {
|
||||
MessageBoxWarning(software_name, "Please install \"pkexec\" first.");
|
||||
@@ -21,22 +21,24 @@
|
||||
# To get the latest revision go to the rule-set branch and get the revision of the last commit
|
||||
# Link: https://github.com/throneproj/routeprofiles/tree/rule-set
|
||||
throne-srslist-info ? {
|
||||
rev = "bf5016b114a2dee6a31aa269093de38892fb9df4";
|
||||
hash = "sha256-RfyFSCecfY1SfvO62nW72+4JLAP7qX8KmmWFGhRrC8I=";
|
||||
rev = "1aa995b5fc30c26b931a61171aea2ab49c3d1711";
|
||||
hash = "sha256-jKYUjgxpE1zwcVv+9Fdj8H1QnPZpTzmzVsMfOMOKGFw=";
|
||||
},
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "throne";
|
||||
version = "1.2.4";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "throneproj";
|
||||
repo = "Throne";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-fDaU3xjrpjeW8MePBaj5aNGJ2GrNQ3/M3LhtBoU+I/A=";
|
||||
hash = "sha256-G1i8nFMabkg7qUbqYq/GYXsREXRcSXtDSO+RgiuulIE=";
|
||||
};
|
||||
|
||||
# NKR_ELEVATION_HINT contains spaces
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -51,21 +53,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6Packages.qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# use a writable config dir
|
||||
(lib.cmakeBool "NKR_PACKAGE" true)
|
||||
# use ThroneCore from PATH first to make use of security wrappers
|
||||
(lib.cmakeBool "NKR_CORE_IN_PATH" true)
|
||||
# the Exec field of the auto-run and the scheme-handler .desktop files
|
||||
(lib.cmakeFeature "NKR_DESKTOP_EXEC" "Throne")
|
||||
# suid cannot be set on ThroneCore in the Nix store, so point users to the NixOS module instead
|
||||
(lib.cmakeFeature "NKR_ELEVATION_HINT" "On NixOS, use programs.throne with tunMode.enable.")
|
||||
];
|
||||
|
||||
env.INPUT_VERSION = finalAttrs.version;
|
||||
|
||||
# suppress errors in 3rdparty/simple-protobuf
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
|
||||
|
||||
patches = [
|
||||
# disable suid request as it cannot be applied to ThroneCore in nix store
|
||||
# and prompt users to use NixOS module instead. And use ThroneCore from PATH
|
||||
# to make use of security wrappers
|
||||
./nixos-disable-setuid-request.patch
|
||||
|
||||
# sets the Exec field of the auto-run and the scheme-handler .desktop files to use the Throne binary from PATH
|
||||
./fix-desktop-exec.patch
|
||||
];
|
||||
|
||||
preBuild =
|
||||
let
|
||||
srslist = fetchurl {
|
||||
@@ -87,8 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm755 Throne -t "$out/share/throne/"
|
||||
install -Dm644 "$src/res/public/Throne.png" -t "$out/share/icons/hicolor/512x512/apps/"
|
||||
|
||||
makeQtWrapper "$out/share/throne/Throne" "$out/bin/Throne" \
|
||||
--append-flag "-appdata" # use writable config dir
|
||||
makeQtWrapper "$out/share/throne/Throne" "$out/bin/Throne"
|
||||
|
||||
ln -s ${finalAttrs.passthru.core}/bin/ThroneCore "$out/share/throne/ThroneCore"
|
||||
|
||||
@@ -110,17 +112,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.core = buildGoModule {
|
||||
pname = "throne-core";
|
||||
inherit (finalAttrs) version src;
|
||||
modRoot = "./core/server";
|
||||
modRoot = "./core";
|
||||
|
||||
patches = [
|
||||
# also check cap_net_admin so we don't have to set suid
|
||||
./core-also-check-capabilities.patch
|
||||
# skip cmd/schemagen, a development tool
|
||||
subPackages = [ "." ];
|
||||
|
||||
# disable a security check, which hopefully is not too bad
|
||||
./dont-check-parent.patch
|
||||
];
|
||||
# the main package has no tests, checkPhase would only rebuild all deps without -trimpath
|
||||
doCheck = false;
|
||||
|
||||
vendorHash = "sha256-qr45kA/xw3NARNUAj5OMjNE1JUeYQXkEXArsyc9K5jA=";
|
||||
vendorHash = "sha256-L189eeaYDdDKGJYT5vr412YpTgHptVfC4jpNSjNcyuk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
@@ -163,10 +163,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"with_utls"
|
||||
"with_dhcp"
|
||||
"with_tailscale"
|
||||
"with_openvpn"
|
||||
"with_openconnect"
|
||||
"badlinkname"
|
||||
"tfogo_checklinkname"
|
||||
"tfogo_checklinkname0"
|
||||
"with_naive_outbound"
|
||||
"with_purego" # use prebuilt .so instead of prebuilt .a files for cronet-go
|
||||
"noparentcheck" # ThroneCore and its security-wrapper live under a different store path than the GUI
|
||||
];
|
||||
};
|
||||
|
||||
@@ -186,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
aleksana
|
||||
Mahdi-zarei
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
|
||||
32
pkgs/by-name/tj/tjq/package.nix
Normal file
32
pkgs/by-name/tj/tjq/package.nix
Normal file
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tjq";
|
||||
version = "0.0.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alpaylan";
|
||||
repo = "tjq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O2Uell85xd9+WJYgB7zEI3mPxaAcUlsoXh6UGvTXZhs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T6wuYWv6l8w5rRtdWs0DWi61j8aDbXMwtv9nQvlC7CM=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Giving types to jq";
|
||||
homepage = "https://github.com/alpaylan/tjq";
|
||||
changelog = "https://github.com/alpaylan/tjq/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
mainProgram = "tjq";
|
||||
};
|
||||
})
|
||||
4
pkgs/by-name/ts/tshock/deps.json
generated
4
pkgs/by-name/ts/tshock/deps.json
generated
@@ -196,8 +196,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "OTAPI.Upcoming",
|
||||
"version": "3.3.11",
|
||||
"hash": "sha256-2v5hl1UUSUmGWnZXWKx2Y3ZmLUwbI0PlEb6mlb9qO0U="
|
||||
"version": "3.3.14",
|
||||
"hash": "sha256-bU3m2QQBjY5DO887cpWNCT0Z8xTFavRbW24Am5zcJv8="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Collections",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildDotnetModule rec {
|
||||
pname = "tshock";
|
||||
version = "6.1.0";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pryaxis";
|
||||
repo = "TShock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s6v/OUZmU0/kOH83N7xnurXdAtf49q/X69XWcKrKi/c=";
|
||||
hash = "sha256-yLYcpEaDzF7hzjIbjh//G1FO1mpBtAodf3yL5ILHCsI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ustreamer";
|
||||
version = "6.56";
|
||||
version = "6.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pikvm";
|
||||
repo = "ustreamer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-02mEZ14fwCrdmXUGhyKrkoo5IZ6/pDJZ/oREaZZe1RA=";
|
||||
hash = "sha256-fIjvxgFiwpPJ2M8v5AxeRnm+7kofXozD5dEe6pIjczk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
setuptools
|
||||
build
|
||||
pip
|
||||
installer
|
||||
]
|
||||
)
|
||||
++ lib.optionals withSystemd [
|
||||
|
||||
@@ -5,16 +5,14 @@
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
pnpm_11,
|
||||
nodejs,
|
||||
nodejs-slim_latest,
|
||||
nodejs-slim,
|
||||
nix-update-script,
|
||||
makeBinaryWrapper,
|
||||
runCommand,
|
||||
vue-language-server,
|
||||
}:
|
||||
let
|
||||
# Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627.
|
||||
pnpm = pnpm_11.override {
|
||||
nodejs-slim = nodejs-slim_latest;
|
||||
};
|
||||
pnpm = pnpm_11;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vue-language-server";
|
||||
@@ -39,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodejs-slim
|
||||
pnpmConfigHook
|
||||
pnpm
|
||||
makeBinaryWrapper
|
||||
@@ -73,14 +71,31 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p $out/{bin,lib/language-tools}
|
||||
cp -r {node_modules,packages,extensions} $out/lib/language-tools/
|
||||
|
||||
makeWrapper ${lib.getExe nodejs} $out/bin/vue-language-server \
|
||||
makeWrapper ${lib.getExe nodejs-slim} $out/bin/vue-language-server \
|
||||
--inherit-argv0 \
|
||||
--add-flags $out/lib/language-tools/packages/language-server/bin/vue-language-server.js
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
tests.smoke = runCommand "vue-language-server-smoke-test" { } ''
|
||||
INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}'
|
||||
CONTENT_LENGTH=''${#INIT_REQUEST}
|
||||
|
||||
RESPONSE=$(
|
||||
{
|
||||
printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST"
|
||||
sleep 1
|
||||
} | timeout 3 ${lib.getExe vue-language-server} --stdio 2>&1 | head -c 1000
|
||||
) || true
|
||||
|
||||
echo "$RESPONSE" | grep -q '"capabilities"'
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Official Vue.js language server";
|
||||
|
||||
@@ -68,14 +68,14 @@ let
|
||||
# Required, otherwise the fixed-output derivation references store paths.
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-GHLJ04D+f7uzWhFDxWVP++XGF2tPziMcfYrgaz2oQL8=";
|
||||
outputHash = "sha256-dW1OJ2AE4HaaJQAHPuyLu5vyv7It3r6OeXlAzEc4OlI=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zerobyte";
|
||||
version = "0.42.0";
|
||||
version = "0.43.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "nicotsx";
|
||||
repo = "zerobyte";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gueZUwoEetsEuAG5QXvLgUUrib79sk2azcmD0XZMhQo=";
|
||||
hash = "sha256-iZmXWxPnp7vYt3joPbluYQ3GXKGoN9qcrUfkWTO3Y7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "decompress";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/decompress/releases/download/v${finalAttrs.version}/decompress-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-qi6ELcAJvN3LtcB5H12+7ivaWhBOzHaBqjesQlN+MSE=";
|
||||
hash = "sha256-yYmMvJhTXV3R1NdUkuwnwRBbj2zOX3naXTQFP9pAxYU=";
|
||||
};
|
||||
|
||||
buildInputs = [ cmdliner ];
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiovodafone";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chemelli74";
|
||||
repo = "aiovodafone";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7m22ALnuLKScbsG7BdiyehEU2VjalGy3DhCvwDUMA5w=";
|
||||
hash = "sha256-JtfSesz81sZ4Cx8sEmUceHyF4TSCV7D/Xk5UM13DFc4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.43.104";
|
||||
version = "1.43.105";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-0Yg+1KeCgrBy43vwjEz7qLIgyP6xNxaB6zU5mxiREaM=";
|
||||
hash = "sha256-rFZ26RLyyryQflB/tgT73VPohMtZKLMRhKvx1o4g75s=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,6 +11,7 @@ buildPythonPackage rec {
|
||||
pname = "lnkparse3";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Matmaus";
|
||||
@@ -33,5 +34,6 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/Matmaus/LnkParse3/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "lnkparse";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -127,8 +127,8 @@ in
|
||||
"sha256-gJM0o+V8YnmwVkgnRzR+Peaz45JuRpE8Hs6LRwfTeUQ=";
|
||||
|
||||
mypy-boto3-appstream =
|
||||
buildMypyBoto3Package "appstream" "1.43.55"
|
||||
"sha256-nxkMmEP6tX2sQWwzwrSvP5fxEwNrfpG/jY+lg1knvOo=";
|
||||
buildMypyBoto3Package "appstream" "1.43.105"
|
||||
"sha256-adYNoAUkA9XmHsIdByF4Q2FBxHyGJK1S2kGWGv7UoRE=";
|
||||
|
||||
mypy-boto3-appsync =
|
||||
buildMypyBoto3Package "appsync" "1.43.0"
|
||||
@@ -443,8 +443,8 @@ in
|
||||
"sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.43.104"
|
||||
"sha256-UnX0kzhTGa7YoOBfAfQDPGUz5A68QcIvN8we3dwpaHo=";
|
||||
buildMypyBoto3Package "ec2" "1.43.105"
|
||||
"sha256-hk8TL5vu7EKGK7mbXDRvqfwUxmuH91BgQ24UCzv7Lr0=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.43.0"
|
||||
@@ -475,8 +475,8 @@ in
|
||||
"sha256-duU3LIeW3FNiplVmduZsNXBoDK7vbO6ecrBt1Y7C9rU=";
|
||||
|
||||
mypy-boto3-elasticache =
|
||||
buildMypyBoto3Package "elasticache" "1.43.102"
|
||||
"sha256-8YK+E1NTJr+Jt5SHTXBxmT/eJhyewLctYsvkDKV2e7I=";
|
||||
buildMypyBoto3Package "elasticache" "1.43.105"
|
||||
"sha256-1xkHQBZZ6VsP9VCpzLjRXFcdSd4t9o/sbMrwlLLD87w=";
|
||||
|
||||
mypy-boto3-elasticbeanstalk =
|
||||
buildMypyBoto3Package "elasticbeanstalk" "1.43.96"
|
||||
@@ -571,8 +571,8 @@ in
|
||||
"sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA=";
|
||||
|
||||
mypy-boto3-glue =
|
||||
buildMypyBoto3Package "glue" "1.43.104"
|
||||
"sha256-hcNGgpHqSt3oStW1K3q4blmrMUWJirbXuBgvcAao9yQ=";
|
||||
buildMypyBoto3Package "glue" "1.43.105"
|
||||
"sha256-f+ENF6mj+3eIWRA3G9m9M/P9oOSrA8oKx8Sv6FN38UI=";
|
||||
mypy-boto3-grafana =
|
||||
buildMypyBoto3Package "grafana" "1.43.11"
|
||||
"sha256-XJOSLyL1+uEweZ9zER7IhH3DFLaLtpJKvuRIn8Ri+P4=";
|
||||
@@ -606,8 +606,8 @@ in
|
||||
"sha256-aL9OaJDsqudoUtUBCQuP0LBDhCQAkIKiC/5hL5PeKPo=";
|
||||
|
||||
mypy-boto3-identitystore =
|
||||
buildMypyBoto3Package "identitystore" "1.43.0"
|
||||
"sha256-9lzXp7Ug90MSZ7WdMiXoMnUiaAA9zCk/oS6gc0ulEMo=";
|
||||
buildMypyBoto3Package "identitystore" "1.43.105"
|
||||
"sha256-i0as7xmMUferTbWUuL9swmphZpltz7W5N9yT27loNY8=";
|
||||
|
||||
mypy-boto3-imagebuilder =
|
||||
buildMypyBoto3Package "imagebuilder" "1.43.101"
|
||||
@@ -622,8 +622,8 @@ in
|
||||
"sha256-9P8m5QYikdsimepaivrYcb/tP1iThyPZWFMkyo24+bo=";
|
||||
|
||||
mypy-boto3-inspector2 =
|
||||
buildMypyBoto3Package "inspector2" "1.43.64"
|
||||
"sha256-7xAA1OyNETjna5Yehnnzd8u3OJF8P3lMsBFE0/0tx/4=";
|
||||
buildMypyBoto3Package "inspector2" "1.43.105"
|
||||
"sha256-MDoJN54MnLMdKw9zOoKBNFLSFYE0BB65XahqBZQXMic=";
|
||||
|
||||
mypy-boto3-internetmonitor =
|
||||
buildMypyBoto3Package "internetmonitor" "1.43.0"
|
||||
@@ -886,8 +886,8 @@ in
|
||||
"sha256-8K0Xm6PMo+daS6xt4kBqaVvO2/LruFV7PVvugI7sNDU=";
|
||||
|
||||
mypy-boto3-mediatailor =
|
||||
buildMypyBoto3Package "mediatailor" "1.43.91"
|
||||
"sha256-qF1kQg21OoQo5jP1D0+TODszZA6fS8bY6brXZ69/skI=";
|
||||
buildMypyBoto3Package "mediatailor" "1.43.105"
|
||||
"sha256-VVLBa6S6sDnw+DkI+xrE8rVwx17REjZd8hGKkwA5ux0=";
|
||||
|
||||
mypy-boto3-medical-imaging =
|
||||
buildMypyBoto3Package "medical-imaging" "1.43.4"
|
||||
@@ -966,8 +966,8 @@ in
|
||||
"sha256-+gOTCID2Ls2G3YIcw7Us8n3yieOaUDJ2U7W/fzKSDic=";
|
||||
|
||||
mypy-boto3-opensearch =
|
||||
buildMypyBoto3Package "opensearch" "1.43.82"
|
||||
"sha256-Bg8eOFGWb2ruPwhQjTHoBzCnj8/ST+sSjW8RrzpRtc0=";
|
||||
buildMypyBoto3Package "opensearch" "1.43.105"
|
||||
"sha256-ShV+UGwrnWTYe8FclbqD61GKBn+d/VxqNrRq2ip7OcQ=";
|
||||
|
||||
mypy-boto3-opensearchserverless =
|
||||
buildMypyBoto3Package "opensearchserverless" "1.43.17"
|
||||
@@ -1082,8 +1082,8 @@ in
|
||||
"sha256-ZmYC3YQujmfSUK0pOGCGFwT7LrSa3oJfo9juUb+2Xpk=";
|
||||
|
||||
mypy-boto3-rds =
|
||||
buildMypyBoto3Package "rds" "1.43.82"
|
||||
"sha256-MSD/jBLp2KsVFRermRmbvWPJyblS5KqzSUD5X2l5jrQ=";
|
||||
buildMypyBoto3Package "rds" "1.43.105"
|
||||
"sha256-TlUCyvReQlcTo/NPR53E6I0DpusHM74AKgRkp4yboC8=";
|
||||
|
||||
mypy-boto3-rds-data =
|
||||
buildMypyBoto3Package "rds-data" "1.43.37"
|
||||
@@ -1170,8 +1170,8 @@ in
|
||||
"sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU=";
|
||||
|
||||
mypy-boto3-sagemaker =
|
||||
buildMypyBoto3Package "sagemaker" "1.43.99"
|
||||
"sha256-wYuwpDpuyoMsjmksyv/zJ6cOwHICWkKPdavS4SYAVmI=";
|
||||
buildMypyBoto3Package "sagemaker" "1.43.105"
|
||||
"sha256-nKA2RMSTSkT7hQsrY85M2kEc1lbHgJHYC4P99xpLkPc=";
|
||||
|
||||
mypy-boto3-sagemaker-a2i-runtime =
|
||||
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0"
|
||||
@@ -1250,8 +1250,8 @@ in
|
||||
"sha256-JO9Mm6dTJuFnbyRzuSaPpT2lvDNaSUMlspWgeH+bt5M=";
|
||||
|
||||
mypy-boto3-sesv2 =
|
||||
buildMypyBoto3Package "sesv2" "1.43.97"
|
||||
"sha256-7SFgIdgy4iSLua815QPUqefHq+EMMu47fCIOB+/ZnzU=";
|
||||
buildMypyBoto3Package "sesv2" "1.43.105"
|
||||
"sha256-aQxcz3bZQw35jYE4V3Q+h02mBvTAk/211fzK6F8iuVw=";
|
||||
|
||||
mypy-boto3-shield =
|
||||
buildMypyBoto3Package "shield" "1.43.0"
|
||||
@@ -1366,8 +1366,8 @@ in
|
||||
"sha256-tiBz8d9cXwrI+7rsE+MnQzyt3BaXJ86Sd8ysVsRruwE=";
|
||||
|
||||
mypy-boto3-transfer =
|
||||
buildMypyBoto3Package "transfer" "1.43.95"
|
||||
"sha256-TmdJNCxOWMRAk+HrKvG/wZUp/8o9Eg4wRCorza4Ts08=";
|
||||
buildMypyBoto3Package "transfer" "1.43.105"
|
||||
"sha256-lv1/qr76JhY1r5SaBgjDRqaQ84VnRbH0/5mBh53Cz+8=";
|
||||
|
||||
mypy-boto3-translate =
|
||||
buildMypyBoto3Package "translate" "1.43.0"
|
||||
|
||||
54
pkgs/development/python-modules/oinker/default.nix
Normal file
54
pkgs/development/python-modules/oinker/default.nix
Normal file
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
httpx,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
rich,
|
||||
typer,
|
||||
uv-build,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "oinker";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "major";
|
||||
repo = "oinker";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jDQKTllteOL30mY089URl/36hY3f5KzSFPNubqnd0d8=";
|
||||
};
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
dependencies = [ httpx ];
|
||||
|
||||
optional-dependencies = {
|
||||
cli = [
|
||||
rich
|
||||
typer
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
]
|
||||
++ finalAttrs.finalPackage.optional-dependencies.cli;
|
||||
|
||||
pythonImportsCheck = [ "oinker" ];
|
||||
|
||||
meta = {
|
||||
description = "Pythonic client library for Porkbun DNS";
|
||||
mainProgram = "oinker";
|
||||
homepage = "https://major.github.io/oinker";
|
||||
changelog = "https://github.com/major/oinker/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ philocalyst ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pajgps-api";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skipperro";
|
||||
repo = "pajgps-api";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7NVr75ss9vUjyn0Yz+bpZVdN4gDx4gvpdDV1bWLKOIQ=";
|
||||
hash = "sha256-aYi+VuU7wcQRepDY+bNRUT6EIDMh/zrAfdUC6xanirM=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peblar";
|
||||
version = "1.0.1";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-peblar";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YkDn67OdJlvqHEkINTD4gxPV3g8bIn7GGKgvDFRcg+U=";
|
||||
hash = "sha256-co3440R9OVEdcLPNsBu1jz6WzZTz746IEFcyTlzNkc0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "portion";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "AlexandreDecan";
|
||||
repo = "portion";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ns9kUoSufegx0I3ag/KVl68ZviEIRx+zPA+BSWq3k80=";
|
||||
hash = "sha256-2v93zKB9oowjklxRTkZtb1yk7XpOA0tEe6f6rQqPerY=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -156,72 +156,75 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
"test/plugin/test_plugins.py"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
lib.optionals rocmSupport [
|
||||
# HSA runtime logs topology error in sandbox breaking test that asserts no output
|
||||
"test_python_logger"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fails in the sandbox:
|
||||
# Error in cpuinfo: failed to parse the list of possible processors in /sys/devices/system/cpu/possible
|
||||
"test_python_logger"
|
||||
disabledTests = [
|
||||
# AssertionError: Tensor-likes are not close!
|
||||
"test_audio_against_cli"
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
# HSA runtime logs topology error in sandbox breaking test that asserts no output
|
||||
"test_python_logger"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fails in the sandbox:
|
||||
# Error in cpuinfo: failed to parse the list of possible processors in /sys/devices/system/cpu/possible
|
||||
"test_python_logger"
|
||||
|
||||
# AssertionError: index 0
|
||||
"test_get_frames_played_at"
|
||||
# AssertionError: index 0
|
||||
"test_get_frames_played_at"
|
||||
|
||||
# AssertionError: Tensor-likes are not equal!
|
||||
"test_against_cli"
|
||||
"test_against_ref"
|
||||
"test_color_conversion_library"
|
||||
"test_color_conversion_library_with_dimension_order"
|
||||
"test_compile"
|
||||
"test_compile_seek_and_next"
|
||||
"test_create_decoder"
|
||||
"test_crop_transform"
|
||||
"test_custom_frame_mappings_json_and_bytes"
|
||||
"test_file_like_decoding"
|
||||
"test_get_frame_at"
|
||||
"test_get_frame_at_av1"
|
||||
"test_get_frame_at_index"
|
||||
"test_get_frame_at_pts"
|
||||
"test_get_frame_played_at"
|
||||
"test_get_frame_played_at_h265"
|
||||
"test_get_frame_with_info_at_index"
|
||||
"test_get_frames_at"
|
||||
"test_get_frames_at_indices"
|
||||
"test_get_frames_at_indices_negative_indices"
|
||||
"test_get_frames_by_pts_in_range"
|
||||
"test_get_frames_in_range"
|
||||
"test_get_frames_in_range_slice_indices_syntax"
|
||||
"test_get_frames_with_missing_num_frames_metadata"
|
||||
"test_getitem_int"
|
||||
"test_getitem_numpy_int"
|
||||
"test_getitem_slice"
|
||||
"test_iteration"
|
||||
"test_seek_and_next"
|
||||
"test_seek_mode_custom_frame_mappings"
|
||||
"test_seek_to_negative_pts"
|
||||
"test_throws_exception_at_eof"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# RuntimeError: Invalid AVIO context holder
|
||||
"test_1d_samples"
|
||||
"test_against_cli"
|
||||
"test_against_to_file"
|
||||
"test_against_to_file"
|
||||
"test_contiguit"
|
||||
"test_crf_valid_value"
|
||||
"test_encode_to_tensor_long_outpu"
|
||||
"test_num_channels"
|
||||
"test_round_trip"
|
||||
"test_video_encoder_against_ffmpeg_cli"
|
||||
"test_video_encoder_round_trip"
|
||||
# AssertionError: Tensor-likes are not equal!
|
||||
"test_against_cli"
|
||||
"test_against_ref"
|
||||
"test_color_conversion_library"
|
||||
"test_color_conversion_library_with_dimension_order"
|
||||
"test_compile"
|
||||
"test_compile_seek_and_next"
|
||||
"test_create_decoder"
|
||||
"test_crop_transform"
|
||||
"test_custom_frame_mappings_json_and_bytes"
|
||||
"test_file_like_decoding"
|
||||
"test_get_frame_at"
|
||||
"test_get_frame_at_av1"
|
||||
"test_get_frame_at_index"
|
||||
"test_get_frame_at_pts"
|
||||
"test_get_frame_played_at"
|
||||
"test_get_frame_played_at_h265"
|
||||
"test_get_frame_with_info_at_index"
|
||||
"test_get_frames_at"
|
||||
"test_get_frames_at_indices"
|
||||
"test_get_frames_at_indices_negative_indices"
|
||||
"test_get_frames_by_pts_in_range"
|
||||
"test_get_frames_in_range"
|
||||
"test_get_frames_in_range_slice_indices_syntax"
|
||||
"test_get_frames_with_missing_num_frames_metadata"
|
||||
"test_getitem_int"
|
||||
"test_getitem_numpy_int"
|
||||
"test_getitem_slice"
|
||||
"test_iteration"
|
||||
"test_seek_and_next"
|
||||
"test_seek_mode_custom_frame_mappings"
|
||||
"test_seek_to_negative_pts"
|
||||
"test_throws_exception_at_eof"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# RuntimeError: Invalid AVIO context holder
|
||||
"test_1d_samples"
|
||||
"test_against_cli"
|
||||
"test_against_to_file"
|
||||
"test_against_to_file"
|
||||
"test_contiguit"
|
||||
"test_crf_valid_value"
|
||||
"test_encode_to_tensor_long_outpu"
|
||||
"test_num_channels"
|
||||
"test_round_trip"
|
||||
"test_video_encoder_against_ffmpeg_cli"
|
||||
"test_video_encoder_round_trip"
|
||||
|
||||
# RuntimeError: Requested next frame while there are no more frames left to decode
|
||||
"test_next"
|
||||
"test_throws_exception_at_eof"
|
||||
"test_throws_exception_if_seek_too_far"
|
||||
];
|
||||
# RuntimeError: Requested next frame while there are no more frames left to decode
|
||||
"test_next"
|
||||
"test_throws_exception_at_eof"
|
||||
"test_throws_exception_if_seek_too_far"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "PyTorch media decoding and encoding";
|
||||
|
||||
@@ -291,7 +291,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Defense-in-depth: never inherit an executable stack from a dependency.
|
||||
# It does happen: https://github.com/NixOS/nixpkgs/issues/567777.
|
||||
NIX_LDFLAGS = "-z,noexecstack";
|
||||
# ELF only: Apple's ld64 rejects `-z`, and Mach-O stacks are already
|
||||
# non-executable unless linked with `-allow_stack_execute`.
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isElf "-z,noexecstack";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -12456,6 +12456,8 @@ self: super: with self; {
|
||||
|
||||
oic = callPackage ../development/python-modules/oic { };
|
||||
|
||||
oinker = callPackage ../development/python-modules/oinker { };
|
||||
|
||||
okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };
|
||||
|
||||
okta = callPackage ../development/python-modules/okta { };
|
||||
|
||||
Reference in New Issue
Block a user