Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -68,6 +68,8 @@
|
||||
|
||||
- Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequisites`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`.
|
||||
|
||||
- `k2pdfopt` has been removed, as it's broken.
|
||||
|
||||
- `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.
|
||||
|
||||
- `mx-puppet-discord` was removed from Nixpkgs along with its NixOS module as it was unmaintained and was the only user of sha1 hashes in tree.
|
||||
|
||||
@@ -748,6 +748,7 @@ in
|
||||
invoiceplane = runTest ./invoiceplane.nix;
|
||||
iodine = runTest ./iodine.nix;
|
||||
iosched = runTest ./iosched.nix;
|
||||
ipget = runTest ./ipget.nix;
|
||||
ipv6 = runTest ./ipv6.nix;
|
||||
iscsi-multipath-root = runTest ./iscsi-multipath-root.nix;
|
||||
iscsi-root = runTest ./iscsi-root.nix;
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "ipget";
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
Luflosi
|
||||
];
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
services.kubo.enable = true;
|
||||
environment.systemPackages = with pkgs; [ ipget ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
with subtest("Add file to IPFS"):
|
||||
ipfs_hash = machine.succeed(
|
||||
"echo -n fnord | ipfs add --quieter"
|
||||
)
|
||||
|
||||
with subtest("Download the file with ipget"):
|
||||
machine.succeed(f"ipget --output file.txt /ipfs/{ipfs_hash}")
|
||||
contents = machine.succeed("cat file.txt")
|
||||
assert contents == "fnord", f"Unexpected file contents: {contents}"
|
||||
'';
|
||||
}
|
||||
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-xk2maMEa07yFPbLiDGc9N6AbzxjTyfVNy/k7wWSMOHE=";
|
||||
hash = "sha256-Ti/gMp0VFLwuvRlgUSQFP3WTDEhoXJZj5ebYiuIFmN0=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-vcN419nPIrFOT8EaznFzThst6exfMGRrcmxyuQttxXg=";
|
||||
hash = "sha256-I2DgC3r3okpzx5QvGY/b5DNrUThBD4kGRM93QT1A6RM=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-WoBfg35mGTIA8YZEk67iYNinF+Q/XEatiVr6x1HdvBk=";
|
||||
hash = "sha256-Hkf5QMp0Gi0eXhENZD8J8SEST4EDcefdMaF2/HZeBp8=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-e75eRgs0FTBnwFbH1vFxFc+aLK+O9TdxgXbV5YnsQLE=";
|
||||
hash = "sha256-evTcY9wXvvoHKeVmueBfOXCMb3dsQioQc/cmXON2D7M=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "continue";
|
||||
publisher = "Continue";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
}
|
||||
// sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2025-09-12";
|
||||
version = "0-unstable-2025-09-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "19b3995e6d09d9cbd4de9871ad94ea183ca53a6e";
|
||||
hash = "sha256-6oZIZFnB2S7u4xxrOAfDPiql0biiXRMGD1iiPhFgCWc=";
|
||||
rev = "a3d84f977b721cda752299739fec525addce1ef9";
|
||||
hash = "sha256-NVuz52c0zt/c8b3uoJWpKO2TMM9PFh/thQt8CfRFZhk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.39.1";
|
||||
version = "2.39.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eEXBOlxqaOvpXp8jPbtI6qFLiiS1VZDts7DFXGJtfCA=";
|
||||
hash = "sha256-NDNyXK4E7TkviESHLp8M+OI56ME0Hatoi9eWjX+G1zo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -20,7 +20,7 @@ buildGoModule rec {
|
||||
rm -rf pkg/e2e/
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-191jlpjDBdusb4Zk+GateNjZa38bDrKjtonnZ4UnzFA=";
|
||||
vendorHash = "sha256-Uqzul9BiXHAJ1BxlOtRS68Tg71SDva6kg3tv7c6ar2E=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/docker/compose/v2/internal.Version=${version}"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2025-08-24";
|
||||
version = "0-unstable-2025-09-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "05cb274c275139dc3fd12922b88fa0a101595d99";
|
||||
hash = "sha256-MPGkB2WkP5wpAc1FFKY4+9Itj6JM76FoaDikxVeMGsQ=";
|
||||
rev = "3381f94bfef51551e3b060f45057ab613129fb35";
|
||||
hash = "sha256-6CUAAxuqfEMb4zhrkBLHccFfaSHhP/PTiBFJAZmFMnE=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "apt";
|
||||
version = "3.1.4";
|
||||
version = "3.1.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "apt-team";
|
||||
repo = "apt";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-l0ZrtYUSX5CmzmtL+qXxvjGNNXG04RUuK9mu1/NJnq8=";
|
||||
hash = "sha256-hVnKI23HWwXkY174HT/Crz2V4FycaIyhhcS18D1zVy0=";
|
||||
};
|
||||
|
||||
# cycle detection; lib can't be split
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "benhsm-minesweeper";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benhsm";
|
||||
repo = "minesweeper";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4ahevo/dogjcJ6GRqVZKYapy1x16F+U6vEsgpt2RdiE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UvvoL7Us201B13M4vwOZEhSB0slAzXCs+9wzJIDictQ=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Simple terminal-based implementation of Minesweeper";
|
||||
homepage = "https://github.com/benhsm/minesweeper";
|
||||
changelog = "https://github.com/benhsm/minesweeper/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "minesweeper";
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ Zaczero ];
|
||||
};
|
||||
})
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloudgoat";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RhinoSecurityLabs";
|
||||
repo = "cloudgoat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xDUDpdEluYKudrjIYOoQWNvF8BoC/VpSVdV5pzfLoMc=";
|
||||
hash = "sha256-GYhi4rh+JXyUQkRkE5XsbczWbGEt1zqsALBQcwRWJbI=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul-template";
|
||||
version = "0.41.1";
|
||||
version = "0.41.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "consul-template";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lQTI3eTKggzNnN0KCu+ZcdqtDT06OfyIWPQg2qfaxro=";
|
||||
hash = "sha256-ExgE1Gw+hlOC+AYDgq15nD90QGa/+rOT1gi3XWY1jj8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Tz80n37NBqKX+h3OE6RBufPQ7OteWpZaa5br2WFIvOs=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "cross-seed";
|
||||
version = "6.13.1";
|
||||
version = "6.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cross-seed";
|
||||
repo = "cross-seed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9esKfc2TuJtMPWF9JV7ML8udjVkcIIU7pN+eOsvg2Z4=";
|
||||
hash = "sha256-WdKd20vzJfWvnZKBID6IzXOScrZgPKDDafzT2PY9N9k=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-fxeFLcfRSHMMLoay/MiiX2wwJPF+XhoAUFnQvxnlvqA=";
|
||||
npmDepsHash = "sha256-iTho+dbJAt7B2R+dN2xo6jnRo/psjQE76GHYksoojdA=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script;
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "darkly-qt${qtMajorVersion}";
|
||||
version = "0.5.22";
|
||||
version = "0.5.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bali10050";
|
||||
repo = "Darkly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m3UMp3dJfGptOR8WDGYgaHfax7Wpad0wKfOI8xZLC1s=";
|
||||
hash = "sha256-BENROvRjnKLjCc1qwGgScfk6WIdHGwz4vZhsmfa///Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dolibarr";
|
||||
version = "22.0.1";
|
||||
version = "22.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dhpG493bRRa0QPETxgmfLYcjmn88+L+0qoZ9dACk7Fc=";
|
||||
hash = "sha256-JKD601BuEQeu4sgVaL88dCGQivgjEkpIdauE9gs6BBk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dolt";
|
||||
version = "1.59.2";
|
||||
version = "1.59.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qIV4pbyrN40joXCgmE0e1EDkfRaHC/G1lwdkpzrO5fU=";
|
||||
hash = "sha256-DfocUOHpPdNeMcL7kVm7ggm2cVgWp/ifvCFyFosxhcs=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-DPo1xzV11Q9emVIlrBFQcWXGNXKfYOKzR/hi5nJJp34=";
|
||||
vendorHash = "sha256-yZ+q4KNfIiR2gpk10dpZOMiEN3V/Lk/pzhgaqp7lKag=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "dotnet-ef";
|
||||
version = "9.0.8";
|
||||
version = "9.0.9";
|
||||
|
||||
nugetHash = "sha256-WwTBhAQDt1crFg35nnoppnOrbHfV9mv6vGhk/VSFjMI=";
|
||||
nugetHash = "sha256-2CX7bgn3Avp8zDStkYgip7yNJaZ6T0QITvFj63m1+E0=";
|
||||
|
||||
meta = {
|
||||
description = "Tools to help with design-time development tasks";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "easyjson";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mailru";
|
||||
repo = "easyjson";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m2WZwi6TM6hiBlCQOe+rxF5z3vvnYqtHQX8d7y5NLgI=";
|
||||
hash = "sha256-aKufvebodIy0UtecpjZ9+5MOUTWKFIqFI3SYgVPWdhQ=";
|
||||
};
|
||||
vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE=";
|
||||
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "espup";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esp-rs";
|
||||
repo = "espup";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fVReUgwiR6aOdHNcXxpQ38ujgfhviU+IFRaoe/1DTRI=";
|
||||
hash = "sha256-blEjUFBzkwplwZgTAtI84MCHvxujNF1WsPJJezRNjxQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-P+VDXzfpYDjZQG3BOr9nLWJVqlkGI3rZcPKBnp3PDxM=";
|
||||
cargoHash = "sha256-Y6Y+62lJ3k6GMkU82CDkTt1Prd3UrtBKqA5Spctochw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hacpack";
|
||||
version = "1.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "The-4n";
|
||||
repo = "hacpack";
|
||||
rev = "v${version}";
|
||||
sha256 = "0d846l36w1n9rxv79fbyhl2zdbqhlgrvk21b9vzr9x77yki89ygs";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
mv config.mk.template config.mk
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ./hacpack $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/The-4n/hacPack";
|
||||
description = "Make and repack Nintendo Switch NCAs/NSPs";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "hacpack";
|
||||
};
|
||||
}
|
||||
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=bitwise-instead-of-logical"
|
||||
"-Wno-error=missing-braces"
|
||||
"-Wno-error=nontrivial-memcall"
|
||||
]
|
||||
);
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ python3Packages.buildPythonPackage rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/Infisical/python-sdk-official";
|
||||
description = "Infisical Python SDK";
|
||||
license = lib.licenses.unfree;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ artur-sannikov ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,20 +2,22 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipget";
|
||||
version = "0.11.3";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q9rgbfPAdAulNuDQ1bXM08aK0IEerbsKqjK8aMnBwcM=";
|
||||
hash = "sha256-7/wXrjnd7YD2qhVvP0yBMJDkDZjxJC1vZcQuqVd44rU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2boqKf/7y/71ThNodUuZXaRHZadx+TU0d6swHHN1VyM=";
|
||||
vendorHash = "sha256-b6Lulzi7zgO0VdWboxi5Vibx8cjuZ6r6O1PJvYubZu4=";
|
||||
|
||||
postPatch = ''
|
||||
# main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
|
||||
@@ -24,6 +26,12 @@ buildGoModule rec {
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) ipget;
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Retrieve files over IPFS and save them locally";
|
||||
homepage = "https://ipfs.io/";
|
||||
|
||||
@@ -42,7 +42,7 @@ in
|
||||
py.pkgs.buildPythonPackage rec {
|
||||
pname = "irrd";
|
||||
version = "4.5.0b1";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irrdnet";
|
||||
@@ -55,11 +55,10 @@ py.pkgs.buildPythonPackage rec {
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail py-radix py-radix-sr
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
@@ -69,14 +68,14 @@ py.pkgs.buildPythonPackage rec {
|
||||
postgresqlTestHook
|
||||
]
|
||||
++ (with py.pkgs; [
|
||||
pytest-asyncio
|
||||
pytest-asyncio_0
|
||||
pytest-freezegun
|
||||
pytestCheckHook
|
||||
smtpdfix
|
||||
httpx
|
||||
]);
|
||||
|
||||
propagatedBuildInputs =
|
||||
dependencies =
|
||||
with py.pkgs;
|
||||
[
|
||||
python-gnupg
|
||||
@@ -142,12 +141,17 @@ py.pkgs.buildPythonPackage rec {
|
||||
kill $REDIS_PID
|
||||
'';
|
||||
|
||||
# skip tests that require internet access
|
||||
disabledTests = [
|
||||
# Skip tests that require internet access
|
||||
"test_020_dash_o_noop"
|
||||
"test_050_non_json_response"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Doesn't work with later pytest releases
|
||||
"irrd/server/whois/tests/test_query_response.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://irrd.readthedocs.io/en/v${version}/releases/";
|
||||
description = "Internet Routing Registry database server, processing IRR objects in the RPSL format";
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 365b835..4341de9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -57,6 +57,7 @@ endif(JPEG_FOUND)
|
||||
include(FindJasper)
|
||||
if(JASPER_FOUND)
|
||||
set(HAVE_JASPER_LIB 1)
|
||||
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
|
||||
endif(JASPER_FOUND)
|
||||
|
||||
# paths from willuslib/wgs.c
|
||||
@@ -71,9 +72,12 @@ else()
|
||||
message(STATUS "Could NOT find ghostscript executable")
|
||||
endif(GHOSTSCRIPT_EXECUTABLE)
|
||||
|
||||
-# willus.h
|
||||
-# HAVE_GSL_LIB
|
||||
-
|
||||
+pkg_check_modules(GSL gsl)
|
||||
+if(GSL_FOUND)
|
||||
+ set(HAVE_GSL_LIB 1)
|
||||
+ include_directories(SYSTEM ${GSL_INCLUDEDIR})
|
||||
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
|
||||
+endif(GSL_FOUND)
|
||||
|
||||
# libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
|
||||
# MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ...
|
||||
@@ -85,7 +89,7 @@ if(MUPDF_FOUND)
|
||||
include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
|
||||
message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
|
||||
set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS}
|
||||
- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -llcms -lgumbo
|
||||
+
|
||||
)
|
||||
endif(MUPDF_FOUND)
|
||||
|
||||
@@ -1,288 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
runCommand,
|
||||
fetchzip,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
jbig2dec,
|
||||
libjpeg_turbo,
|
||||
libpng,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
zlib,
|
||||
enableGSL ? true,
|
||||
gsl,
|
||||
enableGhostScript ? true,
|
||||
ghostscript,
|
||||
enableMuPDF ? true,
|
||||
mupdf,
|
||||
enableDJVU ? true,
|
||||
djvulibre,
|
||||
enableGOCR ? false, # Disabled by default due to crashes
|
||||
gocr,
|
||||
# Tesseract support is currently broken
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/368349
|
||||
enableTesseract ? false,
|
||||
tesseract5,
|
||||
enableLeptonica ? true,
|
||||
leptonica,
|
||||
opencl-headers,
|
||||
fetchDebianPatch,
|
||||
}:
|
||||
|
||||
# k2pdfopt is a pain to package. It requires modified versions of mupdf,
|
||||
# leptonica, and tesseract. Instead of shipping patches for these upstream
|
||||
# packages, k2pdfopt includes just the modified source files for these
|
||||
# packages. The individual files from the {mupdf,leptonica,tesseract}_mod/
|
||||
# directories are intended to replace the corresponding source files in the
|
||||
# upstream packages, for a particular version of that upstream package.
|
||||
#
|
||||
# There are a few ways we could approach packaging these modified versions of
|
||||
# mupdf, leptonica, and mupdf:
|
||||
# 1) Override the upstream source with a new derivation that involves copying
|
||||
# the modified source files from k2pdfopt and replacing the corresponding
|
||||
# source files in the upstream packages. Since the files are intended for a
|
||||
# particular version of the upstream package, this would not allow us to easily
|
||||
# use updates to those packages in nixpkgs.
|
||||
# 2) Manually produce patches which can be applied against the upstream
|
||||
# project, and have the same effect as replacing those files. This is what I
|
||||
# believe k2pdfopt should do this for us anyway. The benefit of creating and
|
||||
# applying patches in this way is that minor updates (esp. security fixes) to
|
||||
# upstream packages might still allow these patches to apply successfully.
|
||||
# 3) Automatically produce these patches inside a nix derivation. This is the
|
||||
# approach taken here, using the "mkPatch" provided below. This has the
|
||||
# benefit of easier review and should hopefully be simpler to update in the
|
||||
# future.
|
||||
|
||||
let
|
||||
# Create a patch against src based on changes applied in patchCommands
|
||||
mkPatch =
|
||||
{
|
||||
name,
|
||||
src,
|
||||
patchCommands,
|
||||
}:
|
||||
runCommand "${name}-k2pdfopt.patch" { inherit src; } ''
|
||||
unpackPhase
|
||||
|
||||
orig=$sourceRoot
|
||||
new=$sourceRoot-modded
|
||||
cp -r $orig/. $new/
|
||||
|
||||
pushd $new >/dev/null
|
||||
${patchCommands}
|
||||
popd >/dev/null
|
||||
|
||||
diff -Naur $orig $new > $out || true
|
||||
'';
|
||||
|
||||
pname = "k2pdfopt";
|
||||
version = "2.55";
|
||||
k2pdfopt_src = fetchzip {
|
||||
url = "http://www.willus.com/${pname}/src/${pname}_v${version}_src.zip";
|
||||
hash = "sha256-orQNDXQkkcCtlA8wndss6SiJk4+ImiFCG8XRLEg963k=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
src = k2pdfopt_src;
|
||||
|
||||
patches = [
|
||||
./0001-Fix-CMakeLists.patch
|
||||
(fetchDebianPatch {
|
||||
inherit pname;
|
||||
version = "${version}+ds";
|
||||
debianRevision = "3.1";
|
||||
patch = "0007-k2pdfoptlib-k2ocr.c-conditionally-enable-tesseract-r.patch";
|
||||
hash = "sha256-uJ9Gpyq64n/HKqo0hkQ2dnkSLCKNN4DedItPGzHfqR8=";
|
||||
})
|
||||
(fetchDebianPatch {
|
||||
inherit pname;
|
||||
version = "${version}+ds";
|
||||
debianRevision = "3.1";
|
||||
patch = "0009-willuslib-CMakeLists.txt-conditionally-add-source-fi.patch";
|
||||
hash = "sha256-cBSlcuhsw4YgAJtBJkKLW6u8tK5gFwWw7pZEJzVMJDE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace willuslib/bmpdjvu.c \
|
||||
--replace "<djvu.h>" "<libdjvu/ddjvuapi.h>"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
let
|
||||
# We use specific versions of these sources below to match the versions
|
||||
# used in the k2pdfopt source. Note that this does _not_ need to match the
|
||||
# version used elsewhere in nixpkgs, since it is only used to create the
|
||||
# patch that can then be applied to the version in nixpkgs.
|
||||
mupdf_patch = mkPatch {
|
||||
name = "mupdf";
|
||||
src = fetchurl {
|
||||
url = "https://mupdf.com/downloads/archive/mupdf-1.23.7-source.tar.gz";
|
||||
hash = "sha256-NaVJM/QA6JZnoImkJfHGXNadRiOU/tnAZ558Uu+6pWg=";
|
||||
};
|
||||
patchCommands = ''
|
||||
cp ${k2pdfopt_src}/mupdf_mod/{filter-basic,font,stext-device,string}.c ./source/fitz/
|
||||
cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/
|
||||
'';
|
||||
};
|
||||
# mupdf_patch no longer applies cleanly against mupdf 1.25.0 or later, due to a conflicting
|
||||
# hunk (mupdf_conflict) introduced in commit bd8d337939f36f55b96cb6984f5c7bbf2f488ce0 of mupdf.
|
||||
# This merge conflict can be resolved as desired by reverting mupdf_conflict, applying mupdf_patch,
|
||||
# and finally reapplying mupdf_conflict, with an increased fuzz factor (see mupdf_modded below).
|
||||
# TODO: remove workaround with conflicting hunk when mupdf in k2pdfopt is updated to 1.25.0 or later
|
||||
mupdf_conflict =
|
||||
hash: revert:
|
||||
fetchpatch {
|
||||
name = "mupdf-conflicting-hunk" + (lib.optionalString revert "-reverted") + ".patch";
|
||||
url = "https://github.com/ArtifexSoftware/mupdf/commit/bd8d337939f36f55b96cb6984f5c7bbf2f488ce0.patch";
|
||||
inherit hash revert;
|
||||
includes = [ "source/fitz/stext-device.c" ];
|
||||
postFetch = ''
|
||||
filterdiff -#6 "$out" > "$tmpfile"
|
||||
mv "$tmpfile" "$out"
|
||||
'';
|
||||
};
|
||||
mupdf_modded = mupdf.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
# The fuzz factor is increased to automatically resolve the merge conflict.
|
||||
patchFlags = [
|
||||
"-p1"
|
||||
"-F3"
|
||||
];
|
||||
# Reverting and reapplying the conflicting hunk is necessary, otherwise the result will be faulty.
|
||||
patches = patches ++ [
|
||||
# revert conflicting hunk
|
||||
(mupdf_conflict "sha256-24tl9YBuZBYhb12yY3T0lKsA7NswfK0QcMYhb2IpepA=" true)
|
||||
# apply modifications
|
||||
mupdf_patch
|
||||
# reapply conflicting hunk
|
||||
(mupdf_conflict "sha256-bnBV7LyX1w/BXxBFF1bkA8x+/0I9Am33o8GiAeEKHYQ=" false)
|
||||
];
|
||||
# This function is missing in font.c, see font-win32.c
|
||||
postPatch = ''
|
||||
echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
leptonica_patch = mkPatch {
|
||||
name = "leptonica";
|
||||
src = fetchurl {
|
||||
url = "http://www.leptonica.org/source/leptonica-1.83.0.tar.gz";
|
||||
hash = "sha256-IGWR3VjPhO84CDba0TO1jJ0a+SSR9amCXDRqFiBEvP4=";
|
||||
};
|
||||
patchCommands = "cp -r ${k2pdfopt_src}/leptonica_mod/. ./src/";
|
||||
};
|
||||
leptonica_modded = leptonica.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
patches = patches ++ [ leptonica_patch ];
|
||||
}
|
||||
);
|
||||
|
||||
tesseract_patch = mkPatch {
|
||||
name = "tesseract";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = "5.3.3";
|
||||
hash = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos=";
|
||||
};
|
||||
patchCommands = ''
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract.* include/tesseract/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h include/tesseract/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{baseapi,config_auto,tesscapi,tesseract}.* src/api/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/api/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{tesscapi,tessedit,tesseract}.* src/ccmain/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/tesseract/baseapi.h src/ccmain/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/dotproduct{avx,fma,sse}.* src/arch/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{intsimdmatrixsse,simddetect}.* src/arch/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{errcode,genericvector,mainblk,params,serialis,tessdatamanager,tess_version,tprintf,unicharset}.* src/ccutil/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/{input,lstmrecognizer}.* src/lstm/
|
||||
cp ${k2pdfopt_src}/tesseract_mod/openclwrapper.* src/opencl/
|
||||
'';
|
||||
};
|
||||
tesseract_modded = tesseract5.override {
|
||||
tesseractBase = tesseract5.tesseractBase.overrideAttrs (
|
||||
{
|
||||
patches ? [ ],
|
||||
buildInputs ? [ ],
|
||||
...
|
||||
}:
|
||||
{
|
||||
pname = "tesseract-k2pdfopt";
|
||||
version = tesseract_patch.src.rev;
|
||||
src = tesseract_patch.src;
|
||||
# opencl-headers were removed from tesseract in Version 5.4
|
||||
buildInputs = buildInputs ++ [ opencl-headers ];
|
||||
patches = patches ++ [ tesseract_patch ];
|
||||
# Additional compilation fixes
|
||||
postPatch = ''
|
||||
echo libtesseract_la_SOURCES += src/api/tesscapi.cpp >> Makefile.am
|
||||
substituteInPlace src/api/tesseract.h \
|
||||
--replace "#include <leptonica.h>" "//#include <leptonica.h>"
|
||||
substituteInPlace include/tesseract/tesseract.h \
|
||||
--replace "#include <leptonica.h>" "//#include <leptonica.h>"
|
||||
'';
|
||||
}
|
||||
);
|
||||
};
|
||||
in
|
||||
[
|
||||
jbig2dec
|
||||
libjpeg_turbo
|
||||
libpng
|
||||
zlib
|
||||
]
|
||||
++ lib.optional enableGSL gsl
|
||||
++ lib.optional enableGhostScript ghostscript
|
||||
++ lib.optional enableMuPDF mupdf_modded
|
||||
++ lib.optional enableDJVU djvulibre
|
||||
++ lib.optional enableGOCR gocr
|
||||
++ lib.optional enableTesseract tesseract_modded
|
||||
++ lib.optional (enableLeptonica || enableTesseract) leptonica_modded;
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ];
|
||||
|
||||
NIX_LDFLAGS = "-lpthread";
|
||||
|
||||
installPhase = ''
|
||||
install -D -m 755 k2pdfopt $out/bin/k2pdfopt
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString enableTesseract ''
|
||||
wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract5}/share/tessdata
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones";
|
||||
homepage = "http://www.willus.com/k2pdfopt";
|
||||
changelog = "https://www.willus.com/k2pdfopt/k2pdfopt_version.txt";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
bosu
|
||||
danielfullmer
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -6,5 +6,8 @@ NODE_ENV=production
|
||||
|
||||
[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists
|
||||
|
||||
# Drizzle will look for configuration in the working directory
|
||||
cd "$KARAKEEP_LIB_PATH/packages/db"
|
||||
|
||||
export RELEASE NODE_ENV
|
||||
exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/packages/db/migrate.ts" "$@"
|
||||
exec "$KARAKEEP_LIB_PATH/node_modules/.bin/drizzle-kit" migrate
|
||||
|
||||
@@ -2,10 +2,13 @@
|
||||
set -eu -o pipefail
|
||||
KARAKEEP_LIB_PATH=
|
||||
RELEASE=
|
||||
NODEJS=
|
||||
NODE_ENV=production
|
||||
NODE_PATH="$KARAKEEP_LIB_PATH/apps/workers"
|
||||
|
||||
[[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists
|
||||
|
||||
cd "$KARAKEEP_LIB_PATH/apps/workers"
|
||||
|
||||
export RELEASE NODE_ENV NODE_PATH
|
||||
exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/apps/workers/index.ts"
|
||||
exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/workers/dist/index.js"
|
||||
|
||||
@@ -17,18 +17,17 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "karakeep";
|
||||
version = "0.26.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karakeep-app";
|
||||
repo = "karakeep";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t5mQmrBrXc1wl5PRCdEHZvIEMxeCokrd0x4YhZU+qE0=";
|
||||
hash = "sha256-KkRCMS/g+xCQyVh1qB/kf5Seqrn2McYBaUHqKOeigCA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/use-local-font.patch
|
||||
./patches/fix-migrations-path.patch
|
||||
./patches/dont-lock-pnpm-version.patch
|
||||
];
|
||||
postPatch = ''
|
||||
@@ -54,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-8NdYEcslo9dxSyJbNWzO81/MrDLO+QyrhQN1hwM0/j4=";
|
||||
hash = "sha256-74jLff9v2+qc09b8ArooUX6qpFt2tDNW3ZayHPcDVj0=";
|
||||
};
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@@ -77,6 +76,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpm run build
|
||||
popd
|
||||
|
||||
echo "Building apps/workers"
|
||||
pushd apps/workers
|
||||
pnpm run build
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
Without this change the migrations script will fail if the working directory
|
||||
isn't the same directory this file is located in. To improve usability we
|
||||
specify the migrations folder relative to __dirname, which doesn't depend on the
|
||||
working directory.
|
||||
|
||||
---
|
||||
--- a/packages/db/migrate.ts
|
||||
+++ b/packages/db/migrate.ts
|
||||
@@ -1,4 +1,5 @@
|
||||
import { db } from "./drizzle";
|
||||
import { migrate } from "drizzle-orm/better-sqlite3/migrator";
|
||||
+import path from "path";
|
||||
|
||||
-migrate(db, { migrationsFolder: "./drizzle" });
|
||||
+migrate(db, { migrationsFolder: path.join(__dirname, "./drizzle") });
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kargo";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akuity";
|
||||
repo = "kargo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-mm4eTpTsnYqYK14N1BG8ObnHwgCY1HnJHHmLrX6WesA=";
|
||||
hash = "sha256-HYTtZ2+eZ5DXXif26t7Q9RnsIRhIxJ88YZHQFNN22Vo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zo3aEs0xrWbjj5nCtZ1GEfAYXy2cnaUCUbN5bjYFZ+Y=";
|
||||
|
||||
@@ -15,12 +15,12 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = extraCommandLineArgs;
|
||||
|
||||
version = "0.2.38";
|
||||
version = "0.2.59";
|
||||
pname = "kiro";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
# workbench.action.showAboutDialog (Help: About)
|
||||
vscodeVersion = "1.100.3";
|
||||
vscodeVersion = "1.103.2";
|
||||
|
||||
executableName = "kiro";
|
||||
longName = "Kiro";
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"x86_64-linux": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509032213--distro-linux-x64-tar-gz/202509032213-distro-linux-x64.tar.gz",
|
||||
"hash": "sha256-nqOtD7Ef7dLYHzAM2jTybV/paUPjPYBJpa2AM0lnyIE="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509172055--distro-linux-x64-tar-gz/202509172055-distro-linux-x64.tar.gz",
|
||||
"hash": "sha256-VL5acxUc3HLKXvebBUaj62I9gIDMNkUxree3TJeca3Q="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509032213-Kiro-dmg-darwin-x64.dmg",
|
||||
"hash": "sha256-IdLKALVT5yj6oTJnOnqAqMzN29ZzI2XFMm61YwwaT/Q="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509172055-Kiro-dmg-darwin-x64.dmg",
|
||||
"hash": "sha256-kwONoLbIB6YvAriwJF5q+8niRsy6cfr2H18D4ha3F7A="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509032213-Kiro-dmg-darwin-arm64.dmg",
|
||||
"hash": "sha256-bqBNm0O6jZS5R+xyuxRys1Sgw3e6QiyHDJ3BKC8UzIo="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509172055-Kiro-dmg-darwin-arm64.dmg",
|
||||
"hash": "sha256-5xvDoGMdS/ovLKJ9gE+Seg/ZtpLXHQ7b78gf0tuZUag="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,9 +89,17 @@ for platform in "${!platform_urls[@]}"; do
|
||||
platform_hashes["$platform"]=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${platform_urls[$platform]}")")
|
||||
done
|
||||
|
||||
# Extract vscode version from the Linux tar.gz archive using nix-prefetch-url
|
||||
archive_path=$(nix-prefetch-url --print-path "${platform_urls["x86_64-linux"]}" | tail -1)
|
||||
vscodeVersion=$(tar -Oxzf "$archive_path" "Kiro/resources/app/product.json" | jq -r '.vsCodeVersion')
|
||||
if [[ -z "$vscodeVersion" || "$vscodeVersion" == "null" ]]; then
|
||||
error_exit "Could not extract vsCodeVersion from product.json"
|
||||
fi
|
||||
|
||||
# Update package.nix and generate sources.json
|
||||
echo "Updating package.nix..."
|
||||
sed -i "s/version = \".*\"/version = \"$max_version\"/" "$PACKAGE_NIX"
|
||||
sed -i "s/vscodeVersion = \".*\"/vscodeVersion = \"$vscodeVersion\"/" "$PACKAGE_NIX"
|
||||
|
||||
echo "Generating sources.json..."
|
||||
json_content="{}"
|
||||
|
||||
@@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
subPackages = [ "cmd/ipfs" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) kubo;
|
||||
inherit (nixosTests) kubo ipget;
|
||||
repoVersion = callPackage ./test-repoVersion.nix { };
|
||||
};
|
||||
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lightning-terminal";
|
||||
version = "0.15.1-alpha";
|
||||
version = "0.15.2-alpha";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "lightning-terminal";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aCZ1dzbj1SYBYQ6ysnk9MQs4V6ysljZYOYp0gOw0WFQ=";
|
||||
hash = "sha256-rk6jnhlWVewVo2MVizjokY0GOuhXjchpGUfs8JBj6LI=";
|
||||
leaveDotGit = true;
|
||||
# Populate values that require us to use git.
|
||||
postFetch = ''
|
||||
@@ -41,7 +41,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tjNF6Llsaba/IlhtrOU4ebzSRHGVy+LPzwhBsS5xJgQ=";
|
||||
vendorHash = "sha256-EA/ejOKcWxl7BQkpXLONJjhftx3/tkUnOHdzcIDlugo=";
|
||||
|
||||
buildInputs = [ lightning-app ];
|
||||
postUnpack = ''
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lychee";
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lycheeverse";
|
||||
repo = "lychee";
|
||||
rev = "lychee-v${version}";
|
||||
hash = "sha256-HbawSQ6ZUDhXSIjRN7SfHMpEPKRb8UD/MXfhxwehK6c=";
|
||||
hash = "sha256-yHIj45RfQch4y+V4Ht7cDMcg5MECejxsbjuE345I/to=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T1mfknbxw9Vvl2VGVH++CeKlLuqsIem/i/ifM1yrZGw=";
|
||||
cargoHash = "sha256-d3umjtXPBJbPRtNCuktYhJUPgKFmB8UEeewWMekDZRE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "masterpdfeditor";
|
||||
version = "5.9.90";
|
||||
version = "5.9.94";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz";
|
||||
};
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-E0bH6Tbq8poQn0kuWcbxup72l/ijBoD1BTUANuEAsM4=";
|
||||
aarch64-linux = "sha256-nH16N9XjMtDpCy6XQLr76SFHnDLB3bsjHZHtHQj60Rw=";
|
||||
x86_64-linux = "sha256-WKMk0uzcjI4/dwjas4Ws3S6VBcUZYO9/WDXgKY22EeE=";
|
||||
aarch64-linux = "sha256-DKNOvEAjCzOHRAn8PRiT/1tv6/NggoWCHgHf5OWOHSA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,18 +9,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mercure";
|
||||
version = "0.20.0";
|
||||
version = "0.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "mercure";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JBvfNzsOP4ggJ7D2+5yW8837QsN15wO6EbFrTKVensU=";
|
||||
hash = "sha256-DmeBnvJhGYtEGoJDey8+Bb7MuP+Y1GLtQHg6QLoAzv4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/caddy";
|
||||
|
||||
vendorHash = "sha256-ZCvIgyGw4F4VGbnuan5O+to5n969ThRZNFezu+byKWg=";
|
||||
vendorHash = "sha256-ZisV7+Mo8TMN+AUGPKHzEluzEShxZCuXrnYgySi57TY=";
|
||||
|
||||
subPackages = [ "mercure" ];
|
||||
excludedPackages = [ "../cmd/mercure" ];
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mprisence";
|
||||
version = "1.2.6";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lazykern";
|
||||
repo = "mprisence";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I/rY8EU7EHlxtKO/++itjkDehGSIOHmU0C1PJGsgvHA=";
|
||||
hash = "sha256-qacyRPFtGrSBame9oOg7AktuI0iU+9VushSj9+zN4ZQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZAr+cdC/A5YsPTdZhKF1qPM37oavXyIDhZYPAQ3zq8A=";
|
||||
cargoHash = "sha256-TvIQUGT/floLv2RQcVhbhPTO59xwzFSFEVK2Gz3XOwA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@ in
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "opam-publish";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-opam";
|
||||
repo = "opam-publish";
|
||||
rev = version;
|
||||
hash = "sha256-clTEm2DGxcNsv+Y1wwWwnM/lrRJDQBHsncwrdqVWA5U=";
|
||||
hash = "sha256-HEmeY3k1sHMNhIUD0GmVlUKKRxC+z/tMAqHGQNT48LA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.6.30";
|
||||
version = "0.6.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0gQlzqHFVcayN1/Z5Ou1Gv1+VQMMwk7QrvVXV92EFp0=";
|
||||
hash = "sha256-Pv+2+j5S4jokGYHGSewk33Vmf41XJj8CwyKYLMG2EWA=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-AYChUMU8vLNaJPfIbX1SThx01uV3V6QpN6OjYrerg5U=";
|
||||
npmDepsHash = "sha256-HBmhRzWY7lIl3OScIlwSj/JJUlVcgFvXNHbw4jJRbl8=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
@@ -134,6 +134,7 @@ python3Packages.buildPythonApplication rec {
|
||||
ldap3
|
||||
loguru
|
||||
markdown
|
||||
mcp
|
||||
nltk
|
||||
onnxruntime
|
||||
openai
|
||||
@@ -183,6 +184,7 @@ python3Packages.buildPythonApplication rec {
|
||||
sentencepiece
|
||||
soundfile
|
||||
starlette-compress
|
||||
starsessions
|
||||
tencentcloud-sdk-python
|
||||
tiktoken
|
||||
transformers
|
||||
@@ -192,7 +194,8 @@ python3Packages.buildPythonApplication rec {
|
||||
xlrd
|
||||
youtube-transcript-api
|
||||
]
|
||||
++ pyjwt.optional-dependencies.crypto;
|
||||
++ pyjwt.optional-dependencies.crypto
|
||||
++ starsessions.optional-dependencies.redis;
|
||||
|
||||
optional-dependencies = with python3Packages; rec {
|
||||
postgres = [
|
||||
|
||||
@@ -11,21 +11,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "parseable";
|
||||
version = "2.3.5";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parseablehq";
|
||||
repo = "parseable";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3kSbhTMnAPA86obH7F8nig8xIvlFpBanWuzgNVU1xFU=";
|
||||
hash = "sha256-0PyXrwFh2YroxeAPL2GCZiOUfzFLThN0ZnL0a7BDnfw=";
|
||||
};
|
||||
|
||||
LOCAL_ASSETS_PATH = fetchzip {
|
||||
url = "https://github.com/parseablehq/console/releases/download/v0.9.15/build.zip";
|
||||
hash = "sha256-T37pI7adfKPDkCETcGcZVzcYVcxROSZLDrFhV4XO4tc=";
|
||||
url = "https://parseable-prism-build.s3.us-east-2.amazonaws.com/v${version}/build.zip";
|
||||
hash = "sha256-7uJvWAGDexzWhnm1ofPHzoRD8Q70fQ+eyUPpQHcWv4o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oXcOozjFKN10+693Eofg8vS2XryDEezAKkAhbGGNZ0A=";
|
||||
cargoHash = "sha256-VAdivS7zxoFrjeTnRGbUqtEgCj73iF29ZiCUfzdP1Yo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pixelflasher";
|
||||
version = "8.5.1.0";
|
||||
version = "8.6.0.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badabing2005";
|
||||
repo = "PixelFlasher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IAetTEycuOhjZEgfqen+Za4hjgCzYQuEduElWuhZybE=";
|
||||
hash = "sha256-lCh4LmmFdX/CvJSYWso1c8cBklb+/qXsbUY3nrzKCYk=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyenv";
|
||||
version = "2.6.7";
|
||||
version = "2.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyenv";
|
||||
repo = "pyenv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Rm4czJoUu36frPvBPvjWo0x0NKEkAHCL07iffsC741o=";
|
||||
hash = "sha256-/rIuFjClGqpZUm91G2fCe05KamlTEHqPs7BUgC+Fgbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.9.0",
|
||||
"version": "1.9.1",
|
||||
"assets": {
|
||||
"aarch64-darwin": {
|
||||
"asset": "scala-cli-aarch64-apple-darwin.gz",
|
||||
"sha256": "18iyr4k2nwihnn1rkpd0qj90czn0ff6hr9637kra93hn4rnb565p"
|
||||
"sha256": "1hlhhy3ncjfjn1k9cc0k8sl43mjgxbsppjy4igs4an2l88pwi9nk"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"asset": "scala-cli-aarch64-pc-linux.gz",
|
||||
"sha256": "0b7ra7r0xvglhn28s52g6qdzma36maqdm4d4s14kvi6svjlzg19s"
|
||||
"sha256": "1lzqyk253bavn9lmb9isa3qx2ylzags9mglb7j433syih8fv2y5z"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "1m0kjah1dgwfsj24l27g9wcjj6j4qcv7a14126xd276lv0imj4hk"
|
||||
"sha256": "1vkbr6nhdfi33402hp60i0b078xbipcg3sc7dfinlikvp4vi6jrm"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "0mfg8swxglhwvn8q291lav2kik5ciw9l0g2q3xqzwkpl8chvmhp9"
|
||||
"sha256": "03d5m0kdb417yf9zw0pkh0wrqivrvvr7akk2xnznbqqjsxfq4sfx"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "2.4.5";
|
||||
version = "2.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "techouse";
|
||||
repo = "sqlite3-to-mysql";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oJQR54g6TAf1jZOa2RXJxmBVbC65nmb2KRQpgppK6us=";
|
||||
hash = "sha256-2SoLiqOLuGcB4IV2CPud+mjc5s8mqobD72kkx0WCwVU=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "storj-uplink";
|
||||
version = "1.136.1";
|
||||
version = "1.137.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yUdD3yMfNFVNX7IJIGlHAYiy3KNjtOeXBe2bgUA+ysk=";
|
||||
hash = "sha256-QvmCtW8szGoo7sNHbChvtkTOUOxf1TQHQCoYeV1pN9o=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
pname = "traefik";
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-ccayxpXbMBSaSHM1E5Q3UmiNjNJen+0xQVNmth1sMSs=";
|
||||
hash = "sha256-vKpOlB29OJHppQOspIICYgeAtemBGb419TIXIW9zrhU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "upsies";
|
||||
version = "2025.04.21";
|
||||
version = "2025.09.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "plotski";
|
||||
repo = "upsies";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gjv0HOFV1VdfhVejGbV2+bMxP9BPfB3/3p6nOAYMS34=";
|
||||
hash = "sha256-g6LS/kJ13IfmDxPJ6hnX4rSxr6TroPM+sIwQeqdHNVs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -37,9 +37,7 @@ python3Packages.buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
aiobtclientapi
|
||||
@@ -65,9 +63,10 @@ python3Packages.buildPythonApplication rec {
|
||||
with python3Packages;
|
||||
[
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytest-httpserver
|
||||
pytest-mock
|
||||
pytest-timeout
|
||||
pytest-httpserver
|
||||
pytestCheckHook
|
||||
trustme
|
||||
]
|
||||
@@ -94,7 +93,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Toolkit for collecting, generating, normalizing and sharing video metadata";
|
||||
homepage = "https://upsies.readthedocs.io/";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "upsies";
|
||||
maintainers = with maintainers; [ ambroisie ];
|
||||
};
|
||||
|
||||
@@ -46,13 +46,13 @@
|
||||
|
||||
let
|
||||
pname = "windmill";
|
||||
version = "1.542.1";
|
||||
version = "1.549.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "windmill-labs";
|
||||
repo = "windmill";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SVE1P7NQ6mz26bS3oURAc1ImvbCJRkT8mMTuCmHeZLU=";
|
||||
hash = "sha256-+4cYZCD8iqrrckYWTDCM++SogptXXahfCKN6O8E8HuE=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
RUSTY_V8_ARCHIVE = librusty_v8;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0OETpBXO/c2YJPta1LLAa/Jf7PusH+GAwgfAmRGh9m0=";
|
||||
cargoHash = "sha256-m7/72IRbzllAfAlbjKsjGrTaiXzpj2TufLKrTpKLbUU=";
|
||||
|
||||
buildFeatures = [
|
||||
"agent_worker_server"
|
||||
@@ -194,7 +194,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
|
||||
npmDepsHash = "sha256-8t5ww8zuP1ZWASKpj6F0bFGWnUDROf7iLBTLsof5jtM=";
|
||||
npmDepsHash = "sha256-2CBqPDEqKGDIGo7ARK3sxTkFNsTxIa6V1QCtSKDkj4I=";
|
||||
|
||||
# without these you get a
|
||||
# FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-ui";
|
||||
version = "11.2.1";
|
||||
version = "11.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zwave-js";
|
||||
repo = "zwave-js-ui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aEJfJyGuSNAY+QWJ51j3cP9gwBCwaq+PilGqCKjlzqc=";
|
||||
hash = "sha256-a0s3ez07++xsmaHDpijbrhpTh7K4QoVumDyw2GQvS4s=";
|
||||
};
|
||||
npmDepsHash = "sha256-eAOoRolOlU5GwxvnQHxoNMhyMfxqZvcOQyLcHnGdVGU=";
|
||||
npmDepsHash = "sha256-J45le5b2oYmxv9IHRS0LYbVhs0Po4u30z38/5CgsIlU=";
|
||||
|
||||
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
|
||||
|
||||
|
||||
@@ -27,13 +27,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-2nBrIMlYUI4PwirkiSJSkw5zw2Kc/KoVRyIIYYx4iYs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"async-timeout"
|
||||
];
|
||||
pythonRelaxDeps = [ "async-timeout" ];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
async-timeout
|
||||
@@ -63,6 +59,8 @@ buildPythonPackage rec {
|
||||
"test_timeout[rtorrent_http]"
|
||||
"test_event_subscriptions_survive_reconnecting[rtorrent_http]"
|
||||
"test_waiting_for_event[rtorrent_http]"
|
||||
# Tests are outdated
|
||||
"test_DelugeRPCRequest_equality"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiobtclientrpc" ];
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
python-multipart,
|
||||
starlette,
|
||||
syrupy,
|
||||
@@ -22,8 +21,6 @@ buildPythonPackage rec {
|
||||
version = "0.26.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirumee";
|
||||
repo = "ariadne";
|
||||
@@ -33,9 +30,11 @@ buildPythonPackage rec {
|
||||
|
||||
patches = [ ./remove-opentracing.patch ];
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
pythonRelaxDeps = [ "graphql-core" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
graphql-core
|
||||
starlette
|
||||
typing-extensions
|
||||
@@ -64,6 +63,10 @@ buildPythonPackage rec {
|
||||
# opentracing
|
||||
"test_query_is_executed_for_multipart_form_request_with_file"
|
||||
"test_query_is_executed_for_multipart_request_with_large_file_with_tracing"
|
||||
# AssertionError: assert not [GraphQLError(...
|
||||
"test_enum_with_int_values_from_dict"
|
||||
"test_enum_with_int_enum_values"
|
||||
"test_enum_with_str_enum_values"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awsiotsdk";
|
||||
version = "1.24.0";
|
||||
version = "1.26.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "aws";
|
||||
repo = "aws-iot-device-sdk-python-v2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bjUppd1neOEeaY+RGcyqXpjhq+plJcopxPRLUBGhks8=";
|
||||
hash = "sha256-FK/Sy2zxWqrLmBiJO80PdBp/NJWV9OujFffCk7CG7jk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
pyyaml,
|
||||
questionary,
|
||||
rich,
|
||||
rich-toolkit,
|
||||
schema,
|
||||
simple-di,
|
||||
starlette,
|
||||
@@ -79,7 +80,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.4.23";
|
||||
version = "1.4.25";
|
||||
aws = [ fs-s3fs ];
|
||||
grpc = [
|
||||
grpcio
|
||||
@@ -129,7 +130,7 @@ let
|
||||
owner = "bentoml";
|
||||
repo = "BentoML";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-p9d8TyN09jJ2VotaAvbC9jxJ5kNC2S7VhkatzrDJ1TY=";
|
||||
hash = "sha256-07LR0Q2inKRKn6NHHldv8kSFtCBcZvGd+VfEEhxc2Ac=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
@@ -148,6 +149,7 @@ buildPythonPackage {
|
||||
"opentelemetry-sdk"
|
||||
"opentelemetry-semantic-conventions"
|
||||
"opentelemetry-util-http"
|
||||
"rich-toolkit"
|
||||
];
|
||||
|
||||
build-system = [
|
||||
@@ -195,6 +197,7 @@ buildPythonPackage {
|
||||
pyyaml
|
||||
questionary
|
||||
rich
|
||||
rich-toolkit
|
||||
schema
|
||||
simple-di
|
||||
starlette
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hidapi,
|
||||
loguru,
|
||||
pyserial,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
uv-build,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "busylight-core";
|
||||
version = "0.15.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JnyJny";
|
||||
repo = "busylight-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r7mAKD/uodY5RRklYL6u2HTdcU+rt6taTpBkTB/Sv9Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "uv_build>=0.7.19,<0.8" "uv_build"
|
||||
'';
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
dependencies = [
|
||||
hidapi
|
||||
loguru
|
||||
pyserial
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "busylight_core" ];
|
||||
|
||||
meta = {
|
||||
description = "Library for interacting programmatically with USB-connected LED lights";
|
||||
homepage = "https://github.com/JnyJny/busylight-core";
|
||||
changelog = "https://github.com/JnyJny/busylight-core/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -2,39 +2,39 @@
|
||||
lib,
|
||||
bitvector-for-humans,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
busylight-core,
|
||||
fastapi,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
hidapi,
|
||||
httpx,
|
||||
loguru,
|
||||
poetry-core,
|
||||
pyserial,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
typer,
|
||||
udevCheckHook,
|
||||
uvicorn,
|
||||
webcolors,
|
||||
udevCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "busylight-for-humans";
|
||||
version = "0.37.0";
|
||||
version = "0.45.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JnyJny";
|
||||
repo = "busylight";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-uKuQy4ce6WTTpprAbQ6QE7WlotMlVacaDZ+dsvY1N58=";
|
||||
hash = "sha256-G+l+jkHZzz3tX1CcC7Cq1iCFZPbeQ6CI4xCMkTWA5EE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
bitvector-for-humans
|
||||
busylight-core
|
||||
hidapi
|
||||
loguru
|
||||
pyserial
|
||||
@@ -50,10 +50,12 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpx
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
udevCheckHook
|
||||
];
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
disabledTestPaths = [ "tests/test_pydantic_models.py" ];
|
||||
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cantools";
|
||||
version = "40.5.0";
|
||||
version = "40.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ApcGMQ2J4YZjFInW2Vlgi3xsRyfqum7KSNSatb+hsnc=";
|
||||
hash = "sha256-V3kROwaKsEMUDqlEGtd9RK1NOC7tiN4WZ4+zIOMhRuw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,29 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
clarifai-grpc,
|
||||
clarifai-protocol,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
fsspec,
|
||||
huggingface-hub,
|
||||
inquirerpy,
|
||||
numpy,
|
||||
pillow,
|
||||
pkgs,
|
||||
psutil,
|
||||
pycocotools,
|
||||
pydantic-core,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
rich,
|
||||
ruff,
|
||||
schema,
|
||||
setuptools,
|
||||
tabulate,
|
||||
tqdm,
|
||||
tritonclient,
|
||||
uv,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai";
|
||||
version = "11.6.7";
|
||||
version = "11.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -32,18 +41,22 @@ buildPythonPackage rec {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python";
|
||||
tag = version;
|
||||
hash = "sha256-1ftwsIKJ494F8q45x0LtvOZhM72AAhJWe0LligNNpkQ=";
|
||||
hash = "sha256-7luvK7xnkJRALXm7X7mg6VG9qRpq9pmFdBRW2GP3heI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"clarifai-protocol"
|
||||
"click"
|
||||
"fsspec"
|
||||
"ruff"
|
||||
"schema"
|
||||
"uv"
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
clarifai-grpc
|
||||
clarifai-protocol
|
||||
click
|
||||
@@ -51,23 +64,29 @@ buildPythonPackage rec {
|
||||
inquirerpy
|
||||
numpy
|
||||
pillow
|
||||
psutil
|
||||
pydantic-core
|
||||
pyyaml
|
||||
rich
|
||||
ruff
|
||||
schema
|
||||
tabulate
|
||||
tqdm
|
||||
tritonclient
|
||||
uv
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
all = [ pycocotools ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
nativeCheckInputs = [
|
||||
pkgs.gitMinimal
|
||||
huggingface-hub
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test requires network access and API key
|
||||
@@ -79,14 +98,18 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Tests require network access and API key
|
||||
"tests/cli/test_compute_orchestration.py"
|
||||
"tests/runners/test_anymodel.py"
|
||||
"tests/runners/test_download_checkpoints.py"
|
||||
"tests/runners/test_model_run_locally.py"
|
||||
"tests/runners/test_model_upload.py"
|
||||
"tests/runners/test_num_threads_config.py"
|
||||
"tests/runners/test_runners_proto.py"
|
||||
"tests/runners/test_runners.py"
|
||||
"tests/runners/test_textmodel.py"
|
||||
"tests/runners/test_url_fetcher.py"
|
||||
"tests/runners/test_vllm_model_upload.py"
|
||||
"tests/test_app.py"
|
||||
"tests/test_data_upload.py"
|
||||
"tests/test_eval.py"
|
||||
"tests/test_list_models.py"
|
||||
"tests/test_model_predict.py"
|
||||
"tests/test_model_train.py"
|
||||
"tests/test_rag.py"
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coiled";
|
||||
version = "1.120.0";
|
||||
version = "1.121.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZVAJlYyEsvDfGd8ioLxmWn43T531jdyhG2L3FROetjU=";
|
||||
hash = "sha256-NJI4oc7MRnXQbKyIb3JNntv+a/HMiWIcIV+Q6I80QNY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -61,7 +61,7 @@ buildPythonPackage rec {
|
||||
plot = [ matplotlib ];
|
||||
symfont = [ sympy ];
|
||||
type1 = lib.optional stdenv.hostPlatform.isDarwin xattr;
|
||||
pathops = [ skia-pathops ];
|
||||
pathops = lib.optional (lib.meta.availableOn stdenv.hostPlatform skia-pathops) skia-pathops;
|
||||
repacker = [ uharfbuzz ];
|
||||
};
|
||||
in
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.39.0";
|
||||
version = "1.40.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_securitycenter";
|
||||
inherit version;
|
||||
hash = "sha256-F3yEa7DTppVr2X9ufWVOQ/kkeytGKZmeOY661gUlzP8=";
|
||||
hash = "sha256-IhiLtqPEyeIkt7DaXgTW+fyOsYBO+qrz+Noxs8ntFOo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "granian";
|
||||
version = "2.5.3";
|
||||
version = "2.5.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emmett-framework";
|
||||
repo = "granian";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-I5rwSb//F2O3/QgWkyeUCVJRBUn6vhYNBt/16n7bC20=";
|
||||
hash = "sha256-6T4ge9QrLxpkgtJvNmgUlHaxFK3KyQLJo12rjs80J3M=";
|
||||
};
|
||||
|
||||
# Granian forces a custom allocator for all the things it runs,
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-vSw72PiIzlmjAbDENhaju3IpC2NKzFE7UqaitE3976c=";
|
||||
hash = "sha256-iY0vh+Y0wU1/wJVXb2GDG8vb5ovrFD+4tXKODEA35Kc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202509261";
|
||||
version = "0.1.202509271";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7etTpcUGBdUyPHBIu/hO2YnR5HPjrwARK7efEsAhFJ0=";
|
||||
hash = "sha256-hZpNv2Yst/JtIhOFd8apaKl+Y3G3fMhmNQ70AGNI55o=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
dnspython,
|
||||
eval-type-backport,
|
||||
fetchFromGitHub,
|
||||
orjson,
|
||||
playwrightcapture,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
@@ -17,19 +18,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lacuscore";
|
||||
version = "1.16.6";
|
||||
version = "1.18.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ail-project";
|
||||
repo = "LacusCore";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LcqGJU+wMKTF1E4asysQPcfURqmgc4WQompPpHEgjb8=";
|
||||
hash = "sha256-+K2zfUGhjQNGIxsh3YHYAH4G3mAoysdpMnscshwl7xI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"dnspython"
|
||||
"orjson"
|
||||
"pydantic"
|
||||
"redis"
|
||||
"requests"
|
||||
@@ -40,6 +41,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
defang
|
||||
dnspython
|
||||
orjson
|
||||
playwrightcapture
|
||||
pydantic
|
||||
redis
|
||||
|
||||
@@ -27,6 +27,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-oWVBsFSKnv/8AHYP5sxO6+u5+hsOw/uQlOetse5ue88=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace-fail "setuptools_scm[toml]>=8.0.0,<9.0.0" "setuptools_scm[toml]"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools_scm[toml]>=8,<9" "setuptools_scm[toml]"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
@@ -49,6 +56,11 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "linearmodels" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Skip long-running tests
|
||||
"linearmodels/tests/panel/test_panel_ols.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Models for panel data, system regression, instrumental variables and asset pricing";
|
||||
homepage = "https://bashtage.github.io/linearmodels/";
|
||||
|
||||
@@ -2,38 +2,36 @@
|
||||
lib,
|
||||
beautifultable,
|
||||
buildPythonPackage,
|
||||
click,
|
||||
click-default-group,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
humanize,
|
||||
keyring,
|
||||
unittestCheckHook,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
requests,
|
||||
setuptools,
|
||||
unittestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mwdblib";
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "4.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CERT-Polska";
|
||||
repo = "mwdblib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+hh7SJFITpLumIuzNgBbXtFh+26tUG66UFv6DLDk5ag=";
|
||||
hash = "sha256-1oz//6rQiuV/WAv+6qs12ULPhB5nmf7ntcHSAKnRT8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
beautifultable
|
||||
click
|
||||
click-default-group
|
||||
humanize
|
||||
keyring
|
||||
python-dateutil
|
||||
requests
|
||||
];
|
||||
|
||||
@@ -43,10 +41,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client library for the mwdb service";
|
||||
mainProgram = "mwdb";
|
||||
homepage = "https://github.com/CERT-Polska/mwdblib";
|
||||
changelog = "https://github.com/CERT-Polska/mwdblib/releases/tag/v${version}";
|
||||
license = with licenses; [ bsd3 ];
|
||||
changelog = "https://github.com/CERT-Polska/mwdblib/releases/tag/${src.tag}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "mwdb";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
pandas,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
scikit-learn,
|
||||
toml-adapt,
|
||||
typer,
|
||||
@@ -19,8 +18,6 @@ buildPythonPackage rec {
|
||||
version = "2.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-cpp";
|
||||
repo = "NiaAML";
|
||||
@@ -31,14 +28,15 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
"pandas"
|
||||
"typer"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
toml-adapt
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
loguru
|
||||
niapy
|
||||
numpy
|
||||
@@ -60,7 +58,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python automated machine learning framework";
|
||||
homepage = "https://github.com/firefly-cpp/NiaAML";
|
||||
changelog = "https://github.com/firefly-cpp/NiaAML/releases/tag/${version}";
|
||||
changelog = "https://github.com/firefly-cpp/NiaAML/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ firefly-cpp ];
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niaclass";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "firefly-cpp";
|
||||
repo = "NiaClass";
|
||||
tag = version;
|
||||
hash = "sha256-cowB+nBb5vH2ntLrcctqICYcf3I4m8rw3g4vO3/rokw=";
|
||||
hash = "sha256-hJ3ZNl13s/woL4G08nNFqL+/olXUtg9MZQQr0BGX0ys=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -42,14 +42,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nicegui";
|
||||
version = "2.24.1";
|
||||
version = "2.24.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zauberzeug";
|
||||
repo = "nicegui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Qwgs7e44h+i0YBLhmSReXVJEBSiShUT0M4QaU/X8uhI=";
|
||||
hash = "sha256-DfYNwtH3p1frF8ehKjl7P1iPQZ+icD4YKZHpD/9oj6Q=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "requests" ];
|
||||
|
||||
@@ -2,22 +2,21 @@
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
numpy,
|
||||
deprecation,
|
||||
hightime,
|
||||
tzlocal,
|
||||
python-decouple,
|
||||
click,
|
||||
deprecation,
|
||||
distro,
|
||||
requests,
|
||||
sphinx,
|
||||
sphinx-rtd-theme,
|
||||
fetchFromGitHub,
|
||||
grpcio,
|
||||
hightime,
|
||||
numpy,
|
||||
poetry-core,
|
||||
protobuf,
|
||||
python-decouple,
|
||||
requests,
|
||||
sphinx-rtd-theme,
|
||||
sphinx,
|
||||
toml,
|
||||
tzlocal,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -32,32 +31,22 @@ buildPythonPackage rec {
|
||||
hash = "sha256-uxf+1nmJ+YFS3zGu+0YP4zOdBlSCHPYC8euqZIGwb00=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '["poetry>=1.2"]' '["poetry-core>=1.0.0"]'
|
||||
'';
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
click
|
||||
deprecation
|
||||
hightime
|
||||
tzlocal
|
||||
numpy
|
||||
python-decouple
|
||||
click
|
||||
requests
|
||||
tzlocal
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
distro
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
optional-dependencies = {
|
||||
docs = [
|
||||
sphinx
|
||||
sphinx-rtd-theme
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -12,14 +12,15 @@ buildPythonPackage rec {
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tWPVhRy7DgsQ+7YYm6h+BhLSLlpvOgBKRXOrWziqqn0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -1,26 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
setuptools-scm,
|
||||
fetchPypi,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "orgparse";
|
||||
version = "0.4.20250520";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZHL9Ft3Ku1I5GFBchlJjq/oFrIC1k+ZooInNopGxot4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "karlicoss";
|
||||
repo = "orgparse";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-y3mkGCZvikbmymgvPOWq4GLxoFmslXGm/cxR2PZ6DRM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "orgparse" ];
|
||||
|
||||
preCheck = ''
|
||||
rm conftest.py
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Ignoring doc folder
|
||||
"doc/"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError
|
||||
"test_data[01_attributes]"
|
||||
"test_data[03_repeated_tasks]"
|
||||
"test_data[04_logbook]"
|
||||
"test_level_0_timestamps"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emacs org-mode parser in Python";
|
||||
homepage = "https://github.com/karlicoss/orgparse";
|
||||
description = "Orgparse - Emacs org-mode parser in Python";
|
||||
changelog = "https://github.com/karlicoss/orgparse/releases/tag/${src.tag}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ twitchy0 ];
|
||||
};
|
||||
|
||||
@@ -4,19 +4,20 @@
|
||||
fetchFromGitHub,
|
||||
|
||||
# dependencies
|
||||
google-generativeai,
|
||||
joblib,
|
||||
networkx,
|
||||
numpy,
|
||||
scipy,
|
||||
scikit-learn,
|
||||
opt-einsum,
|
||||
pandas,
|
||||
pyparsing,
|
||||
torch,
|
||||
pyro-ppl,
|
||||
scikit-learn,
|
||||
scipy,
|
||||
statsmodels,
|
||||
torch,
|
||||
tqdm,
|
||||
joblib,
|
||||
opt-einsum,
|
||||
xgboost,
|
||||
google-generativeai,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
@@ -38,19 +39,20 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
google-generativeai
|
||||
joblib
|
||||
networkx
|
||||
numpy
|
||||
scipy
|
||||
scikit-learn
|
||||
opt-einsum
|
||||
pandas
|
||||
pyparsing
|
||||
torch
|
||||
pyro-ppl
|
||||
scikit-learn
|
||||
scipy
|
||||
statsmodels
|
||||
torch
|
||||
tqdm
|
||||
joblib
|
||||
opt-einsum
|
||||
xgboost
|
||||
google-generativeai
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -64,6 +66,9 @@ buildPythonPackage rec {
|
||||
|
||||
# requires optional dependency daft
|
||||
"test_to_daft"
|
||||
|
||||
# AssertionError
|
||||
"test_estimate_example_smoke_test"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -75,6 +80,8 @@ buildPythonPackage rec {
|
||||
black
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pgmpy" ];
|
||||
|
||||
meta = {
|
||||
description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks";
|
||||
homepage = "https://github.com/pgmpy/pgmpy";
|
||||
|
||||
@@ -60,6 +60,11 @@ buildPythonPackage rec {
|
||||
rm -r phik
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: np.False_ is not true
|
||||
"test_phik_calculation"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Phi_K correlation analyzer library";
|
||||
longDescription = ''
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
aiohttp-socks,
|
||||
aiohttp,
|
||||
beautifulsoup4,
|
||||
buildPythonPackage,
|
||||
dateparser,
|
||||
dnspython,
|
||||
fetchFromGitHub,
|
||||
orjson,
|
||||
playwright-stealth,
|
||||
playwright,
|
||||
poetry-core,
|
||||
puremagic,
|
||||
pydub,
|
||||
pythonOlder,
|
||||
pytz,
|
||||
requests,
|
||||
rfc3161-client,
|
||||
setuptools,
|
||||
speechrecognition,
|
||||
tzdata,
|
||||
@@ -23,22 +24,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.31.7";
|
||||
version = "1.33.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+yVAqDbPuul9pZaEiABFVEmWbfq89SyCULHYRWpXKNc=";
|
||||
hash = "sha256-ivzyE5+wc9AcgfSLliQmc6wXtcaEYCOAJmwk+kHV0Gw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiohttp"
|
||||
"aiohttp-socks"
|
||||
"beautifulsoup4"
|
||||
"orjson"
|
||||
"playwright"
|
||||
"setuptools"
|
||||
"tzdata"
|
||||
@@ -52,11 +52,13 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
dateparser
|
||||
dnspython
|
||||
orjson
|
||||
playwright
|
||||
playwright-stealth
|
||||
puremagic
|
||||
pytz
|
||||
requests
|
||||
rfc3161-client
|
||||
setuptools
|
||||
tzdata
|
||||
w3lib
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20250925";
|
||||
version = "1.0.2.20250927";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/Y3HJais185YGLoXHXAOHWWMl414rblSGP8L7NQIMc8=";
|
||||
hash = "sha256-vbAul+z36HKdKB0MEcuo7ux8wr5vg+v4cUJqGWy1rjg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,23 +9,20 @@
|
||||
mashumaro,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
syrupy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylamarzocco";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zweckj";
|
||||
repo = "pylamarzocco";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dUFjbht0QGrWtSl3JIx1dx4UQs5gFNqKw+UObgH25pk=";
|
||||
hash = "sha256-ciOyz+d91zYP8XJF7HnDeZ0XmqDyQgP1DAOwJeQLnm0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -21,6 +21,8 @@ buildPythonPackage rec {
|
||||
hash = "sha256-eyMMtLgJuBIuPCyenYrHaRQIrb2tzPaIzM2UCAPPqDg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "awsiotsdk" ];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -42,14 +42,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reflex";
|
||||
version = "0.8.11";
|
||||
version = "0.8.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reflex-dev";
|
||||
repo = "reflex";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kIYwdtzyhkg1y4Rv+HN1656ET8lhRtIBrrS5W9obmoM=";
|
||||
hash = "sha256-NNjabOL5ls5aUaM+KiyLRwrkh2nAnwMYwDsd+jIsGLc=";
|
||||
};
|
||||
|
||||
# 'rich' is also somehow checked when building the wheel,
|
||||
|
||||
@@ -18,19 +18,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich-toolkit";
|
||||
version = "0.14.9";
|
||||
version = "0.15.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patrick91";
|
||||
repo = "rich-toolkit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bX6HqUwFkXXc2Z1LF6BSVBEOl2UUJE9pCBKsfOxUoc0=";
|
||||
tag = version;
|
||||
hash = "sha256-NcdABfbqE+VzE6bptBO98Cf7jetlfVqa/LB5Chg/P8Y=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
@@ -43,14 +41,12 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rich_toolkit"
|
||||
];
|
||||
pythonImportsCheck = [ "rich_toolkit" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/patrick91/rich-toolkit/releases/tag/${src.tag}";
|
||||
description = "Rich toolkit for building command-line applications";
|
||||
homepage = "https://pypi.org/project/rich-toolkit";
|
||||
homepage = "https://github.com/patrick91/rich-toolkit/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -74,6 +74,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/fonttools/skia-pathops";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.BarinovMaxim ];
|
||||
# "The Skia team is not endian-savvy enough to support big-endian CPUs."
|
||||
badPlatforms = lib.platforms.bigEndian;
|
||||
# ERROR at //gn/BUILDCONFIG.gn:87:14: Script returned non-zero exit code.
|
||||
broken = isPyPy;
|
||||
};
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "soco";
|
||||
version = "0.30.11";
|
||||
version = "0.30.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoCo";
|
||||
repo = "SoCo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-x5WKG2KFBr0FQu28160qHB2ckKdpx0cKhgYTH6sLnuw=";
|
||||
hash = "sha256-PczdR6lG4oKsg5eRIPSjRgYMERyvDeLnXpeOj/1aY24=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
itsdangerous,
|
||||
redis,
|
||||
starlette,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
httpx,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "starsessions";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-oleshkevich";
|
||||
repo = "starsessions";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JI044sn6LQI37PvSLdz2dooa3v5qdHmp6DZD0p7VzJU=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
itsdangerous
|
||||
starlette
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "starsessions" ];
|
||||
|
||||
optional-dependencies = {
|
||||
redis = [
|
||||
redis
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpx
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/backends/test_redis.py" # requires a running redis instance
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Advanced sessions for Starlette and FastAPI frameworks";
|
||||
homepage = "https://github.com/alex-oleshkevich/starsessions";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "9.8.1";
|
||||
version = "9.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
tag = version;
|
||||
hash = "sha256-zJiezLn2zEbSGPSRT4yNp7GaJnjArCo+QJDaGD0wyVM=";
|
||||
hash = "sha256-ZOkXJ1NN3qmHABfOBpR1tECCIfAwwVMGyLBbU1jYowc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-docutils";
|
||||
version = "0.22.1.20250923";
|
||||
version = "0.22.2.20250924";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_docutils";
|
||||
inherit version;
|
||||
hash = "sha256-93VMfuq0QUQJXih7s6/LltaTbcP6Myz/Tl71UzuqGY8=";
|
||||
hash = "sha256-oT+0EmdsFk7ex8Lyb+Uqt7C3yGgWjazEKY9qgGkpjz0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-html5lib";
|
||||
version = "1.1.11.20250809";
|
||||
version = "1.1.11.20250917";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_html5lib";
|
||||
inherit version;
|
||||
hash = "sha256-eXbsdCa7AJmX3F4HK8o+2YjddH0Mv+CTx9+9PV7Iv1c=";
|
||||
hash = "sha256-e1J0M3fzP5tP1zha+9LUV7iGTuUfkP8qeVrZ6MBTNzo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ibus-chewing";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chewing";
|
||||
repo = "ibus-chewing";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-griEIWdIcnHrTcHTfF/a8QFigmnAZ36YmUVMvTLZ1x4=";
|
||||
hash = "sha256-3lNzQHuWFreIf4M6z4St5ZfOwjAJOMBLwzOI8KTCTEw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-libpinyin";
|
||||
version = "1.16.4";
|
||||
version = "1.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libpinyin";
|
||||
repo = "ibus-libpinyin";
|
||||
tag = version;
|
||||
hash = "sha256-ZIZ485Jk6LkFZ8TKEqlUeTZIIOZqo61uLQtPAfAX/Io=";
|
||||
hash = "sha256-3QZHovjzGifWLFVudCnJOwMn/M3Nzfn8CZ1HpQwzUVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1150,6 +1150,7 @@ mapAliases {
|
||||
### H ###
|
||||
|
||||
hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
|
||||
hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # added 2025-09-26
|
||||
haka = throw "haka has been removed because it failed to build and was unmaintained for 9 years"; # Added 2025-03-11
|
||||
hardinfo = throw "'hardinfo' has been removed as it was abandoned upstream. Consider using 'hardinfo2' instead."; # added 2025-04-17
|
||||
harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
|
||||
@@ -1236,6 +1237,7 @@ mapAliases {
|
||||
|
||||
### K ###
|
||||
|
||||
k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
|
||||
k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20
|
||||
k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01
|
||||
k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15
|
||||
|
||||
@@ -6033,7 +6033,7 @@ with pkgs;
|
||||
};
|
||||
python314FreeThreading = python314.override {
|
||||
self = python314FreeThreading;
|
||||
pythonAttr = "python313FreeThreading";
|
||||
pythonAttr = "python314FreeThreading";
|
||||
enableGIL = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -2258,6 +2258,8 @@ self: super: with self; {
|
||||
|
||||
bundlewrap-teamvault = callPackage ../development/python-modules/bundlewrap-teamvault { };
|
||||
|
||||
busylight-core = callPackage ../development/python-modules/busylight-core { };
|
||||
|
||||
busylight-for-humans = callPackage ../development/python-modules/busylight-for-humans { };
|
||||
|
||||
busypie = callPackage ../development/python-modules/busypie { };
|
||||
@@ -17624,6 +17626,8 @@ self: super: with self; {
|
||||
|
||||
starlink-grpc-core = callPackage ../development/python-modules/starlink-grpc-core { };
|
||||
|
||||
starsessions = callPackage ../development/python-modules/starsessions { };
|
||||
|
||||
stashy = callPackage ../development/python-modules/stashy { };
|
||||
|
||||
static3 = callPackage ../development/python-modules/static3 { };
|
||||
|
||||
Reference in New Issue
Block a user