Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -136,6 +136,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.
|
||||
|
||||
- `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled. This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.
|
||||
|
||||
- `services.caddy` now supports setting `httpPort` and `httpsPort` and opening them in the firewall via `openFirewall`.
|
||||
|
||||
- `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options.
|
||||
|
||||
- `glibc` has been updated to version 2.42.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
config,
|
||||
options,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
@@ -305,6 +306,23 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
httpPort = mkOption {
|
||||
default = 80;
|
||||
type = with types; nullOr port;
|
||||
description = ''
|
||||
The default port to listen on for HTTP traffic.
|
||||
'';
|
||||
};
|
||||
|
||||
httpsPort = mkOption {
|
||||
default = 443;
|
||||
type = with types; nullOr port;
|
||||
description = ''
|
||||
The default port to listen on for HTTPS traffic.
|
||||
Will also be used for HTTP/3.
|
||||
'';
|
||||
};
|
||||
|
||||
enableReload = mkOption {
|
||||
default = true;
|
||||
type = types.bool;
|
||||
@@ -376,6 +394,19 @@ in
|
||||
[here](https://caddyserver.com/docs/caddyfile/concepts#environment-variables)
|
||||
'';
|
||||
};
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description = ''
|
||||
Whether to enable opening the specified http(s) ports in the firewall.
|
||||
Any port set to `null` will not be opened.
|
||||
|
||||
::: {.note}
|
||||
If you use other ports for your virtual hosts, you need to open them manually.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# implementation
|
||||
@@ -399,6 +430,18 @@ in
|
||||
services.caddy.globalConfig = ''
|
||||
${optionalString (cfg.email != null) "email ${cfg.email}"}
|
||||
${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"}
|
||||
${optionalString (
|
||||
!elem cfg.httpPort [
|
||||
null
|
||||
options.services.caddy.httpPort.default
|
||||
]
|
||||
) "http_port ${cfg.httpPort}"}
|
||||
${optionalString (
|
||||
!elem cfg.httpsPort [
|
||||
null
|
||||
options.services.caddy.httpsPort.default
|
||||
]
|
||||
) "https_port ${cfg.httpsPort}"}
|
||||
log {
|
||||
${cfg.logFormat}
|
||||
}
|
||||
@@ -480,5 +523,13 @@ in
|
||||
listToAttrs certCfg;
|
||||
|
||||
environment.etc.${etcConfigFile}.source = cfg.configFile;
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = filter (port: port != null) [
|
||||
cfg.httpPort
|
||||
cfg.httpsPort
|
||||
];
|
||||
allowedUDPPorts = optional (cfg.httpsPort != null) cfg.httpsPort;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -408,6 +408,7 @@ in
|
||||
containers-tmpfs = runTest ./containers-tmpfs.nix;
|
||||
containers-unified-hierarchy = runTest ./containers-unified-hierarchy.nix;
|
||||
convos = runTest ./convos.nix;
|
||||
coredns = runTest ./coredns.nix;
|
||||
corerad = runTest ./corerad.nix;
|
||||
corteza = runTest ./corteza.nix;
|
||||
cosmic = runTest {
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "coredns";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ johanot ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.dnsutils ];
|
||||
services.coredns = {
|
||||
enable = true;
|
||||
config = ''
|
||||
.:10053 {
|
||||
ipecho {
|
||||
domain test.nixos.org
|
||||
ttl 2629800
|
||||
}
|
||||
}
|
||||
'';
|
||||
package = pkgs.coredns.override {
|
||||
externalPlugins = [
|
||||
{
|
||||
name = "ipecho";
|
||||
repo = "github.com/Eun/coredns-ipecho";
|
||||
version = "224170ebca45cc59c6b071d280a18f42d1ff130c";
|
||||
position = "start-of-file";
|
||||
}
|
||||
];
|
||||
vendorHash = "sha256-dNxHpXkiqz7B/JhZdxfZluIHFVXILlSm3XtB+v/EoMY=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("coredns.service")
|
||||
machine.wait_for_open_port(10053)
|
||||
machine.succeed("dig @127.0.0.1 -p 10053 127.0.0.2.test.nixos.org A +short | grep 127.0.0.2")
|
||||
'';
|
||||
}
|
||||
@@ -21,20 +21,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.1.1.tar.gz";
|
||||
hash = "sha256-vtTTqvG932G0LBOESaUvTOhF1vQiyvZKPuAu/QcQdzY=";
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.2.tar.gz";
|
||||
hash = "sha256-c6DFfBnMihKr/ZzMVy1ymnAE3c7iS45h3GOc5yZH8Es=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.1.1-aarch64.tar.gz";
|
||||
hash = "sha256-Yh04N3okMfeqUUL3GZukSUJzMAHdBlE+quDMu/phFc4=";
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.2-aarch64.tar.gz";
|
||||
hash = "sha256-zdXJB07yDuK8snFtGEiaICfOl3rD7zMeX+1ZBiagIaU=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.1.1.dmg";
|
||||
hash = "sha256-H6qUuONV/iYZwDJfylpDr/AvF+Wl4gnVkegZhr8hbmQ=";
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.2.dmg";
|
||||
hash = "sha256-G06dmosEsKbV5dvRL9RxXTe+XQ8Hlkhf4nEQF6A8QiA=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.1.1-aarch64.dmg";
|
||||
hash = "sha256-I7FDOc8OM0P+FGMCdjKKcnHUbUTPRzFz7l56oTcGiXE=";
|
||||
url = "https://download.jetbrains.com/cpp/CLion-2025.3.2-aarch64.dmg";
|
||||
hash = "sha256-sLj5Qod0XwlA+/t/ZoeFrbaQbsP2S3kz/F5VjLkwFgQ=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -48,8 +48,8 @@ in
|
||||
product = "CLion";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3.1.1";
|
||||
buildNumber = "253.29346.307";
|
||||
version = "2025.3.2";
|
||||
buildNumber = "253.30387.78";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
|
||||
@@ -12,20 +12,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1.tar.gz";
|
||||
hash = "sha256-j/WgB1G/b1x8RIXT1LWdcgISCCqHOmqLatfOzpV4T8Y=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2.tar.gz";
|
||||
hash = "sha256-6FaCc3Kqq0jjDdmSARGk4KPIU5xrUzkSINhXcY/Gs4M=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1-aarch64.tar.gz";
|
||||
hash = "sha256-7UKtan4cuM7svjWayM2SThGemASTSrAxKVk0TUwEgbg=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2-aarch64.tar.gz";
|
||||
hash = "sha256-W7OuGrk8vab0GwCTdzKZ/sWvnYQZEDNEyEQsnM3SMqU=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1.dmg";
|
||||
hash = "sha256-5Dnb9xwtAid63j6ntU5YIZN+oVLzZsXNJexGpL8m9sM=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2.dmg";
|
||||
hash = "sha256-uPkK+UkAUMC+JYiGnQZmdt1DKtTqHrjpE/ghpnuGb/w=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.1-aarch64.dmg";
|
||||
hash = "sha256-24ZD2GpM4pGrJyqxyEJSQsERINR6/dNhLtd3WtzmNaU=";
|
||||
url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.2-aarch64.dmg";
|
||||
hash = "sha256-5LPKKtCOreiYIEWFbQNPITktjORGA8v+22tbZhUc+Uk=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -40,8 +40,8 @@ mkJetBrainsProduct {
|
||||
productShort = "Gateway";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3.1";
|
||||
buildNumber = "253.29346.239";
|
||||
version = "2025.3.2";
|
||||
buildNumber = "253.30387.104";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
|
||||
@@ -13,20 +13,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.1.1.tar.gz";
|
||||
hash = "sha256-3lQSHpqNf/yaOyIWeuhYitI//mBuJG/sfvrWMdJvtEs=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.2.tar.gz";
|
||||
hash = "sha256-YLXO+YhulYfkOSR6fjZKuppmPa+uLqvP/E4NxAm7o8Q=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.1.1-aarch64.tar.gz";
|
||||
hash = "sha256-tm2+8klFjyMhqPs4uH14fTY0doWDUAsrW9gehU5bGKg=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.2-aarch64.tar.gz";
|
||||
hash = "sha256-kphcT6a7JV72FqcTq7iuvAcolSgWdFvObn/o0jZP69g=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.1.1.dmg";
|
||||
hash = "sha256-keHuiyw/lhhOwP3uP8g8puiyRUTtHhXqk4kdSrIOeJQ=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.2.dmg";
|
||||
hash = "sha256-Lxyp1g0KYapesVJ+LkRFslzIGrp2KPMrXP9nFx/CTYI=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.1.1-aarch64.dmg";
|
||||
hash = "sha256-scG0YiqE3q2BCh3VRhHZ0ep6PDY8zRtBDRBJQGLDOSI=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2025.3.2-aarch64.dmg";
|
||||
hash = "sha256-lWH6M5lOjUYwzx2AqEv53V7J+5PEF9+KMZKfqbivUeY=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -40,8 +40,8 @@ in
|
||||
product = "PyCharm";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3.1.1";
|
||||
buildNumber = "253.29346.308";
|
||||
version = "2025.3.2";
|
||||
buildNumber = "253.30387.127";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
|
||||
@@ -18,20 +18,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.2.tar.gz";
|
||||
hash = "sha256-c6Pou6a27cwCcvcpKnhQOt2Emf+iSHyOIQIyXTEB3hE=";
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.3.tar.gz";
|
||||
hash = "sha256-uAPFVBR5KSyJGGZEIDsqCZFBXcmKyDfgQgiaIUvyB2w=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.2-aarch64.tar.gz";
|
||||
hash = "sha256-YUBymEX/fv71/cFrBUi0jvgTHn0eFh02tFT/HIE3+5k=";
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.3-aarch64.tar.gz";
|
||||
hash = "sha256-MfItRr0LLQza6uKeGphAd2YN5+DacdQnOpVuvrnJtnw=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.2.dmg";
|
||||
hash = "sha256-UlcMaFh7o/X8RkfjUr1fsDrHvN/rFhH7X1rvwaMTSzY=";
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.3.dmg";
|
||||
hash = "sha256-5Di4lXgbAwq8I1+6XKxB6JsmwEpc8qXNjUiPK+N6reM=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.2-aarch64.dmg";
|
||||
hash = "sha256-fOX2HBJA8CbLVMLGxMMCmw0CFbKtEiW+WgkiIgwIqLE=";
|
||||
url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.3-aarch64.dmg";
|
||||
hash = "sha256-ftJq0KNkwj/YPw1abPB3wRcDWMryZAEvqbNdY1RaT9g=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -45,8 +45,8 @@ in
|
||||
product = "RustRover";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2025.3.2";
|
||||
buildNumber = "253.29346.361";
|
||||
version = "2025.3.3";
|
||||
buildNumber = "253.30387.122";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
|
||||
@@ -55,8 +55,8 @@ let
|
||||
}
|
||||
else
|
||||
{
|
||||
version = "2025.4";
|
||||
hash = "sha256-yhdyC0omDrc2SSEen2qUDudUNFISmEQhPDrMsKknpcM=";
|
||||
version = "2026.0";
|
||||
hash = "sha256-Ipcm9DbMUVv9jEqnrzqXsYBy9xtevQsI2vZWVXHi2es=";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "alt-tab-macos";
|
||||
version = "7.36.0";
|
||||
version = "8.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
|
||||
hash = "sha256-tKh6Jc8MXUJvmteC+jh2OCC9nfpPzyKZ9SyWwvbzwEM=";
|
||||
hash = "sha256-213AlF4lNg5K4y25rXCBtVoc4w/3m7b8gGi0jFgzqR0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -27,6 +27,9 @@ let
|
||||
cmake
|
||||
];
|
||||
|
||||
# Required for gcc-15 compatibility
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBLAS_LIBRARIES=${blas}/lib"
|
||||
"-DBLA_STATIC=OFF"
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bazaar";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kolunmi";
|
||||
repo = "bazaar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c6mAWnX0iKXJqOxe/kgUqmXXVKO7ZEI+vKoYLKOuNos=";
|
||||
hash = "sha256-kLCakA3HNzCYZ3yE5rK05qzhZehoQ74xRLMCQ2DzUDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{
|
||||
"version": "2.4.21",
|
||||
"version": "2.4.22",
|
||||
"vscodeVersion": "1.105.1",
|
||||
"sources": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/dc8361355d709f306d5159635a677a571b277bcc/linux/x64/Cursor-2.4.21-x86_64.AppImage",
|
||||
"hash": "sha256-OOjANfVHMlRN1uWq2jNmK/RqI4Q5NTlN/19Nl2jWiKI="
|
||||
"url": "https://downloads.cursor.com/production/618c607a249dd7fd2ffc662c6531143833bebd44/linux/x64/Cursor-2.4.22-x86_64.AppImage",
|
||||
"hash": "sha256-qB6HEJZdn8+MdudNd/kVooArUGg1jBaeArlvOKCpFao="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://downloads.cursor.com/production/dc8361355d709f306d5159635a677a571b277bcc/linux/arm64/Cursor-2.4.21-aarch64.AppImage",
|
||||
"hash": "sha256-tk7TzkLy8oHtXp0UcMwhDXa9B2f2lanWYmPbF7OKfZ0="
|
||||
"url": "https://downloads.cursor.com/production/618c607a249dd7fd2ffc662c6531143833bebd44/linux/arm64/Cursor-2.4.22-aarch64.AppImage",
|
||||
"hash": "sha256-5QVw5iN17yeU8TFMZrCW/AswgNl4bUONeuhBdretiWk="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/dc8361355d709f306d5159635a677a571b277bcc/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-uacRpz0HFRfmaNekSB5qLXpnhiQRvAw03W+9QfPl6ZY="
|
||||
"url": "https://downloads.cursor.com/production/618c607a249dd7fd2ffc662c6531143833bebd44/darwin/x64/Cursor-darwin-x64.dmg",
|
||||
"hash": "sha256-hNpy1wfaxo2W/8Itbam1tt5tLqo2BjsnYZyl5NQn23g="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://downloads.cursor.com/production/dc8361355d709f306d5159635a677a571b277bcc/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-nCch/JXO1lzj0ibAa8e0OPlnBTOrIk/fvq9CO46Ev8w="
|
||||
"url": "https://downloads.cursor.com/production/618c607a249dd7fd2ffc662c6531143833bebd44/darwin/arm64/Cursor-darwin-arm64.dmg",
|
||||
"hash": "sha256-JvkumedZhRyqZdjOVhqjMRShtGPCafVCGOewFooEGpc="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,6 +78,7 @@ buildGoModule (finalAttrs: {
|
||||
for src in ${toString (attrsToSources externalPlugins)}; do go get $src; done
|
||||
go mod vendor
|
||||
CC= GOOS= GOARCH= go generate
|
||||
go mod vendor
|
||||
go mod tidy
|
||||
'';
|
||||
|
||||
@@ -134,6 +135,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
coredns-external-plugins = nixosTests.coredns;
|
||||
kubernetes-single-node = nixosTests.kubernetes.dns-single-node;
|
||||
kubernetes-multi-node = nixosTests.kubernetes.dns-multi-node;
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
buildFHSEnv,
|
||||
electron_36,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
electron,
|
||||
git,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
@@ -25,8 +25,6 @@ let
|
||||
hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
|
||||
};
|
||||
|
||||
electron = electron_36;
|
||||
|
||||
unwrapped = stdenvNoCC.mkDerivation {
|
||||
pname = "${pname}-unwrapped";
|
||||
inherit version src;
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "github-backup";
|
||||
version = "0.61.2";
|
||||
version = "0.61.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josegonzalez";
|
||||
repo = "python-github-backup";
|
||||
tag = version;
|
||||
hash = "sha256-yxVovL4jjS+qMDH9ZrLVnFMLQeO+xwh49npv/ifgFEQ=";
|
||||
hash = "sha256-iZM/gXjEBJpqCkW54quNVsr6zrfAfRrcdRy6icecMHk=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -1,25 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
writeScript,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
cacert,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "gogdl";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "heroic-gogdl";
|
||||
rev = "1ff09820915f855ea764c6e49ea2def63e86b3bb";
|
||||
hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0=";
|
||||
# two commits after the v1.2.0 tag, because the release messed up submodule fetching
|
||||
rev = "9759dfb1f50e0c68854f938e9568d84cab59652c";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-yjiPHEiZjs9TnBRaKzm1TpLcPK0tfIrzM30DX66m+1Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
requests
|
||||
];
|
||||
|
||||
@@ -32,31 +35,4 @@ python3Packages.buildPythonApplication rec {
|
||||
license = with lib.licenses; [ gpl3 ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
# Upstream no longer create git tags when bumping the version, so we have to
|
||||
# extract it from the source code on the main branch.
|
||||
passthru.updateScript = writeScript "gogdl-update-script" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused jq common-updater-scripts
|
||||
set -eou pipefail;
|
||||
|
||||
owner=Heroic-Games-Launcher
|
||||
repo=heroic-gogdl
|
||||
path='gogdl/__init__.py'
|
||||
|
||||
version=$(
|
||||
curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \
|
||||
https://raw.githubusercontent.com/$owner/$repo/main/$path |
|
||||
sed -n 's/^\s*version\s*=\s*"\([0-9]\.[0-9]\.[0-9]\)"\s*$/\1/p')
|
||||
|
||||
commit=$(curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \
|
||||
https://api.github.com/repos/$owner/$repo/commits?path=$path |
|
||||
jq -r '.[0].sha')
|
||||
|
||||
update-source-version \
|
||||
${pname} \
|
||||
"$version" \
|
||||
--file=./pkgs/games/gogdl/default.nix \
|
||||
--rev=$commit
|
||||
'';
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "heroic-epic-integration";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Etaash-mathamsetty";
|
||||
repo = "heroic-epic-integration";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Zn0MsaQd8Ro6eu8IQkMcLNGLVTUukwajkn8PRLfB+Yw=";
|
||||
hash = "sha256-pRgs1w4bzm5Ao0zXfaNxBAR8+h7w4I+C+bm4nT7kIgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Wrapper process for games launched through Heroic Games Launcher";
|
||||
longDescription = ''
|
||||
@@ -44,6 +46,4 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
})
|
||||
|
||||
@@ -4,19 +4,17 @@
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
}:
|
||||
let
|
||||
version = "0.20.37";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "legendary-heroic";
|
||||
inherit version;
|
||||
version = "0.20.39";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "legendary";
|
||||
rev = version;
|
||||
sha256 = "sha256-mOys7lOPrrzBUBMIM/JvKygFQ/qIGD68BDNigk5BCIo=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2+9MRbwugBlBdZQQo6BUcLmwCqVdTAv9CZ+sPu5VAxY=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -25,11 +23,14 @@ python3Packages.buildPythonApplication {
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
requests
|
||||
requests-futures
|
||||
filelock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "legendary" ];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Free and open-source Epic Games Launcher alternative";
|
||||
longDescription = ''
|
||||
@@ -40,6 +41,4 @@ python3Packages.buildPythonApplication {
|
||||
maintainers = [ ];
|
||||
mainProgram = "legendary";
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,8 +10,9 @@
|
||||
nodejs,
|
||||
python3,
|
||||
makeWrapper,
|
||||
# Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL.
|
||||
electron_37,
|
||||
# Electron updates can break Heroic, so try to use same version as upstream.
|
||||
# If the used electron version is higher than upstream's then the node-abi package might need to be updated
|
||||
electron_39,
|
||||
vulkan-helper,
|
||||
gogdl,
|
||||
nile,
|
||||
@@ -20,33 +21,40 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pnpm = pnpm_10;
|
||||
electron = electron_39;
|
||||
|
||||
legendary = callPackage ./legendary.nix { };
|
||||
epic-integration = callPackage ./epic-integration.nix { };
|
||||
comet-gog = comet-gog_heroic;
|
||||
electron = electron_37;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "heroic-unwrapped";
|
||||
version = "2.18.1";
|
||||
version = "2.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "HeroicGamesLauncher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x792VA4PZleqUUgarh59JxJVXrvT95/rINYk8t9i3X0=";
|
||||
hash = "sha256-e+/FRvG9u6ZQsMGD5hqY+yLPjsbLSrjC9Wp0xdxVk6w=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-F8H0eYltIJ0S8AX+2S3cR+v8dvePw09VWToVOLM8qII=";
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-uwJYOm+2wGNRHAiIw1UjCBLBW6kjtj6AFLWihCqtL28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10
|
||||
pnpm
|
||||
python3
|
||||
makeWrapper
|
||||
];
|
||||
@@ -54,8 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
# Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
|
||||
./fix-non-steam-shortcuts.patch
|
||||
# Fixes incorrect path to GalaxyCommunication.exe
|
||||
./pr-4885.patch
|
||||
];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
@@ -68,9 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpm --offline electron-vite build
|
||||
pnpm --offline electron-builder \
|
||||
--linux \
|
||||
--dir \
|
||||
-c.asarUnpack="**/*.node" \
|
||||
-c.electronDist=${electron.dist} \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
@@ -85,25 +89,27 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir -p "$out/opt/heroic"
|
||||
cp -r dist/linux-unpacked/resources "$out/opt/heroic"
|
||||
|
||||
cp -r public "$out/opt/heroic/resources/app.asar.unpacked/build"
|
||||
rm -rf "$out/opt/heroic/resources/app.asar.unpacked/build/bin"
|
||||
mkdir -p \
|
||||
"$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux" \
|
||||
"$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/win32"
|
||||
bin_dir="$out/opt/heroic/resources/app.asar.unpacked/build/bin"
|
||||
|
||||
# Clean up prebuilt binaries
|
||||
rm -r "$bin_dir"
|
||||
mkdir -p "$bin_dir/x64/linux/" "$bin_dir/x64/win32/"
|
||||
|
||||
ln -s \
|
||||
"${lib.getExe gogdl}" \
|
||||
"${lib.getExe legendary}" \
|
||||
"${lib.getExe nile}" \
|
||||
"${lib.getExe comet-gog}" \
|
||||
"${lib.getExe vulkan-helper}" \
|
||||
"$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/linux"
|
||||
"$bin_dir/x64/linux/"
|
||||
|
||||
# Don't symlink these so we don't confuse Windows applications under Wine/Proton.
|
||||
cp \
|
||||
"${comet-gog.dummy-service}/GalaxyCommunication.exe" \
|
||||
"${epic-integration}/EpicGamesLauncher.exe" \
|
||||
"$out/opt/heroic/resources/app.asar.unpacked/build/bin/x64/win32"
|
||||
"$bin_dir/x64/win32/"
|
||||
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
|
||||
makeWrapper "${lib.getExe electron}" "$out/bin/heroic" \
|
||||
--inherit-argv0 \
|
||||
--set ELECTRON_FORCE_IS_PACKAGED 1 \
|
||||
--suffix PATH ":" "${umu-launcher}/bin" \
|
||||
@@ -128,7 +134,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
|
||||
changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [
|
||||
tomasajt
|
||||
iedame
|
||||
keenanweaver
|
||||
DieracDelta
|
||||
baksa
|
||||
];
|
||||
# Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
|
||||
# It may also work on other Linux targets, but all the game stores only
|
||||
# support x86 Linux, so it would require extra hacking to run games via QEMU
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
From a98cc23b288e13665c8698eec56e0653613946d7 Mon Sep 17 00:00:00 2001
|
||||
From: Aidan Gauland <aidalgol@fastmail.net>
|
||||
Date: Tue, 19 Aug 2025 09:45:55 +1200
|
||||
Subject: [PATCH] [Fix] Run GalaxyComm executable path through fixAsarPath
|
||||
|
||||
---
|
||||
src/backend/constants/paths.ts | 4 ++++
|
||||
src/backend/launcher.ts | 15 +++++----------
|
||||
2 files changed, 9 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/backend/constants/paths.ts b/src/backend/constants/paths.ts
|
||||
index 1d05ce5b58..2e9cff1197 100644
|
||||
--- a/src/backend/constants/paths.ts
|
||||
+++ b/src/backend/constants/paths.ts
|
||||
@@ -44,6 +44,10 @@ export const fakeEpicExePath = fixAsarPath(
|
||||
join(publicDir, 'bin', 'x64', 'win32', 'EpicGamesLauncher.exe')
|
||||
)
|
||||
|
||||
+export const galaxyCommunicationExePath = fixAsarPath(
|
||||
+ join(publicDir, 'bin', 'x64', 'win32', 'GalaxyCommunication.exe')
|
||||
+)
|
||||
+
|
||||
export const webviewPreloadPath = fixAsarPath(
|
||||
join('file://', publicDir, 'webviewPreload.js')
|
||||
)
|
||||
diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts
|
||||
index a239cff927..2262dc35b2 100644
|
||||
--- a/src/backend/launcher.ts
|
||||
+++ b/src/backend/launcher.ts
|
||||
@@ -80,7 +80,7 @@ import {
|
||||
defaultWinePrefix,
|
||||
fixesPath,
|
||||
flatpakHome,
|
||||
- publicDir,
|
||||
+ galaxyCommunicationExePath,
|
||||
runtimePath,
|
||||
userHome
|
||||
} from './constants/paths'
|
||||
@@ -888,28 +888,23 @@ async function prepareWineLaunch(
|
||||
|
||||
try {
|
||||
if (runner === 'gog' && experimentalFeatures?.cometSupport !== false) {
|
||||
- const communicationSource = join(
|
||||
- publicDir,
|
||||
- 'bin/x64/win32/GalaxyCommunication.exe'
|
||||
- )
|
||||
-
|
||||
- const galaxyCommPath =
|
||||
+ const galaxyCommWinePath =
|
||||
'C:\\ProgramData\\GOG.com\\Galaxy\\redists\\GalaxyCommunication.exe'
|
||||
const communicationDest = await getWinePath({
|
||||
- path: galaxyCommPath,
|
||||
+ path: galaxyCommWinePath,
|
||||
gameSettings,
|
||||
variant: 'unix'
|
||||
})
|
||||
|
||||
if (!existsSync(communicationDest)) {
|
||||
mkdirSync(dirname(communicationDest), { recursive: true })
|
||||
- await copyFile(communicationSource, communicationDest)
|
||||
+ await copyFile(galaxyCommunicationExePath, communicationDest)
|
||||
await runWineCommand({
|
||||
commandParts: [
|
||||
'sc',
|
||||
'create',
|
||||
'GalaxyCommunication',
|
||||
- `binpath=${galaxyCommPath}`
|
||||
+ `binpath=${galaxyCommWinePath}`
|
||||
],
|
||||
gameSettings,
|
||||
protonVerb: 'runinprefix'
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
nodejs_20,
|
||||
nodejs_22,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
writeShellScriptBin,
|
||||
@@ -13,16 +13,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs_20;
|
||||
nodejs = nodejs_22;
|
||||
buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
|
||||
|
||||
version = "1.24.0";
|
||||
# update together with httptoolkit
|
||||
# nixpkgs-update: no auto update
|
||||
version = "1.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "httptoolkit";
|
||||
repo = "httptoolkit-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bwtNJz72dgeojMETvobsFr9x1St5rCO/Mwu5DBmcMhs=";
|
||||
hash = "sha256-tcUQe4YIUpQ9I5nq66K7LO84mLFo8YAdHY/c2HROSpk=";
|
||||
};
|
||||
|
||||
overridesNodeModules = buildNpmPackage' {
|
||||
@@ -30,7 +32,7 @@ let
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/overrides/js";
|
||||
|
||||
npmDepsHash = "sha256-MtUJY9IxzkGPuoIXHAr9nNNF+NpEf2b/oAYauJPwdaw=";
|
||||
npmDepsHash = "sha256-8cNGJdT8ndXa72ETttU2PjA8nfn+MTWesVVlA8GA1qQ=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -85,8 +87,6 @@ let
|
||||
# don't fetch node headers
|
||||
substituteInPlace node_modules/cmake-js/lib/dist.js \
|
||||
--replace-fail '!this.downloaded' 'false'
|
||||
|
||||
npm rebuild --verbose
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@@ -102,7 +102,7 @@ buildNpmPackage' {
|
||||
|
||||
patches = [ ./only-build-for-one-platform.patch ];
|
||||
|
||||
npmDepsHash = "sha256-ZumcKqm0JFu8UR/6tnSDzv9ABULmhsUnHtNsYvmR0Ao=";
|
||||
npmDepsHash = "sha256-vhTe7EccEX57h7LDtNaaLaNR8xHSOlbnLtGrs7qT7pY=";
|
||||
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index 8823235..a014292 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -498,10 +498,11 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/rebuild/node_modules/node-abi": {
|
||||
- "version": "3.74.0",
|
||||
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz",
|
||||
- "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==",
|
||||
+ "version": "3.77.0",
|
||||
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz",
|
||||
+ "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==",
|
||||
"dev": true,
|
||||
+ "license": "MIT",
|
||||
"dependencies": {
|
||||
"semver": "^7.3.5"
|
||||
},
|
||||
@@ -5239,9 +5240,10 @@
|
||||
}
|
||||
},
|
||||
"node_modules/node-abi": {
|
||||
- "version": "2.30.0",
|
||||
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
|
||||
- "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
|
||||
+ "version": "2.30.1",
|
||||
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
|
||||
+ "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
|
||||
+ "license": "MIT",
|
||||
"dependencies": {
|
||||
"semver": "^5.4.1"
|
||||
}
|
||||
@@ -7774,9 +7776,9 @@
|
||||
}
|
||||
},
|
||||
"node-abi": {
|
||||
- "version": "3.74.0",
|
||||
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz",
|
||||
- "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==",
|
||||
+ "version": "3.77.0",
|
||||
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.77.0.tgz",
|
||||
+ "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"semver": "^7.3.5"
|
||||
@@ -11329,9 +11331,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node-abi": {
|
||||
- "version": "2.30.0",
|
||||
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz",
|
||||
- "integrity": "sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==",
|
||||
+ "version": "2.30.1",
|
||||
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
|
||||
+ "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
|
||||
"requires": {
|
||||
"semver": "^5.4.1"
|
||||
},
|
||||
@@ -6,30 +6,28 @@
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
electron_37,
|
||||
electron_39,
|
||||
httptoolkit-server,
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_37;
|
||||
electron = electron_39;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "httptoolkit";
|
||||
version = "1.22.1";
|
||||
|
||||
# update together with httptoolkit-server
|
||||
# nixpkgs-update: no auto update
|
||||
version = "1.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "httptoolkit";
|
||||
repo = "httptoolkit-desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6iiXOBVtPLdW9MWUcu2Hggm7uPHudASebRPQ34JJTMQ=";
|
||||
hash = "sha256-b1u+DFhxU/ED4GgMHFaF51zNfC+0vIg6ujyA8jIy8AQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# generated via running: `npm update node-abi`
|
||||
./bump-node-abi.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-WtnL9Gf1zGWnIjMifh0l3fwaeur+iI1l/Vwta+X6EAM=";
|
||||
npmDepsHash = "sha256-FX8sClJL66zvWEaaw0lmoat7cM396RA8Rq9NgRVh0Vw=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libks";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "signalwire";
|
||||
repo = "libks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XnNyzH+VdBHligJ5+ct835Mekw2DbxMboC06Umm2Zak=";
|
||||
hash = "sha256-oLf1ECSKa6KLTA8MO0le44eEDaLmPz/RHoLa8ZSwjWs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "librelane";
|
||||
version = "3.0.0.dev47-unstable-2026-01-12";
|
||||
version = "3.0.0.dev49";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librelane";
|
||||
repo = "librelane";
|
||||
rev = "f1efecac3151f3275fa2ea7d656f8ea7e3225a9d";
|
||||
hash = "sha256-XZHypZ+Ht1Zbb0N9VBUmrZKwWuqYA0/w7DpZBOO9KU8=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-g6bQMg9W0gbvJzVvO4ESeAtswbBoUVY3NXLK4UdOcGs=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -0,0 +1,339 @@
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index bc450db..83dff09 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -59,12 +59,12 @@
|
||||
"css-loader": "^7.1.2",
|
||||
"css-minimizer-webpack-plugin": "^7.0.2",
|
||||
"del": "^6.1.1",
|
||||
- "electron": "37.6.1",
|
||||
- "electron-builder": "^26.3.2",
|
||||
+ "electron": "40.0.0",
|
||||
+ "electron-builder": "^26.4.0",
|
||||
"electron-debug": "^3.2.0",
|
||||
"electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03",
|
||||
"electron-to-chromium": "^1.5.262",
|
||||
- "electron-updater": "6.7.2",
|
||||
+ "electron-updater": "6.7.3",
|
||||
"eslint": "^8.57.1",
|
||||
"eslint-config-standard": "^17.1.0",
|
||||
"eslint-config-standard-with-typescript": "^43.0.1",
|
||||
@@ -2059,9 +2059,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/universal/node_modules/fs-extra": {
|
||||
- "version": "11.3.2",
|
||||
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
|
||||
- "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
|
||||
+ "version": "11.3.3",
|
||||
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz",
|
||||
+ "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -2119,9 +2119,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@electron/windows-sign/node_modules/fs-extra": {
|
||||
- "version": "11.3.2",
|
||||
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
|
||||
- "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
|
||||
+ "version": "11.3.3",
|
||||
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.3.tgz",
|
||||
+ "integrity": "sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
@@ -4189,9 +4189,9 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/app-builder-lib": {
|
||||
- "version": "26.3.2",
|
||||
- "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.3.2.tgz",
|
||||
- "integrity": "sha512-ZG4wzxbmmiLUm+W0wXMlMI0LHXK/fsR+Rf21SUs7avujGQ7ZCFLgmIvvWaQ69u1EFnSkYZ2sefKqk1yW/HXeuw==",
|
||||
+ "version": "26.4.0",
|
||||
+ "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.4.0.tgz",
|
||||
+ "integrity": "sha512-Uas6hNe99KzP3xPWxh5LGlH8kWIVjZixzmMJHNB9+6hPyDpjc7NQMkVgi16rQDdpCFy22ZU5sp8ow7tvjeMgYQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -4205,7 +4205,7 @@
|
||||
"@malept/flatpak-bundler": "^0.4.0",
|
||||
"@types/fs-extra": "9.0.13",
|
||||
"async-exit-hook": "^2.0.1",
|
||||
- "builder-util": "26.3.1",
|
||||
+ "builder-util": "26.3.4",
|
||||
"builder-util-runtime": "9.5.1",
|
||||
"chromium-pickle-js": "^0.2.0",
|
||||
"ci-info": "4.3.1",
|
||||
@@ -4213,7 +4213,7 @@
|
||||
"dotenv": "^16.4.5",
|
||||
"dotenv-expand": "^11.0.6",
|
||||
"ejs": "^3.1.8",
|
||||
- "electron-publish": "26.3.1",
|
||||
+ "electron-publish": "26.3.4",
|
||||
"fs-extra": "^10.1.0",
|
||||
"hosted-git-info": "^4.1.0",
|
||||
"isbinaryfile": "^5.0.0",
|
||||
@@ -4224,7 +4224,7 @@
|
||||
"minimatch": "^10.0.3",
|
||||
"plist": "3.1.0",
|
||||
"resedit": "^1.7.0",
|
||||
- "semver": "7.7.2",
|
||||
+ "semver": "~7.7.3",
|
||||
"tar": "^6.1.12",
|
||||
"temp-file": "^3.4.0",
|
||||
"tiny-async-pool": "1.3.0",
|
||||
@@ -4234,8 +4234,8 @@
|
||||
"node": ">=14.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
- "dmg-builder": "26.3.2",
|
||||
- "electron-builder-squirrel-windows": "26.3.2"
|
||||
+ "dmg-builder": "26.4.0",
|
||||
+ "electron-builder-squirrel-windows": "26.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/app-builder-lib/node_modules/fs-extra": {
|
||||
@@ -4994,9 +4994,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/builder-util": {
|
||||
- "version": "26.3.1",
|
||||
- "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.3.1.tgz",
|
||||
- "integrity": "sha512-pplZEYBx1g15qvIOshpR1WTwjAwQM4ukhGgSNdYPnbuM6wLePq3+njy1sGfekCrJmUP+2xfuwuT9zEoUWfX5zQ==",
|
||||
+ "version": "26.3.4",
|
||||
+ "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.3.4.tgz",
|
||||
+ "integrity": "sha512-aRn88mYMktHxzdqDMF6Ayj0rKoX+ZogJ75Ck7RrIqbY/ad0HBvnS2xA4uHfzrGr5D2aLL3vU6OBEH4p0KMV2XQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -5005,7 +5005,6 @@
|
||||
"app-builder-bin": "5.0.0-alpha.12",
|
||||
"builder-util-runtime": "9.5.1",
|
||||
"chalk": "^4.1.2",
|
||||
- "ci-info": "^4.2.0",
|
||||
"cross-spawn": "^7.0.6",
|
||||
"debug": "^4.3.4",
|
||||
"fs-extra": "^10.1.0",
|
||||
@@ -5198,9 +5197,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/cacache/node_modules/tar": {
|
||||
- "version": "7.5.2",
|
||||
- "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
|
||||
- "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
|
||||
+ "version": "7.5.7",
|
||||
+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz",
|
||||
+ "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==",
|
||||
"dev": true,
|
||||
"license": "BlueOak-1.0.0",
|
||||
"dependencies": {
|
||||
@@ -6665,14 +6664,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/dmg-builder": {
|
||||
- "version": "26.3.2",
|
||||
- "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.3.2.tgz",
|
||||
- "integrity": "sha512-UM7/WRmESXnKXBShmKJ+xiEQ3U82/zb/tyaCKGn4Y4cf+WynLzQPeBToZtrIXTs3ZPyJQBIf+btkoCzVVnhO4g==",
|
||||
+ "version": "26.4.0",
|
||||
+ "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.4.0.tgz",
|
||||
+ "integrity": "sha512-ce4Ogns4VMeisIuCSK0C62umG0lFy012jd8LMZ6w/veHUeX4fqfDrGe+HTWALAEwK6JwKP+dhPvizhArSOsFbg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
- "app-builder-lib": "26.3.2",
|
||||
- "builder-util": "26.3.1",
|
||||
+ "app-builder-lib": "26.4.0",
|
||||
+ "builder-util": "26.3.4",
|
||||
"fs-extra": "^10.1.0",
|
||||
"iconv-lite": "^0.6.2",
|
||||
"js-yaml": "^4.1.0"
|
||||
@@ -6966,15 +6965,15 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron": {
|
||||
- "version": "37.6.1",
|
||||
- "resolved": "https://registry.npmjs.org/electron/-/electron-37.6.1.tgz",
|
||||
- "integrity": "sha512-aHtJVNjqf0lk7dlPoc1X+fMBpZtLn+XGvP6IYc3gooTwsD1D/Ic2SBRC9SnIk6LkWTsDaSF9jgH1d9Q7eABy/Q==",
|
||||
+ "version": "40.0.0",
|
||||
+ "resolved": "https://registry.npmjs.org/electron/-/electron-40.0.0.tgz",
|
||||
+ "integrity": "sha512-UyBy5yJ0/wm4gNugCtNPjvddjAknMTuXR2aCHioXicH7aKRKGDBPp4xqTEi/doVcB3R+MN3wfU9o8d/9pwgK2A==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@electron/get": "^2.0.0",
|
||||
- "@types/node": "^22.7.7",
|
||||
+ "@types/node": "^24.9.0",
|
||||
"extract-zip": "^2.0.1"
|
||||
},
|
||||
"bin": {
|
||||
@@ -6985,18 +6984,18 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron-builder": {
|
||||
- "version": "26.3.2",
|
||||
- "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.3.2.tgz",
|
||||
- "integrity": "sha512-Lbfw8KHx1gxmg0tRFKb67hdvqzaz+ha4Ab5l6iQWo3o2yoVImiiJeifs8PSM5evo3BQWCLKtSQaSdZxg1ldIdg==",
|
||||
+ "version": "26.4.0",
|
||||
+ "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.4.0.tgz",
|
||||
+ "integrity": "sha512-FCUqvdq2AULL+Db2SUGgjOYTbrgkPxZtCjqIZGnjH9p29pTWyesQqBIfvQBKa6ewqde87aWl49n/WyI/NyUBog==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
- "app-builder-lib": "26.3.2",
|
||||
- "builder-util": "26.3.1",
|
||||
+ "app-builder-lib": "26.4.0",
|
||||
+ "builder-util": "26.3.4",
|
||||
"builder-util-runtime": "9.5.1",
|
||||
"chalk": "^4.1.2",
|
||||
"ci-info": "^4.2.0",
|
||||
- "dmg-builder": "26.3.2",
|
||||
+ "dmg-builder": "26.4.0",
|
||||
"fs-extra": "^10.1.0",
|
||||
"lazy-val": "^1.0.5",
|
||||
"simple-update-notifier": "2.0.0",
|
||||
@@ -7011,15 +7010,15 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron-builder-squirrel-windows": {
|
||||
- "version": "26.3.2",
|
||||
- "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.3.2.tgz",
|
||||
- "integrity": "sha512-SgvOmoulc1Ezmmi2aIh7//Fs9/Yr6B9L55MeBLy3A5Fn1dUnOF7Px4xNBFiw+fEFxrFCej3cCo2JqGOcBi31Pg==",
|
||||
+ "version": "26.4.0",
|
||||
+ "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.4.0.tgz",
|
||||
+ "integrity": "sha512-7dvalY38xBzWNaoOJ4sqy2aGIEpl2S1gLPkkB0MHu1Hu5xKQ82il1mKSFlXs6fLpXUso/NmyjdHGlSHDRoG8/w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
- "app-builder-lib": "26.3.2",
|
||||
- "builder-util": "26.3.1",
|
||||
+ "app-builder-lib": "26.4.0",
|
||||
+ "builder-util": "26.3.4",
|
||||
"electron-winstaller": "5.4.0"
|
||||
}
|
||||
},
|
||||
@@ -7142,14 +7141,14 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron-publish": {
|
||||
- "version": "26.3.1",
|
||||
- "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.3.1.tgz",
|
||||
- "integrity": "sha512-XYGYL/fpQULLW9slTVPelaUOGlKfOTmV2Uda3K+qzFzvNnkGJCj7L0nLVvMuj5cgxpAX+3BhO5HOUb4rv6jikA==",
|
||||
+ "version": "26.3.4",
|
||||
+ "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.3.4.tgz",
|
||||
+ "integrity": "sha512-5/ouDPb73SkKuay2EXisPG60LTFTMNHWo2WLrK5GDphnWK9UC+yzYrzVeydj078Yk4WUXi0+TaaZsNd6Zt5k/A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/fs-extra": "^9.0.11",
|
||||
- "builder-util": "26.3.1",
|
||||
+ "builder-util": "26.3.4",
|
||||
"builder-util-runtime": "9.5.1",
|
||||
"chalk": "^4.1.2",
|
||||
"form-data": "^4.0.0",
|
||||
@@ -7204,9 +7203,9 @@
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/electron-updater": {
|
||||
- "version": "6.7.2",
|
||||
- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.7.2.tgz",
|
||||
- "integrity": "sha512-URw19f7afuB5HQOdxhu5wdnWE+w/lTGsXJ3RdObSJXIkW0i9r3ZUWrd1CjggTrD0qzEuxBODe4VFPM8OBg4qEA==",
|
||||
+ "version": "6.7.3",
|
||||
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.7.3.tgz",
|
||||
+ "integrity": "sha512-EgkT8Z9noqXKbwc3u5FkJA+r48jwZ5DTUiOkJMOTEEH//n5Am6wfQGz7nvSFEA2oIAMv9jRzn5JKTyWeSKOPgg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -7216,7 +7215,7 @@
|
||||
"lazy-val": "^1.0.5",
|
||||
"lodash.escaperegexp": "^4.1.2",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
- "semver": "7.7.2",
|
||||
+ "semver": "~7.7.3",
|
||||
"tiny-typed-emitter": "^2.1.0"
|
||||
}
|
||||
},
|
||||
@@ -7297,15 +7296,22 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron/node_modules/@types/node": {
|
||||
- "version": "22.17.0",
|
||||
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.0.tgz",
|
||||
- "integrity": "sha512-bbAKTCqX5aNVryi7qXVMi+OkB3w/OyblodicMbvE38blyAz7GxXf6XYhklokijuPwwVg9sDLKRxt0ZHXQwZVfQ==",
|
||||
+ "version": "24.10.9",
|
||||
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.9.tgz",
|
||||
+ "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
- "undici-types": "~6.21.0"
|
||||
+ "undici-types": "~7.16.0"
|
||||
}
|
||||
},
|
||||
+ "node_modules/electron/node_modules/undici-types": {
|
||||
+ "version": "7.16.0",
|
||||
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
|
||||
+ "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
|
||||
+ "dev": true,
|
||||
+ "license": "MIT"
|
||||
+ },
|
||||
"node_modules/emoji-regex": {
|
||||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
|
||||
@@ -11800,9 +11806,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/node-abi": {
|
||||
- "version": "4.12.0",
|
||||
- "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.12.0.tgz",
|
||||
- "integrity": "sha512-bPSN9a/qIEiURzVVO/I7P/8oPeYTSl+vnvVZBXM/8XerKOgA3dMAIUjl+a+lz9VwTowwSKS3EMsgz/vWDXOkuQ==",
|
||||
+ "version": "4.26.0",
|
||||
+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.26.0.tgz",
|
||||
+ "integrity": "sha512-8QwIZqikRvDIkXS2S93LjzhsSPJuIbfaMETWH+Bx8oOT9Sa9UsUtBFQlc3gBNd1+QINjaTloitXr1W3dQLi9Iw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"semver": "^7.6.3"
|
||||
@@ -11896,9 +11902,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/node-gyp/node_modules/tar": {
|
||||
- "version": "7.5.2",
|
||||
- "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
|
||||
- "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
|
||||
+ "version": "7.5.7",
|
||||
+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz",
|
||||
+ "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==",
|
||||
"dev": true,
|
||||
"license": "BlueOak-1.0.0",
|
||||
"dependencies": {
|
||||
@@ -16401,6 +16407,7 @@
|
||||
"version": "6.2.1",
|
||||
"resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
|
||||
"integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
|
||||
+ "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
diff --git a/package.json b/package.json
|
||||
index 3e5c884..96732dd 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -133,12 +133,12 @@
|
||||
"css-loader": "^7.1.2",
|
||||
"css-minimizer-webpack-plugin": "^7.0.2",
|
||||
"del": "^6.1.1",
|
||||
- "electron": "37.6.1",
|
||||
- "electron-builder": "^26.3.2",
|
||||
+ "electron": "40.0.0",
|
||||
+ "electron-builder": "^26.4.0",
|
||||
"electron-debug": "^3.2.0",
|
||||
"electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03",
|
||||
"electron-to-chromium": "^1.5.262",
|
||||
- "electron-updater": "6.7.2",
|
||||
+ "electron-updater": "6.7.3",
|
||||
"eslint": "^8.57.1",
|
||||
"eslint-config-standard": "^17.1.0",
|
||||
"eslint-config-standard-with-typescript": "^43.0.1",
|
||||
@@ -10,22 +10,22 @@
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
|
||||
electron_37,
|
||||
electron_40,
|
||||
nodejs_22,
|
||||
commandLineArgs ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_37;
|
||||
electron = electron_40;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "lx-music-desktop";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lyswhut";
|
||||
repo = "lx-music-desktop";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-g4QVpymzoRKIq70aRLXGFmUmIpSiXIZThrp8fumBKTQ=";
|
||||
};
|
||||
|
||||
@@ -57,6 +57,7 @@ buildNpmPackage rec {
|
||||
(replaceVars ./electron-builder.patch {
|
||||
electron_version = electron.version;
|
||||
})
|
||||
./electron-version.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,7 +68,7 @@ buildNpmPackage rec {
|
||||
# Npm 11 (nodejs 24) can't resolve all dependencies from the prefetched cache.
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-t6I8ch36Yh6N+qZy4/yr/gSyJ3qdyMWss5LbsagEFMQ=";
|
||||
npmDepsHash = "sha256-BmrY7IXx6Z+sBAemYnOZUBMyLInENMOB6fh/4LoV80w=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
@@ -123,11 +124,11 @@ buildNpmPackage rec {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "Music software based on Electron and Vue";
|
||||
homepage = "https://github.com/lyswhut/lx-music-desktop";
|
||||
changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${version}";
|
||||
changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = electron.meta.platforms;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
mainProgram = "lx-music-desktop";
|
||||
maintainers = with lib.maintainers; [ starryreverie ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
diff --git a/.cargo/config.toml b/.cargo/config.toml
|
||||
index 4abaaa83d..edc4d6710 100644
|
||||
index dde3bc53f..693808c6e 100644
|
||||
--- a/.cargo/config.toml
|
||||
+++ b/.cargo/config.toml
|
||||
@@ -1,12 +1,5 @@
|
||||
-[target.x86_64-unknown-linux-gnu]
|
||||
-rustflags = ["-C", "target-cpu=native"]
|
||||
-
|
||||
-[target.aarch64-apple-darwin]
|
||||
@@ -1,15 +1,10 @@
|
||||
-[build]
|
||||
-rustflags = ["-C", "target-cpu=native"]
|
||||
-
|
||||
[target.wasm32-unknown-unknown]
|
||||
rustflags = ["-C", "target-feature=+simd128"]
|
||||
[target.aarch64-apple-darwin]
|
||||
rustflags = [
|
||||
- "-C", "target-cpu=native",
|
||||
"-C", "target-feature=+aes,+sha2,+fp16",
|
||||
]
|
||||
|
||||
[target.x86_64-apple-darwin]
|
||||
rustflags = [
|
||||
- "-C", "target-cpu=native",
|
||||
"-C", "target-feature=-avx,-avx2",
|
||||
]
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
assert accelIsValid;
|
||||
(acceleration == "cuda") || (config.cudaSupport && acceleration == null);
|
||||
|
||||
minRequiredCudaCapability = "6.1"; # build fails with 6.0
|
||||
minRequiredCudaCapability = "8.0"; # build fails with 7.5
|
||||
inherit (cudaPackages.flags) cudaCapabilities;
|
||||
cudaCapabilityString =
|
||||
if cudaCapability == null then
|
||||
@@ -74,20 +74,29 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mistral-rs";
|
||||
version = "0.5.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EricLBuehler";
|
||||
repo = "mistral.rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mkxgssJUBtM1DYOhFfj8YKlW61/gd0cgPtMze7YZ9L8=";
|
||||
hash = "sha256-2gE3LRm2oy6H+y6dRNnwYIjlaG67it16bfhfTk4CUTc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./no-native-cpu.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-YGGtS8gJJQKIgXxMWjO05ikSVdfVNs+cORbJ+Wf88y4=";
|
||||
postPatch =
|
||||
# LTO significantly increases the build time (12m -> 1h)
|
||||
''
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace-fail \
|
||||
"lto = true" \
|
||||
"lto = false"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-nktoMh07PfGJ156XrKa1N/icB634cr9ybsHq/y9zHKo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -121,18 +130,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
++ lib.optionals (hostPlatform.isDarwin && metalSupport) [ "metal" ];
|
||||
|
||||
env = {
|
||||
# metal (proprietary) is not available in the darwin sandbox.
|
||||
# Hence, we must disable metal precompilation.
|
||||
MISTRALRS_METAL_PRECOMPILE = 0;
|
||||
|
||||
SWAGGER_UI_DOWNLOAD_URL =
|
||||
let
|
||||
# When updating:
|
||||
# - Look for the version of `utoipa-swagger-ui` at:
|
||||
# https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/mistralrs-server/Cargo.toml
|
||||
# https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/Cargo.toml
|
||||
# - Look at the corresponding version of `swagger-ui` at:
|
||||
# https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-<UTOPIA-SWAGGER-UI-VERSION>/utoipa-swagger-ui/build.rs#L21-L22
|
||||
swaggerUiVersion = "5.17.12";
|
||||
swaggerUiVersion = "5.17.14";
|
||||
|
||||
swaggerUi = fetchurl {
|
||||
url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip";
|
||||
hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I=";
|
||||
hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw=";
|
||||
};
|
||||
in
|
||||
"file://${swaggerUi}";
|
||||
@@ -155,7 +168,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
# swagger-ui will once more be copied in the target directory during the check phase
|
||||
# See https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-7.1.0/utoipa-swagger-ui/build.rs#L168
|
||||
# See https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-9.0.2/utoipa-swagger-ui/build.rs#L168
|
||||
# Not deleting the existing unpacked archive leads to a `PermissionDenied` error
|
||||
preCheck = ''
|
||||
rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/
|
||||
@@ -166,23 +179,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# - `cargo check ... --features=metal` (on darwin) requires the sandbox to be completely disabled
|
||||
checkFeatures = [ ];
|
||||
|
||||
# Try to access internet
|
||||
checkFlags = [
|
||||
# Try to access internet
|
||||
"--skip=gguf::gguf_tokenizer::tests::test_encode_decode_gpt2"
|
||||
"--skip=gguf::gguf_tokenizer::tests::test_encode_decode_llama"
|
||||
"--skip=util::tests::test_parse_image_url"
|
||||
"--skip=utils::tiktoken::tests::test_tiktoken_conversion"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/mistralrs-server";
|
||||
doInstallCheck = true;
|
||||
# When started, mistralrs tries to load libcuda.so from the driver which is not available in the sandbox
|
||||
# mistralrs: error while loading shared libraries: libcuda.so.1: cannot open shared object file: No such file or directory
|
||||
doInstallCheck = !cudaSupport;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
version = testers.testVersion { package = mistral-rs; };
|
||||
|
||||
withMkl = lib.optionalAttrs (hostPlatform.isLinux && hostPlatform.isx86_64) (
|
||||
mistral-rs.override { acceleration = "mkl"; }
|
||||
);
|
||||
@@ -200,7 +213,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
changelog = "https://github.com/EricLBuehler/mistral.rs/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "mistralrs-server";
|
||||
mainProgram = "mistralrs";
|
||||
platforms =
|
||||
if cudaSupport then
|
||||
lib.platforms.linux
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchdarcs,
|
||||
python3Packages,
|
||||
ocamlPackages,
|
||||
darwin,
|
||||
makeBinaryWrapper,
|
||||
coreutils,
|
||||
nix-prefetch-darcs,
|
||||
@@ -31,6 +33,9 @@ ocamlPackages.buildDunePackage (finalAttrs: {
|
||||
# For manpages
|
||||
python3Packages.docutils
|
||||
python3Packages.pygments
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.sigtool
|
||||
];
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
|
||||
@@ -68,6 +68,9 @@ stdenv.mkDerivation {
|
||||
disabledTests = [
|
||||
"test_cifspacegroup_11"
|
||||
"pybindtest_obconv_writers"
|
||||
# These tests fail with GCC 15
|
||||
"test_align_4"
|
||||
"test_align_5"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.1.36";
|
||||
version = "1.1.41";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ovFGFI2dSZLKSeuanRZg9cNvMCxYnS3UbtaCKls5BYQ=";
|
||||
hash = "sha256-p4mZRJ+BQs790hjCOJ9iXzg3JoCa4lqOdCqDRkoEfWw=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# NOTE: Required else we get errors that our fixed-output derivation references store paths
|
||||
dontFixup = true;
|
||||
|
||||
outputHash = "sha256-MPzEzyx+Av0sa6EU3ewjUSwAOyA+GJGfvEoROYqZjkM=";
|
||||
outputHash = "sha256-bjSPHxPTyzhMOztd7HjUl/lvMZYVk944xPj8ADDn5Y4=";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
pname = "openfga";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
@@ -17,10 +17,10 @@ buildGoModule {
|
||||
owner = "openfga";
|
||||
repo = "openfga";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-L8rzLTMcE2tcXrYQdTlkuIrRzZ+gHBj/NYZaq9zpUik=";
|
||||
hash = "sha256-PpDyDwKYx45Q07n7AdwVQdZ2TygDYo/Zi6m+RnzGPzE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pwEyPHQZ6XYa/HhopvY/hDFHIAbnC51d2IQBSpvMBY8=";
|
||||
vendorHash = "sha256-UoGxXhf3hx3Gk8GCcPpBMbmKxLrxVl3lNpBOEubdHtw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cacert,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -14,17 +13,18 @@
|
||||
libzip,
|
||||
lua5_4,
|
||||
luajit,
|
||||
mbedtls_2,
|
||||
mbedtls,
|
||||
pcre2,
|
||||
sdl3,
|
||||
sdl3-image,
|
||||
xz,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pragtical";
|
||||
version = "3.7.0";
|
||||
pluginManagerVersion = "1.4.0";
|
||||
version = "3.8.1";
|
||||
pluginManagerVersion = "1.4.7.1";
|
||||
linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -50,18 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
find subprojects -type d -name .git -prune -execdir rm -r {} +
|
||||
'';
|
||||
|
||||
hash = "sha256-oqXv08TvZWVRsSCX6V9oAGHkFS0hL/gm3tGdiivOI6Q=";
|
||||
hash = "sha256-b4qbNkqwyu4Ofaz3hof8lheOKYoerA2hfKMSNsTpHVY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/pragtical/pragtical/pull/334
|
||||
(fetchpatch {
|
||||
name = "fix-dirmonitor-backend-detection.patch";
|
||||
url = "https://github.com/pragtical/pragtical/commit/5cf26e1f6a491f28d761390309dd77a795bdae9d.patch";
|
||||
hash = "sha256-eD17ItcsyRTKn6jydyW3J2lFq/hl3qHUmQ2LC4LXKC0=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -79,14 +70,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libzip
|
||||
lua5_4
|
||||
luajit
|
||||
mbedtls_2
|
||||
mbedtls
|
||||
pcre2
|
||||
sdl3
|
||||
sdl3-image
|
||||
xz
|
||||
zlib
|
||||
];
|
||||
|
||||
mesonFlags = [ "-Duse_system_lua=true" ];
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "use_system_lua" true)
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/pragtical/pragtical/blob/${finalAttrs.src.rev}/changelog.md";
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "slade";
|
||||
version = "3.2.11-unstable-2026-01-17";
|
||||
version = "3.2.11-unstable-2026-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = "97e9f38a1b348705e68a9a6d66bbe6156e923770";
|
||||
hash = "sha256-kZ6KyhI2oZH0SeymcHge9+rbq/ZGfhKXGdfOlje2zqM=";
|
||||
rev = "10cfdb655f541ba2c37da97bea9d5fc0cb5c7541";
|
||||
hash = "sha256-5aXfy7sAewIOMqzgd1HBrVlusx2TKz61SfTFsTIRTII=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "slurm";
|
||||
version = "25.11.1.1";
|
||||
version = "25.11.2.1";
|
||||
|
||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||
# because the latter does not keep older releases.
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
repo = "slurm";
|
||||
# The release tags use - instead of .
|
||||
rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
|
||||
hash = "sha256-Hv0rqogwZH5GafwlELghAbKLwurd8x30u9DJZylBQP0=";
|
||||
hash = "sha256-ukQlxKD+XhvL/sh15g3Tk5drsgXkK3hV+PFa1d2y9mk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -59,15 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"dev"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# upstream patch; remove with next upgrade.
|
||||
(fetchpatch {
|
||||
name = "pmix-509-compatability.patch";
|
||||
url = "https://github.com/SchedMD/slurm/commit/be063f0c646d2bfe10d358fa7063f2b64e19e063.patch";
|
||||
hash = "sha256-QbKMBMl+VTLrzdXhPtcqwC7OcAXcJBxDS8jRZ2EoJL4=";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace src/common/env.c \
|
||||
--replace "/bin/echo" "${lib.getExe' coreutils "echo"}"
|
||||
|
||||
@@ -8,17 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "systemctl-tui";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgwood";
|
||||
repo = "systemctl-tui";
|
||||
# https://github.com/rgwood/systemctl-tui/issues/68#issuecomment-3735677971
|
||||
tag = "v${finalAttrs.version}-take2";
|
||||
hash = "sha256-6SN8c8gDVsvFFyrcFjdO70pJpVxWG/AbdB6V4mM5Q5Y=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qm5CcBry1Cls/neZz4Q4jdNjN3vr3pdV0X7KWW0qP70=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4VlKJUxmxC1dIZYsUMLhNzOJTYacpddlKZUSwjKlzJ8=";
|
||||
cargoHash = "sha256-0wR8AaGfIlsQbYzwCI4xEGZ+tu1ETHRJ8VlLT5shkOk=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tempo";
|
||||
version = "2.9.1";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Cbac8LQGZ5y+6JE40s/eCufeUH4QxyOiGOfg4XFIstE=";
|
||||
hash = "sha256-ciiJg8PdvifYGalfo/V8RFTKkZ8pHM9RlwfGRKeRAhU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -46,11 +46,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tor";
|
||||
version = "0.4.8.21";
|
||||
version = "0.4.8.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6vb1tzCRuVV2lF6t6YgW3f980AW+/k2UcYpvdmuECQM=";
|
||||
hash = "sha256-yIYg2SeKJ549In/2CXW4SqQTWSEfjs/2hgGZI7mSkzI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -23,13 +23,13 @@ assert lib.assertMsg (
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vgmstream";
|
||||
version = "2055";
|
||||
version = "2083";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vgmstream";
|
||||
repo = "vgmstream";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU=";
|
||||
hash = "sha256-iSl4rkyJhZIyxVnX55zFu98PTv3ekEJrOaPIb+KOcRE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious";
|
||||
|
||||
@@ -90,7 +90,7 @@ buildDunePackage {
|
||||
]
|
||||
++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ])
|
||||
++ (
|
||||
if lib.versionAtLeast version "3.3.0" || version == "dev" then
|
||||
if lib.versionAtLeast version "2.0.7" || version == "dev" then
|
||||
[
|
||||
ppx_deriving
|
||||
]
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildPecl rec {
|
||||
pname = "mongodb";
|
||||
version = "2.1.4";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-php-driver";
|
||||
rev = version;
|
||||
hash = "sha256-hvkC0fBONDhgozTfEM0xdlDSY9VM4O1qCgJKEwWOdH0=";
|
||||
hash = "sha256-07Sc9bg5MHWhAyhrghqGjblMrgP/kuKwIjtt0WUCnDo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202601281";
|
||||
version = "0.1.202601291";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xixOMQC8/gZO7xfA740qd5j9hiRphpotfJdPVKjBIrA=";
|
||||
hash = "sha256-3Q2zBJ85Qmnb10SuudC2ops5uKjDF6oeg8J+Pp5SeLg=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
psycopg2,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-vector-stores-postgres";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_postgres";
|
||||
inherit version;
|
||||
hash = "sha256-0p25AoDSSCvarESejZBw4AfsMDsEjt+2ckfdXCBuerU=";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-e1xi5GLWgde42GaLk+WwAjv9Oqr8924rS/z4hdw7ScY=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [ "psycopg2-binary" ];
|
||||
@@ -41,4 +41,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nrgkick-api";
|
||||
version = "1.5.0";
|
||||
version = "1.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andijakl";
|
||||
repo = "nrgkick-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WtSL9fUJF2xsX53epFcY++KwjnAs3YiKHDb2a5x4tfE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q9mLX+DjNSyvjJ6hNPZckaHTNNelOsOlOe9XeVqutaU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -38,8 +38,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python client for NRGkick Gen2 EV charger local REST API";
|
||||
homepage = "https://github.com/andijakl/nrgkick-api";
|
||||
changelog = "https://github.com/andijakl/nrgkick-api/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/andijakl/nrgkick-api/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,9 +6,6 @@
|
||||
# build-system
|
||||
poetry-core,
|
||||
|
||||
# dependencies
|
||||
packaging,
|
||||
|
||||
# tests
|
||||
jax,
|
||||
numpy,
|
||||
@@ -16,26 +13,22 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyvers";
|
||||
version = "0.1.0";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmoens";
|
||||
repo = "pyvers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BUUfb0vI1r/VV5aF9gmqnXGOIWQfBJ98MrcF/IH5CEs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VKNwhxyc1f7tyJO7JyBNELlZwVv6U2N8ye0OYFN/nmc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
packaging
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyvers" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -48,8 +41,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python library for dynamic dispatch based on module versions and backends";
|
||||
homepage = "https://github.com/vmoens/pyvers";
|
||||
changelog = "https://github.com/vmoens/pyvers/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/vmoens/pyvers/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "sagemaker-core";
|
||||
version = "1.0.74";
|
||||
version = "1.0.75";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-core";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1wQvytoIMeBpFZfP88CfHXy0sJdg3+D0P7vXcltNAWs=";
|
||||
hash = "sha256-yRXnXGH4BoURohty/daPYd6FDGsAk9a1AiXtyCkKxug=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.39";
|
||||
version = "3.1.40";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4C9icsmK8wpFUGTLXD4Lvt88iJT3HzFG0FX8YMKRlKA=";
|
||||
hash = "sha256-3040m7RGQDcVRR6x03+bKCmbBNXtbBmu208k8ADjZ24=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
pybind11,
|
||||
@@ -27,16 +28,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tensordict";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "tensordict";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yxyA9BfN2hp1C3s+g2zBM2gVtckH3LV7luWw8DshFUs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PUPDKv10Ks4B1kpgbRcnmfWFUkpFEdxMmTNztFVfdK4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -86,6 +87,10 @@ buildPythonPackage rec {
|
||||
# hangs forever on some CPUs
|
||||
"test_map_iter_interrupt_early"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# AssertionError: assert 'a string!' == 'a metadata!'
|
||||
"test_save_load_memmap"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Hangs due to the use of a pool
|
||||
"test_chunksize_num_chunks"
|
||||
@@ -109,9 +114,9 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Pytorch dedicated tensor container";
|
||||
changelog = "https://github.com/pytorch/tensordict/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/pytorch/tensordict/releases/tag/${finalAttrs.src.tag}";
|
||||
homepage = "https://github.com/pytorch/tensordict";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
numpy,
|
||||
pybind11,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
torch,
|
||||
|
||||
# dependencies
|
||||
@@ -45,6 +46,7 @@
|
||||
vllm,
|
||||
# marl
|
||||
pettingzoo,
|
||||
vmas,
|
||||
# offline-data
|
||||
h5py,
|
||||
huggingface-hub,
|
||||
@@ -71,16 +73,16 @@
|
||||
scipy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "torchrl";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "rl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Vd/w11P4NVrx2xki+VYlXQaM8F+vpdokke8ZAHg6h0Q=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ae1zhc3lESCsuAJbbjrT5Vv0zTIiiBw9HBtKwWsbVzc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -94,6 +96,7 @@ buildPythonPackage rec {
|
||||
numpy
|
||||
pybind11
|
||||
setuptools
|
||||
setuptools-scm
|
||||
torch
|
||||
];
|
||||
dontUseCmakeConfigure = true;
|
||||
@@ -139,7 +142,7 @@ buildPythonPackage rec {
|
||||
marl = [
|
||||
# dm-meltingpot (unpackaged)
|
||||
pettingzoo
|
||||
# vmas (unpackaged)
|
||||
vmas
|
||||
];
|
||||
offline-data = [
|
||||
h5py
|
||||
@@ -155,6 +158,9 @@ buildPythonPackage rec {
|
||||
open-spiel = [
|
||||
# open-spiel (unpackaged)
|
||||
];
|
||||
procgen = [
|
||||
# procgen (unpackaged)
|
||||
];
|
||||
rendering = [ moviepy ];
|
||||
replay-buffer = [ torch ];
|
||||
utils = [
|
||||
@@ -191,10 +197,10 @@ buildPythonPackage rec {
|
||||
scipy
|
||||
torchvision
|
||||
]
|
||||
++ optional-dependencies.atari
|
||||
++ optional-dependencies.gym-continuous
|
||||
++ optional-dependencies.llm
|
||||
++ optional-dependencies.rendering;
|
||||
++ finalAttrs.passthru.optional-dependencies.atari
|
||||
++ finalAttrs.passthru.optional-dependencies.gym-continuous
|
||||
++ finalAttrs.passthru.optional-dependencies.llm
|
||||
++ finalAttrs.passthru.optional-dependencies.rendering;
|
||||
|
||||
disabledTests = [
|
||||
# Require network
|
||||
@@ -284,13 +290,16 @@ buildPythonPackage rec {
|
||||
# which is not the same as the test file we want to collect:
|
||||
# /build/source/test/smoke_test.py
|
||||
"test/llm"
|
||||
|
||||
# Hang indefinitely
|
||||
"test/services/test_services.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning";
|
||||
homepage = "https://github.com/pytorch/rl";
|
||||
changelog = "https://github.com/pytorch/rl/releases/tag/v${version}";
|
||||
changelog = "https://github.com/pytorch/rl/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -19,16 +19,16 @@ let
|
||||
hash = "sha256-El4WA92t2O/L4wUqH6Xj8w+ANtb6liRwafDhqn8jxjQ=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "yaramod";
|
||||
version = "4.5.2";
|
||||
version = "4.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avast";
|
||||
repo = "yaramod";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5tZhJcgpS8BwLEFlIM+RnXeUC5gXq4TPfSe0KI6U34w=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2XI7lGfoMHimtuQ29I1cFtV4OgfvR3Qcvh/FhA0yeBw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -67,8 +67,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Parsing of YARA rules into AST and building new rulesets in C++";
|
||||
homepage = "https://github.com/avast/yaramod";
|
||||
changelog = "https://github.com/avast/yaramod/blob/${src.tag}/CHANGELOG.md";
|
||||
changelog = "https://github.com/avast/yaramod/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ msm ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,9 +17,11 @@ let
|
||||
in
|
||||
with lib.versions;
|
||||
lib.switch rocq-core.rocq-version [
|
||||
(case (range "9.0" "9.1") "1.10.2")
|
||||
(case (range "9.0" "9.1") "1.10.0")
|
||||
(case (range "9.0" "9.1") "1.9.1")
|
||||
] null;
|
||||
release."1.10.2".sha256 = "sha256-Uzni9qrYQP45Tr+JkHs0BuRARwmWSMwA/iHhIzkolxc=";
|
||||
release."1.10.0".sha256 = "sha256-c52nS8I0tia7Q8lZTFJyHVPVabW9xv55m7w6B7y3+e8=";
|
||||
release."1.9.1".sha256 = "sha256-AiS0ezMyfIYlXnuNsVLz1GlKQZzJX+ilkrKkbo0GrF0=";
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
@@ -23,35 +23,35 @@
|
||||
},
|
||||
"38": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "b91e12ec6695f969ccf792d95dc7ea5da35f399cec2bed4d7b25d8a1f545b5de",
|
||||
"aarch64-linux": "73e87c432fa52b9005e12e23a1fcffcfada853de19492f905c50dbb46fd778df",
|
||||
"armv7l-linux": "a78ff548aa93586ce01c6406f49d1f8979a30542f286d05adb56e61a3147bba5",
|
||||
"headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m",
|
||||
"x86_64-darwin": "459dd05f00c29d435112596f87bc5bd0aeb16796dff0744e5421086417877d24",
|
||||
"x86_64-linux": "fe428cd212680e1d6df61fa67efc260b9221d089c7a14c9863f18bcbeace5628"
|
||||
"aarch64-darwin": "5ef05a4719275c14f2fc9f77aef41421c3a7d6ccd8e909bbefda688a5b40f78f",
|
||||
"aarch64-linux": "089681f662520b775bbaf17c9f1aac86861025cbe6ec3007d85ecc7b5662e21a",
|
||||
"armv7l-linux": "d5ebe3191715d2dec081e0e9b09345d0e2c022481fece1207e8cb293acecf745",
|
||||
"headers": "0dwvhcliyjcz6pq9znq81k3r60jfqk92mngf5yglx5j6fql5r4zm",
|
||||
"x86_64-darwin": "72d298f9d8a723651d858406ca48c5aa5eef0308e5d9b3c7deef3ebf70c763b1",
|
||||
"x86_64-linux": "e0a789a809527bd182cc307c46899c7d4fdaf07d7e79aef0dc5e613c80278b88"
|
||||
},
|
||||
"version": "38.7.2"
|
||||
"version": "38.8.0"
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "064edf951e0ab546809e217a417401023fd7e3b662de8be0316e8173f6f3db6d",
|
||||
"aarch64-linux": "468d3096630953a52fc051abd48714004b58ac550f9c7e798c256c774811b0f2",
|
||||
"armv7l-linux": "37a889a488e7a64d86961ad774f20e3cbb5dd965d76a6efd98c83488c33964e0",
|
||||
"headers": "0ywhsg295d390mgm1dd64jgzag35gib65b3ybzilsg58d4gvvp5g",
|
||||
"x86_64-darwin": "484c7f39235ea6c2c87b2ce5149436daa4eec97c9a6b11dc662f01ec1b81969e",
|
||||
"x86_64-linux": "a676357322bdf28153ba3ad67e8558dd54d76757fe2b1ad48c53f4a5e20614c6"
|
||||
"aarch64-darwin": "3261e399827377703671140f04939b2a7d378f8d74bbc64a46277ce3332cc31e",
|
||||
"aarch64-linux": "29123a371161d946fa932bf4be3381a55a99803ec922cf4ca8e699c31a30ba47",
|
||||
"armv7l-linux": "093f5fff73d9a0964e3ed02d57ccc986195078de796dcf83c96079350d983cc9",
|
||||
"headers": "0awfmgrz47ga410rv83f0zppw4vrxxdd3ya4yzd2mmpkcxr80sr9",
|
||||
"x86_64-darwin": "22c8e2c8f6c725c9d99112dae46184d5e357dc3b4b21ec65257083fd42719b3e",
|
||||
"x86_64-linux": "c2be95ee3e7ffa26c674e4af4187dc4b610acb6ea62a869896f0882302923c81"
|
||||
},
|
||||
"version": "39.3.0"
|
||||
"version": "39.4.0"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "bfa742c44b0053a9b6cf46a8124baff4a8a567feca2a5adbabf749075b298b69",
|
||||
"aarch64-linux": "46969d090510b26af41d7cde74cab15a9ad35eb45e61e976076626f2db3589a1",
|
||||
"armv7l-linux": "f87d8643c911c2e3678447be5a44636bdf375a1c3a9a7f20be3171a7ed510b86",
|
||||
"headers": "0wjpbk33i1z74djqyscribisd281cs5c266nrh2r6aabn2byh16l",
|
||||
"x86_64-darwin": "0120bcbd5cd063953b477fe8f950244b2f37770b9f85e60ca9b6bcaf85627b33",
|
||||
"x86_64-linux": "2ac22df42a4368cdd93ff9f9f25c7f04b9157143a3a3a06d4f01ae0dbb4e6fd5"
|
||||
"aarch64-darwin": "f2866f3b84e0bdb7a3333f5401f8244ae14b34f5ce67ed45f259a3ac393b3a87",
|
||||
"aarch64-linux": "4f07ff00445a707289d46f52dffd6faa504a4b60355ddb20df36ff8daa5cfc70",
|
||||
"armv7l-linux": "953ab4b20661a1e6f7d2acadb5e57f67927ea5ad4cb8cf93d5a9634cca7f1f2f",
|
||||
"headers": "0c8h4hcdxqhmjb4x4hf2hpz2lgkqq4nbqs3l4iypywg0qr8d65gn",
|
||||
"x86_64-darwin": "84254c6a2dc1bff85c8c4de3572218101d68314c15c2892693a1992b193ae86b",
|
||||
"x86_64-linux": "26f7675cc103f6ca0a1122d82f30bed7544c1a5d5507a6980992ae07ec876a12"
|
||||
},
|
||||
"version": "40.0.0"
|
||||
"version": "40.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,35 +23,35 @@
|
||||
},
|
||||
"38": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "6327236404c59f28ae0892d3898d240fe5e40c944019196afd1c9f03b3cc4a5a",
|
||||
"aarch64-linux": "1e29832d58ed5582869cee4739b442b6641a4d36bdf350e12cfbd54b9ab7f773",
|
||||
"armv7l-linux": "016b3f9d1f526f6943440379d431185f69ac4501d0f8acfa3b728dcc8944ab03",
|
||||
"headers": "1f1381qc705fv50sbm0g5f6wm8pkwqvrbhb1kvi3i9mk2910y14m",
|
||||
"x86_64-darwin": "4a5e11cf313bc337b1ba373643b55801869f7245ddff1287fee3dfa1d3d8c0be",
|
||||
"x86_64-linux": "e083831cec7c952bab51cf49ff380558195edd01678a21eb71a67eddbebf87c1"
|
||||
"aarch64-darwin": "f08c0a63e75d10cf117d9893d85862f8c962ab026806c0e2d3bafbe5e635d8b3",
|
||||
"aarch64-linux": "2ca72361584f6e8e00a438cd54a77c2c84e197e2561e788afb03ba3a08056c12",
|
||||
"armv7l-linux": "d4213af3c0b6218b2d59fe7bac56e81359e09e770c6425d2820c65b75201e9e1",
|
||||
"headers": "0dwvhcliyjcz6pq9znq81k3r60jfqk92mngf5yglx5j6fql5r4zm",
|
||||
"x86_64-darwin": "023ccf116daffead9035873261fb445a5acb160fed107dd8950ad69e5dc6f133",
|
||||
"x86_64-linux": "c4e34d1be7c6f7287ff2ee2752d82444a35e62565f4e25092e1a4bdc85651014"
|
||||
},
|
||||
"version": "38.7.2"
|
||||
"version": "38.8.0"
|
||||
},
|
||||
"39": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "3d5ef8b78ce4f35320a76a241bbc67f7a1922cedbfe338de111e5fd617677ca8",
|
||||
"aarch64-linux": "e0f1fa67b9f1ba8f15b2fc0aa0570e80d68261286a19862638a4f26c6966ecf2",
|
||||
"armv7l-linux": "8a4f46da6a51c97e3296c13aa480a7714e7bd5e8fa46876526ece89c8ae5b182",
|
||||
"headers": "0ywhsg295d390mgm1dd64jgzag35gib65b3ybzilsg58d4gvvp5g",
|
||||
"x86_64-darwin": "ed1951ecc55949c65452e1f8cd29b2348c8fd7932c2b1e11279987525b4658bc",
|
||||
"x86_64-linux": "44e15ac6c421e7bc7b36c55721085e5ccd4996c0770785dc78c55baaf4f73322"
|
||||
"aarch64-darwin": "b41e3ef0759e2bb24ef468dbb7300a9b07fc2d212053ee358d7b274fc206844f",
|
||||
"aarch64-linux": "54e9024b394ec614d210c129ea6d9c9ec205e67f8fa8426652329be273a4ca3d",
|
||||
"armv7l-linux": "10379333f8c5a17c09103c5ce802606b471d6e287a0d849aa29ec1c11ad278ed",
|
||||
"headers": "0awfmgrz47ga410rv83f0zppw4vrxxdd3ya4yzd2mmpkcxr80sr9",
|
||||
"x86_64-darwin": "6c81bbca1adf2d08ec545fabb99e0b96b8bc6ea0f59bbb798f034cee9618216a",
|
||||
"x86_64-linux": "05c54bf453331acc2d8d6b5b8854ed262fcdfda0223cd6651c9f137d62eee3b0"
|
||||
},
|
||||
"version": "39.3.0"
|
||||
"version": "39.4.0"
|
||||
},
|
||||
"40": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "27393f69ecca3686dad7a0e594ff06081631f7659307071f136bdb680e5c3649",
|
||||
"aarch64-linux": "588aafc8b3afdb1abefccf9dfee95ebd1a590bea77370553103dcb03406f3366",
|
||||
"armv7l-linux": "3ac8f1f6b2f3da81d2ebadb56f6d8cd05ada3dfa340f84b39e266ae8c35b7cf7",
|
||||
"headers": "0wjpbk33i1z74djqyscribisd281cs5c266nrh2r6aabn2byh16l",
|
||||
"x86_64-darwin": "633c29541cb253ceacb6fe2855086d18060ced216ad869d1f887a298467c2e28",
|
||||
"x86_64-linux": "77f71758783822b7e24fb6777f9e4ccabf1cd5e4e964b905fb63a068b4d849da"
|
||||
"aarch64-darwin": "09aae73536472087120cd3fbdff7229dab9f36167e5999075a4f2d7af2eeda89",
|
||||
"aarch64-linux": "59f6245921d3efd4b5c9f36db69d1fb3ca7eb3a66de6264abde3a4a5cf6d509c",
|
||||
"armv7l-linux": "d90cdce84b28d4934413b4ee64d0f46430740676173ad87ed3db2c7692f6654e",
|
||||
"headers": "0c8h4hcdxqhmjb4x4hf2hpz2lgkqq4nbqs3l4iypywg0qr8d65gn",
|
||||
"x86_64-darwin": "24623db1ff05f35bac2f702f9338596a2db6b1f742e9dfaa35772eecb9ba5b39",
|
||||
"x86_64-linux": "d211f0e3693f52bb1e9495075bb363a527e19e1207ba4b384e233a32d6681443"
|
||||
},
|
||||
"version": "40.0.0"
|
||||
"version": "40.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1388,10 +1388,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-gSW1dI2PBGaLleuekWEI8Om/HE+V7w7QPy3wWxfN0V0=",
|
||||
"hash": "sha256-ptOkmAyByN8nR5/CpFJBLPeNI7zVbz0pqfQcWwbh3R4=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v38.7.2"
|
||||
"tag": "v38.8.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -1725,10 +1725,10 @@
|
||||
},
|
||||
"src/third_party/electron_node": {
|
||||
"args": {
|
||||
"hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=",
|
||||
"hash": "sha256-+/hfkGo3X0bM90vS2uto+6ax4PzMk8ME4BDtQPULOCg=",
|
||||
"owner": "nodejs",
|
||||
"repo": "node",
|
||||
"tag": "v22.21.1"
|
||||
"tag": "v22.22.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -2650,10 +2650,10 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "sha256-R5AHeNFOeH7ZXipzM9u08KG5zJhkDDTW4kGt3BYYN64=",
|
||||
"electron_yarn_hash": "sha256-JCd5N7Wf17TfVyhEw4JA225vdqXeyMKgADYzOagGYd8=",
|
||||
"modules": "139",
|
||||
"node": "22.21.1",
|
||||
"version": "38.7.2"
|
||||
"node": "22.22.0",
|
||||
"version": "38.8.0"
|
||||
},
|
||||
"39": {
|
||||
"chrome": "142.0.7444.265",
|
||||
@@ -2712,10 +2712,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-udrEpPg2LDThZDTXJ1jpkIEiDwlD7lRUJsV6HSwN0i8=",
|
||||
"hash": "sha256-5sOTpnllc27NEZIomvx5oosxKtc3oBm+Dk3r5PZ3f4c=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v39.3.0"
|
||||
"tag": "v39.4.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -3049,10 +3049,10 @@
|
||||
},
|
||||
"src/third_party/electron_node": {
|
||||
"args": {
|
||||
"hash": "sha256-ZfbpeoBBCULqhNQxL78ikXG1OOZI/EQDgcTqgUYY0KY=",
|
||||
"hash": "sha256-+/hfkGo3X0bM90vS2uto+6ax4PzMk8ME4BDtQPULOCg=",
|
||||
"owner": "nodejs",
|
||||
"repo": "node",
|
||||
"tag": "v22.21.1"
|
||||
"tag": "v22.22.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -3998,13 +3998,13 @@
|
||||
"fetcher": "fetchFromGitiles"
|
||||
}
|
||||
},
|
||||
"electron_yarn_hash": "sha256-veyZGCQJO23iQk4gmFo5oLASxamiYm4tAQSUS12IGxg=",
|
||||
"electron_yarn_hash": "sha256-DyXKL0dXU+9K7EyR4WSsq49w3BOk/hHE6lW2uYS3AAw=",
|
||||
"modules": "140",
|
||||
"node": "22.21.1",
|
||||
"version": "39.3.0"
|
||||
"node": "22.22.0",
|
||||
"version": "39.4.0"
|
||||
},
|
||||
"40": {
|
||||
"chrome": "144.0.7559.60",
|
||||
"chrome": "144.0.7559.96",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
@@ -4013,15 +4013,15 @@
|
||||
"version": "0-unstable-2025-12-01"
|
||||
}
|
||||
},
|
||||
"version": "144.0.7559.60"
|
||||
"version": "144.0.7559.96"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-xd7eAfRiSMO0NavLy95b78e+fYCV3eGkAyVQhOixvaA=",
|
||||
"hash": "sha256-2K/lRbMxLhH1RImERMiwQrDrJPWSAI6ffAFG0rJmJaY=",
|
||||
"postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"tag": "144.0.7559.60",
|
||||
"tag": "144.0.7559.96",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -4060,10 +4060,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-/6WaLMcOqIyc02Gjm/B4DRLSsrhn9YkIngB1O9WfpkU=",
|
||||
"hash": "sha256-Nt/PmsLg3dfEQYUX9ifzWznvseJq4fSo8jOwMq/euEo=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v40.0.0"
|
||||
"tag": "v40.1.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
@@ -4285,8 +4285,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"args": {
|
||||
"hash": "sha256-GJuT3rqNxvKkRTMvoMi8/QYda0y0RTkZLhb5v9QkwGA=",
|
||||
"rev": "a8d1e554a9bd35b0418ba7fd6b0bc005250a7703",
|
||||
"hash": "sha256-MsUmRx5fQYWbkPJ/JvaoT//qjPYy5xxZXIa3t5LDxSY=",
|
||||
"rev": "9e0e116de6735ab113349675d31a23c121254fe0",
|
||||
"url": "https://dawn.googlesource.com/dawn.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -4357,8 +4357,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"args": {
|
||||
"hash": "sha256-BmwsvTjgYQayFnyT9EfFzpCfbgdTt9xZlsUba0uJelg=",
|
||||
"rev": "d5efa4236f8676254c9f39ccfef18bd633de5fd3",
|
||||
"hash": "sha256-vLkWH/EiDHxl/dz4soKybQF1hgud/7MlnDhVPicYJGY=",
|
||||
"rev": "a3064782146fc247c488d44c1ad3496b29d55ec4",
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -5339,8 +5339,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"args": {
|
||||
"hash": "sha256-vyOtnPA3tAeorNOGTDuAnwJ/UtpjeO8z+RSjx9RIFFc=",
|
||||
"rev": "ad25f9ae50a53bee50f459bfee25fb1e6f64adc3",
|
||||
"hash": "sha256-gBzwGvl/tqj4Z6acdLN326I80kBLEk+Nn8oN6D193o4=",
|
||||
"rev": "6c2c296f23a5487ccb2536cf7c90d01f35d03077",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
@@ -5349,6 +5349,6 @@
|
||||
"electron_yarn_hash": "sha256-XfBaGCIERh5B/xq7H5zcB9moB75X1QVR53i3LCpa0D8=",
|
||||
"modules": "143",
|
||||
"node": "24.11.1",
|
||||
"version": "40.0.0"
|
||||
"version": "40.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,9 +23,9 @@ let
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqx = {
|
||||
version = "6.18.6"; # lqx
|
||||
version = "6.18.7"; # lqx
|
||||
suffix = "lqx1"; # lqx
|
||||
sha256 = "18b5yw91k4m9cfa2gw6n07sw3xfnzs9xx7hb0ls26r4d8jn01lsq"; # lqx
|
||||
sha256 = "1wm1qzim11gka3fmfz3qxxhl1rjyy9jb6pjqh2q8fpg33g005wsh"; # lqx
|
||||
isLqx = true;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user