Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -22924,6 +22924,12 @@
|
||||
githubId = 92817635;
|
||||
name = "Sanskar Gurdasani";
|
||||
};
|
||||
santosh = {
|
||||
email = "santoshxshrestha@gmail.com";
|
||||
name = "Santosh Shrestha";
|
||||
github = "santoshxshrestha";
|
||||
githubId = 182977126;
|
||||
};
|
||||
sarahec = {
|
||||
email = "seclark@nextquestion.net";
|
||||
github = "sarahec";
|
||||
|
||||
@@ -1334,26 +1334,21 @@ in
|
||||
# we check if wirelessInterfaces is empty as that means all interfaces implicit
|
||||
shouldWarn = wirelessEnabled && (wirelessInterfaces == [ ] || hasInterfaceConflict);
|
||||
in
|
||||
if shouldWarn then
|
||||
[
|
||||
''
|
||||
Some wireless interface is configured for both for client and access point mode:
|
||||
this is not allowed. Either specify `networking.wireless.interfaces` and exclude
|
||||
those from `services.hostapd.radios` or make sure to not run the `wpa_supplicant`
|
||||
and `hostapd` services simultaneously.
|
||||
''
|
||||
]
|
||||
else
|
||||
[ ];
|
||||
lib.optional shouldWarn ''
|
||||
Some wireless interface is configured for both for client and access point mode:
|
||||
this is not allowed. Either specify `networking.wireless.interfaces` and exclude
|
||||
those from `services.hostapd.radios` or make sure to not run the `wpa_supplicant`
|
||||
and `hostapd` services simultaneously.
|
||||
''
|
||||
++ lib.optional config.networking.wireless.iwd.enable ''
|
||||
hostapd and iwd do conflict,
|
||||
use `networking.wireless.enable` in combination with `networking.wireless.interfaces` to avoid it.
|
||||
'';
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.radios != { };
|
||||
message = "At least one radio must be configured with hostapd!";
|
||||
}
|
||||
{
|
||||
assertion = !config.networking.wireless.iwd.enable;
|
||||
message = "hostapd and iwd conflict, use `networking.wireless.enable` in combination with `networking.wireless.interfaces`";
|
||||
}
|
||||
]
|
||||
# Radio warnings
|
||||
++ (concatLists (
|
||||
|
||||
@@ -8,6 +8,7 @@ import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import warnings
|
||||
import json
|
||||
from typing import NamedTuple, Any, Sequence
|
||||
@@ -64,7 +65,10 @@ class SystemIdentifier(NamedTuple):
|
||||
|
||||
def copy_if_not_exists(source: Path, dest: Path) -> None:
|
||||
if not dest.exists():
|
||||
shutil.copyfile(source, dest)
|
||||
tmpfd, tmppath = tempfile.mkstemp(dir=dest.parent, prefix=dest.name, suffix='.tmp.')
|
||||
shutil.copyfile(source, tmppath)
|
||||
os.fsync(tmpfd)
|
||||
shutil.move(tmppath, dest)
|
||||
|
||||
|
||||
def generation_dir(profile: str | None, generation: int) -> Path:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,11 +9,11 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "140.3.0esr";
|
||||
version = "140.3.1esr";
|
||||
applicationName = "Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "f2a45352372a7c54bfc3a07652098b55634d111ea88550d33e7e2710d15524d689ee39fbd3b2049643436530e13c237d03e05fb7abd3970c9c18b66e5a84c85a";
|
||||
sha512 = "a9302d99d7f07f4b250aa214635814964dd083204268e05fe877a3d8330b9c0caa6c29ed19da71bd88979b7cf39ed52f17698968b0da5b0d7430b6764b43b6cc";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "143.0";
|
||||
version = "143.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "49fe5e5dbb7539be3e4c517d3cac453ea9b739e61040c4ac1abcf3d6665732fba5ff91fb040f3c0294af0f8c2824235a94e60ac9c26e25cb14d89d4b50c8a911";
|
||||
sha512 = "ef00d8bab715e7c2f4c138cfce0698e004f0616c767c8a7fa918e24e4a9f9151c41184d9c089ccbc6ab46a3b4bf6f12d723196f47e9c9d7f55f2ca44bab17cb2";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (final: {
|
||||
pname = "evil-helix";
|
||||
version = "20250823";
|
||||
version = "20250915";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usagi-flow";
|
||||
repo = "evil-helix";
|
||||
tag = "release-${final.version}";
|
||||
hash = "sha256-G4oMiXjx+/i9flVRw5M3doHpTGjEDg/27CpBd5zxpEM=";
|
||||
hash = "sha256-6kqKTZNS1RZwfxcFoa2uC7fUKcQ+KhT5KXusyCt59YQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Mf0nrgMk1MlZkSyUN6mlM5lmTcrOHn3xBNzmVGtApEU=";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "factoriolab";
|
||||
version = "3.17.2";
|
||||
version = "3.17.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "factoriolab";
|
||||
repo = "factoriolab";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-umEIFN2TQV+T3MtLuUyHi5eORbixsGUDLozTFDStlP8=";
|
||||
hash = "sha256-Ra3xnOCIzx5oCeMU8kARcup+wsxknePBO/w1xGbwgT8=";
|
||||
fetchLFS = true;
|
||||
};
|
||||
buildInputs = [ vips ];
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
frigate,
|
||||
nixosTests,
|
||||
fetchpatch,
|
||||
protobuf_21,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -38,6 +39,11 @@ let
|
||||
hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs=";
|
||||
};
|
||||
});
|
||||
onnxruntime = super.onnxruntime.override (old: {
|
||||
onnxruntime = old.onnxruntime.override (old: {
|
||||
protobuf = protobuf_21;
|
||||
});
|
||||
});
|
||||
};
|
||||
};
|
||||
python3Packages = python.pkgs;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go2rtc";
|
||||
version = "1.9.9";
|
||||
version = "1.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexxIT";
|
||||
repo = "go2rtc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TUUIEr90ZUMxsuF86CWZVpfo277mnefJ/ofPgwpKhcE=";
|
||||
hash = "sha256-SWFVcfOfSCKuNJlahsZRY21n17vL1VjtDRiSZ5o3VGc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BU31vb+qhMQtO9PXUjrQP3mEA0iOTEK/ZYXW6jL0UNo=";
|
||||
vendorHash = "sha256-k01+xngNA4SMCJa9Vhg+MxDgf973sUcrVXppwAz4MBs=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
name = "isle-portable";
|
||||
version = "0-unstable-2025-09-12";
|
||||
version = "0-unstable-2025-09-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isledecomp";
|
||||
repo = "isle-portable";
|
||||
rev = "ec3c770c61a717e8da1006beeda384533e235f8c";
|
||||
hash = "sha256-XzPHthUYSDj9gleq0Tnhe79xIU2X57ZqMzND53q8+sI=";
|
||||
rev = "7eb16922908f69af9ab4451e8037b9f5ef4c01d2";
|
||||
hash = "sha256-Z0CcUJCIvwioEpTOYRQFp5bYUBwlI9oKuj6/jxCMhw4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "jj-pre-push";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acarapetis";
|
||||
repo = "jj-pre-push";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9HyVWxYmemF/K3ttQ0L1lZF/XFkSeqwli/Mm+FFI8lQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
python3Packages.uv-build
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
typer-slim
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"jj_pre_push"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Run pre-commit.com before `jj git push`";
|
||||
homepage = "https://github.com/acarapetis/jj-pre-push";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ xanderio ];
|
||||
mainProgram = "jj-pre-push";
|
||||
};
|
||||
}
|
||||
Generated
+969
-1032
File diff suppressed because it is too large
Load Diff
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keyguard";
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AChep";
|
||||
repo = "keyguard-app";
|
||||
tag = "r20250830";
|
||||
hash = "sha256-m52oXJ+6tfTP8KE0+g5D67B7C0HVJRg65GWp7Vx2OQc=";
|
||||
tag = "r20250915";
|
||||
hash = "sha256-WAD8cZkaZbv3tyzKYEBH25g7x7xmdIWAnvMxnNKYpME=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -34,16 +34,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lapce";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lapce";
|
||||
repo = "lapce";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-4f6+o1xOopmBZEcQfC6A9VS9lcntKiWsB1iAzdRxYno=";
|
||||
sha256 = "sha256-0mF8JusW/oMjkAaCtL6ySazlWoR+76vRydyVXHbxNRM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hVV3zPGpCBTR56MiSpnMf/ESSHFdMQ0x0IKOa/qzUn8=";
|
||||
cargoHash = "sha256-Jjul26YTcMSf8szuetX3rU4b1eVsD/SBe1UanIAS1Ew=";
|
||||
|
||||
env = {
|
||||
# Get openssl-sys to use pkg-config
|
||||
|
||||
@@ -16,13 +16,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";
|
||||
};
|
||||
|
||||
# fix build with cmake v4
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 2.6.0)' 'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
|
||||
homepage = "https://laszip.org";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.michelk ];
|
||||
platforms = platforms.unix;
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = with lib.maintainers; [ michelk ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,18 +2,17 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "move-mount-beneath";
|
||||
version = "unstable-2023-11-26";
|
||||
version = "0-unstable-2025-09-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brauner";
|
||||
repo = "move-mount-beneath";
|
||||
rev = "d3d16c0d7766eb1892fcc24a75f8d35df4b0fe45";
|
||||
hash = "sha256-hUboFthw9ABwK6MRSNg7+iu9YbiJALNdsw9Ub3v43n4=";
|
||||
rev = "f8773d1f99f9cfa2f5bf173e1b1d1b21eb1ee446";
|
||||
hash = "sha256-C7QiClwFTKBcdmGilwZSCAsaVoEDXTO9384Y/47JrPk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -22,15 +21,6 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fix uninitialized variable in flags_attr, https://github.com/brauner/move-mount-beneath/pull/2
|
||||
(fetchpatch {
|
||||
name = "aarch64";
|
||||
url = "https://github.com/brauner/move-mount-beneath/commit/0bd0b863f7b98608514d90d4f2a80a21ce2e6cd3.patch";
|
||||
hash = "sha256-D3TttAT0aFqpYC8LuVnrkLwDcfVFOSeYzUDx6VqPu1Q=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Toy binary to illustrate adding a mount beneath an existing mount";
|
||||
mainProgram = "move-mount";
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "newsboat";
|
||||
version = "2.40";
|
||||
version = "2.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newsboat";
|
||||
repo = "newsboat";
|
||||
rev = "r${finalAttrs.version}";
|
||||
hash = "sha256-BxZq+y2MIIKAaXi7Z2P8JqTfHtX2BBY/ShUhGk7Cf/8=";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-LhEhbK66OYwAD/pel81N7Hgh/xEvnFR8GlZzgqZIe5M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lIK7F52pxMMhrImtO+bAR/iGOvuhhe/g+oWn6iNA1mY=";
|
||||
cargoHash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
|
||||
|
||||
# TODO: Check if that's still needed
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
@@ -101,7 +101,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
homepage = "https://newsboat.org/";
|
||||
changelog = "https://github.com/newsboat/newsboat/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/newsboat/newsboat/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console";
|
||||
maintainers = with lib.maintainers; [
|
||||
dotlambda
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nightdiamond-cursors";
|
||||
version = "0-unstable-2025-09-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "santoshxshrestha";
|
||||
repo = "NightDiamond-cursors";
|
||||
rev = "3ff3c0486430a4901b4d5cbbee87a370aa2b8ce9";
|
||||
hash = "sha256-huruHo5w7Qrte1+nIiz+P1xPNDGrv5/eByHwaSlZYwQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/icons
|
||||
cp -r NightDiamond-* $out/share/icons/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/santoshxshrestha/NightDiamond-cursors";
|
||||
description = "NightDiamond cursor themes";
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ santosh ];
|
||||
};
|
||||
}
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "oelint-adv";
|
||||
version = "8.2.1";
|
||||
version = "8.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "priv-kweihmann";
|
||||
repo = "oelint-adv";
|
||||
tag = version;
|
||||
hash = "sha256-JMQqh3bNyG1m001D9v8Gt870bioqduDfpaQFwE5INRQ=";
|
||||
hash = "sha256-W8W+hNgRVxBVkEDyKtFVx2mCyvbMA4CPjR1NrehClJs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,15 +8,16 @@
|
||||
let
|
||||
config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "process-compose";
|
||||
version = "1.75.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = "process-compose";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BKf8FrgpGhYzuukAFP+OCjvp5bMCQL6BmZ+Tk/E8RIY=";
|
||||
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -36,7 +37,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-X ${config-module}.Version=v${version}"
|
||||
"-X ${config-module}.Version=v${finalAttrs.version}"
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
@@ -61,9 +62,9 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Simple and flexible scheduler and orchestrator to manage non-containerized applications";
|
||||
homepage = "https://github.com/F1bonacc1/process-compose";
|
||||
changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}";
|
||||
changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ thenonameguy ];
|
||||
mainProgram = "process-compose";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pyrefly";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "pyrefly";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sI+F+kI8ApE1cHpE3q/tSntaD/1c26jT5BLJ3BtzpBA=";
|
||||
hash = "sha256-HPPDsvWEFfh/GNMUPiVjQr28YBBs2DACBGM3cxo5Nx4=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "pyrefly";
|
||||
cargoHash = "sha256-+93SQA0KrJsskXUMA9S5eaq0EIWVK1/ZoUbp6wQ7Cc4=";
|
||||
cargoHash = "sha256-46kcoBG/PWwf8VdlvLNzEhfYRTmmKi/uTjwFkl7Wozg=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "scalingo";
|
||||
version = "1.39.0";
|
||||
version = "1.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-5La3k6DXCYpnTgtnHolJ5pL7EPjkO+bXgT48gcRsbsc=";
|
||||
hash = "sha256-AY2Iy7MwZ0OmNdv9EPgJ79Ug8pDuxlVNtLRhlX+XCC4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -21,117 +21,125 @@ let
|
||||
;
|
||||
|
||||
pname = "stash";
|
||||
in
|
||||
buildGoModule (
|
||||
finalAttrs:
|
||||
let
|
||||
frontend = stdenv.mkDerivation (final: {
|
||||
pname = "${finalAttrs.pname}-ui";
|
||||
inherit (finalAttrs) version gitHash;
|
||||
src = "${finalAttrs.src}/ui/v2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stashapp";
|
||||
repo = "stash";
|
||||
tag = "v${version}";
|
||||
hash = srcHash;
|
||||
};
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${final.src}/yarn.lock";
|
||||
hash = finalAttrs.yarnHash;
|
||||
};
|
||||
|
||||
frontend = stdenv.mkDerivation (final: {
|
||||
inherit version;
|
||||
pname = "${pname}-ui";
|
||||
src = "${src}/ui/v2.5";
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
# Needed for executing package.json scripts
|
||||
nodejs
|
||||
];
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${final.src}/yarn.lock";
|
||||
hash = yarnHash;
|
||||
postPatch = ''
|
||||
substituteInPlace codegen.ts \
|
||||
--replace-fail "../../graphql/" "${finalAttrs.src}/graphql/"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
export VITE_APP_DATE='1970-01-01 00:00:00'
|
||||
export VITE_APP_GITHASH=${finalAttrs.gitHash}
|
||||
export VITE_APP_STASH_VERSION=v${finalAttrs.version}
|
||||
export VITE_APP_NOLEGACY=true
|
||||
|
||||
yarn --offline run gqlgen
|
||||
yarn --offline build
|
||||
|
||||
mv build $out
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
});
|
||||
in
|
||||
{
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
gitHash
|
||||
yarnHash
|
||||
vendorHash
|
||||
;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stashapp";
|
||||
repo = "stash";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = srcHash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
yarnConfigHook
|
||||
yarnBuildHook
|
||||
# Needed for executing package.json scripts
|
||||
nodejs
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X 'github.com/stashapp/stash/internal/build.buildstamp=1970-01-01 00:00:00'"
|
||||
"-X 'github.com/stashapp/stash/internal/build.githash=${finalAttrs.gitHash}'"
|
||||
"-X 'github.com/stashapp/stash/internal/build.version=v${finalAttrs.version}'"
|
||||
"-X 'github.com/stashapp/stash/internal/build.officialBuild=false'"
|
||||
];
|
||||
tags = [
|
||||
"sqlite_stat4"
|
||||
"sqlite_math_functions"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/stash" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace codegen.ts \
|
||||
--replace-fail "../../graphql/" "${src}/graphql/"
|
||||
cp -a ${frontend} ui/v2.5/build
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$(mktemp -d)
|
||||
export VITE_APP_DATE='1970-01-01 00:00:00'
|
||||
export VITE_APP_GITHASH=${gitHash}
|
||||
export VITE_APP_STASH_VERSION=v${version}
|
||||
export VITE_APP_NOLEGACY=true
|
||||
|
||||
yarn --offline run gqlgen
|
||||
yarn --offline build
|
||||
|
||||
mv build $out
|
||||
|
||||
runHook postBuild
|
||||
preBuild = ''
|
||||
# `go mod tidy` requires internet access and does nothing
|
||||
echo "skip_mod_tidy: true" >> gqlgen.yml
|
||||
# remove `-trimpath` fron `GOFLAGS` because `gqlgen` does not work with it
|
||||
GOFLAGS="''${GOFLAGS/-trimpath/}" go generate ./cmd/stash
|
||||
'';
|
||||
|
||||
dontInstall = true;
|
||||
dontFixup = true;
|
||||
});
|
||||
in
|
||||
buildGoModule {
|
||||
inherit
|
||||
pname
|
||||
src
|
||||
version
|
||||
vendorHash
|
||||
;
|
||||
strictDeps = true;
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X 'github.com/stashapp/stash/internal/build.buildstamp=1970-01-01 00:00:00'"
|
||||
"-X 'github.com/stashapp/stash/internal/build.githash=${gitHash}'"
|
||||
"-X 'github.com/stashapp/stash/internal/build.version=v${version}'"
|
||||
"-X 'github.com/stashapp/stash/internal/build.officialBuild=false'"
|
||||
];
|
||||
tags = [
|
||||
"sqlite_stat4"
|
||||
"sqlite_math_functions"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/stash" ];
|
||||
|
||||
preBuild = ''
|
||||
cp -a ${frontend} ui/v2.5/build
|
||||
# `go mod tidy` requires internet access and does nothing
|
||||
echo "skip_mod_tidy: true" >> gqlgen.yml
|
||||
# remove `-trimpath` fron `GOFLAGS` because `gqlgen` does not work with it
|
||||
GOFLAGS="''${GOFLAGS/-trimpath/}" go generate ./cmd/stash
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
updateScript = ./update.py;
|
||||
tests = {
|
||||
inherit (nixosTests) stash;
|
||||
version = testers.testVersion {
|
||||
package = stash;
|
||||
version = "v${version} (${gitHash}) - Unofficial Build - 1970-01-01 00:00:00";
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
updateScript = ./update.py;
|
||||
tests = {
|
||||
inherit (nixosTests) stash;
|
||||
version = testers.testVersion {
|
||||
package = stash;
|
||||
version = "v${finalAttrs.version} (${finalAttrs.gitHash}) - Unofficial Build - 1970-01-01 00:00:00";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
mainProgram = "stash";
|
||||
description = "Organizer for your adult videos/images";
|
||||
license = lib.licenses.agpl3Only;
|
||||
homepage = "https://stashapp.cc/";
|
||||
changelog = "https://github.com/stashapp/stash/blob/v${version}/ui/v2.5/src/docs/en/Changelog/v${lib.versions.major version}${lib.versions.minor version}0.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
Golo300
|
||||
DrakeTDL
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
}
|
||||
meta = {
|
||||
mainProgram = "stash";
|
||||
description = "Organizer for your adult videos/images";
|
||||
license = lib.licenses.agpl3Only;
|
||||
homepage = "https://stashapp.cc/";
|
||||
changelog = "https://github.com/stashapp/stash/blob/v${finalAttrs.version}/ui/v2.5/src/docs/en/Changelog/v${lib.versions.major finalAttrs.version}${lib.versions.minor finalAttrs.version}0.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
Golo300
|
||||
DrakeTDL
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -3,27 +3,31 @@
|
||||
stdenv,
|
||||
fetchsvn,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libusb-compat-0_1,
|
||||
libftdi,
|
||||
libftdi1,
|
||||
}:
|
||||
|
||||
# The xc3sprog project doesn't seem to make proper releases, they only put out
|
||||
# prebuilt binary subversion snapshots on sourceforge.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "787";
|
||||
version = "795";
|
||||
pname = "xc3sprog";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
|
||||
sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx";
|
||||
sha256 = "sha256-E0MGwC3gIfl60gjGaSeSPTR5jJm9r8m7Et3402lek/w=";
|
||||
rev = version;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libusb-compat-0_1
|
||||
libftdi
|
||||
libftdi1
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-terminal";
|
||||
version = "7.1.1";
|
||||
version = "7.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "terminal";
|
||||
rev = version;
|
||||
sha256 = "sha256-B/VEVS1dJQGJ8+gqgJ/mb3+r29ZPtCSSlur/CAr6BJg=";
|
||||
sha256 = "sha256-aMVZSPCh3aQ9VvPyHGKX4p/XG3KhnJpdiFWD0dIjByw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -54,8 +54,13 @@ setupCUDAToolkit_ROOT() {
|
||||
fi
|
||||
done
|
||||
|
||||
appendToVar cmakeFlags "-DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR"
|
||||
appendToVar cmakeFlags "-DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"
|
||||
# Use array form so semicolon-separated lists are passed safely.
|
||||
if [[ -n "${CUDAToolkit_INCLUDE_DIR-}" ]]; then
|
||||
cmakeFlagsArray+=("-DCUDAToolkit_INCLUDE_DIR=${CUDAToolkit_INCLUDE_DIR}")
|
||||
fi
|
||||
if [[ -n "${CUDAToolkit_ROOT-}" ]]; then
|
||||
cmakeFlagsArray+=("-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT}")
|
||||
fi
|
||||
}
|
||||
preConfigureHooks+=(setupCUDAToolkit_ROOT)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "140.3.0";
|
||||
hash = "sha512-8qRTUjcqfFS/w6B2UgmLVWNNER6ohVDTPn4nENFVJNaJ7jn707IElkNDZTDhPCN9A+Bft6vTlwycGLZuWoTIWg==";
|
||||
version = "140.3.1";
|
||||
hash = "sha512-qTAtmdfwf0slCqIUY1gUlk3QgyBCaOBf6Hej2DMLnAyqbCntGdpxvYiXm3zzntUvF2mJaLDaWw10MLZ2S0O2zA==";
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ in
|
||||
};
|
||||
|
||||
h3_4 = generic {
|
||||
version = "4.2.0";
|
||||
hash = "sha256-SzuxoYjsXCLhlAhQS7JoKvH8C3vquXttf58d4LnkeVM=";
|
||||
version = "4.3.0";
|
||||
hash = "sha256-DUILKZ1QvML6qg+WdOxir6zRsgTvk+En6yjeFf6MQBg=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,7 +27,9 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace 'PytestRemovedIn8Warning' 'PytestRemovedIn9Warning'
|
||||
--replace-fail 'PytestRemovedIn8Warning' 'PytestRemovedIn9Warning'
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"setuptools_scm[toml]>=8.0.3,<9",' '"setuptools_scm[toml]",'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "authlib";
|
||||
version = "1.6.1";
|
||||
version = "1.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "lepture";
|
||||
repo = "authlib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2VVfq3D5SbWQI+ZLtG1+fv5CkY54DQ9dvgpMiSffueE=";
|
||||
hash = "sha256-AzIjfUH89tYZwVnOpdSwEzaGNpedfQ50k9diKUfH+Fg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.40.35";
|
||||
version = "1.40.36";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-LW8tvm6bQt63uPvu0FFGHnkGkD8m6ZY00AvkXMQNtBo=";
|
||||
hash = "sha256-nYxTZw4Yd8FrvBoa8QcHxBvNLURtKfIV/Z7esfm7+uo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,43 +6,25 @@
|
||||
buildPythonPackage,
|
||||
django,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
hypothesis,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
twisted,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "daphne";
|
||||
version = "4.1.2";
|
||||
version = "4.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django";
|
||||
repo = "daphne";
|
||||
tag = version;
|
||||
hash = "sha256-RAK2CaKKVmVIv1MBK+9xyADOrHq664MQOry4KaGTNCw=";
|
||||
hash = "sha256-MPlvXcg7bBF1yaphjjMtnGsGpp6ca5GsgmXONw/V9Do=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/django/daphne/pull/526
|
||||
(fetchpatch2 {
|
||||
name = "fix-tests-with-Twisted-24.7.0.patch";
|
||||
url = "https://github.com/django/daphne/commit/0370c7a0937011d5345b14d484ec171d3ae9f875.patch";
|
||||
hash = "sha256-/3d2pRcEtGvINGHRQF3RZ8IVIETSZb6rhf+ZHUFSQQo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace-fail "pytest-runner" ""
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -67,7 +49,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Django ASGI (HTTP/WebSocket) server";
|
||||
homepage = "https://github.com/django/daphne";
|
||||
changelog = "https://github.com/django/daphne/blob/${version}/CHANGELOG.txt";
|
||||
changelog = "https://github.com/django/daphne/blob/${src.tag}/CHANGELOG.txt";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
mainProgram = "daphne";
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dashscope";
|
||||
version = "1.24.4";
|
||||
version = "1.24.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dashscope";
|
||||
repo = "dashscope-sdk-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PX7RoL4EGMU62G64+T6tjgDgO+SAOZNysl199kvAWME=";
|
||||
hash = "sha256-kHvNg8yPlZyAr7Qgncv+axgG9sOKTjvxYnRojO5ih1g=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -166,8 +166,8 @@ rec {
|
||||
"sha256-BZXrWhqf5gFrTW0fAsiyiydzc0cTv2lPj5DTRLrv+pI=";
|
||||
|
||||
mypy-boto3-batch =
|
||||
buildMypyBoto3Package "batch" "1.40.19"
|
||||
"sha256-PZ3AtPJ1RultJXvzdRyGAfBMKTTMtQShCfWuDGrK+M8=";
|
||||
buildMypyBoto3Package "batch" "1.40.36"
|
||||
"sha256-pi8VVxFJ9z5+4yRP9Tug6nJI5Kj441juIsOKgjT0EQ4=";
|
||||
|
||||
mypy-boto3-billingconductor =
|
||||
buildMypyBoto3Package "billingconductor" "1.40.0"
|
||||
@@ -470,8 +470,8 @@ rec {
|
||||
"sha256-DQZUI72cnRt4YwHMQivMdL4y9B9EN2H7dIMmybcX/Uk=";
|
||||
|
||||
mypy-boto3-eks =
|
||||
buildMypyBoto3Package "eks" "1.40.19"
|
||||
"sha256-2LwmEEYeKrx5Ee/1ETxaQz29/dT+CPd88jJpPqBBcng=";
|
||||
buildMypyBoto3Package "eks" "1.40.36"
|
||||
"sha256-xlT0PW+10gO1jpddeCR82y+4+A9e1SNK756ph8/1Iik=";
|
||||
|
||||
mypy-boto3-elastic-inference =
|
||||
buildMypyBoto3Package "elastic-inference" "1.36.0"
|
||||
@@ -613,8 +613,8 @@ rec {
|
||||
"sha256-nOj8fkesQ6iVsoLwa/29LYl9X16UUL13k7M2rTEln0U=";
|
||||
|
||||
mypy-boto3-imagebuilder =
|
||||
buildMypyBoto3Package "imagebuilder" "1.40.18"
|
||||
"sha256-ESRTEa4C5wrITcd1KyZNVP8fUEgumSoQVpWDnoJz7lc=";
|
||||
buildMypyBoto3Package "imagebuilder" "1.40.36"
|
||||
"sha256-aOo29FyR1QdV3DCIQAM/rumH/LjbQozDfmisNyyCi4I=";
|
||||
|
||||
mypy-boto3-importexport =
|
||||
buildMypyBoto3Package "importexport" "1.40.0"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
attrs,
|
||||
bitarray,
|
||||
buildPythonPackage,
|
||||
@@ -23,6 +24,8 @@ buildPythonPackage rec {
|
||||
hash = "sha256-CLsUVARpyxOshvrHY+NoVi0HSvn1R02jDnMqn0sRGgM=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -39,6 +42,11 @@ buildPythonPackage rec {
|
||||
"tests/test_examples.py"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# OSError: [Errno 48] Address already in use
|
||||
"test_full_message_flow"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for decoding and encoding AIS messages (AIVDM/AIVDO)";
|
||||
homepage = "https://github.com/M0r13n/pyais";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety-schemas";
|
||||
version = "0.0.14";
|
||||
version = "0.0.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "safety_schemas";
|
||||
inherit version;
|
||||
hash = "sha256-SZU/elnpGVcr4lWVqJRvnLvNIGb+PhYMlGfZ0dbXr2o=";
|
||||
hash = "sha256-O7BNEb1LXMefn6GDxlimqM+CepzuxEOl/6bu04pQok4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyupio";
|
||||
repo = "safety";
|
||||
tag = version;
|
||||
hash = "sha256-E48iuPZhAttQi4RCJGZikz+/kTXOZbq1zp+4fypTc94=";
|
||||
hash = "sha256-oGz2ZHGYaHi4RusNbZ5iqxuz2JBbchP5ip+uHHV10U0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tree-sitter-language-pack";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
pyproject = true;
|
||||
|
||||
# Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script.
|
||||
@@ -28,18 +28,22 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "tree_sitter_language_pack";
|
||||
inherit version;
|
||||
hash = "sha256-kA6zvYLBvPXPIO2FKxtv3H6uieQKhg+l4iGnlmh8NZo=";
|
||||
hash = "sha256-LaU5dR7MULnmu/yji1dQGjxV5nGGqTnVvxSdnLciCXQ=";
|
||||
};
|
||||
|
||||
# Upstream bumped the setuptools and typing-extensions dependencies, but we can still use older versions
|
||||
# since the newer ones aren’t packaged in nixpkgs. We can't use pythonRelaxDepsHook here because it runs
|
||||
# in postBuild, while the dependency check occurs during the build phase.
|
||||
# Upstream bumped dependencies aggressively, but we can still use older
|
||||
# versions since the newer ones aren’t packaged in nixpkgs. We can't use
|
||||
# pythonRelaxDepsHook here because it runs in postBuild, while the dependency
|
||||
# check occurs during the build phase.
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools>=80.9.0" "setuptools>=78.1.0" \
|
||||
--replace-fail "typing-extensions>=4.14.0" "typing-extensions>=4.13.2"
|
||||
--replace-fail "typing-extensions>=4.15.0" "typing-extensions>=4.14.1"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
setuptools
|
||||
@@ -53,8 +57,10 @@ buildPythonPackage rec {
|
||||
tree-sitter-yaml
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pythonRelaxDeps = [
|
||||
"tree-sitter"
|
||||
"tree-sitter-embedded-template"
|
||||
"tree-sitter-yaml"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
@@ -62,8 +68,8 @@ buildPythonPackage rec {
|
||||
"tree_sitter_language_pack.bindings"
|
||||
];
|
||||
|
||||
# make sure import the built version, not the source one
|
||||
preCheck = ''
|
||||
# make sure import the built version, not the source one
|
||||
rm -r tree_sitter_language_pack
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user