Merge branch 'staging-next' into staging
This commit is contained in:
Michael Daniels
@@ -842,6 +842,17 @@ general. A number of other parameters can be overridden:
|
||||
(hello { }).override { extraRustcOpts = "-Z debuginfo=2"; }
|
||||
```
|
||||
|
||||
- The lint level cap passed to `rustc` (`allow` by default, which
|
||||
silences all lints). Because `rustc` only honours the first
|
||||
`--cap-lints` it receives, this cannot be changed via
|
||||
`extraRustcOpts`; use this attribute instead. Useful when overriding
|
||||
the `rust` attribute to point at `clippy-driver`, since clippy lints
|
||||
are also capped by this flag:
|
||||
|
||||
```nix
|
||||
(hello { }).override { capLints = "warn"; }
|
||||
```
|
||||
|
||||
- Phases, just like in any other derivation, can be specified using
|
||||
the following attributes: `preUnpack`, `postUnpack`, `prePatch`,
|
||||
`patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,
|
||||
|
||||
@@ -122,6 +122,9 @@
|
||||
|
||||
- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.
|
||||
|
||||
- Varnish Cache has been updated to major version 8, `varnish` now refers to `varnish80`. That release contains breaking changes, see [Upgrading to Varnish-Cache 8.0](https://vinyl-cache.org/docs/8.0/whats-new/upgrading-8.0.html).
|
||||
Note that the Varnish 6 LTS release remains available as `varnish60`.
|
||||
|
||||
- `eslint` has been updated from version 9 to version 10. Please see https://eslint.org/blog/2026/02/eslint-v10.0.0-released/ for details about the breaking changes included in the update.
|
||||
|
||||
- `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`.
|
||||
|
||||
@@ -85,6 +85,15 @@ in
|
||||
example = 2309;
|
||||
description = "The value that will be passed to the PORT environment variable, telling LibreChat what to listen on.";
|
||||
};
|
||||
LIBRECHAT_LOG_DIR = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "${cfg.dataDir}/logs";
|
||||
defaultText = lib.literalExpression "/var/lib/librechat/logs";
|
||||
description = ''
|
||||
Logs will be saved into this directory.
|
||||
By default it is relative to `services.librechat.dataDir`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
example = {
|
||||
@@ -120,9 +129,11 @@ in
|
||||
type = lib.types.submodule {
|
||||
freeformType = format.type;
|
||||
};
|
||||
default = { };
|
||||
default = {
|
||||
version = "1.2.1";
|
||||
};
|
||||
example = {
|
||||
version = "1.0.8";
|
||||
version = "1.2.1";
|
||||
cache = true;
|
||||
interface = {
|
||||
privacyPolicy = {
|
||||
|
||||
@@ -1708,6 +1708,10 @@ in
|
||||
imports = [ ./varnish.nix ];
|
||||
_module.args.package = pkgs.varnish77;
|
||||
};
|
||||
varnish80 = runTest {
|
||||
imports = [ ./varnish.nix ];
|
||||
_module.args.package = pkgs.varnish80;
|
||||
};
|
||||
vault = runTest ./vault.nix;
|
||||
vault-agent = runTest ./vault-agent.nix;
|
||||
vault-dev = runTest ./vault-dev.nix;
|
||||
|
||||
+29
-18
@@ -1,13 +1,10 @@
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
accessKey = "BKIKJAA5BMMU2RHO6IBB";
|
||||
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
|
||||
accessKey = "GKaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
secretKey = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
s3Addr = "127.0.0.1:9000";
|
||||
|
||||
minioCredentialsFile = pkgs.writeText "minio-credentials-full" ''
|
||||
MINIO_ROOT_USER=${accessKey}
|
||||
MINIO_ROOT_PASSWORD=${secretKey}
|
||||
'';
|
||||
environmentFile = pkgs.runCommand "atticd-env" { } ''
|
||||
echo ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64="$(${lib.getExe pkgs.openssl} genrsa -traditional 4096 | ${pkgs.coreutils}/bin/base64 -w0)" > $out
|
||||
'';
|
||||
@@ -36,8 +33,8 @@ in
|
||||
storage = {
|
||||
type = "s3";
|
||||
bucket = "attic";
|
||||
region = "us-east-1";
|
||||
endpoint = "http://127.0.0.1:9000";
|
||||
region = "garage";
|
||||
endpoint = "http://${s3Addr}";
|
||||
|
||||
credentials = {
|
||||
access_key_id = accessKey;
|
||||
@@ -49,14 +46,24 @@ in
|
||||
inherit environmentFile;
|
||||
};
|
||||
|
||||
services.minio = {
|
||||
services.garage = {
|
||||
enable = true;
|
||||
rootCredentialsFile = minioCredentialsFile;
|
||||
package = pkgs.garage_2;
|
||||
settings = {
|
||||
rpc_bind_addr = "127.0.0.1:3901";
|
||||
rpc_public_addr = "127.0.0.1:3901";
|
||||
rpc_secret = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
replication_factor = 1;
|
||||
|
||||
s3_api = {
|
||||
s3_region = "garage";
|
||||
api_bind_addr = s3Addr;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.attic-client
|
||||
pkgs.minio-client
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -74,15 +81,19 @@ in
|
||||
local.succeed("attic push test-cache ${environmentFile}")
|
||||
|
||||
with subtest("s3 storage push"):
|
||||
s3.wait_for_unit("atticd.service")
|
||||
s3.wait_for_unit("minio.service")
|
||||
s3.wait_for_open_port(9000)
|
||||
s3.wait_for_unit("garage.service")
|
||||
s3.wait_for_open_port(3901)
|
||||
garage_node_id = s3.succeed("garage status | tail -n1 | awk '{ print $1 }'")
|
||||
s3.succeed(
|
||||
"mc alias set minio "
|
||||
+ "http://localhost:9000 "
|
||||
+ "${accessKey} ${secretKey} --api s3v4",
|
||||
"mc mb minio/attic",
|
||||
f"garage layout assign -c 100MB -z garage {garage_node_id}",
|
||||
"garage layout apply --version 1",
|
||||
"garage key import ${accessKey} ${secretKey} --yes",
|
||||
"garage bucket create attic",
|
||||
"garage bucket allow --read --write --owner attic --key ${accessKey}"
|
||||
)
|
||||
|
||||
s3.wait_for_unit("atticd.service")
|
||||
s3.wait_for_open_port(9000)
|
||||
token = s3.succeed("atticd-atticadm make-token --sub stop --validity 1y --create-cache '*' --pull '*' --push '*' --delete '*' --configure-cache '*' --configure-cache-retention '*'").strip()
|
||||
|
||||
s3.succeed(f"attic login s3 http://localhost:8080 {token}")
|
||||
|
||||
@@ -35,17 +35,17 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-3s0UzfkufKXXm57JgKaMan/SRAlGTLmdIRXXpzxQvAo=";
|
||||
x86_64-darwin = "sha256-1+1Lin4KH3BiriA6m0TJlVG4m9Xl+PyE5cJFborOATM=";
|
||||
aarch64-linux = "sha256-p68lztb+e8OMXtyaqXDdElhuhmv4Og7R+tdRXG85DnU=";
|
||||
aarch64-darwin = "sha256-DUjT+vqjct8WMiRecltPcL+Jn78DfnuyGTMWhaGVcRY=";
|
||||
armv7l-linux = "sha256-70WqRdVnx4zTY5eUFrxz4MiREXNSvahuINcu/9VNkZU=";
|
||||
x86_64-linux = "sha256-VyjqPTyLn8eGh/XS3nn0PMqiAsrL91vDZD6Z9L2oh24=";
|
||||
x86_64-darwin = "sha256-3ACtYUblaJs8I1BHHFOSFuAODP0dziXFvd0qdJ/izZ8=";
|
||||
aarch64-linux = "sha256-wyiOvHNMuE6SbInYK9vlYVkbdxAlf9/xHa2nKWh8ecc=";
|
||||
aarch64-darwin = "sha256-0sOKWswv7M3VCralFt1BAA45JrQyAX4Fr/5imNmcaHA=";
|
||||
armv7l-linux = "sha256-hAAuYK7ZQGpAQLE9o8/GF+qHHj0OfT15IXY9cvaKBC0=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.111.0";
|
||||
version = "1.112.0";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -53,7 +53,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "ce099c1ed25d9eb3076c11e4a280f3eb52b4fbeb";
|
||||
rev = "07ff9d6178ede9a1bd12ad3399074d726ebe6e43";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -86,7 +86,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-0fEyS5/FtUBVE6J8NGghKITtIq6Yykyi5Vt8S20INP8=";
|
||||
hash = "sha256-je83XIJD2Ayc4/j05BCUi/0dblVGlLQdDf+u7wfHZgA=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -11,7 +11,8 @@ buildNpmPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrol-ui";
|
||||
|
||||
npmDepsHash = "sha256-crkAK9k7wwbjiAQGBK584/29Zi0TZlljuASdvni8RkQ=";
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-AzRw6DuloOFC7VN7yM9czqxosfVIoXAltv2xHUxac7k=";
|
||||
|
||||
postBuild = ''
|
||||
cp -r dist $out
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
rustPlatform,
|
||||
testers,
|
||||
hwdata,
|
||||
libdrm,
|
||||
coolercontrol,
|
||||
runtimeShell,
|
||||
@@ -21,7 +22,7 @@ rustPlatform.buildRustPackage {
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/coolercontrold";
|
||||
|
||||
cargoHash = "sha256-5YYodScAAs6ERVbj+irvyNS9IOkVaBHR4DCXTrrtyVI=";
|
||||
cargoHash = "sha256-rFwbHsGkKLD9UgkdTbxMIjARmU0Ewal1NIwlbzRL/vc=";
|
||||
|
||||
buildInputs = [ libdrm ];
|
||||
|
||||
@@ -39,8 +40,12 @@ rustPlatform.buildRustPackage {
|
||||
cp -R ${coolercontrol.coolercontrol-ui-data}/* resources/app/
|
||||
|
||||
# Hardcode a shell
|
||||
substituteInPlace src/repositories/utils.rs \
|
||||
substituteInPlace daemon/src/repositories/utils.rs \
|
||||
--replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")'
|
||||
|
||||
# This is supposed to be a "nix-compatible file path", but there is nothing that actually does the substitution
|
||||
substituteInPlace daemon/src/repositories/hwmon/pci_ids.rs \
|
||||
--replace-fail '@hwdata@' '${hwdata}'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.1.1";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "coolercontrol";
|
||||
repo = "coolercontrol";
|
||||
rev = version;
|
||||
hash = "sha256-ocGW55z/cbO7uXWxiHoE798hN56fLlSgmZkO507eruY=";
|
||||
tag = version;
|
||||
hash = "sha256-v1enPMezagA3gcYD5EbC1ecTOXEsMLRGWIKzgDxzRWg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
colors,
|
||||
buildTests,
|
||||
codegenUnits,
|
||||
capLints,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -31,6 +32,12 @@ let
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
"-C codegen-units=${toString codegenUnits}"
|
||||
"--remap-path-prefix=$NIX_BUILD_TOP=/"
|
||||
# When the rust-src component is present (common with rust-overlay
|
||||
# toolchains), rustc unvirtualises libstd source paths. Panic
|
||||
# locations from monomorphised generic std code then embed the
|
||||
# toolchain store path in .rodata, pulling the entire toolchain into
|
||||
# the closure. Remap to a stable placeholder to break the reference.
|
||||
"--remap-path-prefix=${rustc}=/rustc"
|
||||
(mkRustcDepArgs dependencies crateRenames)
|
||||
(mkRustcFeatureArgs crateFeatures)
|
||||
]
|
||||
@@ -73,6 +80,7 @@ in
|
||||
LIB_EXT="${stdenv.hostPlatform.extensions.library}"
|
||||
LIB_PATH="${libPath}"
|
||||
LIB_NAME="${libName}"
|
||||
CAP_LINTS="${capLints}"
|
||||
|
||||
CRATE_NAME='${lib.replaceStrings [ "-" ] [ "_" ] libName}'
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
crateVersion,
|
||||
extraLinkFlags,
|
||||
extraRustcOptsForBuildRs,
|
||||
capLints,
|
||||
libName,
|
||||
libPath,
|
||||
release,
|
||||
@@ -195,7 +196,7 @@ in
|
||||
fi
|
||||
noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
|
||||
${mkRustcFeatureArgs crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
|
||||
-L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}
|
||||
-L dependency=target/buildDeps ${buildDeps} --cap-lints ${capLints} $EXTRA_BUILD_FLAGS --color ${colors}
|
||||
|
||||
mkdir -p target/build/${crateName}.out
|
||||
export RUST_BACKTRACE=1
|
||||
|
||||
@@ -196,6 +196,16 @@ lib.makeOverridable
|
||||
# Example: [ "-Z debuginfo=2" ]
|
||||
# Default: []
|
||||
extraRustcOptsForBuildRs,
|
||||
# The lint level cap passed to rustc via `--cap-lints`.
|
||||
# See <https://doc.rust-lang.org/rustc/lints/levels.html#capping-lints>.
|
||||
#
|
||||
# rustc honours only the first `--cap-lints` it sees, so appending a
|
||||
# second one via `extraRustcOpts` has no effect. Use this parameter
|
||||
# instead if you need lints to fire (e.g. when running clippy).
|
||||
#
|
||||
# Example: "warn"
|
||||
# Default: "allow"
|
||||
capLints,
|
||||
# Whether to enable building tests.
|
||||
# Use true to enable.
|
||||
# Default: false
|
||||
@@ -249,12 +259,14 @@ lib.makeOverridable
|
||||
"buildTests"
|
||||
"codegenUnits"
|
||||
"links"
|
||||
"capLints"
|
||||
];
|
||||
extraDerivationAttrs = removeAttrs crate processedAttrs;
|
||||
nativeBuildInputs_ = nativeBuildInputs;
|
||||
buildInputs_ = buildInputs;
|
||||
extraRustcOpts_ = extraRustcOpts;
|
||||
extraRustcOptsForBuildRs_ = extraRustcOptsForBuildRs;
|
||||
capLints_ = capLints;
|
||||
buildTests_ = buildTests;
|
||||
|
||||
# crate2nix has a hack for the old bash based build script that did split
|
||||
@@ -383,6 +395,7 @@ lib.makeOverridable
|
||||
lib.optionals (crate ? extraRustcOptsForBuildRs) crate.extraRustcOptsForBuildRs
|
||||
++ extraRustcOptsForBuildRs_
|
||||
++ (lib.optional (edition != null) "--edition ${edition}");
|
||||
capLints = crate.capLints or capLints_;
|
||||
|
||||
configurePhase = configureCrate {
|
||||
inherit
|
||||
@@ -403,6 +416,7 @@ lib.makeOverridable
|
||||
crateLinks
|
||||
extraLinkFlags
|
||||
extraRustcOptsForBuildRs
|
||||
capLints
|
||||
crateLicense
|
||||
crateLicenseFile
|
||||
crateReadme
|
||||
@@ -433,6 +447,7 @@ lib.makeOverridable
|
||||
extraRustcOpts
|
||||
buildTests
|
||||
codegenUnits
|
||||
capLints
|
||||
;
|
||||
};
|
||||
dontStrip = !release;
|
||||
@@ -472,6 +487,7 @@ lib.makeOverridable
|
||||
verbose = crate_.verbose or true;
|
||||
extraRustcOpts = [ ];
|
||||
extraRustcOptsForBuildRs = [ ];
|
||||
capLints = "allow";
|
||||
features = [ ];
|
||||
nativeBuildInputs = [ ];
|
||||
buildInputs = [ ];
|
||||
|
||||
@@ -15,7 +15,7 @@ build_lib() {
|
||||
$lib_src \
|
||||
--out-dir target/lib \
|
||||
-L dependency=target/deps \
|
||||
--cap-lints allow \
|
||||
--cap-lints $CAP_LINTS \
|
||||
$LINK \
|
||||
$EXTRA_LINK_ARGS \
|
||||
$EXTRA_LINK_ARGS_LIB \
|
||||
@@ -52,7 +52,7 @@ build_bin() {
|
||||
$EXTRA_LINK_ARGS \
|
||||
$EXTRA_LINK_ARGS_BINS \
|
||||
$EXTRA_LIB \
|
||||
--cap-lints allow \
|
||||
--cap-lints $CAP_LINTS \
|
||||
$BUILD_OUT_DIR \
|
||||
$EXTRA_BUILD \
|
||||
$EXTRA_FEATURES \
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
self = REAndroidLibrary {
|
||||
pname = "arsclib";
|
||||
# 1.3.8 is not new enough for APKEditor because of API changes
|
||||
version = "1.3.8-unstable-2026-02-27";
|
||||
version = "1.3.8-unstable-2026-03-21";
|
||||
projectName = "ARSCLib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -18,8 +18,8 @@ let
|
||||
# This is the latest commit at the time of packaging.
|
||||
# It can be changed to a stable release ("V${version}")
|
||||
# if it is compatible with APKEditor.
|
||||
rev = "b34f2e36d29077400e5b9f24fef9af3a3d9e8100";
|
||||
hash = "sha256-FhIZ9O1af8UcmcDcEWewMNBDr5Knd3BZL5PqEltCqxE=";
|
||||
rev = "f6c2dc2f6db9063445e84f7ede316d4f1f029351";
|
||||
hash = "sha256-IZ2Us7tcuE+L4bfA4JAcF6Idz1Y2S2IfqW4NSbsxr5o=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
|
||||
@@ -55,7 +55,7 @@ let
|
||||
apkeditor =
|
||||
let
|
||||
pname = "apkeditor";
|
||||
version = "1.4.7";
|
||||
version = "1.4.8";
|
||||
projectName = "APKEditor";
|
||||
in
|
||||
REAndroidLibrary {
|
||||
@@ -71,7 +71,7 @@ let
|
||||
owner = "REAndroid";
|
||||
repo = "APKEditor";
|
||||
tag = "V${version}";
|
||||
hash = "sha256-xvb/shZj39yxejoXF8Sruylyj4843SeAc0AIiM5s1rs=";
|
||||
hash = "sha256-1XNefeEPs8SEBw+hY2CzZ+rPojNcAbg1AqvzhVcNyy4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# generated by zon2nix (https://github.com/nix-community/zon2nix)
|
||||
|
||||
{
|
||||
linkFarm,
|
||||
fetchzip,
|
||||
fetchgit,
|
||||
}:
|
||||
|
||||
linkFarm "zig-packages" [
|
||||
{
|
||||
name = "toml-0.3.2-YDcxkrdYAQB8b9k1q_sp51jt2ymgGLmOX_BD4kQi53Eo";
|
||||
path = fetchgit {
|
||||
url = "https://github.com/lepton9/zig-toml";
|
||||
rev = "8a9b79dde56ac1fc38960ed9c482efb9ff88a6a8";
|
||||
hash = "sha256-LAE/l049Bvh3VKT7XrTYEdj+Ekg3JWO2op37ec58sFU=";
|
||||
};
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
callPackage,
|
||||
|
||||
pkg-config,
|
||||
zig,
|
||||
|
||||
fontconfig,
|
||||
freetype,
|
||||
glfw,
|
||||
libGL,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxi,
|
||||
libxrandr,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "attyx";
|
||||
version = "0.2.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semos-labs";
|
||||
repo = "attyx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fREiPiBTzzJtFEPWOISiZ/BI5lZmPyn80oAXohEEGig=";
|
||||
};
|
||||
|
||||
deps = callPackage ./build.zig.zon.nix { };
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
zig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
freetype
|
||||
glfw
|
||||
libGL
|
||||
libx11
|
||||
libxcursor
|
||||
libxi
|
||||
libxrandr
|
||||
];
|
||||
|
||||
zigBuildFlags = [
|
||||
"--system"
|
||||
"${finalAttrs.deps}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Fast GPU-accelerated terminal emulator built with Zig";
|
||||
homepage = "https://github.com/semos-labs/attyx";
|
||||
changelog = "https://github.com/semos-labs/attyx/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ sophronesis ];
|
||||
mainProgram = "attyx";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -12,14 +12,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "canaille";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "yaal";
|
||||
repo = "canaille";
|
||||
tag = version;
|
||||
hash = "sha256-6Ksvl03HgpVQRhHtKWQwTrPBkaXcVWoejGaMFBAykHM=";
|
||||
hash = "sha256-hJt2BU8Z0XF94skgK5x1TJUZ9bwEt+VJvaeLLyykpsE=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
@@ -48,7 +48,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
[
|
||||
pytestCheckHook
|
||||
postgresql
|
||||
coverage
|
||||
flask-webtest
|
||||
pyquery
|
||||
pytest-cov-stub
|
||||
@@ -147,7 +146,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
meta = {
|
||||
description = "Lightweight Identity and Authorization Management";
|
||||
homepage = "https://canaille.readthedocs.io/en/latest/index.html";
|
||||
changelog = "https://gitlab.com/yaal/canaille/-/blob/${src.rev}/CHANGES.rst";
|
||||
changelog = "https://gitlab.com/yaal/canaille/-/blob/${src.tag}/CHANGES.rst";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ erictapen ];
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1265,7 +1265,7 @@
|
||||
"sha2 0.10.9",
|
||||
"shadowquic",
|
||||
"shadowsocks",
|
||||
- "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
|
||||
+ "smoltcp",
|
||||
"sock2proc",
|
||||
"socket2 0.6.2",
|
||||
"ssh-key",
|
||||
@@ -4636,7 +4636,7 @@
|
||||
"etherparse 0.16.0",
|
||||
"futures",
|
||||
"rand 0.8.5",
|
||||
- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "smoltcp",
|
||||
"spin 0.9.8",
|
||||
"tokio",
|
||||
"tokio-util",
|
||||
@@ -7293,20 +7293,6 @@
|
||||
]
|
||||
|
||||
[[package]]
|
||||
-name = "smoltcp"
|
||||
-version = "0.12.0"
|
||||
-source = "git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64#ac32e643a4b7e09161193071526b3ca5a0deedb5"
|
||||
-dependencies = [
|
||||
- "bitflags 1.3.2",
|
||||
- "byteorder",
|
||||
- "cfg-if",
|
||||
- "defmt 0.3.100",
|
||||
- "heapless",
|
||||
- "log",
|
||||
- "managed",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
name = "sock2proc"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/Watfaq/sock2proc.git?rev=9f9e630#9f9e6304d62285115b2e4fa632527ae563bf0fcc"
|
||||
@@ -9797,7 +9783,7 @@
|
||||
"netstack-lwip",
|
||||
"netstack-smoltcp",
|
||||
"rand 0.9.2",
|
||||
- "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "smoltcp",
|
||||
"socket2 0.6.2",
|
||||
"tokio",
|
||||
"tracing",
|
||||
@@ -10,27 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "clash-rs";
|
||||
version = "0.9.5";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Watfaq";
|
||||
repo = "clash-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ymxT6AGBDTfiMbpU4Ou/SwAnUZF3vKvtt/BgWRtQTJc=";
|
||||
hash = "sha256-5o98Yj8a30Tn/Cf3QMZ5EaCjCgD3XttqaHHuIjBWg4s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-G1RLUFnQVX6tbLIF6ql6RDGZUwGPGFBHgx15KT3/tNQ=";
|
||||
|
||||
cargoPatches = [ ./Cargo.patch ];
|
||||
|
||||
patches = [
|
||||
./unbounded-shifts.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace clash-lib/Cargo.toml \
|
||||
--replace-fail ', git = "https://github.com/smoltcp-rs/smoltcp.git", rev = "ac32e64"' ""
|
||||
'';
|
||||
cargoHash = "sha256-tRAkA64D2UOEqLbkKiSBDbNlvX7tejSJwYF7+VwicAk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/clash-lib/src/lib.rs
|
||||
+++ b/clash-lib/src/lib.rs
|
||||
@@ -3,7 +3,7 @@
|
||||
#![feature(sync_unsafe_cell)]
|
||||
#![feature(lazy_get)]
|
||||
#![feature(duration_millis_float)]
|
||||
-#![cfg_attr(not(version("1.87.0")), feature(unbounded_shifts))]
|
||||
+#![feature(unbounded_shifts)]
|
||||
#![cfg_attr(not(version("1.88.0")), feature(let_chains))]
|
||||
|
||||
use crate::{
|
||||
@@ -13,17 +13,17 @@
|
||||
let
|
||||
pname = "clash-verge-rev";
|
||||
# Please keep service version in sync
|
||||
version = "2.4.6";
|
||||
version = "2.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clash-verge-rev";
|
||||
repo = "clash-verge-rev";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-s/dUy9vYxdUlAahVPkoOHjoF+WCl3xhJOubZtS1PB5o=";
|
||||
hash = "sha256-Jw9GXD0RFFPkqhJuNZaooxIHVDt1ti0a4g863jIwtkY=";
|
||||
};
|
||||
|
||||
pnpm-hash = "sha256-7xNaLlnXLty80x1d25pBeLZUu0r3R+87DYoJ6rTHSTA=";
|
||||
vendor-hash = "sha256-1b0vmx0apWSNlaTMR58eufinBuIC7/F3UG3C8X62/gE=";
|
||||
pnpm-hash = "sha256-2iGCe9LmH99hVOWEWkDy7/XH4r/Jlr8rzL5FrCRpn3Q=";
|
||||
vendor-hash = "sha256-EHsGCrphP6SRQ04Q0sIh8CmzMwbvqDQeiL44ItBGIaM=";
|
||||
|
||||
service = callPackage ./service.nix {
|
||||
inherit
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index d5895c0b..a7954a89 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -7255,7 +7255,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"parking_lot",
|
||||
"raw-window-handle",
|
||||
- "tao-macros 0.1.3 (git+https://github.com/tauri-apps/tao)",
|
||||
+ "tao-macros",
|
||||
"unicode-segmentation",
|
||||
"url",
|
||||
"windows 0.61.3",
|
||||
@@ -7275,16 +7275,6 @@ dependencies = [
|
||||
"syn 2.0.114",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "tao-macros"
|
||||
-version = "0.1.3"
|
||||
-source = "git+https://github.com/tauri-apps/tao#a133504b6dc963a5ad7786e01e746dba72236b65"
|
||||
-dependencies = [
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn 2.0.114",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "tap"
|
||||
version = "1.0.1"
|
||||
@@ -10040,7 +10030,7 @@ dependencies = [
|
||||
"raw-window-handle",
|
||||
"sha2 0.10.9",
|
||||
"soup3",
|
||||
- "tao-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "tao-macros",
|
||||
"thiserror 2.0.18",
|
||||
"tracing",
|
||||
"url",
|
||||
@@ -46,11 +46,6 @@ rustPlatform.buildRustPackage {
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Duplicate versions of tao-macros make fetchCargoVendor fail, keep one of them.
|
||||
./patch-cargo-lock.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# We disable the option to try to use the bleeding-edge version of mihomo
|
||||
# If you need a newer version, you can override the mihomo input of the wrapped package
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "25.8.18.1-lts";
|
||||
rev = "557fdf60f81c4370867dff464de7f4b1064d39a7";
|
||||
hash = "sha256-6QBejA0GdhjHVcqHVqjZkiJ1tmPglvIaFffBWyseYX8=";
|
||||
version = "25.8.20.4-lts";
|
||||
rev = "2e1cd6354ae8898072e5dbf97aa6e5945761e3d7";
|
||||
hash = "sha256-Xd9hLb4sXnSQby8NuKnD0b8R6iGb+M4u0L0yYASNvzw=";
|
||||
lts = true;
|
||||
}
|
||||
|
||||
@@ -23,16 +23,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.5";
|
||||
version = "2.0.6";
|
||||
devenvNixVersion = "2.32";
|
||||
devenvNixRev = "ef483d53f25990bf0b4fd39f5414f885977ebd85";
|
||||
devenvNixRev = "e127c1c94cefe02d8ca4cca79ef66be4c527510e";
|
||||
|
||||
nix_components =
|
||||
(nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {
|
||||
owner = "cachix";
|
||||
repo = "nix";
|
||||
rev = devenvNixRev;
|
||||
hash = "sha256-eY8JFns4OeEidye8VIW68LSoykbPO0bQujvQVLLK7Qg=";
|
||||
hash = "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=";
|
||||
})).overrideScope
|
||||
(
|
||||
finalScope: prevScope: {
|
||||
@@ -48,10 +48,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "cachix";
|
||||
repo = "devenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8tO3NLG9Lc/NUee0Owcf/z63TNTrUcx7eVRxSb294rk=";
|
||||
hash = "sha256-i1G6n/7Z5fO9RhplzXQSTiLyh1Cs0GhoCoEStFLARtA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ecntFSPDWblllDtS/D086UKtQJG9La4TGEBhP3q0CfY=";
|
||||
cargoHash = "sha256-p5kI7HlG6RVxCCEb/J0L2gh36jkm/atAV98ny3h4vqo=";
|
||||
|
||||
env = {
|
||||
RUSTFLAGS = "--cfg tracing_unstable";
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dunst";
|
||||
version = "1.13.1";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F7CONYJ95aKNZ+BpWNUerCBMflgJYgSaLAqp6XJ1G5k=";
|
||||
hash = "sha256-Idh/moq+OjD3VpZKJ3blO1JAK7PPX42z15rQz/JZb84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "fiddler-everywhere";
|
||||
version = "7.7.0";
|
||||
version = "7.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
|
||||
hash = "sha256-klHlC0WrqUdPbaI5oHSOcfEVFaPZNPSYtRK5fmkvsl4=";
|
||||
hash = "sha256-mwHtT7GAR7CdOVvFPpzqF6j1Ed5kBlJ39RyITg1BgAs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fly";
|
||||
version = "8.1.0";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "concourse";
|
||||
repo = "concourse";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-M7TNOVBA30j87VkRJaYlAUE08wnQdB90Ey/u9SX39u4=";
|
||||
hash = "sha256-JWl3dUx3eQWD8I+be6APuQklUw1ZzW6xK6iypxbgxF0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZZfiRfOkAcF3ItB4tjp8BgurMThxUOoBMyt9PeJpus4=";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "gotosocial";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LnxEvOLv+NBjdAbxxtilegW/xqBvMzy3CGM75yJsW0s=";
|
||||
hash = "sha256-Z3j5/pXnNTHgBmPEfFgjOJuL03LsPtvAwbuoL9wb5bk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
# https://goupile.org/en/build recommends a Paranoid build
|
||||
# which is not bit by bit reproducible, whereas others are
|
||||
profile ? "Paranoid",
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
assert lib.assertOneOf "profile" profile [
|
||||
@@ -25,14 +27,14 @@ let
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "goupile";
|
||||
version = "3.12.1";
|
||||
version = "3.12.4";
|
||||
|
||||
# https://github.com/Koromix/rygel/tags
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koromix";
|
||||
repo = "rygel";
|
||||
tag = "goupile/${finalAttrs.version}";
|
||||
hash = "sha256-Pn/0tjezVKJedAtqj69avxeIK2l3l9FGioYSyEao12E=";
|
||||
hash = "sha256-2lHCOsvjTZeRkboefIdyh7JoSmes3KgvjFnXKnQ4On4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -65,7 +67,10 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
versionCheckProgramArg = "--version";
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) goupile; };
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) goupile; };
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=goupile/(.*)" ]; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Koromix/rygel/blob/${finalAttrs.src.rev}/src/goupile/CHANGELOG.md";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hello-wayland";
|
||||
version = "0-unstable-2024-03-04";
|
||||
version = "0-unstable-2026-03-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = "hello-wayland";
|
||||
rev = "5f3a35def81116f0a74fcaf5a421d66c6700482d";
|
||||
hash = "sha256-gcLR8gosQlPPgFrxqmRQ6/59RjAfJNX6CcsYP+L+A58=";
|
||||
rev = "9a64c5ce78d004dc50814361b5153cef071f7042";
|
||||
hash = "sha256-YSdBY0IJQB7iyiunVikFHd0S2GlPy7cZBl+aQkpCY1s=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -11,22 +11,26 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hugo";
|
||||
version = "0.155.3";
|
||||
version = "0.158.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2TvzM7veSAGDqomWXHuEnYX8bGVxAxTto0Xzc+vypDY=";
|
||||
hash = "sha256-7/zrJdoJVDVHt/2qKPkfrxjxMMpB2F2i0fCXZLkd7gw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Fh38o7wD6/gL4szvT4UmA4lzIStqITjgjulsIQlPmHU=";
|
||||
vendorHash = "sha256-StGdZ1FP6906jFbqoYQgrbEOx1YPCsqE+01ITQgtaEU=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTestPrefixes = [
|
||||
# Workaround for "failed to load modules"
|
||||
# Workaround for integration tests that reach out to the public
|
||||
# internet. Alternative option is to prefetch but it was decided
|
||||
# to continue to use ignores.
|
||||
# ref: https://github.com/NixOS/nixpkgs/pull/501960
|
||||
"TestCommands/mod"
|
||||
"TestCommands/hugo__static_issue14507"
|
||||
# Server tests are flaky, at least in x86_64-darwin. See #368072
|
||||
# We can try testing again after updating the `httpget` helper
|
||||
# ref: https://github.com/gohugoio/hugo/blob/v0.140.1/main_test.go#L220-L233
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "jpegli";
|
||||
version = "0-unstable-2025-02-11";
|
||||
version = "0-unstable-2026-03-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "jpegli";
|
||||
rev = "bc19ca2393f79bfe0a4a9518f77e4ad33ce1ab7a";
|
||||
hash = "sha256-8th+QHLOoAIbSJwFyaBxUXoCXwj7K7rgg/cCK7LgOb0=";
|
||||
rev = "a069db9215c9aab9f3a685d012b55f1c3a85c164";
|
||||
hash = "sha256-YTp69ycZLdZPMZlCsqbmBcao+SX4RW+mY5lOvbogPHA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jsoncons";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielaparker";
|
||||
repo = "jsoncons";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-brcOFD6EO6lVL4A+LrZp6CxZFY2mu+i10IQmjwf4XMo=";
|
||||
hash = "sha256-p+LMT0231ZKtxoTqWjUZof3WQu+lLqAS3n20u9dYTzM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lepton-jpeg-util";
|
||||
version = "0.5.3";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "lepton_jpeg_rust";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DfVgQGGnrOOa/UdkYHSENbtxkbR0cTe08uglUM2hfGI=";
|
||||
hash = "sha256-G46++ZRHdfaSElt9LwI1keDXXE2/VKH2m9+EY+QNOK4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AryHUFB6EWSUvKs+lBI16+A27VfRsr6aUtrwsiZxT28=";
|
||||
cargoHash = "sha256-jO+LHoZKn0RORKRw5GIwO8kBoQMjvBrofRYN33OHm/I=";
|
||||
|
||||
buildAndTestSubdir = "util";
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ diff --git a/package.json b/package.json
|
||||
index 2131951..91e4846 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -114,5 +114,15 @@
|
||||
@@ -114,5 +114,13 @@
|
||||
"admin/",
|
||||
"packages/"
|
||||
]
|
||||
@@ -10,9 +10,7 @@ index 2131951..91e4846 100644
|
||||
+ "files": [
|
||||
+ "api",
|
||||
+ "client/dist",
|
||||
+ "packages/data-provider",
|
||||
+ "packages/data-schemas",
|
||||
+ "packages/mcp"
|
||||
+ "packages"
|
||||
+ ],
|
||||
+ "bin": {
|
||||
+ "librechat-server": "api/server/index.js"
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/api/config/meiliLogger.js b/api/config/meiliLogger.js
|
||||
index 195b387..d445e54 100644
|
||||
--- a/api/config/meiliLogger.js
|
||||
+++ b/api/config/meiliLogger.js
|
||||
@@ -2,7 +2,7 @@ const path = require('path');
|
||||
const winston = require('winston');
|
||||
require('winston-daily-rotate-file');
|
||||
|
||||
-const logDir = path.join(__dirname, '..', 'logs');
|
||||
+const logDir = path.join('.', 'logs');
|
||||
|
||||
const { NODE_ENV } = process.env;
|
||||
|
||||
diff --git a/api/config/winston.js b/api/config/winston.js
|
||||
index 8f51b99..2ebd041 100644
|
||||
--- a/api/config/winston.js
|
||||
+++ b/api/config/winston.js
|
||||
@@ -3,7 +3,7 @@ const winston = require('winston');
|
||||
require('winston-daily-rotate-file');
|
||||
const { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat } = require('./parsers');
|
||||
|
||||
-const logDir = path.join(__dirname, '..', 'logs');
|
||||
+const logDir = path.join('.', 'logs');
|
||||
|
||||
const { NODE_ENV, DEBUG_LOGGING = true, DEBUG_CONSOLE = false, CONSOLE_JSON = false } = process.env;
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
diff --git a/client/package.json b/client/package.json
|
||||
index f96aefa2d..ef3050f72 100644
|
||||
--- a/client/package.json
|
||||
+++ b/client/package.json
|
||||
@@ -121,7 +121,7 @@
|
||||
"@tanstack/react-query-devtools": "^4.29.0",
|
||||
"@testing-library/dom": "^9.3.0",
|
||||
"@testing-library/jest-dom": "^5.16.5",
|
||||
- "@testing-library/react": "^14.0.0",
|
||||
+ "@testing-library/react": "^14.3.1",
|
||||
"@testing-library/user-event": "^14.4.3",
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/js-cookie": "^3.0.6",
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index 5b484fd55..7cbc13f49 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -20,6 +20,7 @@
|
||||
"@eslint/js": "^9.20.0",
|
||||
"@microsoft/eslint-formatter-sarif": "^3.1.0",
|
||||
"@playwright/test": "^1.50.1",
|
||||
+ "@testing-library/react": "^14.3.1",
|
||||
"@types/react-virtualized": "^9.22.0",
|
||||
"caniuse-lite": "^1.0.30001741",
|
||||
"cross-env": "^7.0.3",
|
||||
@@ -2718,7 +2719,7 @@
|
||||
"@tanstack/react-query-devtools": "^4.29.0",
|
||||
"@testing-library/dom": "^9.3.0",
|
||||
"@testing-library/jest-dom": "^5.16.5",
|
||||
- "@testing-library/react": "^14.0.0",
|
||||
+ "@testing-library/react": "^14.3.1",
|
||||
"@testing-library/user-event": "^14.4.3",
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/js-cookie": "^3.0.6",
|
||||
@@ -51744,7 +51745,7 @@
|
||||
"@rollup/plugin-replace": "^5.0.5",
|
||||
"@rollup/plugin-terser": "^0.4.4",
|
||||
"@tanstack/react-query": "^4.28.0",
|
||||
- "@testing-library/react": "^14.0.0",
|
||||
+ "@testing-library/react": "^16.3.0",
|
||||
"@types/react": "^18.2.11",
|
||||
"@types/react-dom": "^18.2.4",
|
||||
"caniuse-lite": "^1.0.30001741",
|
||||
diff --git a/package.json b/package.json
|
||||
index 693de111d..5e58ab1f0 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -99,6 +99,7 @@
|
||||
"@eslint/js": "^9.20.0",
|
||||
"@microsoft/eslint-formatter-sarif": "^3.1.0",
|
||||
"@playwright/test": "^1.50.1",
|
||||
+ "@testing-library/react": "^14.3.1",
|
||||
"@types/react-virtualized": "^9.22.0",
|
||||
"caniuse-lite": "^1.0.30001741",
|
||||
"cross-env": "^7.0.3",
|
||||
diff --git a/packages/client/package.json b/packages/client/package.json
|
||||
index 71aac0c29..ab6fabca1 100644
|
||||
--- a/packages/client/package.json
|
||||
+++ b/packages/client/package.json
|
||||
@@ -75,7 +75,7 @@
|
||||
"@rollup/plugin-replace": "^5.0.5",
|
||||
"@rollup/plugin-terser": "^0.4.4",
|
||||
"@tanstack/react-query": "^4.28.0",
|
||||
- "@testing-library/react": "^14.0.0",
|
||||
+ "@testing-library/react": "^16.3.0",
|
||||
"@types/react": "^18.2.11",
|
||||
"@types/react-dom": "^18.2.4",
|
||||
"caniuse-lite": "^1.0.30001741",
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchNpmDeps,
|
||||
fetchFromGitHub,
|
||||
nodejs_22,
|
||||
pkg-config,
|
||||
@@ -11,15 +10,15 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "librechat";
|
||||
version = "0.8.0";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danny-avila";
|
||||
repo = "LibreChat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DTmb9J2nsMy6f+V6BgRtFgpTwOi9OQnvikSx4QZQ0HI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XiPnTKiSOMezUZuhkaGJ0xHiT7jrz8OYbZrvq5gb/V8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -30,28 +29,13 @@ buildNpmPackage rec {
|
||||
# Also, we set the `bin` property to the server script to benefit from the
|
||||
# auto-generated wrapper.
|
||||
./0001-npm-pack.patch
|
||||
# LibreChat tries writing logs to the package directory, which is immutable
|
||||
# in our case. We patch the log directory to target the current working directory
|
||||
# instead, which in case of NixOS will be the service's data directory.
|
||||
./0002-logs.patch
|
||||
# Similarly to the logs, user uploads are by default written to the package
|
||||
# directory as well. Again, we patch this to be relative to the current working
|
||||
# directory instead.
|
||||
./0003-upload-paths.patch
|
||||
# The npm dependencies are causing issues with the build. The package @testing-library/react
|
||||
# appears to not be included in NPM deps, even though it is present in the project
|
||||
# This patch fixes this by placing the dependency in different files and regenerating the
|
||||
# lock file.
|
||||
./0004-fix-deps-v080.patch
|
||||
# User uploads are by default written to the package directory as well.
|
||||
# We patch this to be relative to the current working directory instead.
|
||||
./0002-upload-paths.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-97cEw6VD7FoVayrxClHuS1iUcQmDw7/aUoUV6ektvOY=";
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
name = "${pname}-${version}-npm-deps-patched";
|
||||
hash = npmDepsHash;
|
||||
patches = [ ./0004-fix-deps-v080.patch ];
|
||||
};
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-h15rNYl2QYnh7/cJvA7lrRqmXw8Ri2QKTfTr7w7+mMo=";
|
||||
|
||||
# npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
|
||||
nodejs = nodejs_22;
|
||||
@@ -65,12 +49,21 @@ buildNpmPackage rec {
|
||||
vips
|
||||
];
|
||||
|
||||
# required for sharp
|
||||
makeCacheWritable = true;
|
||||
|
||||
npmBuildScript = "frontend";
|
||||
npmPruneFlags = [ "--production" ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
# Upstream defaults to the immutable package directory.
|
||||
# As a functioning default, we set this to the current working directory (through a relative logs path),
|
||||
# but make it easy for the module to override.
|
||||
"--set-default LIBRECHAT_LOG_DIR ./logs"
|
||||
];
|
||||
|
||||
# npmConfigHook only patches the root node_modules
|
||||
postConfigure = ''
|
||||
patchShebangs client/node_modules
|
||||
'';
|
||||
|
||||
# For reasons beyond my understanding, the api and client directory disappears after the build finishes.
|
||||
# Hence, the build fails with broken symlinks and if the symlink is removed,
|
||||
# starting LibreChat fails with a "module not found" error.
|
||||
@@ -97,8 +90,12 @@ buildNpmPackage rec {
|
||||
meta = {
|
||||
description = "Open-source app for all your AI conversations, fully customizable and compatible with any AI provider";
|
||||
homepage = "https://github.com/danny-avila/LibreChat";
|
||||
changelog = "https://www.librechat.ai/changelog/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ niklaskorz ];
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
niklaskorz
|
||||
];
|
||||
mainProgram = "librechat-server";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
name = "metals-deps-${finalAttrs.version}";
|
||||
buildCommand = ''
|
||||
export COURSIER_CACHE=$(pwd)
|
||||
${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} \
|
||||
${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} org.scalameta:metals-mcp_2.13:${finalAttrs.version} \
|
||||
-r bintray:scalacenter/releases \
|
||||
-r sonatype:snapshots > deps
|
||||
mkdir -p $out/share/java
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-Snx4JvWOTkJcihVRwj25op4BJqmChz+1fZH/PrCCbt0=";
|
||||
outputHash = "sha256-Gc5fQCXLWvDLzxfj+NfOcelVV51UoydNfGdDx1T4cbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -41,6 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/metals \
|
||||
--add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/metals-mcp \
|
||||
--add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.McpMain"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -170,11 +170,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "145.0.3800.97";
|
||||
version = "146.0.3856.62";
|
||||
|
||||
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-Zih/MOiE1AptZBOtR5V7IRd50JVokzzXQb1V6pUK0VI=";
|
||||
hash = "sha256-ana/Vyt3pRyxhNBdduRLRt/wbcdn6622UPEJolCc3Pc=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
rec {
|
||||
|
||||
pname = "mobilizon";
|
||||
version = "5.2.2";
|
||||
version = "5.2.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "kaihuri";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-SPkkanqEuxcZ7x0rqRk0pcB2c2rg08DcTO+SWP4cEqk=";
|
||||
hash = "sha256-uMMmRP3T9KlF+S0xDk2rY2bqEjjM8zWJVRbegth4pdw=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ in
|
||||
buildNpmPackage {
|
||||
inherit (common) pname version src;
|
||||
|
||||
npmDepsHash = "sha256-zcYx7Iv+fWMSr1BeX4C9DXwugRq8z+lNhNcwoCz1Pug=";
|
||||
npmDepsHash = "sha256-nqjqRdIF583cmUd/mg9+PogA8Tpo5mfh0R9IylDpWZg=";
|
||||
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
|
||||
|
||||
@@ -17,12 +17,12 @@ let
|
||||
{
|
||||
absinthe = buildMix rec {
|
||||
name = "absinthe";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "absinthe";
|
||||
version = "${version}";
|
||||
sha256 = "db65993420944ad90e932827663d4ab704262b007d4e3900cd69615f14ccc8ce";
|
||||
sha256 = "d93e1aa61d68b974f48d5660104cb911ae045ee3a5d69954d251f91f3dbe2077";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -100,12 +100,12 @@ let
|
||||
|
||||
bandit = buildMix rec {
|
||||
name = "bandit";
|
||||
version = "1.10.1";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "bandit";
|
||||
version = "${version}";
|
||||
sha256 = "4b4c35f273030e44268ace53bf3d5991dfc385c77374244e2f960876547671aa";
|
||||
sha256 = "99a52d909c48db65ca598e1962797659e3c0f1d06e825a50c3d75b74a5e2db18";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -150,12 +150,12 @@ let
|
||||
|
||||
castore = buildMix rec {
|
||||
name = "castore";
|
||||
version = "1.0.17";
|
||||
version = "1.0.18";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "castore";
|
||||
version = "${version}";
|
||||
sha256 = "12d24b9d80b910dd3953e165636d68f147a31db945d2dcb9365e441f8b5351e5";
|
||||
sha256 = "f393e4fe6317829b158fb74d86eb681f737d2fe326aa61ccf6293c4104957e34";
|
||||
};
|
||||
|
||||
beamDeps = [ ];
|
||||
@@ -176,12 +176,12 @@ let
|
||||
|
||||
cldr_utils = buildMix rec {
|
||||
name = "cldr_utils";
|
||||
version = "2.29.1";
|
||||
version = "2.29.5";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "cldr_utils";
|
||||
version = "${version}";
|
||||
sha256 = "3844a0a0ed7f42e6590ddd8bd37eb4b1556b112898f67dea3ba068c29aabd6c2";
|
||||
sha256 = "962d3a2028b232ee0a5373941dc411028a9442f53444a4d5d2c354f687db1835";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -245,12 +245,12 @@ let
|
||||
|
||||
credo = buildMix rec {
|
||||
name = "credo";
|
||||
version = "1.7.15";
|
||||
version = "1.7.17";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "credo";
|
||||
version = "${version}";
|
||||
sha256 = "291e8645ea3fea7481829f1e1eb0881b8395db212821338e577a90bf225c5607";
|
||||
sha256 = "1eb5645c835f0b6c9b5410f94b5a185057bcf6d62a9c2b476da971cde8749645";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -294,12 +294,12 @@ let
|
||||
|
||||
db_connection = buildMix rec {
|
||||
name = "db_connection";
|
||||
version = "2.8.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "db_connection";
|
||||
version = "${version}";
|
||||
sha256 = "a61a3d489b239d76f326e03b98794fb8e45168396c925ef25feb405ed09da8fd";
|
||||
sha256 = "17d502eacaf61829db98facf6f20808ed33da6ccf495354a41e64fe42f9c509c";
|
||||
};
|
||||
|
||||
beamDeps = [ telemetry ];
|
||||
@@ -472,12 +472,12 @@ let
|
||||
|
||||
ecto_sql = buildMix rec {
|
||||
name = "ecto_sql";
|
||||
version = "3.13.4";
|
||||
version = "3.13.5";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ecto_sql";
|
||||
version = "${version}";
|
||||
sha256 = "2b38cf0749ca4d1c5a8bcbff79bbe15446861ca12a61f9fba604486cb6b62a14";
|
||||
sha256 = "aa36751f4e6a2b56ae79efb0e088042e010ff4935fc8684e74c23b1f49e25fdc";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -555,12 +555,12 @@ let
|
||||
|
||||
ex_cldr = buildMix rec {
|
||||
name = "ex_cldr";
|
||||
version = "2.44.1";
|
||||
version = "2.47.2";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ex_cldr";
|
||||
version = "${version}";
|
||||
sha256 = "3880cd6137ea21c74250cd870d3330c4a9fdec07fabd5e37d1b239547929e29b";
|
||||
sha256 = "4a7cef380a1c2546166b45d6ee5e8e2f707ea695b12ae6dadd250201588b4f16";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -574,12 +574,12 @@ let
|
||||
|
||||
ex_cldr_calendars = buildMix rec {
|
||||
name = "ex_cldr_calendars";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ex_cldr_calendars";
|
||||
version = "${version}";
|
||||
sha256 = "e29b2b186ce2832cc0da1574944cf206dd221da13b3da98c80da62d6ab71b343";
|
||||
sha256 = "ab69fd04bc1ae18baf9d2e57335d4754c5ac263076ea397eb112621702251fe5";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -591,12 +591,12 @@ let
|
||||
|
||||
ex_cldr_currencies = buildMix rec {
|
||||
name = "ex_cldr_currencies";
|
||||
version = "2.16.5";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ex_cldr_currencies";
|
||||
version = "${version}";
|
||||
sha256 = "4397179028f0a7389de278afd0239771f39ba8d1984ce072bc9b715fa28f30d3";
|
||||
sha256 = "e266a0a61f4c7d83608154d49b59e4d7485b2aaa7ba1d0e17b3c55910595de51";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -607,12 +607,12 @@ let
|
||||
|
||||
ex_cldr_dates_times = buildMix rec {
|
||||
name = "ex_cldr_dates_times";
|
||||
version = "2.25.2";
|
||||
version = "2.25.6";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ex_cldr_dates_times";
|
||||
version = "${version}";
|
||||
sha256 = "3766037b28d0ba576a33ba432f2d5c4c437ed79ab18c343df543e34a23858d0a";
|
||||
sha256 = "926ff5662b849f86088832ee66b61a96aab0fa5a54d5e14240e08ad3030663e2";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -639,12 +639,12 @@ let
|
||||
|
||||
ex_cldr_numbers = buildMix rec {
|
||||
name = "ex_cldr_numbers";
|
||||
version = "2.37.0";
|
||||
version = "2.38.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ex_cldr_numbers";
|
||||
version = "${version}";
|
||||
sha256 = "adc011aad34ab545e1d53ae248891479efcd25ba51f662822ec7c5083d0122f8";
|
||||
sha256 = "4f95738f1dc4e821485e52226666f7691c9276bf6eba49cba8d23c8a2db05e84";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -676,12 +676,12 @@ let
|
||||
|
||||
ex_doc = buildMix rec {
|
||||
name = "ex_doc";
|
||||
version = "0.39.3";
|
||||
version = "0.40.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "ex_doc";
|
||||
version = "${version}";
|
||||
sha256 = "0590955cf7ad3b625780ee1c1ea627c28a78948c6c0a9b0322bd976a079996e1";
|
||||
sha256 = "bcef0e2d360d93ac19f01a85d58f91752d930c0a30e2681145feea6bd3516e00";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -874,12 +874,12 @@ let
|
||||
|
||||
floki = buildMix rec {
|
||||
name = "floki";
|
||||
version = "0.38.0";
|
||||
version = "0.38.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "floki";
|
||||
version = "${version}";
|
||||
sha256 = "a5943ee91e93fb2d635b612caf5508e36d37548e84928463ef9dd986f0d1abd9";
|
||||
sha256 = "e744bf0db7ee34b2c8b62767f04071107af0516a81144b9a2f73fe0494200e5b";
|
||||
};
|
||||
|
||||
beamDeps = [ ];
|
||||
@@ -1502,12 +1502,12 @@ let
|
||||
|
||||
oban = buildMix rec {
|
||||
name = "oban";
|
||||
version = "2.20.2";
|
||||
version = "2.20.3";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "oban";
|
||||
version = "${version}";
|
||||
sha256 = "523365ef0217781c061d15f496e3200a5f1b43e08b1a27c34799ef8bfe95815f";
|
||||
sha256 = "075ffbf1279a96bec495bc63d647b08929837d70bcc0427249ffe4d1dddaec33";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1546,12 +1546,12 @@ let
|
||||
|
||||
phoenix = buildMix rec {
|
||||
name = "phoenix";
|
||||
version = "1.8.3";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "phoenix";
|
||||
version = "${version}";
|
||||
sha256 = "36169f95cc2e155b78be93d9590acc3f462f1e5438db06e6248613f27c80caec";
|
||||
sha256 = "83b2bb125127e02e9f475c8e3e92736325b5b01b0b9b05407bcb4083b7a32485";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1632,12 +1632,12 @@ let
|
||||
|
||||
phoenix_live_view = buildMix rec {
|
||||
name = "phoenix_live_view";
|
||||
version = "1.1.19";
|
||||
version = "1.1.27";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "phoenix_live_view";
|
||||
version = "${version}";
|
||||
sha256 = "d5ad357d6b21562a5b431f0ad09dfe76db9ce5648c6949f1aac334c8c4455d32";
|
||||
sha256 = "415735d0b2c612c9104108b35654e977626a0cb346711e1e4f1ed16e3c827ede";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1757,12 +1757,12 @@ let
|
||||
|
||||
postgrex = buildMix rec {
|
||||
name = "postgrex";
|
||||
version = "0.21.1";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "postgrex";
|
||||
version = "${version}";
|
||||
sha256 = "27d8d21c103c3cc68851b533ff99eef353e6a0ff98dc444ea751de43eb48bdac";
|
||||
sha256 = "a68c4261e299597909e03e6f8ff5a13876f5caadaddd0d23af0d0a61afcc5d84";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1968,12 +1968,12 @@ let
|
||||
|
||||
swoosh = buildMix rec {
|
||||
name = "swoosh";
|
||||
version = "1.20.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "swoosh";
|
||||
version = "${version}";
|
||||
sha256 = "13e610f709bae54851d68afb6862882aa646e5c974bf49e3bf5edd84a73cf213";
|
||||
sha256 = "3193813b462d6dd519e907c680df04988c47bae372b4159e0c4c9f1c42dffea3";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -1990,12 +1990,12 @@ let
|
||||
|
||||
telemetry = buildRebar3 rec {
|
||||
name = "telemetry";
|
||||
version = "1.3.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "telemetry";
|
||||
version = "${version}";
|
||||
sha256 = "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6";
|
||||
sha256 = "2172e05a27531d3d31dd9782841065c50dd5c3c7699d95266b2edd54c2dafa1c";
|
||||
};
|
||||
|
||||
beamDeps = [ ];
|
||||
@@ -2003,12 +2003,12 @@ let
|
||||
|
||||
tesla = buildMix rec {
|
||||
name = "tesla";
|
||||
version = "1.15.3";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "tesla";
|
||||
version = "${version}";
|
||||
sha256 = "98bb3d4558abc67b92fb7be4cd31bb57ca8d80792de26870d362974b58caeda7";
|
||||
sha256 = "eb3bdfc0c6c8a23b4e3d86558e812e3577acff1cb4acb6cfe2da1985a1035b89";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
@@ -2053,12 +2053,12 @@ let
|
||||
|
||||
tls_certificate_check = buildRebar3 rec {
|
||||
name = "tls_certificate_check";
|
||||
version = "1.31.0";
|
||||
version = "1.32.0";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "tls_certificate_check";
|
||||
version = "${version}";
|
||||
sha256 = "9d2b41b128d5507bd8ad93e1a998e06d0ab2f9a772af343f4c00bf76c6be1532";
|
||||
sha256 = "38e38db768244d808e11ed27f812e7d927ea5f999007b07d0473db44d7f7cc51";
|
||||
};
|
||||
|
||||
beamDeps = [ ssl_verify_fun ];
|
||||
@@ -2066,12 +2066,12 @@ let
|
||||
|
||||
tz_world = buildMix rec {
|
||||
name = "tz_world";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchHex {
|
||||
pkg = "tz_world";
|
||||
version = "${version}";
|
||||
sha256 = "9173ba7aa7c5e627e23adfc0c8d001a56a7072d5bdc8d3a94e4cd44e25decba1";
|
||||
sha256 = "ee260d860d475a1a0fa7cd5d76b114007dbbc902144b61d1ca24e6bc23432a4c";
|
||||
};
|
||||
|
||||
beamDeps = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
writeShellScriptBin,
|
||||
writeScript,
|
||||
beam,
|
||||
mix2nix,
|
||||
fetchFromGitHub,
|
||||
@@ -51,8 +51,8 @@ beamPackages.mixRelease rec {
|
||||
repo = "cldr";
|
||||
rev = "v${old.version}";
|
||||
hash =
|
||||
assert old.version == "2.44.1";
|
||||
"sha256-5XLPQYDW9yV0ZkWbyiB2s213GTccFjdqckBmx09n4eE=";
|
||||
assert old.version == "2.47.2";
|
||||
"sha256-XiShurm4i/Qxop1nE4Z/8tMj5953kUqn+4kBrILxO+Y=";
|
||||
};
|
||||
postInstall = ''
|
||||
cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/
|
||||
@@ -141,11 +141,11 @@ beamPackages.mixRelease rec {
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) mobilizon; };
|
||||
updateScript = writeShellScriptBin "update.sh" ''
|
||||
set -eou pipefail
|
||||
updateScript = writeScript "update-mobilizon" ''
|
||||
set -euo pipefail
|
||||
|
||||
${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
|
||||
${lib.getExe nixfmt} pkgs/servers/mobilizon/mix.nix
|
||||
${lib.getExe mix2nix} '${src}/mix.lock' > pkgs/by-name/mo/mobilizon/mix.nix
|
||||
${lib.getExe nixfmt} pkgs/by-name/mo/mobilizon/mix.nix
|
||||
'';
|
||||
elixirPackage = beamPackages.elixir;
|
||||
inherit mixNixDeps;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
pkg-config,
|
||||
@@ -65,7 +65,9 @@ let
|
||||
};
|
||||
component = availableComponents.${componentName};
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
# Vendored gvisor has a build-tag conflict with Go 1.26 (netbirdio/netbird#5290).
|
||||
# TODO: revert to 'buildGoModule' when a release includes netbirdio/netbird#5447.
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.65.3";
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nextcloud-client";
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "nextcloud-releases";
|
||||
repo = "desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cur50O//LSZwXvbE7qeaNa0BgpdR25NIpCUF5NDDObY=";
|
||||
hash = "sha256-EKJj2z3CkWrNL2idBHu5jHuPXQXKwjEjUAgo6OOY/08=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -3,10 +3,7 @@
|
||||
config,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
applyPatches,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
abseil-cpp_202407,
|
||||
abseil-cpp_202508,
|
||||
cmake,
|
||||
cpuinfo,
|
||||
eigen,
|
||||
@@ -59,39 +56,20 @@ let
|
||||
hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0=";
|
||||
};
|
||||
|
||||
onnx-src = applyPatches {
|
||||
onnx-src = fetchFromGitHub {
|
||||
name = "onnx-src";
|
||||
src = fetchFromGitHub {
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
tag = "v1.18.0";
|
||||
hash = "sha256-UhtF+CWuyv5/Pq/5agLL4Y95YNP63W2BraprhRqJOag=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix "error: conversion from 'onnx::OpSchema' to non-scalar type 'onnx::OpSchemaRegistry::OpSchemaRegisterOnce'"
|
||||
# https://github.com/microsoft/onnxruntime/issues/26229
|
||||
# Fix from https://github.com/onnx/onnx/pull/7390
|
||||
(fetchpatch {
|
||||
url = "https://github.com/onnx/onnx/commit/595a069aaac07586f111681245bc808ee63551f8.patch";
|
||||
includes = [ "onnx/defs/schema.h" ];
|
||||
hash = "sha256-FFAJuJse4nmNT3ixvEdlqzbr3edY46SqEFv7z/oo6m0=";
|
||||
})
|
||||
|
||||
# Fix "undefined reference to `onnx::RNNShapeInference(onnx::InferenceContext&)'"
|
||||
(fetchpatch {
|
||||
url = "https://github.com/onnx/onnx/commit/6769c41ad64ebca0358da8c7211d2c6d0e627b2b.patch";
|
||||
hash = "sha256-VlTHs0om20kTNvSVQaasSsa5JROliQy4k9BECTsBtbU=";
|
||||
})
|
||||
];
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
tag = "v1.20.1";
|
||||
hash = "sha256-XZJXD6sBvVJ6cLPyDkKOW8oSkjqcw9whUqDWd7dxY3c=";
|
||||
};
|
||||
|
||||
cutlass-src = fetchFromGitHub {
|
||||
name = "cutlass-src";
|
||||
owner = "NVIDIA";
|
||||
repo = "cutlass";
|
||||
tag = "v3.9.2";
|
||||
hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
|
||||
tag = "v4.2.1";
|
||||
hash = "sha256-iP560D5Vwuj6wX1otJhwbvqe/X4mYVeKTpK533Wr5gY=";
|
||||
};
|
||||
|
||||
dlpack-src = fetchFromGitHub {
|
||||
@@ -106,30 +84,17 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "onnxruntime";
|
||||
version = "1.23.2";
|
||||
version = "1.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "onnxruntime";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-hZ2L5+0Enkw4rGDKVpRECnKXP87w6Kbiyp6Fdxwt6hk=";
|
||||
hash = "sha256-CjPgRkPyp7dUPAOo3cePWQvucOlQAwtT4NO5w3NkV+E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Missing cstdint include (GCC 15 compatibility)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/microsoft/onnxruntime/commit/d6e712c5b7b6260a61e54d1fe40107cf5366ee77.patch";
|
||||
hash = "sha256-FSuPybX8f2VoxvLhcYx4rdChaiK8bSUDR32sN3Efwfc=";
|
||||
})
|
||||
|
||||
# Correct maybe-uninitialized and range-loop-construct warnings
|
||||
# https://github.com/microsoft/onnxruntime/pull/26201
|
||||
(fetchpatch {
|
||||
url = "https://github.com/microsoft/onnxruntime/commit/8ebd0bf1cf02414584d15d7244b07fa97d65ba02.patch";
|
||||
hash = "sha256-vX+kaFiNdmqWI91JELcLpoaVIHBb5EPbI7rCAMYAx04=";
|
||||
})
|
||||
|
||||
# Skip execinfo include on musl
|
||||
# https://github.com/microsoft/onnxruntime/pull/25726
|
||||
./musl-execinfo.patch
|
||||
@@ -139,16 +104,36 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fix build of unit tests with musl libc
|
||||
# https://github.com/microsoft/onnxruntime/issues/9155
|
||||
(fetchurl {
|
||||
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/462dfe0eb4b66948fe48de44545cc22bb64fdf9f/community/onnxruntime/0001-Remove-MATH_NO_EXCEPT-macro.patch";
|
||||
hash = "sha256-BdeGYevZExWWCuJ1lSw0Roy3h+9EbJgFF8qMwVxSn1A=";
|
||||
})
|
||||
# Patch adapted from https://gitlab.alpinelinux.org/alpine/aports/-/raw/462dfe0eb4b66948fe48de44545cc22bb64fdf9f/community/onnxruntime/0001-Remove-MATH_NO_EXCEPT-macro.patch
|
||||
./remove-MATH_NO_EXCEPT-macro.patch
|
||||
|
||||
# Fix build of ignored outputs after Protobuf 34 added `[[nodiscard]]` to
|
||||
# many functions.
|
||||
./protobuf34-nodiscard.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/libonnxruntime.pc.cmake.in \
|
||||
--replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
|
||||
echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
|
||||
''
|
||||
+ ''
|
||||
substituteInPlace onnxruntime/core/platform/posix/env.cc --replace-fail \
|
||||
"return PathString{};" \
|
||||
"return PathString(\"$out/lib/\");"
|
||||
''
|
||||
+ lib.optionalString rocmSupport ''
|
||||
patchShebangs tools/ci_build/hipify-perl
|
||||
''
|
||||
# https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
|
||||
+ lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString pythonSupport ''
|
||||
${python3Packages.python.interpreter} ../setup.py bdist_wheel
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
@@ -261,7 +246,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=unused-variable")
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeBool "FETCHCONTENT_QUIET" false)
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack-src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11-src}")
|
||||
@@ -344,29 +329,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
hardeningDisable = lib.optional effectiveStdenv.hostPlatform.isMusl "fortify";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/libonnxruntime.pc.cmake.in \
|
||||
--replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
|
||||
echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
|
||||
''
|
||||
# https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249
|
||||
+ ''
|
||||
substituteInPlace onnxruntime/core/platform/env.h --replace-fail \
|
||||
"GetRuntimePath() const { return PathString(); }" \
|
||||
"GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
|
||||
''
|
||||
+ lib.optionalString rocmSupport ''
|
||||
patchShebangs tools/ci_build/hipify-perl
|
||||
''
|
||||
# https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
|
||||
+ lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
|
||||
rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
|
||||
'';
|
||||
|
||||
postBuild = lib.optionalString pythonSupport ''
|
||||
${python3Packages.python.interpreter} ../setup.py bdist_wheel
|
||||
'';
|
||||
|
||||
# perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh`
|
||||
postInstall = ''
|
||||
install -m644 -Dt $out/include \
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/onnxruntime/core/framework/graph_partitioner.cc b/onnxruntime/core/framework/graph_partitioner.cc
|
||||
index 43caf4766d..fabc2a26a0 100644
|
||||
index 9cb2111670..8a3ec5bab9 100644
|
||||
--- a/onnxruntime/core/framework/graph_partitioner.cc
|
||||
+++ b/onnxruntime/core/framework/graph_partitioner.cc
|
||||
@@ -957,7 +957,7 @@
|
||||
@@ -966,7 +966,7 @@ static Status CreateEpContextModel(const ExecutionProviders& execution_providers
|
||||
|
||||
AllocatorPtr allocator = output_buffer_holder->buffer_allocator;
|
||||
IAllocatorUniquePtr<void> buffer = IAllocator::MakeUniquePtr<void>(allocator, buffer_size);
|
||||
@@ -11,7 +11,7 @@ index 43caf4766d..fabc2a26a0 100644
|
||||
|
||||
*output_buffer_holder->buffer_size_ptr = buffer_size;
|
||||
*output_buffer_holder->buffer_ptr = buffer.release();
|
||||
@@ -970,7 +970,7 @@
|
||||
@@ -979,7 +979,7 @@ static Status CreateEpContextModel(const ExecutionProviders& execution_providers
|
||||
auto out_stream_buf = std::make_unique<epctx::OutStreamBuf>(*output_write_func_holder);
|
||||
std::ostream out_stream(out_stream_buf.get());
|
||||
|
||||
@@ -21,10 +21,10 @@ index 43caf4766d..fabc2a26a0 100644
|
||||
ORT_RETURN_IF_ERROR(out_stream_buf->GetStatus());
|
||||
} else {
|
||||
diff --git a/onnxruntime/python/onnxruntime_pybind_schema.cc b/onnxruntime/python/onnxruntime_pybind_schema.cc
|
||||
index cd1d2a8da1..05da1a1447 100644
|
||||
index 8cb617fe52..254fc1abf9 100644
|
||||
--- a/onnxruntime/python/onnxruntime_pybind_schema.cc
|
||||
+++ b/onnxruntime/python/onnxruntime_pybind_schema.cc
|
||||
@@ -169,7 +169,7 @@
|
||||
@@ -163,7 +163,7 @@ void addOpSchemaSubmodule(py::module& m) {
|
||||
"_default_value",
|
||||
[](ONNX_NAMESPACE::OpSchema::Attribute* attr) -> py::bytes {
|
||||
std::string out;
|
||||
@@ -34,10 +34,10 @@ index cd1d2a8da1..05da1a1447 100644
|
||||
})
|
||||
.def_readonly("required", &ONNX_NAMESPACE::OpSchema::Attribute::required);
|
||||
diff --git a/onnxruntime/test/ep_graph/test_ep_graph.cc b/onnxruntime/test/ep_graph/test_ep_graph.cc
|
||||
index 7e6d157799..f08b09990d 100644
|
||||
index 055b255132..3925db8ac7 100644
|
||||
--- a/onnxruntime/test/ep_graph/test_ep_graph.cc
|
||||
+++ b/onnxruntime/test/ep_graph/test_ep_graph.cc
|
||||
@@ -232,7 +232,7 @@
|
||||
@@ -261,7 +261,7 @@ TEST(EpGraphTest, SerializeToProto_InputModelHasExternalIni) {
|
||||
handle_initializer_data));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
@@ -46,7 +46,7 @@ index 7e6d157799..f08b09990d 100644
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
@@ -357,7 +357,7 @@
|
||||
@@ -395,7 +395,7 @@ TEST(EpGraphTest, SerializeToProto_Mnist) {
|
||||
handle_initializer_data));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
@@ -55,7 +55,7 @@ index 7e6d157799..f08b09990d 100644
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
@@ -487,7 +487,7 @@
|
||||
@@ -525,7 +525,7 @@ TEST(EpGraphTest, SerializeToProto_ConstantOfShape) {
|
||||
handle_initializer_data));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
@@ -64,7 +64,7 @@ index 7e6d157799..f08b09990d 100644
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
@@ -552,7 +552,7 @@
|
||||
@@ -590,7 +590,7 @@ TEST(EpGraphTest, SerializeToProto_3LayerSubgraphs) {
|
||||
ASSERT_CXX_ORTSTATUS_OK(OrtEpUtils::OrtGraphToProto(test_graph->GetOrtGraph(), model_proto));
|
||||
|
||||
std::ofstream ofs(serialized_model_path, std::ios::binary);
|
||||
@@ -73,24 +73,73 @@ index 7e6d157799..f08b09990d 100644
|
||||
ofs.flush();
|
||||
|
||||
ASSERT_TRUE(std::filesystem::exists(serialized_model_path));
|
||||
diff --git a/onnxruntime/test/optimizer/graph_transform_test_builder.cc b/onnxruntime/test/optimizer/graph_transform_test_builder.cc
|
||||
index 756cc4159e..8323851385 100644
|
||||
--- a/onnxruntime/test/optimizer/graph_transform_test_builder.cc
|
||||
+++ b/onnxruntime/test/optimizer/graph_transform_test_builder.cc
|
||||
@@ -158,7 +158,7 @@
|
||||
diff --git a/onnxruntime/test/framework/inference_session_test.cc b/onnxruntime/test/framework/inference_session_test.cc
|
||||
index 1c4e7800b7..8ceb05f0f6 100644
|
||||
--- a/onnxruntime/test/framework/inference_session_test.cc
|
||||
+++ b/onnxruntime/test/framework/inference_session_test.cc
|
||||
@@ -1045,7 +1045,7 @@ static void TestBindHelper(const std::string& log_str,
|
||||
CreateMatMulModel(p_model, run_provider_type);
|
||||
|
||||
// Serialize the model to a string.
|
||||
std::string model_data;
|
||||
- model.ToProto().SerializeToString(&model_data);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
|
||||
std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
|
||||
std::string s1;
|
||||
- p_model->ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
|
||||
std::stringstream sstr(s1);
|
||||
ASSERT_STATUS_OK(session_object.Load(sstr));
|
||||
ASSERT_STATUS_OK(session_object.Initialize());
|
||||
@@ -1078,7 +1078,7 @@ TEST(InferenceSessionTests, TestIOBindingReuse) {
|
||||
CreateMatMulModel(p_model, kCpuExecutionProvider);
|
||||
|
||||
auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
|
||||
std::string s1;
|
||||
- p_model->ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(p_model->ToProto().SerializeToString(&s1));
|
||||
std::stringstream sstr(s1);
|
||||
ASSERT_TRUE(session_object.Load(sstr).IsOK());
|
||||
ASSERT_STATUS_OK(session_object.Initialize());
|
||||
diff --git a/onnxruntime/test/ir/graph_test.cc b/onnxruntime/test/ir/graph_test.cc
|
||||
index 4d80cb7047..c69ac46c05 100644
|
||||
--- a/onnxruntime/test/ir/graph_test.cc
|
||||
+++ b/onnxruntime/test/ir/graph_test.cc
|
||||
@@ -1244,7 +1244,7 @@ TEST_F(GraphTest, GraphConstruction_CheckGraphInputOutputOrderMaintained) {
|
||||
auto proto = model.ToProto();
|
||||
std::string s1;
|
||||
// std::stringstream s1;
|
||||
- model.ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
|
||||
|
||||
ModelProto model_proto;
|
||||
// const bool result = model_proto.ParseFromIstream(&s1);
|
||||
@@ -1313,7 +1313,7 @@ TEST_F(GraphTest, UnusedInitializerAndNodeArgsAreIgnored) {
|
||||
auto proto = model.ToProto();
|
||||
std::string s1;
|
||||
// std::stringstream s1;
|
||||
- model.ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
|
||||
|
||||
ModelProto model_proto;
|
||||
const bool result = model_proto.ParseFromString(s1);
|
||||
@@ -1342,7 +1342,7 @@ TEST_F(GraphTest, UnusedSparseInitializerIsIgnored) {
|
||||
ConstructASimpleAddGraph(*m_graph, nullptr);
|
||||
auto* m_sparse_initializer = m_graph->add_sparse_initializer();
|
||||
ConstructSparseTensor("unused_sparse_initializer", *m_sparse_initializer);
|
||||
- model_proto.SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(model_proto.SerializeToString(&s1));
|
||||
}
|
||||
|
||||
ModelProto model_proto_1;
|
||||
@@ -1940,7 +1940,7 @@ TEST_F(GraphTest, SparseInitializerHandling) {
|
||||
ConstructASimpleAddGraph(*m_graph, nullptr);
|
||||
auto* m_sparse_initializer = m_graph->add_sparse_initializer();
|
||||
ConstructSparseTensor(input_initializer_name, *m_sparse_initializer);
|
||||
- model_proto.SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(model_proto.SerializeToString(&s1));
|
||||
}
|
||||
|
||||
ModelProto model_proto_sparse;
|
||||
diff --git a/onnxruntime/test/optimizer/nchwc_optimizer_test.cc b/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
|
||||
index 538f600404..111692d4ca 100644
|
||||
index fc0ba86c7f..b086040212 100644
|
||||
--- a/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
|
||||
+++ b/onnxruntime/test/optimizer/nchwc_optimizer_test.cc
|
||||
@@ -185,7 +185,7 @@
|
||||
@@ -185,7 +185,7 @@ void NchwcOptimizerTester(const std::function<void(NchwcTestHelper& helper)>& bu
|
||||
|
||||
// Serialize the model to a string.
|
||||
std::string model_data;
|
||||
@@ -99,3 +148,56 @@ index 538f600404..111692d4ca 100644
|
||||
|
||||
auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches) {
|
||||
SessionOptions session_options;
|
||||
diff --git a/onnxruntime/test/providers/compare_provider_test_utils.cc b/onnxruntime/test/providers/compare_provider_test_utils.cc
|
||||
index 6312014387..578d72cb09 100644
|
||||
--- a/onnxruntime/test/providers/compare_provider_test_utils.cc
|
||||
+++ b/onnxruntime/test/providers/compare_provider_test_utils.cc
|
||||
@@ -83,7 +83,7 @@ void CompareOpTester::CompareWithCPU(const std::string& target_provider_type,
|
||||
|
||||
// first run with cpu
|
||||
std::string s1;
|
||||
- model.ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
|
||||
std::istringstream model_proto_str(s1);
|
||||
|
||||
ASSERT_STATUS_OK(cpu_session_object.Load(model_proto_str));
|
||||
@@ -104,7 +104,7 @@ void CompareOpTester::CompareWithCPU(const std::string& target_provider_type,
|
||||
ASSERT_STATUS_OK(target_session_object.RegisterExecutionProvider(std::move(target_execution_provider)));
|
||||
|
||||
std::string s2;
|
||||
- tp_model.ToProto().SerializeToString(&s2);
|
||||
+ ASSERT_TRUE(tp_model.ToProto().SerializeToString(&s2));
|
||||
std::istringstream model_proto_str1(s2);
|
||||
ASSERT_STATUS_OK(target_session_object.Load(model_proto_str1));
|
||||
|
||||
@@ -159,7 +159,7 @@ void CompareOpTester::CompareEPs(const std::shared_ptr<IExecutionProvider>& sour
|
||||
|
||||
// first run with source provider
|
||||
std::string s1;
|
||||
- model.ToProto().SerializeToString(&s1);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&s1));
|
||||
std::istringstream model_proto_str(s1);
|
||||
|
||||
ASSERT_STATUS_OK(source_session_object.Load(model_proto_str));
|
||||
@@ -181,7 +181,7 @@ void CompareOpTester::CompareEPs(const std::shared_ptr<IExecutionProvider>& sour
|
||||
ASSERT_STATUS_OK(target_session_object.RegisterExecutionProvider(target_execution_provider));
|
||||
|
||||
std::string s2;
|
||||
- tp_model.ToProto().SerializeToString(&s2);
|
||||
+ ASSERT_TRUE(tp_model.ToProto().SerializeToString(&s2));
|
||||
std::istringstream model_proto_str1(s2);
|
||||
ASSERT_STATUS_OK(target_session_object.Load(model_proto_str1));
|
||||
|
||||
diff --git a/onnxruntime/test/unittest_util/graph_transform_test_builder.cc b/onnxruntime/test/unittest_util/graph_transform_test_builder.cc
|
||||
index 5caafa0f37..327463c615 100644
|
||||
--- a/onnxruntime/test/unittest_util/graph_transform_test_builder.cc
|
||||
+++ b/onnxruntime/test/unittest_util/graph_transform_test_builder.cc
|
||||
@@ -158,7 +158,7 @@ void TransformerTester(const std::function<void(ModelTestBuilder& helper)>& buil
|
||||
|
||||
// Serialize the model to a string.
|
||||
std::string model_data;
|
||||
- model.ToProto().SerializeToString(&model_data);
|
||||
+ ASSERT_TRUE(model.ToProto().SerializeToString(&model_data));
|
||||
std::shared_ptr<IExecutionProvider> ep_shared = ep ? std::move(ep) : nullptr;
|
||||
|
||||
auto run_model = [&](TransformerLevel level, std::vector<OrtValue>& fetches,
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
diff --git a/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc b/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
|
||||
index 3fb8cc3e15..ccc9bd543e 100644
|
||||
--- a/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
|
||||
+++ b/onnxruntime/test/providers/cpu/math/element_wise_ops_test.cc
|
||||
@@ -3797,13 +3797,7 @@ TEST(MathOpTest, Mean_8) {
|
||||
test.Run(OpTester::ExpectResult::kExpectSuccess, "", {kTensorrtExecutionProvider}); // TensorRT: Input batch size is inconsistent
|
||||
}
|
||||
|
||||
-#ifdef _LIBCPP_VERSION
|
||||
-#define MATH_NO_EXCEPT
|
||||
-#else
|
||||
-#define MATH_NO_EXCEPT noexcept
|
||||
-#endif
|
||||
-
|
||||
-template <float (&op)(float value) MATH_NO_EXCEPT>
|
||||
+template <float (&op)(float value)>
|
||||
void TrigFloatTest(OpTester& test, std::initializer_list<float> input, float abs_error = -1.0f) {
|
||||
std::vector<int64_t> dims{static_cast<int64_t>(input.size())};
|
||||
|
||||
@@ -3821,7 +3815,7 @@ void TrigFloatTest(OpTester& test, std::initializer_list<float> input, float abs
|
||||
test.Run();
|
||||
}
|
||||
|
||||
-template <double (&op)(double value) MATH_NO_EXCEPT>
|
||||
+template <double (&op)(double value)>
|
||||
void TrigDoubleTest(OpTester& test, std::initializer_list<double> input,
|
||||
const std::unordered_set<std::string> excluded_provider_types = {}) {
|
||||
std::vector<int64_t> dims{static_cast<int64_t>(input.size())};
|
||||
@@ -3835,7 +3829,7 @@ void TrigDoubleTest(OpTester& test, std::initializer_list<double> input,
|
||||
test.Run(OpTester::ExpectResult::kExpectSuccess, "", excluded_provider_types);
|
||||
}
|
||||
|
||||
-template <float (&op)(float value) MATH_NO_EXCEPT>
|
||||
+template <float (&op)(float value)>
|
||||
void TrigFloat16Test(OpTester& test, std::initializer_list<float> input) {
|
||||
std::vector<int64_t> dims{static_cast<int64_t>(input.size())};
|
||||
|
||||
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "Molcas";
|
||||
repo = "OpenMolcas";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+DU651GiGZRHdkLuGLCPU/95uOhG+kENCTi1T+8Hz1g=";
|
||||
hash = "sha256-FzO1fvMw+/r6SKiaODlhkmKlbzQ9TXLYXk+xpz/fs2I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
cgal_5,
|
||||
curl,
|
||||
dbus,
|
||||
draco,
|
||||
eigen,
|
||||
expat,
|
||||
ffmpeg,
|
||||
@@ -41,6 +42,7 @@
|
||||
libx11,
|
||||
libnoise,
|
||||
withSystemd ? stdenv.hostPlatform.isLinux,
|
||||
withNvidiaGLWorkaround ? false,
|
||||
}:
|
||||
let
|
||||
wxGTK' =
|
||||
@@ -48,23 +50,26 @@ let
|
||||
withCurl = true;
|
||||
withPrivateFonts = true;
|
||||
withWebKit = true;
|
||||
withEGL = false;
|
||||
}).overrideAttrs
|
||||
(old: {
|
||||
buildInputs = old.buildInputs ++ [ libsecret ];
|
||||
configureFlags = old.configureFlags ++ [
|
||||
# Disable noisy debug dialogs
|
||||
"--enable-debug=no"
|
||||
"--enable-secretstore"
|
||||
];
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "orca-slicer";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoftFever";
|
||||
repo = "OrcaSlicer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RdMBx/onLq58oI1sL0cHmF2SGDfeI9KkPPCbjyMqECI=";
|
||||
hash = "sha256-c1WTODLrXGtyJWkEueOz5jHhPbA/JFcMeAwhpvoKnKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -90,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cgal_5
|
||||
curl
|
||||
dbus
|
||||
draco
|
||||
eigen
|
||||
expat
|
||||
ffmpeg
|
||||
@@ -196,13 +202,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DGL_SILENCE_DEPRECATION")
|
||||
(lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-Wl,--no-as-needed")
|
||||
(lib.cmakeBool "ORCA_VERSION_CHECK_DEFAULT" false)
|
||||
(lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include/noise")
|
||||
(lib.cmakeFeature "LIBNOISE_LIBRARY" "${libnoise}/lib/libnoise-static.a")
|
||||
(lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${libnoise}/include")
|
||||
(lib.cmakeFeature "LIBNOISE_LIBRARY_RELEASE" "${libnoise}/lib/libnoise-static.a")
|
||||
"-Wno-dev"
|
||||
|
||||
# cmake 4 compatibility, remove in next update
|
||||
# see: https://github.com/SoftFever/OrcaSlicer/commit/883607e1d4a0b2bb719f2f4bcd9fd72f8c2174fa
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.13")
|
||||
];
|
||||
|
||||
# Generate translation files
|
||||
@@ -216,6 +218,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
}"
|
||||
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
|
||||
${lib.optionalString withNvidiaGLWorkaround ''
|
||||
--set __GLX_VENDOR_LIBRARY_NAME mesa
|
||||
--set __EGL_VENDOR_LIBRARY_FILENAMES /run/opengl-driver/share/glvnd/egl_vendor.d/50_mesa.json
|
||||
--set MESA_LOADER_DRIVER_OVERRIDE zink
|
||||
--set GALLIUM_DRIVER zink
|
||||
--set WEBKIT_DISABLE_DMABUF_RENDERER 1
|
||||
''}
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
|
||||
index d85c65fd5..07914f69f 100644
|
||||
index 5f959145..95d250a7 100644
|
||||
--- a/src/libslic3r/CMakeLists.txt
|
||||
+++ b/src/libslic3r/CMakeLists.txt
|
||||
@@ -557,7 +557,8 @@ target_link_libraries(libslic3r
|
||||
@@ -579,7 +579,9 @@ target_link_libraries(libslic3r
|
||||
libigl
|
||||
libnest2d
|
||||
miniz
|
||||
- opencv_world
|
||||
+ opencv_core
|
||||
+ opencv_imgproc
|
||||
+ opencv_imgcodecs
|
||||
PRIVATE
|
||||
${CMAKE_DL_LIBS}
|
||||
${EXPAT_LIBRARIES}
|
||||
|
||||
@@ -37,11 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/pass-cli";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pv";
|
||||
version = "1.10.4";
|
||||
version = "1.10.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-fplPm4ZFggookohGgFFXWt8JoeaI2OTY+j7MSHeL98k=";
|
||||
hash = "sha256-qyG0+GYigGRragLhufCWeQkY+JyVK74NBv73XTtS+xU=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
withUi ? true,
|
||||
buildFeatures ?
|
||||
# enable all features except self_update by default
|
||||
# https://github.com/dathere/qsv/blob/17.0.0/Cargo.toml#L370
|
||||
# https://github.com/dathere/qsv/blob/18.0.0/Cargo.toml#L370
|
||||
[
|
||||
"apply"
|
||||
"feature_capable"
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "qsv";
|
||||
version = "17.0.0";
|
||||
version = "18.0.0";
|
||||
|
||||
inherit buildFeatures;
|
||||
|
||||
@@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "dathere";
|
||||
repo = "qsv";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RIrphnw0opCvp0fhkvevNaOQJ8/25c34qYfg4IVNP9g=";
|
||||
hash = "sha256-2S10BYLSB2pLMX5kiLv1v4naSwFL66rl7NPzBGrz9Rg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nTyxEX2jiFZxkao0/xFxGjpitc5K0BQSvvo3A+PFLEI=";
|
||||
cargoHash = "sha256-IdzTG3L3bzOMrmQls1mTsPQYp3hHThZ5l968fH+4Q5s=";
|
||||
|
||||
buildInputs = [
|
||||
file
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rattler-build";
|
||||
version = "0.59.0";
|
||||
version = "0.61.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "rattler-build";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IpFoK8TA/QhdAjp3jNlNrlSHwxbEFYNujGdtpMmMWkI=";
|
||||
hash = "sha256-IuCfWhj3MQVJghJYkmLxV//VOZ9SSNTbIiyo3KsRbLc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MKVVWQS78IbZ6eABj/MLMqxmjhN6IeXIUHjr83sdulI=";
|
||||
cargoHash = "sha256-dgjCTHq0HHv5GX7BrZgH4oUXWbnb8SRBU13Qf9f4Qt0=";
|
||||
|
||||
doCheck = false; # test requires network access
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "renovate";
|
||||
version = "43.59.4";
|
||||
version = "43.76.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "renovatebot";
|
||||
repo = "renovate";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pdB5b8mdvuykI7iCiINj2iITPZXJIqyVObQDuDszIdc=";
|
||||
hash = "sha256-9DAgX6CG3Wnesp5AZqfv12KT8tRAGZXuewm7fqPVmpg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-EujMiRpGdEsl9CWtM+WMffYWS3Fbv9QSNjTagyvnNyY=";
|
||||
hash = "sha256-LgVtV/jyJP/+fJ9XQHEsz67COUHV4RL0hfVdxph1cUg=";
|
||||
};
|
||||
|
||||
env.COREPACK_ENABLE_STRICT = 0;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rs-tftpd";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "altugbakan";
|
||||
repo = "rs-tftpd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ObGJVoFI4HTQ2tuoFbMBrub/64X9AMF/oCs1OPXzWJ8=";
|
||||
hash = "sha256-ozp/PAc5rFexr81Sx0MPaBLIyggttjImdt+Vs7BDnfc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oQOT4P4/zGXLe7gMetBqTIRDWbroKp8sCChQFgeZ0zs=";
|
||||
cargoHash = "sha256-mu7o0vqI12bR0z9YaBa36JNgVbLVGZfpQpnsCqhckeU=";
|
||||
|
||||
buildFeatures = [ "client" ];
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.12.4",
|
||||
"version": "1.12.5",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "0hvgmj18xdmkpqh6595cqwkl2b0hrg9c2rchqp6g2nwlqqwas1y4"
|
||||
"sha256": "1sylwkki7qzqa3ksissic2h9jd2s9bw07mqd25jkc1npcagmn9n5"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "0j1v58r10pqlx3d1xhj8c9sxdgip2qylrcxwknxb9rza4kvsyww0"
|
||||
"sha256": "07w90ld5vs2mcbjlcj4cv6gif7wvz87zlsxn74nzqdy26fmb7k13"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "19g9jsmkn1pagmgabqjpkhl65sl264c25wjdrf2dcd2gjkzpcvkd"
|
||||
"sha256": "1fy97chlgg77sbq2bxpyvpbzxdflj441v01a0qx6ip8ymz043kyq"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "1j6rkc9g0ljrf3svws1x03v28c4053d7bqg8ja6bjjld042c8d02"
|
||||
"sha256": "102pvpyk8sgr3sr8b6i8q7p9c6z59cldphnj193nr6hk7bmgxmi1"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,7 +176,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
hexa
|
||||
supinie
|
||||
];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
mainProgram = "servo";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spicedb";
|
||||
version = "1.49.1";
|
||||
version = "1.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "spicedb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FqgNtHh2eDy48uFWMmqjpVnrGHBUEM+CG3ukkPhEOqY=";
|
||||
hash = "sha256-ixV2BINcZgcl17g58Qsi6t7nbjmJ86MBEcl12AEMHfg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wK5GDMkWesWRO5J2M5ambZShAw7b4U0+/lmAgXn8Ags=";
|
||||
vendorHash = "sha256-C3GqC0isMM8XP8K6BLd7I3UFxXPHs2Vmm0+LCroH6k4=";
|
||||
|
||||
ldflags = [
|
||||
"-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "steelix";
|
||||
version = "25.07-unstable-2026-03-01";
|
||||
version = "0-unstable-2026-03-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattwparas";
|
||||
repo = "helix";
|
||||
rev = "69d8222d17d42be19d4610f74c756d9e172cef68";
|
||||
hash = "sha256-QQuflhLeN+1tH2g7ob1N+DSnQaWDsRk0YzyX69QIX1k=";
|
||||
rev = "03ad8a1b026c28f9ecec80c4d67151731ec9d5fc";
|
||||
hash = "sha256-ifMz83gWOfZTxahD+kafCij2Z6SBDgntM/nCdN7OZEs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Dx+82EutywNJohvfTgoIQ3B6f2wQS9MkFyOBzXqngXM=";
|
||||
cargoHash = "sha256-iKurrnsJw3x4QHNQYALinO39bw/XVAFJSdN/t8Nzq68=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ttypr";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tanciaku";
|
||||
repo = "ttypr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y6FXkNfd+4Nkus+Z6Ah2AJX9iWeXQnIDeKmuLFUZDdQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bmwvirAbjzD5NJDHJgbPhnNqTdfo8CWJ2JWgFEBz+2Y=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/tanciaku/ttypr/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Terminal typing practice";
|
||||
longDescription = ''
|
||||
ttypr is a simple, lightweight typing practice application that
|
||||
runs in your terminal, built with Rust and Ratatui.
|
||||
'';
|
||||
homepage = "https://github.com/hotellogical05/ttypr";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "ttypr";
|
||||
maintainers = with lib.maintainers; [ yiyu ];
|
||||
};
|
||||
})
|
||||
@@ -1,86 +0,0 @@
|
||||
From db2e25602339253c12ed65720bae7c793c044bdc Mon Sep 17 00:00:00 2001
|
||||
From: Scott Bowman <scott@bowmans.org>
|
||||
Date: Thu, 19 Feb 2026 16:58:03 -0600
|
||||
Subject: [PATCH] Broaden pgrep patterns to detect driver on NixOS and pip
|
||||
entry points
|
||||
|
||||
Use multiple pgrep patterns to find running driver processes,
|
||||
covering python -m invocation, pip console_scripts entry points,
|
||||
and NixOS wrapped executables.
|
||||
---
|
||||
tuxbox/gui/driver_manager.py | 50 ++++++++++++++++++++++--------------
|
||||
1 file changed, 31 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/tuxbox/gui/driver_manager.py b/tuxbox/gui/driver_manager.py
|
||||
index accb457..384c00e 100644
|
||||
--- a/tuxbox/gui/driver_manager.py
|
||||
+++ b/tuxbox/gui/driver_manager.py
|
||||
@@ -82,6 +82,17 @@ class DriverManager:
|
||||
DriverManager._systemctl_available = shutil.which('systemctl') is not None
|
||||
return DriverManager._systemctl_available
|
||||
|
||||
+ # Patterns to match driver processes via pgrep -f (full command line match).
|
||||
+ # Multiple patterns cover different invocation methods:
|
||||
+ # - "python -m tuxbox [args]" (standard / systemd service)
|
||||
+ # - "/path/to/tuxbox [args]" (pip entry point)
|
||||
+ # - "/path/to/.tuxbox-wrapped [args]" (NixOS wrapper)
|
||||
+ # The patterns intentionally exclude GUI processes (tuxbox-gui, tuxbox.gui).
|
||||
+ DRIVER_PGREP_PATTERNS = [
|
||||
+ r'python.*-m\s+tuxbox(\s|$)',
|
||||
+ r'[/.]tuxbox(-wrapped)?(\s|$)',
|
||||
+ ]
|
||||
+
|
||||
@staticmethod
|
||||
def _get_driver_pids() -> list:
|
||||
"""Get PIDs of running driver processes
|
||||
@@ -89,27 +100,28 @@ class DriverManager:
|
||||
Returns:
|
||||
List of PID strings for running tuxbox processes
|
||||
"""
|
||||
- try:
|
||||
- # Use pgrep to find Python processes running tuxbox
|
||||
- # -f matches against full command line
|
||||
- result = subprocess.run(
|
||||
- ['pgrep', '-f', f'python.*-m.*{DriverManager.DRIVER_MODULE}'],
|
||||
- capture_output=True,
|
||||
- text=True,
|
||||
- timeout=5
|
||||
- )
|
||||
+ all_pids = set()
|
||||
+ our_pid = str(os.getpid())
|
||||
+ parent_pid = str(os.getppid())
|
||||
|
||||
- if result.returncode == 0 and result.stdout.strip():
|
||||
- pids = result.stdout.strip().split('\n')
|
||||
- # Filter out our own process (the GUI)
|
||||
- our_pid = str(os.getpid())
|
||||
- parent_pid = str(os.getppid())
|
||||
- return [pid for pid in pids if pid and pid != our_pid and pid != parent_pid]
|
||||
- return []
|
||||
+ for pattern in DriverManager.DRIVER_PGREP_PATTERNS:
|
||||
+ try:
|
||||
+ result = subprocess.run(
|
||||
+ ['pgrep', '-f', pattern],
|
||||
+ capture_output=True,
|
||||
+ text=True,
|
||||
+ timeout=5
|
||||
+ )
|
||||
|
||||
- except Exception as e:
|
||||
- logger.debug(f"pgrep failed: {e}")
|
||||
- return []
|
||||
+ if result.returncode == 0 and result.stdout.strip():
|
||||
+ for pid in result.stdout.strip().split('\n'):
|
||||
+ if pid and pid != our_pid and pid != parent_pid:
|
||||
+ all_pids.add(pid)
|
||||
+
|
||||
+ except Exception as e:
|
||||
+ logger.debug(f"pgrep failed for pattern '{pattern}': {e}")
|
||||
+
|
||||
+ return list(all_pids)
|
||||
|
||||
@staticmethod
|
||||
def stop_driver() -> Tuple[bool, str]:
|
||||
--
|
||||
2.52.0
|
||||
|
||||
@@ -5,20 +5,16 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tuxbox";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndyCappDev";
|
||||
repo = "tuxbox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hBk4KhLNMgk8bFCZPQMtQlJ1/RB9qcL4kiF+eb3n4LU=";
|
||||
hash = "sha256-jPPjGumArcnsRKQm3HKhoTGh913WEB5MUs7Y7eCHXNY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./Broaden-pgrep-patterns-to-detect-driver-on-NixOS.patch
|
||||
];
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
@@ -28,6 +24,20 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pyside6
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Copy .desktop file to output
|
||||
mkdir -p $out/share/applications/
|
||||
cp ./tuxbox-gui.desktop $out/share/applications/
|
||||
|
||||
substituteInPlace $out/share/applications/tuxbox-gui.desktop \
|
||||
--replace-fail "/usr/local/bin/tuxbox-gui" "$out/bin/tuxbox-gui"
|
||||
|
||||
# Install uinput udev rules
|
||||
mkdir -p $out/lib/udev/rules.d/
|
||||
echo 'KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"' > $out/lib/udev/rules.d/99-tuxbox-uinput.rules
|
||||
chmod 0744 $out/lib/udev/rules.d/99-tuxbox-uinput.rules
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/AndyCappDev/tuxbox/releases/tag/${finalAttrs.version}";
|
||||
description = "Linux driver for all TourBox models - Native feel with USB, Bluetooth, haptics and graphical configuration GUI";
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2026-03-18
|
||||
# Last updated: 2026-03-23
|
||||
{
|
||||
linux-version = "12.1.2.24730";
|
||||
linux-version = "12.1.2.25838";
|
||||
darwin-version = "12.1.25205";
|
||||
x86_64-linux = {
|
||||
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/24730/wps-office_12.1.2.24730.AK.preread.sw_625635_amd64.deb";
|
||||
hash = "sha256-kkITeff8xnq2E9OpiMeMr2ixTILhVbTfScESxZ3WXCY=";
|
||||
url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/25838/wps-office_12.1.2.25838.AK.preread.sw_648473_amd64.deb";
|
||||
hash = "sha256-S6LPXU444p8eDljZXTenkAyj8WyAoR3q/1HzhFqJgvc=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25205/WPS_Office_12.1.25205(25205)_x64.dmg";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zellij";
|
||||
version = "0.43.1";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pUExOToThqDBrNNKHh8Z+PFkijx22I7gpYXTAywlSxM=";
|
||||
hash = "sha256-9jVBz+in8TrdX5qYXdSBCN3SYhG/JJLIbkq0DC0tm4Q=";
|
||||
};
|
||||
|
||||
# Remove the `vendored_curl` feature in order to link against the libcurl from nixpkgs instead of
|
||||
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail ', "vendored_curl"' ""
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-KWE9K7M2pelow5I2rvEZho9L0kmnSXVLDD9XBpzlEEY=";
|
||||
cargoHash = "sha256-nGMOVq5etxiOfocjTKXAd8sJHFw34T49Ga48Isc8dCg=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
|
||||
@@ -325,6 +325,19 @@
|
||||
./ghc-9.6-or-later-docs-sphinx-9.patch
|
||||
]
|
||||
|
||||
# Fixes rts/Types.h missing from the install when targeting javascript
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line
|
||||
# TODO(@sternenseemann): patch likely included in 9.12.4
|
||||
++ lib.optionals (lib.versionAtLeast version "9.12.3" && lib.versionOlder version "9.15") [
|
||||
(fetchpatch {
|
||||
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
|
||||
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
|
||||
includes = [ "rts/rts.cabal" ];
|
||||
})
|
||||
]
|
||||
|
||||
++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
|
||||
|
||||
stdenv = stdenvNoCC;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./common-hadrian.nix {
|
||||
version = "9.15.20260218";
|
||||
rev = "68bd08055594b8cbf6148a72d108786deb6c12a1";
|
||||
sha256 = "sha256-SOTlIjtxC4QLG5phTOEYPp1mS59jhL05bGAzopdLAJg=";
|
||||
version = "9.15.20260322";
|
||||
rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
|
||||
sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
|
||||
}
|
||||
|
||||
@@ -28,9 +28,9 @@ let
|
||||
"21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
|
||||
"22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU=";
|
||||
"23.0.0-git".gitRelease = {
|
||||
rev = "696e82db339ce6dc907378bd977ec7857cc892e9";
|
||||
rev-version = "23.0.0-unstable-2026-03-15";
|
||||
sha256 = "sha256-rX5GMsPJcKLkePHryT+Ru3X0S6BzM71uRoKT1ftmnO4=";
|
||||
rev = "c911b8492374942bf4cfe35411e90a35d3837f6a";
|
||||
rev-version = "23.0.0-unstable-2026-03-22";
|
||||
sha256 = "sha256-LrA705BjLHt8U2qazT6+tOLglxNxTbwiCdTkYYIzIfU=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
||||
@@ -22,13 +22,13 @@ backendStdenv.mkDerivation (finalAttrs: {
|
||||
# NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
|
||||
name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
|
||||
pname = "gdrcopy";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "gdrcopy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2cDsDc1lGW9rNF1q3EhjmiJhNaIwuFYlNdooPe7/R2I=";
|
||||
hash = "sha256-KfdCiJE8q5MUYjI5qsZjeFmBm9jKfdSxtrlhmQRosns=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@@ -72,6 +72,8 @@ qtModule {
|
||||
"-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AudioToolbox";
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AudioToolbox";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
sqlite,
|
||||
gst-plugins-base,
|
||||
gst-plugins-bad,
|
||||
woff2,
|
||||
bubblewrap,
|
||||
libseccomp,
|
||||
libbacktrace,
|
||||
@@ -85,7 +84,7 @@ in
|
||||
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.50.6";
|
||||
version = "2.52.0";
|
||||
name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
|
||||
|
||||
outputs = [
|
||||
@@ -100,7 +99,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Kygav4iU/8YXIVLlZgt17u7b4cxD1ng9Cdx598hlu0I=";
|
||||
hash = "sha256-sxxV8YGUrIO6CMm5O77/71en7P9/Qch00XqeeFPcoZ8=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
@@ -145,6 +144,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
enchant
|
||||
expat
|
||||
flite
|
||||
freetype
|
||||
libavif
|
||||
libepoxy
|
||||
libjxl
|
||||
@@ -173,12 +173,10 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
nettle
|
||||
p11-kit
|
||||
sqlite
|
||||
woff2
|
||||
]
|
||||
++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=274032
|
||||
fontconfig
|
||||
freetype
|
||||
]
|
||||
++ lib.optionals clangStdenv.hostPlatform.isDarwin [
|
||||
libedit
|
||||
@@ -221,7 +219,6 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
[
|
||||
"-DENABLE_INTROSPECTION=ON"
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_SOUP2=${cmakeBool false}"
|
||||
"-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
|
||||
"-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
|
||||
]
|
||||
|
||||
@@ -1129,9 +1129,11 @@ in
|
||||
hash = "sha256-8lYvdraKEd1nf8dkZuSDQRVJvX56gHCcTZVtyoy/0IM=";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (
|
||||
if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"
|
||||
);
|
||||
env = old.env // {
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (
|
||||
if lua.pkgs.isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua"
|
||||
);
|
||||
};
|
||||
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
cargo
|
||||
|
||||
@@ -6,19 +6,17 @@
|
||||
integers,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "posix-base";
|
||||
version = "2.2.0";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-posix";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JKJIiuo4lW8DmcK1mJlT22784J1NS2ig860jDbRIjIo=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nBSIuz4WEnESlECdKujEcSxFOcSBFxW1zo7J/lT/lCY=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ctypes
|
||||
integers
|
||||
@@ -30,4 +28,4 @@ buildDunePackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
buildDunePackage,
|
||||
posix-base,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "posix-errno";
|
||||
|
||||
inherit (posix-base) version src;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
posix-base
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = posix-base.meta // {
|
||||
description = "Posix-errno provides comprehensive errno handling";
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
buildDunePackage,
|
||||
posix-base,
|
||||
unix-errno,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
@@ -10,7 +9,6 @@ buildDunePackage {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
posix-base
|
||||
unix-errno
|
||||
];
|
||||
|
||||
meta = posix-base.meta // {
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ buildDunePackage, posix-base }:
|
||||
{
|
||||
buildDunePackage,
|
||||
posix-base,
|
||||
dune-configurator,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "posix-socket";
|
||||
@@ -7,6 +11,8 @@ buildDunePackage {
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
propagatedBuildInputs = [ posix-base ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
buildDunePackage,
|
||||
posix-base,
|
||||
posix-types,
|
||||
unix-errno,
|
||||
posix-errno,
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
@@ -14,7 +14,7 @@ buildDunePackage {
|
||||
propagatedBuildInputs = [
|
||||
posix-base
|
||||
posix-types
|
||||
unix-errno
|
||||
posix-errno
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
ctypes-foreign,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "srt";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-srt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FVgOEBPYZz7SQ5c6mLAssDwY1NuXsV3ghP7OyLRd9Kw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+1/TffqssRA9YR3KLfbAr/ZpDF5XUKw24gj4HWrhObU=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
@@ -31,10 +31,10 @@ buildDunePackage rec {
|
||||
meta = {
|
||||
description = "OCaml bindings for the libsrt library";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/savonet/ocaml-srt";
|
||||
maintainers = with lib.maintainers; [
|
||||
vbgl
|
||||
dandellion
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
numpy,
|
||||
}:
|
||||
@@ -16,6 +17,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-k6ULWGpNLOxoqy+Z0D71g8V2HY+6VTXLjoHaeB0Nkv8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Numpy 2.4 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/biopython/biopython/pull/5161.patch";
|
||||
hash = "sha256-oN0nNlhvshIgNrmm+tIeCAJx1U/OqhdL4tj51DV2CHU=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ numpy ];
|
||||
@@ -33,8 +42,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# https://github.com/biopython/biopython/issues/5135
|
||||
broken = lib.versionAtLeast numpy.version "2.4";
|
||||
description = "Python library for bioinformatics";
|
||||
longDescription = ''
|
||||
Biopython is a set of freely available tools for biological computation
|
||||
|
||||
@@ -26,9 +26,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "bitsandbytes";
|
||||
version = "0.49.1";
|
||||
|
||||
brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) {
|
||||
"CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport;
|
||||
"CUDA is not targeting Linux" = cudaSupport && !stdenv.hostPlatform.isLinux;
|
||||
@@ -73,15 +70,16 @@ let
|
||||
paths = cuda-common-redist;
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bitsandbytes";
|
||||
version = "0.49.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitsandbytes-foundation";
|
||||
repo = "bitsandbytes";
|
||||
tag = version;
|
||||
hash = "sha256-nNhxDJITXNIZMXuZdzpF5dl1K1kFEVQ0gbTqZnOf/sI=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Z7C159ZpdthQppXibzA06rAglfM3Hmwd7LX4bPjk1Eo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -204,11 +202,11 @@ buildPythonPackage {
|
||||
meta = {
|
||||
description = "8-bit CUDA functions for PyTorch";
|
||||
homepage = "https://github.com/bitsandbytes-foundation/bitsandbytes";
|
||||
changelog = "https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/${version}";
|
||||
changelog = "https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
bcdarwin
|
||||
jk
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cron-descriptor";
|
||||
version = "2.0.6";
|
||||
version = "2.0.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Salamek";
|
||||
repo = "cron-descriptor";
|
||||
tag = version;
|
||||
hash = "sha256-f7TQ3wvcHrzefZowUvxl1T0LCGeCnvpPI/IZn4XcDa4=";
|
||||
hash = "sha256-apU+5RMyO6QQ5+i+wgLJtIni6dJoq4oxCqkCo5w9uLo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
lib,
|
||||
py-moneyed,
|
||||
django,
|
||||
certifi,
|
||||
pytestCheckHook,
|
||||
pytest-django,
|
||||
pytest-cov-stub,
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "django-money";
|
||||
version = "3.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-money";
|
||||
repo = "django-money";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VxAKTtrbDMRhiLxqjVYt7pLGl0sy9F1iwswP/hxQ01k=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
django
|
||||
py-moneyed
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
exchange = [ certifi ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
pytest-cov-stub
|
||||
]
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "djmoney" ];
|
||||
|
||||
disabledTests = [
|
||||
# avoid tests which import mixer, an abandoned library
|
||||
"test_mixer_blend"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Money fields for Django forms and models";
|
||||
homepage = "https://github.com/django-money/django-money";
|
||||
changelog = "https://github.com/django-money/django-money/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ kurogeek ];
|
||||
};
|
||||
})
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "genai-prices";
|
||||
version = "0.0.55";
|
||||
version = "0.0.56";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "genai-prices";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FxHBVroKC9tgYJ+a429cnv7UVWMBoeTX+BEah7eD9Us=";
|
||||
hash = "sha256-xiyYK+Dzx4aI9pFpO6mWf860br//PBeIl2N4xRuNQPk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/packages/python";
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchPypi,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
pint,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
@@ -22,7 +23,10 @@ buildPythonPackage rec {
|
||||
hatchling
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pint
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Units and constants in the HEP system of units";
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "indevolt-api";
|
||||
version = "1.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xirt";
|
||||
repo = "indevolt-api";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IDX7GgEDLryKTVIQM52hApI5Il+V7ay9usmL5FPc6vc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
# no tests in upstream repository
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "indevolt_api" ];
|
||||
|
||||
meta = {
|
||||
description = "Python API client for Indevolt devices";
|
||||
homepage = "https://github.com/Xirt/indevolt-api";
|
||||
changelog = "https://github.com/Xirt/indevolt-api/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
})
|
||||
@@ -176,6 +176,12 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AttributeError: 'google._upb._message.FieldDescriptor' object has no attribute 'label'
|
||||
"test_health_handler"
|
||||
"test_list_handler"
|
||||
"test_liveness_handler"
|
||||
"test_server_readiness"
|
||||
|
||||
# Started failing since vllm was updated to 0.13.0
|
||||
# pydantic_core._pydantic_core.ValidationError: 1 validation error for RerankResponse
|
||||
# usage.prompt_tokens
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "lance-namespace-urllib3-client";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance-namespace";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Vfy/A9ZrvHM4M/3ZCmq+xv/WxSh9eRaTlbk+ejvSUY=";
|
||||
hash = "sha256-eN50KkYOOs209oB5O7AOMXuYpOjXWU6mccRGPgM/4DQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/python/lance_namespace_urllib3_client";
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "lance-namespace";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance-namespace";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Vfy/A9ZrvHM4M/3ZCmq+xv/WxSh9eRaTlbk+ejvSUY=";
|
||||
hash = "sha256-eN50KkYOOs209oB5O7AOMXuYpOjXWU6mccRGPgM/4DQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/python/lance_namespace";
|
||||
|
||||
@@ -42,21 +42,21 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "lancedb";
|
||||
version = "0.29.2";
|
||||
version = "0.30.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lancedb";
|
||||
tag = "python-v${finalAttrs.version}";
|
||||
hash = "sha256-sOgRGn0romt5xJ70c+GSqNoRAp0D9F9hEq6bm7JRK/Y=";
|
||||
hash = "sha256-LzuzVl6cTkn1Owd91bHi5JS43KZUhd/ZD9biS21MdVs=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "python";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-GQA5RuxpYmrNqNrpW4GLZlXrphflErmR5PeeVcs6ZJQ=";
|
||||
hash = "sha256-U5wpWN6e26187DYeT85l6TxBnUu8rD+UzE98OIkretc=";
|
||||
};
|
||||
|
||||
build-system = [ rustPlatform.maturinBuildHook ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "nvidia-ml-py";
|
||||
version = "13.590.48";
|
||||
version = "13.595.45";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "nvidia_ml_py";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-gYTRvlKRSsfwmRzRwNlGxl3IioQMdUzRLCdLd7iHYN0=";
|
||||
hash = "sha256-yfNIl/4EQf81vI81uvgPgwogsPTmznHgoyW8Dmas8Hk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
numpy,
|
||||
pint,
|
||||
toolz,
|
||||
xarray,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
@@ -27,9 +29,25 @@ buildPythonPackage rec {
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fixes 2 test failures. The merge commit of PR:
|
||||
# https://github.com/xarray-contrib/pint-xarray/pull/367
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/xarray-contrib/pint-xarray/commit/296ee2e60c671175507de1fe904fa7e4d0a70586.patch?full_index=1";
|
||||
hash = "sha256-SS2zQ7fIeLzEUTd+8BW1PFBw8+qed0fLslns1jNpLtA=";
|
||||
})
|
||||
# Similarly to the above, fixes 3 more test failures. See:
|
||||
# https://github.com/xarray-contrib/pint-xarray/pull/368
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/xarray-contrib/pint-xarray/commit/6134b61e2cb6b4c46b7b0974a6e499dff2d9e18e.patch?full_index=1";
|
||||
hash = "sha256-s1AbaXAeL0sGkj/DWV5145FKGHW4eF+a11w1yg5QENA=";
|
||||
})
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
pint
|
||||
toolz
|
||||
xarray
|
||||
];
|
||||
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pylance";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-71PogI877/dLwwlvMBraaC0vQWKtAHI/bmGEIBZVui4=";
|
||||
hash = "sha256-zlD6jHMpgk4gvMjBizZP2VV0zM6iKaatIq6PbBKWaJ8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/python";
|
||||
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-scQDRyX3hweYZep+LVAsiVqOvDTEw/ss0/4M3R4ewDU=";
|
||||
hash = "sha256-+4UVY4JjQsVT+S5+j9PEXoFuiZhrrelSEfY8EvXp/Sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
aiohttp,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-timeout,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyliebherrhomeapi";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mettolen";
|
||||
repo = "pyliebherrhomeapi";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-J+s9oRKK2DWZV05M1bvDEBqczaJXuif4t3eOJUgrAu0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyliebherrhomeapi" ];
|
||||
|
||||
meta = {
|
||||
description = "Python library for Liebherr Home API";
|
||||
homepage = "https://github.com/mettolen/pyliebherrhomeapi";
|
||||
changelog = "https://github.com/mettolen/pyliebherrhomeapi/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.jamiemagee ];
|
||||
};
|
||||
})
|
||||
@@ -1,33 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isPy27,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
six,
|
||||
typing-extensions,
|
||||
pytestCheckHook,
|
||||
hypothesis,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyrsistent";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TEj3j2KrWWxnkIYITQ3RMlSuTz1scqg//fXr3vjyZaQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobgu";
|
||||
repo = "pyrsistent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8fLyz8ELOg5GCrBHLSl4iiCgEZ6MuFoBwNKns5AI5Ps=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
hypothesis
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyrsistent" ];
|
||||
@@ -35,6 +33,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/tobgu/pyrsistent/";
|
||||
description = "Persistent/Functional/Immutable data structures";
|
||||
changelog = "https://github.com/tobgu/pyrsistent/blob/${finalAttrs.src.tag}/CHANGES.txt";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -22,16 +22,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "pyscf";
|
||||
version = "2.12.1";
|
||||
version = "2.12.1-unstable-2026-03-21";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyscf";
|
||||
repo = "pyscf";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-voiXNoJ7lHQeqroOs9AxqX55NDEhHVNMLeB+XzJgBQM=";
|
||||
rev = "e8642fb7220248bd750c34ef6adf88a9744977ee";
|
||||
hash = "sha256-RVv5vTmTtHDAbgOXHW1DUzYVsf+NvrYh9++WfNGJ07k=";
|
||||
};
|
||||
|
||||
# setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user