Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2025-12-14 12:08:24 +00:00
committed by GitHub
47 changed files with 594 additions and 166 deletions
+5
View File
@@ -11190,6 +11190,11 @@
githubId = 3698237;
name = "ImUrX";
};
Inarizxc = {
name = "Inarizxc";
github = "Inarizxc";
githubId = 128096405;
};
inclyc = {
email = "i@lyc.dev";
github = "inclyc";
+13 -20
View File
@@ -72,6 +72,13 @@ in
'';
};
host = lib.mkOption {
type = types.str;
default = "127.0.0.1";
example = "0.0.0.0";
description = "The host address for Szurubooru to bind to.";
};
threads = mkOption {
type = types.int;
default = 4;
@@ -265,9 +272,6 @@ in
(lib.filterAttrsRecursive (_: x: x != null))
]
);
pyenv = python.buildEnv.override {
extraLibs = [ (python.pkgs.toPythonModule cfg.server.package) ];
};
in
{
description = "Server of Szurubooru, an image board engine dedicated for small and medium communities";
@@ -283,20 +287,9 @@ in
];
wants = [ "network-online.target" ];
environment = {
PYTHONPATH = "${pyenv}/${pyenv.sitePackages}/";
};
path =
with pkgs;
[
envsubst
ffmpeg_4-full
]
++ (with python.pkgs; [
alembic
waitress
]);
path = with pkgs; [
ffmpeg_4-full
];
script = ''
export SZURUBOORU_SECRET="$(<$CREDENTIALS_DIRECTORY/secret)"
@@ -307,10 +300,10 @@ in
install -m0640 ${cfg.server.package.src}/config.yaml.dist ${cfg.dataDir}/config.yaml.dist
touch ${cfg.dataDir}/config.yaml
chmod 0640 ${cfg.dataDir}/config.yaml
envsubst -i ${configFile} -o ${cfg.dataDir}/config.yaml
${lib.getExe pkgs.envsubst} -i ${configFile} -o ${cfg.dataDir}/config.yaml
sed 's|script_location = |script_location = ${cfg.server.package.src}/|' ${cfg.server.package.src}/alembic.ini > ${cfg.dataDir}/alembic.ini
alembic upgrade head
waitress-serve --port ${toString cfg.server.port} --threads ${toString cfg.server.threads} szurubooru.facade:app
${lib.getExe cfg.server.package.alembic} upgrade head
${lib.getExe cfg.server.package.waitress} --host ${cfg.server.host} --port ${toString cfg.server.port} --threads ${toString cfg.server.threads} szurubooru.facade:app
'';
serviceConfig = {
+1
View File
@@ -26,6 +26,7 @@ import ./make-test-python.nix (
server = {
port = 6666;
host = "127.0.0.1";
settings = {
domain = "http://127.0.0.1";
secretFile = pkgs.writeText "secret" "secret";
@@ -264,13 +264,13 @@
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
},
"datadog_datadog": {
"hash": "sha256-6VRifhAzLqgugh5oi2LgSWrJhhy3mPpQJSeaudAm/0g=",
"hash": "sha256-XN9Ae+6GZugtv4PdECdgiW6TJevaTaX3zkDDBifq4UU=",
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
"owner": "DataDog",
"repo": "terraform-provider-datadog",
"rev": "v3.81.0",
"rev": "v3.82.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-3fOhxvIEBbBLA/4Nbq/Qp3+ynNnFYclH3nGnV2vYvug="
"vendorHash": "sha256-dyCYlNdi6kaNYZToyiXw66AfDIeTgKAyQEtxh4wZ2Wo="
},
"datadrivers_nexus": {
"hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
@@ -489,13 +489,13 @@
"vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
},
"hashicorp_aws": {
"hash": "sha256-OP3vYRhNvq3pRkem2wWioc/jnjn0neFu40DDfIGHcXU=",
"hash": "sha256-KcNBOW9UHQFp0s/VFonraAmZ56yENWxlXqOFv0Iv8J8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
"rev": "v6.25.0",
"rev": "v6.26.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-WFhO48sN8sLRztMBZsGRzOEJO3gi6j5o6wfikiFwuJM="
"vendorHash": "sha256-XWHsAbvVMLVZCzMr2UlBb62fmKXTt/iczUI2pudiSLM="
},
"hashicorp_awscc": {
"hash": "sha256-+qcv9cCr5MraBa91x+iziMBK1Wdaq4lg0xbDBf3cmFE=",
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
version = "0-unstable-2025-12-03";
version = "0-unstable-2025-12-09";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "5a3820ed34f3ca149fd2aa7a795cf7aed4891374";
hash = "sha256-VLleaYgqpLXGDj762zQPQQeitWP/mtiEQ8ffx/9bUvA=";
rev = "96785149f069325c349f24c21c8dcfe83f0211f4";
hash = "sha256-eMWBvK/E/rH5iLKfMRAQx3UcD4gDZ8mEKe+oPUsQaNM=";
};
dontConfigure = true;
+2 -2
View File
@@ -9,13 +9,13 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "app2unit";
version = "1.1.2";
version = "1.2.1";
src = fetchFromGitHub {
owner = "Vladimir-csp";
repo = "app2unit";
tag = "v${finalAttrs.version}";
sha256 = "sha256-M2sitlrQNSLthSaDH+R8gUcZ8i+o1ktf2SB/vvjyJEI=";
sha256 = "sha256-DZ0W7SygOUmjIO0+K8hS9K1U+gSp1gA6Q15eXr6rOmo=";
};
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -9,20 +9,20 @@
}:
let
version = "2025.11.3";
version = "2025.12";
product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-Pju4aPHu1Po1049qOiOoKRU5CEdcvTiW0tXNRPoHP9A=";
hash = "sha256-6firazY0uyDBjdw8Qvs48xVXwy3MfCULtitb1gvGHQM=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-HZh+6jXdWMml4/sRu7KFXYfWmEsAkMFlKxdcghD9YPk=";
hash = "sha256-hvhS6JKISPeDp0L7ElI/BojitUp93TvuPgO4zKBJjnI=";
};
src = fetchurl {
+60
View File
@@ -0,0 +1,60 @@
{
lib,
makeWrapper,
rustPlatform,
fetchFromGitHub,
pkg-config,
wayland,
wayland-protocols,
libGL,
vulkan-loader,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chameleos";
version = "0.1.2";
src = fetchFromGitHub {
owner = "Treeniks";
repo = "chameleos";
tag = "v${finalAttrs.version}";
hash = "sha256-zCAYEtDYJm9A+HC9M2XLtz47q+6dcBOVPgh4lmp4z/k=";
};
cargoHash = "sha256-zBEu/T17W7dwz8jxnXm2NsHaVZo1wDFSW75yiYfRIoY=";
postPatch = ''
substituteInPlace build.rs --replace-fail '"git"' '"echo"'
'';
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
wayland
wayland-protocols
libGL
vulkan-loader
];
postInstall = ''
wrapProgram $out/bin/chameleos \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libGL
vulkan-loader
]
}
'';
meta = {
description = "Screen annotation tool for niri and Hyprland";
homepage = "https://github.com/Treeniks/chameleos";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ lonerOrz ];
mainProgram = "chameleos";
};
})
+43
View File
@@ -0,0 +1,43 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
pname = "chkbit";
version = "6.5.0";
src = fetchFromGitHub {
owner = "laktak";
repo = "chkbit";
tag = "v${finalAttrs.version}";
hash = "sha256-zf5UNpTsdTRym9B2xfuRIBl4Mpv97K+4VVbVPTEWFms=";
};
vendorHash = "sha256-hiXn7LmO4bYti9iufonQSLM1G0BZGB8u0QRqSYBvxNc=";
ldflags = [
"-s"
"-w"
"-X main.appVersion=${finalAttrs.version}"
];
# Tests expect binary to be in the source directory
preCheck = ''
ln -s ../go/bin/chkbit .
'';
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "version";
meta = {
description = "Check your files for data corruption and run quick file deduplication";
homepage = "https://github.com/laktak/chkbit";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ qubitnano ];
mainProgram = "chkbit";
};
})
+25
View File
@@ -0,0 +1,25 @@
{
fetchFromGitHub,
rustPlatform,
lib,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "disktui";
version = "1.2.0";
src = fetchFromGitHub {
owner = "Maciejonos";
repo = "disktui";
tag = "v${finalAttrs.version}";
hash = "sha256-FDpdOpyvdU2Uw22am/Vkdls+s6ZdmodNt3WAQd8L53I=";
};
cargoHash = "sha256-CBSd/zeThyhmsaKx8Pg+u14QEQVq5nPLcRKet9n8WC8=";
meta = {
description = "TUI for disk management on Linux";
homepage = "https://github.com/Maciejonos/disktui";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Inarizxc ];
platforms = lib.platforms.linux;
mainProgram = "disktui";
};
})
+2 -2
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "hacompanion";
version = "1.0.23";
version = "1.0.24";
src = fetchFromGitHub {
owner = "tobias-kuendig";
repo = "hacompanion";
rev = "v${version}";
hash = "sha256-C86XRgNwR0VD0Dph4D7ysB9ul6fBw1MTK++ODsJrE8k=";
hash = "sha256-Lzy25tay8PJvEtZURLec5366nWJElI8D7oDckZmIEoU=";
};
vendorHash = "sha256-y2eSuMCDZTGdCs70zYdA8NKbuPPN5xmnRfMNK+AE/q8=";
+2 -2
View File
@@ -24,7 +24,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.96.0";
version = "1.97.0";
pyproject = false;
src = fetchFromGitea {
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
tag = "v${version}";
hash = "sha256-ReWAHvB5SkSjYnLex9QML8VVwCVKeEkk1tQ2AY/SM7Y=";
hash = "sha256-rwaqWf3WupTcwHz2NPBl5/UNYoFV3cwGmIMyrxHUav4=";
};
nativeBuildInputs = [
+3
View File
@@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
libiconv,
nix-update-script,
}:
stdenv.mkDerivation {
@@ -44,6 +45,8 @@ stdenv.mkDerivation {
runHook postInstall
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "Lightweight lossless file minifier/optimizer";
longDescription = ''
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau";
version = "0.702";
version = "0.703";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
tag = finalAttrs.version;
hash = "sha256-XHktbCz70b3+o66vq1AKBKbZbmHIyT+1Usub82hSvc0=";
hash = "sha256-guAHyy8sqncpMOa6VmbOB4Hg8vXJT121MaxQ+iWl25k=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "numr";
version = "0.1.8";
version = "0.2.0";
src = fetchFromGitHub {
owner = "nasedkinpv";
repo = "numr";
rev = "v${finalAttrs.version}";
hash = "sha256-FcvXhgao8l5vBggziAMmvmxKZ1uIr8UDyk64RTohYMg=";
hash = "sha256-Qy0HIG2E7d7QU19XQAAWodJdAglaCSFM+IeDCnvpzww=";
};
cargoHash = "sha256-LHTAhGHc0hnq1lzYkQhAO3VhwbzVi0vN1D6VBgEV/Js=";
cargoHash = "sha256-iXUIf2G00qYgwHZ70Egzu0RginOjKVgidkMhjPwEIT4=";
nativeBuildInputs = [
pkg-config
+168
View File
@@ -0,0 +1,168 @@
# generated by zon2nix (https://github.com/Cloudef/zig2nix)
{
lib,
linkFarm,
fetchurl,
fetchgit,
runCommandLocal,
zig,
name ? "zig-packages",
}:
with builtins;
with lib;
let
unpackZigArtifact =
{ name, artifact }:
runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig =
{
name,
url,
hash,
}:
let
artifact = fetchurl { inherit url hash; };
in
unpackZigArtifact { inherit name artifact; };
fetchGitZig =
{
name,
url,
hash,
rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
}:
let
parts = splitString "#" url;
url_base = elemAt parts 0;
url_without_query = elemAt (splitString "?" url_base) 0;
in
fetchgit {
inherit name rev hash;
url = url_without_query;
deepClone = false;
};
fetchZigArtifact =
{
name,
url,
hash,
...
}@args:
let
parts = splitString "://" url;
proto = elemAt parts 0;
path = elemAt parts 1;
fetcher = {
"git+http" = fetchGitZig (
args
// {
url = "http://${path}";
}
);
"git+https" = fetchGitZig (
args
// {
url = "https://${path}";
}
);
http = fetchZig {
inherit name hash;
url = "http://${path}";
};
https = fetchZig {
inherit name hash;
url = "https://${path}";
};
};
in
fetcher.${proto};
in
linkFarm name [
{
name = "imgz-0.2.0-BqHzkKdnCwCNWVkntlBIrAD-_DByuc4fQQN7xy0pB-D6";
path = fetchZigArtifact {
name = "imgz";
url = "git+https://github.com/shreyassanthu77/imgz.git#0ab36f0649772a5dd93d9eab9e7a8a22082a9256";
hash = "sha256-JuYja284173noSQ4r8FkUuVasw7o8eqpRdrd+p7RYRU=";
rev = "0ab36f0649772a5dd93d9eab9e7a8a22082a9256";
};
}
{
name = "N-V-__8AAModCAATNPKPcCapFcZFQHw0a8VjUyjAokEkvmW7";
path = fetchZigArtifact {
name = "spng_upstream";
url = "https://github.com/randy408/libspng/archive/refs/tags/v0.7.4.zip";
hash = "sha256-eokGtSeXby2SYlRVg1HpKosinTLwMwBInGnzGI0xyG4=";
};
}
{
name = "N-V-__8AAPdUlQAUAx3gzEYFfTSNog15JPi1d6S5uDyDt-qA";
path = fetchZigArtifact {
name = "libjpeg_turbo_upstream";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.2.zip";
hash = "sha256-bgBBn9o4FVDeGE2jxmIEHnvhEgL4Cj7Bd5VNVSIcJ1c=";
};
}
{
name = "N-V-__8AAM5leQDoUCIdk0aoRB23XUlXRCDajkBojfoAcK9q";
path = fetchZigArtifact {
name = "libtiff_upstream";
url = "https://gitlab.com/libtiff/libtiff/-/archive/57dd777d7f4ec687e067dc51ec99877e774b57fe/libtiff-57dd777d7f4ec687e067dc51ec99877e774b57fe.tar.gz";
hash = "sha256-ylvL3HHDXhuKy2SI/4U2BZka5w/GBqSSSOhvKp4fhd0=";
};
}
{
name = "zlib-1.3.1-ZZQ7lbYMAAB1hTSOKSXAKAgHsfDcyWNH_37ojw5WSpgR";
path = fetchZigArtifact {
name = "zlib";
url = "git+https://github.com/allyourcodebase/zlib#61e7df7e996ec5a5f13a653db3c419adb340d6ef";
hash = "sha256-Z9TlunK+ISlTPbudB63dpkGeQO+5epGdAI4qfBd9ra0=";
rev = "61e7df7e996ec5a5f13a653db3c419adb340d6ef";
};
}
{
name = "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o";
path = fetchZigArtifact {
name = "zlib";
url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz";
hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw=";
};
}
{
name = "zstd-1.5.7-KEItkJ8vAAC5_rRlKmLflYQ-eKXbAIQBWZNmmJtS18q0";
path = fetchZigArtifact {
name = "zstd";
url = "git+https://github.com/allyourcodebase/zstd.git?ref=1.5.7#01327d49cbc56dc24c20a167bb0055d7fc23de84";
hash = "sha256-1w+hR2U9t6R4sNvUMynDsYO0sNAan2svjxjUvxT+x6A=";
rev = "01327d49cbc56dc24c20a167bb0055d7fc23de84";
};
}
{
name = "N-V-__8AAGxifwAAGwXwvsnl_aOXFGLZTeYCu0WBhuEXr96u";
path = fetchZigArtifact {
name = "zstd";
url = "git+https://github.com/facebook/zstd.git?ref=v1.5.7#f8745da6ff1ad1e7bab384bd1f9d742439278e99";
hash = "sha256-tNFWIT9ydfozB8dWcmTMuZLCQmQudTFJIkSr0aG7S44=";
rev = "f8745da6ff1ad1e7bab384bd1f9d742439278e99";
};
}
{
name = "N-V-__8AAAgPfAB2dLHqe8Vw--VN8ULPqqYFewfk4tobT8ov";
path = fetchZigArtifact {
name = "libwebp_upstream";
url = "git+https://github.com/webmproject/libwebp.git#23359a1039d054b6e46ca97fa8789a755457fbd5";
hash = "sha256-CrFA9utsqHc5UE8ue6yqMTlUQCjFDpOMYPK6aB0dRd4=";
rev = "23359a1039d054b6e46ca97fa8789a755457fbd5";
};
}
]
+50
View File
@@ -0,0 +1,50 @@
{
lib,
stdenv,
installShellFiles,
fetchFromGitHub,
zig_0_15,
callPackage,
versionCheckHook,
nasm,
}:
let
zig = zig_0_15;
in
stdenv.mkDerivation (finalAttrs: {
pname = "odiff";
version = "4.3.2";
src = fetchFromGitHub {
owner = "dmtrKovalenko";
repo = "odiff";
tag = "v${finalAttrs.version}";
hash = "sha256-gCF+CInczBJfDyZgxEQor5C/OSxKciCu9gbZanaE/nA=";
};
postPatch = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
nativeBuildInputs = [
installShellFiles
zig.hook
nasm
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
meta = {
homepage = "https://github.com/dmtrKovalenko/odiff";
description = "SIMD-first image comparison library";
changelog = "https://github.com/dmtrKovalenko/odiff/releases";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ddogfoodd ];
platforms = lib.platforms.linux;
mainProgram = "odiff";
};
})
+2 -2
View File
@@ -9,12 +9,12 @@
}:
buildGoModule (finalAttrs: {
pname = "optnix";
version = "0.3.0";
version = "0.3.1";
src = fetchFromSourcehut {
owner = "~watersucks";
repo = "optnix";
tag = "v${finalAttrs.version}";
hash = "sha256-kPCRCnjuKZd6RE5pkQJMYWpexnMyhUy9jrBFSztkiLM=";
hash = "sha256-fjEtC0GlTsxS6cMNJgaXkI5ik8fZPoPFy43XLIEUUPI=";
};
vendorHash = "sha256-g/H91PiHWSRRQOkaobw2wAYX/07DFxWTCTlKzf7BT1Y=";
@@ -38,15 +38,15 @@ let
unsupportedDeviceIds = lib.removeAttrs deviceIds (lib.attrNames supportedDeviceIds);
componentHashes = {
"arria_lite" = "sha256-ASvi9YX15b4XXabGjkuR5wl9wDwCijl8s750XTR/4XU=";
"cyclone" = "sha256-iNA4S5mssffgn29NUhibJk6iKnmJ+vG9LYY3W+nnqcI=";
"cyclone10lp" = "sha256-247yR2fm5A3LWRjePJU99z1NBYziV8WkPL05wHJ4Z1Q=";
"cyclonev" = "sha256-Fa1PQ3pp9iTPYQljeKGyxHIXHaSolJZR8vXVb3gEN7g=";
"max" = "sha256-lAA1CgSfAjfilLDhRzfU2OkzGAChk7TMFckeboMB4mI=";
"max10" = "sha256-edycBj0P3qwLN2YS//QpCHQeGOW8WM0RqTIWdGAkEv8=";
"arria_lite" = "sha256-Epxvu1z7Z4vQWASIYEJAy5P7Meee114ZNVIAZnmTEH8=";
"cyclone" = "sha256-lKOYy61BHxY4OyonxADg6d7IGwckGX8zu0x6dpGB5Lo=";
"cyclone10lp" = "sha256-lurSlhCuE6i2ULKNFvlWNtk6rqdvVwREC607HbMSH2I=";
"cyclonev" = "sha256-1uSE/RsKR3hbyLzTGOQn1Ml5j5J26e+SmFI1hl9ry28=";
"max" = "sha256-jY/b906fJKgJOL3h5nWR5RQdvAJ3U9of6y4VopGo2z0=";
"max10" = "sha256-gFeESwuRwrp+8rN7GYbRmOxPGDHMm+ClLRjl/rTBnOk=";
};
version = "24.1std.0.1077";
version = "25.1std.0.1129";
download =
{ name, sha256 }:
@@ -60,12 +60,12 @@ let
[
{
name = "QuartusLiteSetup-${version}-linux.run";
sha256 = "sha256-NFWT1VWcb3gun7GhpPbHzR3SIYBMpK40jESXS/vC5II=";
sha256 = "sha256-UYQz7H3NYXJVYK9lM1P3pcMgzOnlKLInR7io3zZ0xOs=";
}
]
++ lib.optional withQuesta {
name = "QuestaSetup-${version}-linux.run";
sha256 = "sha256-4+Y34UiJwenlIp/XKzMs+2aYZt/Y6XmNmiYyXVmOQkc=";
sha256 = "sha256-0F7psE+jTimCoy+UVJRgxNC6GEVdY/PJu49hf+D7T3U=";
}
);
components = map (
+1
View File
@@ -34,6 +34,7 @@ maven.buildMavenPackage rec {
desktopName = "RuneLite";
genericName = "Oldschool Runescape";
categories = [ "Game" ];
startupWMClass = "net-runelite-client-RuneLite";
};
# tests require internet :(
+2 -2
View File
@@ -20,14 +20,14 @@
python3Packages.buildPythonApplication rec {
pname = "sc-controller";
version = "0.5.4";
version = "0.5.5";
format = "setuptools";
src = fetchFromGitHub {
owner = "C0rn3j";
repo = "sc-controller";
tag = "v${version}";
hash = "sha256-7rSsRoxFCXSHSIIoBrIPPY+4/+M99Hdop8+EeryJues=";
hash = "sha256-IQxHa0bR8FWad9v5DfvXHskwayCgzbJm5ekzf1sjfiQ=";
};
nativeBuildInputs = [
+6 -3
View File
@@ -36,14 +36,17 @@ stdenv.mkDerivation rec {
--replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
'';
# On Darwin, non-static build segfaults on python module import.
# See: https://github.com/NixOS/nixpkgs/issues/466092
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"-DSPM_ENABLE_SHARED=OFF"
];
meta = {
homepage = "https://github.com/google/sentencepiece";
description = "Unsupervised text tokenizer for Neural Network-based text generation";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ pashashocky ];
# sentencepiece 0.2.1 segfaults on darwin when instantiated
# See https://github.com/NixOS/nixpkgs/issues/466092
badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
};
}
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
yasm,
versionCheckHook,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "svt-vp9";
version = "0.3.1";
src = fetchFromGitHub {
owner = "OpenVisualCloud";
repo = "SVT-VP9";
tag = "v${finalAttrs.version}";
hash = "sha256-M7XpHCqTxGgk/UOlMR0jEXist6vGie6abRYLnVvC6sg=";
};
outputs = [
"bin"
"out"
"dev"
];
nativeBuildInputs = [
cmake
ninja
yasm
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "VP9-compliant encoder targeting performance levels applicable to both VOD and live video applications";
changelog = "https://github.com/OpenVisualCloud/SVT-VP9/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/OpenVisualCloud/SVT-VP9";
license = lib.licenses.bsd2Patent;
maintainers = with lib.maintainers; [
niklaskorz
];
mainProgram = "SvtVp9EncApp";
platforms = [ "x86_64-linux" ];
};
})
+3 -3
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "syshud";
version = "0-unstable-2025-12-06";
version = "0-unstable-2025-12-09";
src = fetchFromGitHub {
owner = "System64fumo";
repo = "syshud";
rev = "f1e13091544e37ea276f219361348936bf4a272c";
hash = "sha256-6lVS6sjK16194uH9raPJwkOZIOjgYVfYU2DK2Ruio1c=";
rev = "52b828850c8f761106ed47d03c6c45b1a48d5d94";
hash = "sha256-FX5PsZIhIlC9WGuw1dR6BOBtdNj6StDsjQEWOZp+Fik=";
};
postPatch = ''
+5 -3
View File
@@ -1,13 +1,15 @@
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2ba2d317..9758074b 100644
index 92c50e4e..67a306eb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,7 +162,7 @@ importers:
@@ -156,8 +156,8 @@ importers:
specifier: ^22.13.4
version: 22.13.13
'@types/react':
- specifier: 18.3.1
- version: 18.3.1
+ specifier: 19.0.12
version: 19.0.12
+ version: 19.0.12
'@types/react-dom':
specifier: 18.3.1
version: 18.3.1
+3 -3
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vencord";
version = "1.13.6";
version = "1.13.8";
src = fetchFromGitHub {
owner = "Vendicated";
repo = "Vencord";
tag = "v${finalAttrs.version}";
hash = "sha256-QY23r5URr0yDuZXamnW7Nrp+GAJOZ2Q+yZiyEHB8+o8=";
hash = "sha256-qVR5LcRWuh5KUoK0VRTpjEK3Er8VNjb71NP5G3RSDQM=";
};
patches = [ ./fix-deps.patch ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
(pnpm_10.fetchDeps {
inherit (finalAttrs) pname src;
fetcherVersion = 2;
hash = "sha256-5MjxEs+jbowJJbJ9+Z+vppFImpB+PZzEhntwRAgv+xM=";
hash = "sha256-M9yZxBtuZg5KwG2Sli+f6Ionwccq7F7tI8/FnP1iObA=";
}).overrideAttrs
{ inherit (finalAttrs) patches postPatch; };
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "alexapy";
version = "1.29.11";
version = "1.29.12";
pyproject = true;
src = fetchFromGitLab {
owner = "keatontaylor";
repo = "alexapy";
tag = "v${version}";
hash = "sha256-czg3g1dsHBQbbSeXmLrU28eo66Ph9FYx/q4nyR2BZL4=";
hash = "sha256-F1D3+evsuWKz/tAVxJj6bq36vO+Bn137EcRM5cnngTo=";
};
pythonRelaxDeps = [ "aiofiles" ];
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "awsiotsdk";
version = "1.26.0";
version = "1.27.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-FK/Sy2zxWqrLmBiJO80PdBp/NJWV9OujFffCk7CG7jk=";
hash = "sha256-CafecTMRNIKQ2FB13SLJwtYwysNMG5DYl2xfHnejApU=";
};
postPatch = ''
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "bloodyad";
version = "2.5.0";
version = "2.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "CravateRouge";
repo = "bloodyAD";
tag = "v${version}";
hash = "sha256-WKD8R1pH1dIAxMIM2SLPV+AoFi3z1O96U8XK2QyVYxQ=";
hash = "sha256-qz7jhFBkJdIDnnGOz4SvDI/YcSXdP7B1FPKxaGRJRWE=";
};
pythonRelaxDeps = [ "cryptography" ];
@@ -10,7 +10,6 @@
pytest-mock,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
requests,
requests-mock,
responses,
@@ -20,16 +19,14 @@
buildPythonPackage rec {
pname = "censys";
version = "2.2.18";
version = "2.2.19";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "censys";
repo = "censys-python";
tag = "v${version}";
hash = "sha256-fHqDXqhjqfj8VBb7Od7wuUXAEHQBXwm5LAUPLM0oN2Q=";
hash = "sha256-3eQtGCIKtjpDWfyrIEPZnA6xLMNl0cg61wh0nuwNwh4=";
};
build-system = [ poetry-core ];
@@ -67,19 +67,19 @@
buildPythonPackage rec {
pname = "chromadb";
version = "1.3.5";
version = "1.3.6";
pyproject = true;
src = fetchFromGitHub {
owner = "chroma-core";
repo = "chroma";
tag = version;
hash = "sha256-pIVoPW7Sdc3XN66SuA6IILQkhoNwqy/X4OWgW08CC58=";
hash = "sha256-J1IhFF8HPpWfYmIaU1mot1dcuGyQm+IfE7goThaC9F0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-3cY9d28dE7Ndh0o1MiBLSwRggkjjnXRcnmsvC2t5S7A=";
hash = "sha256-hjN+pHMTWin6oXpy3PiH9rrRfM4P/KJ2VyenJHkWAkI=";
};
# Can't use fetchFromGitHub as the build expects a zipfile
@@ -216,6 +216,9 @@ buildPythonPackage rec {
# No such file or directory: 'openssl'
"test_ssl_self_signed_without_ssl_verify"
"test_ssl_self_signed"
# https://github.com/chroma-core/chroma/issues/6029
"test_embedding_function_config_roundtrip"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Fails in nixpkgs-review on Darwin due to concurrent copies running and the lack of network namespaces.
@@ -236,6 +239,10 @@ buildPythonPackage rec {
# ValueError: An instance of Chroma already exists for ephemeral with different settings
"chromadb/test/test_chroma.py"
# pytest can't tell which test_schema.py to load
# https://github.com/chroma-core/chroma/issues/6031
"chromadb/test/property/test_schema.py"
];
__darwinAllowLocalNetworking = true;
@@ -1,6 +1,5 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
@@ -38,12 +37,8 @@ buildPythonPackage rec {
numpy
pyside6
pyyaml
tqdm
]
# Sentencepiece is optional and its inclusion crashes darwin
# See https://github.com/NixOS/nixpkgs/issues/466092
++ lib.optionals stdenv.hostPlatform.isLinux [
sentencepiece
tqdm
];
nativeCheckInputs = [ pytestCheckHook ];
@@ -2,14 +2,16 @@
buildPythonPackage,
lib,
fetchurl,
fetchpatch,
stdenv,
boost,
boost189,
cairomm,
cgal,
expat,
gmp,
fontconfig,
gobject-introspection,
graphviz,
gtk3,
llvmPackages,
matplotlib,
@@ -21,11 +23,22 @@
python,
scipy,
sparsehash,
zstandard,
gitUpdater,
}:
let
boost' = boost.override {
boost' = boost189.override {
patches = [
# required to build against Clang >= 21 (https://github.com/boostorg/lexical_cast/pull/87)
# TODO: drop when upgrading to Boost >= 1.90
(fetchpatch {
name = "Reduce-dependency-on-Boost.TypeTraits-now-that-C-11-.patch";
url = "https://github.com/boostorg/lexical_cast/commit/8fc8a19931c8cb452400af907959fdacbbdd8ec1.patch";
relative = "include";
hash = "sha256-OO39ejR+I5ufjqinrMJ6HgjTE7Ph+XBu50PqcIKaIQo=";
})
];
enablePython = true;
inherit python;
};
@@ -33,50 +46,77 @@ in
buildPythonPackage rec {
pname = "graph-tool";
version = "2.98";
format = "other";
pyproject = false;
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
hash = "sha256-7vGUi5N/XwQ3Se7nX+DG1+jwNlUdlF6dVeN4cLBsxSc=";
};
postPatch = ''
postPatch =
# remove error messages about tput during build process without adding ncurses
substituteInPlace configure \
--replace-fail 'tput setaf $1' : \
--replace-fail 'tput sgr0' :
'';
''
substituteInPlace configure \
--replace-fail 'tput setaf $1' : \
--replace-fail 'tput sgr0' :
''
+
# hardcode path to graphviz library to avoid find_library, which would require setting LD_LIBRARY_PATH
''
substituteInPlace src/graph_tool/draw/graphviz_draw.py \
--replace-fail \
'ctypes.util.find_library("gvc")' \
'"${lib.getLib graphviz}/lib/libgvc${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
"--with-boost-libdir=${boost'}/lib"
"--with-cgal=${cgal}"
];
configureFlags =
lib.mapAttrsToList (lib.withFeatureAs true) {
boost-libdir = "${lib.getLib boost'}/lib";
cgal = lib.getDev cgal;
python-module-path = "$(out)/${python.sitePackages}";
}
++
lib.optionals stdenv.cc.isGNU
# enable GCC's link-time optimizer in order to reduce compilation time and memory usage during compilation
# https://graph-tool.skewed.de/installation.html#memory-requirements-for-compilation
# https://git.skewed.de/count0/graph-tool/-/issues/798#note_5626
[ "MOD_CXXFLAGS=-flto" ];
enableParallelBuilding = true;
build-system = [ pkg-config ];
nativeBuildInputs = [ pkg-config ];
# https://graph-tool.skewed.de/installation.html#manual-compilation
dependencies = [
buildInputs = [
boost'
cairomm
cgal
expat
gmp
gobject-introspection
gtk3
matplotlib
mpfr
numpy
pycairo
pygobject3
scipy
sparsehash
]
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
pythonImportsCheck = [ "graph_tool" ];
dependencies = [
gtk3
matplotlib
numpy
pycairo
pygobject3
scipy
zstandard
];
propagatedNativeBuildInputs = [ gobject-introspection ];
preInstallCheck =
# avoid warnings about Matplotlib and Fontconfig configuration issues
''
export HOME=$(mktemp -d)
export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
'';
pythonImportsCheck = [ "graph_tool.all" ];
passthru.updateScript = gitUpdater {
url = "https://git.skewed.de/count0/graph-tool";
@@ -1,6 +1,5 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
@@ -15,6 +14,7 @@
pydantic,
pydantic-extra-types,
requests,
sentencepiece,
tiktoken,
typing-extensions,
@@ -26,7 +26,6 @@
pycountry,
pydantic-settings,
pytestCheckHook,
sentencepiece,
soundfile,
soxr,
uvicorn,
@@ -54,6 +53,7 @@ buildPythonPackage rec {
pydantic
pydantic-extra-types
requests
sentencepiece
tiktoken
typing-extensions
];
@@ -62,8 +62,7 @@ buildPythonPackage rec {
opencv = [
opencv-python-headless
];
# Broken on Darwin. See https://github.com/NixOS/nixpkgs/issues/466092
sentencepiece = lib.optionals (!stdenv.hostPlatform.isDarwin) [
sentencepiece = [
sentencepiece
];
soundfile = [
@@ -98,8 +97,7 @@ buildPythonPackage rec {
soundfile
soxr
uvicorn
]
++ lib.concatAttrValues optional-dependencies;
];
disabledTests = [
# Require internet
@@ -114,20 +112,6 @@ buildPythonPackage rec {
"test_openai_chat_fields"
];
# Requires sentencepiece which segfaults when initialized on Darwin
# See https://github.com/NixOS/nixpkgs/issues/466092
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
"tests/experimental/test_app.py"
"tests/experimental/test_tools.py"
"tests/test_fim_tokenizer.py"
"tests/test_integration_samples.py"
"tests/test_mistral_tokenizer.py"
"tests/test_tokenize_v1.py"
"tests/test_tokenize_v2.py"
"tests/test_tokenize_v3.py"
"tests/test_tokenizer_v7.py"
];
meta = {
description = "Tools to help you work with Mistral models";
homepage = "https://github.com/mistralai/mistral-common";
@@ -17,12 +17,12 @@
buildPythonPackage rec {
pname = "nitrokey";
version = "0.4.1";
version = "0.4.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-m351pDLMuZaddbUqJz5r/ljz/vVq+RBDGk4xskc3HCk=";
hash = "sha256-ZyB5gNZc5HxohZypc/198PPBxqG9URscQfXYAWzs7n8=";
};
pythonRelaxDeps = [ "protobuf" ];
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pyexploitdb";
version = "0.3.4";
version = "0.3.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-62uayIMtvFWX0SYHT0jz18wsIiRp/R7D6DNhOsCbT3s=";
hash = "sha256-YRiC4k1kJqswUsNAVcSFq5S5gPZZygT7DZO1r4X0fBY=";
};
build-system = [ setuptools ];
@@ -90,10 +90,5 @@ buildPythonPackage rec {
homepage = "https://github.com/meta-pytorch/tokenizers";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ GaetanLepage ];
badPlatforms = [
# sentencepiece 0.21.0 segfaults when initialized on Darwin
# See https://github.com/NixOS/nixpkgs/issues/466092
lib.systems.inspect.patterns.isDarwin
];
};
}
@@ -12,22 +12,19 @@
pydantic,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
urllib3,
}:
buildPythonPackage rec {
pname = "qdrant-client";
version = "1.16.1";
version = "1.16.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "qdrant";
repo = "qdrant-client";
tag = "v${version}";
hash = "sha256-YRBSSYF+XnPkpc3WjCrSxsJ27CsgEY8GWqSbaT4p6Sw=";
hash = "sha256-sOZDQmwiTz3lZ1lR0xJDxMmNc5QauWLJV5Ida2INibY=";
};
build-system = [ poetry-core ];
@@ -16,8 +16,8 @@ buildPythonPackage {
# Pypi source package doesn't contain tests
src = fetchFromGitHub {
owner = "dorianbrown";
repo = "rank-bm25";
rev = version;
repo = "rank_bm25";
tag = version;
hash = "sha256-+BxQBflMm2AvCLAFFj52Jpkqn+KErwYXU1wztintgOg=";
};
@@ -11,19 +11,19 @@
buildPythonPackage rec {
pname = "ruff-api";
version = "0.2.0";
version = "0.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "amyreese";
repo = "ruff-api";
tag = "v${version}";
hash = "sha256-+tGBaHEau2OjAjj452wEAQ4gyxczg6Fb+NJ42oIkKQY=";
hash = "sha256-4ekNPgOOqRIVjIR8LNSALE7fByjMEn8y25y9Rdvf+ms=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-cpW2XsrQvFC5wkGF8hBQ7xFp5oLEJpbHuHBLi6VFkEo=";
hash = "sha256-SqouHcEDehxNnNPdrkDUYx8AieHiPMs04RgrkdqYcpU=";
};
nativeBuildInputs = [
@@ -15,6 +15,8 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/python";
pythonImportsCheck = [ "sentencepiece" ];
# sentencepiece installs 'bin' output.
meta = removeAttrs sentencepiece.meta [ "outputsToInstall" ];
}
@@ -67,9 +67,5 @@ buildPythonPackage rec {
changelog = "https://github.com/speechbrain/speechbrain/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
badPlatforms = [
# See https://github.com/NixOS/nixpkgs/issues/466092
lib.systems.inspect.patterns.isDarwin
];
};
}
@@ -119,10 +119,5 @@ buildPythonPackage rec {
changelog = "https://github.com/meta-pytorch/torchtune/releases/tag/${src.tag}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ GaetanLepage ];
badPlatforms = [
# sentencepiece 0.21.0 segfaults when initialized on Darwin
# See https://github.com/NixOS/nixpkgs/issues/466092
lib.systems.inspect.patterns.isDarwin
];
};
}
@@ -364,13 +364,13 @@
buildPythonPackage rec {
pname = "types-aiobotocore";
version = "2.26.0.post2";
version = "3.0.0";
pyproject = true;
src = fetchPypi {
pname = "types_aiobotocore";
inherit version;
hash = "sha256-aOvl6d4yAUQuVjWa8YJJPi5kLoVakTOlkYNSy/WsTi0=";
hash = "sha256-i5mMof92tnZ72hgKk7C1D8j24V5HzcmYZ6XvRMnXM1Q=";
};
build-system = [ setuptools ];
+2 -1
View File
@@ -14,7 +14,8 @@ let
};
in
lib.recurseIntoAttrs {
lib.recurseIntoAttrs rec {
client = callPackage ./client.nix { inherit src version; };
server = callPackage ./server.nix { inherit src version; };
inherit (server) tests;
}
+15 -1
View File
@@ -6,6 +6,7 @@
fetchPypi,
python3,
ffmpeg_4-full,
szurubooru,
}:
let
@@ -53,7 +54,6 @@ python.pkgs.buildPythonApplication {
nativeBuildInputs = with python.pkgs; [ setuptools ];
propagatedBuildInputs = with python.pkgs; [
alembic
certifi
coloredlogs
legacy-cgi
@@ -80,6 +80,20 @@ python.pkgs.buildPythonApplication {
passthru.tests.szurubooru = nixosTests.szurubooru;
# Database migration. Needs the szurubooru server in its environment for the
# migration to complete successfully.
passthru.alembic = python.pkgs.alembic.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
szurubooru.server
];
});
# Waitress is used to run the serer.
passthru.waitress = python.pkgs.waitress.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
szurubooru.server
];
});
meta = {
description = "Server of szurubooru, an image board engine for small and medium communities";
homepage = "https://github.com/rr-/szurubooru";
+1 -1
View File
@@ -6444,7 +6444,7 @@ self: super: with self; {
granian = callPackage ../development/python-modules/granian { };
graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal; };
graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal graphviz; };
grapheme = callPackage ../development/python-modules/grapheme { };