Merge master into staging-nixos
This commit is contained in:
@@ -26,6 +26,9 @@ Sandro Jäckel <sandro.jaeckel@gmail.com>
|
||||
Sandro Jäckel <sandro.jaeckel@gmail.com> <sandro.jaeckel@sap.com>
|
||||
superherointj <5861043+superherointj@users.noreply.github.com>
|
||||
Tomodachi94 <tomodachi94@protonmail.com> Tomo <68489118+Tomodachi94@users.noreply.github.com>
|
||||
toastal <toastal@posteo.net>
|
||||
toastal <toastal@posteo.net> <561087+toastal@users.noreply.github.com>
|
||||
toastal <toastal@posteo.net> <toastal@protonmail.com>
|
||||
Vladimír Čunát <v@cunat.cz> <vcunat@gmail.com>
|
||||
Vladimír Čunát <v@cunat.cz> <vladimir.cunat@nic.cz>
|
||||
Yifei Sun <ysun@hey.com>
|
||||
|
||||
@@ -30,7 +30,7 @@ let
|
||||
};
|
||||
|
||||
imageFile = mkOption {
|
||||
type = with types; nullOr package;
|
||||
type = with types; nullOr pathInStore;
|
||||
default = null;
|
||||
description = ''
|
||||
Path to an image file to load before running the image. This can
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
# https://github.com/nianeyna/ao3downloader/blob/f8399bb8aca276ae7359157b90afd13925c90056/pyproject.toml#L8
|
||||
python312Packages.buildPythonApplication rec {
|
||||
pname = "ao3downloader";
|
||||
version = "2025.6.1";
|
||||
version = "2025.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nianeyna";
|
||||
repo = "ao3downloader";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ukS3uku8OW5nhM2Nr0IxAiG03XfqUn/Xyd0lZDGGkWw=";
|
||||
hash = "sha256-EXoDUeadR25XpUNkXIALbZOqUJIdTNdbfYZoVwgZq7U=";
|
||||
};
|
||||
|
||||
build-system = with python312Packages; [
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "2.15.0";
|
||||
version = "2.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rHum5wQFQ3MuPCelJYzPo5ce4vlHA34ARgSQ6uJTE60=";
|
||||
hash = "sha256-REK3rJ+Svf6bLIfLwizlLa3rIBgnhQHbhzTTe8VPoc4=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-copilot-cli";
|
||||
version = "0.0.365";
|
||||
version = "0.0.367";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-tOsF3B1GB7/Gs9E8dw/P2SCcrmjIjYj/kfP6wWqBEUA=";
|
||||
hash = "sha256-RkJLklYZx1xWuRpxbZQDLPvRbfSbI6JhBZAswfyN+zk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gitlogue";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unhappychoice";
|
||||
repo = "gitlogue";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SkdyOEMN4neW/KHf5nuBh3e5CJ2Vrul/1ydOhpK1Rdg=";
|
||||
hash = "sha256-OKRgtWa1HbUgczuS0EdMgosuKPaZJhzIfjwKZAAaBCs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RIs7pf+S01nupYzOIferlh+c/NuNHgBTspx+9MGl33g=";
|
||||
cargoHash = "sha256-cq1bjOxuGJDRLoO0p5tmGF4IjUojXF52p/n6mugPdPg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "harsh";
|
||||
version = "0.11.3";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wakatara";
|
||||
repo = "harsh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mQhBQFDint6ZlS5yQ9oGLJVxmol9p+st9X7wRCBuc/g=";
|
||||
hash = "sha256-/NgYjw/euTD55Ao91JL9og2FvHEYhDyT7mmPnJzoH4o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+yHIpUttvrdiTt0IuMTT4iCN34hNOb3JjZTmi5qb8yI=";
|
||||
vendorHash = "sha256-dGHEP5OYr/t2JNhfIHKGXJMl8OJS5FJPXsDQXa1AiEA=";
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "liske";
|
||||
repo = "ifstate";
|
||||
tag = version;
|
||||
hash = "sha256-p96wyvKDTckdUnPpZB2LS/c/d2OJA7iE+iH2QtvpVy4=";
|
||||
hash = "sha256-gDeMVnseOLBGpyyjE/L60ujp0LZGf3uzlKfPiQB4VHA=";
|
||||
};
|
||||
docs = stdenv.mkDerivation {
|
||||
pname = "ifstate-docs";
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "OpenSC";
|
||||
repo = "libp11";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-teYXlPtCt6ifQDArbCJWGrYl9pdr6V7HVpU4HXTPIco=";
|
||||
sha256 = "sha256-xH5Ic8HpWB5O2MWXf2A9FUiV10VZajDdPqEVF0Hs6u0=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nebula";
|
||||
version = "1.9.7";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackhq";
|
||||
repo = "nebula";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-U6PCHRSETkrA/nulTqIn9vvj3zks10kJ1k2syFsPMnM=";
|
||||
hash = "sha256-p/2A1ZTBUPvrA8eAgLxjR7NSAfiIEkDcjX0Db8dCmfQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA=";
|
||||
vendorHash = "sha256-rod6YDosI9nBf2v6Q/rw/fT9p9N8Zo/lu989UhyL8/s=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/nebula"
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pixi";
|
||||
version = "0.59.0";
|
||||
version = "0.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prefix-dev";
|
||||
repo = "pixi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aDwuMRceMxRCh9w89Q2ktpNWwmStg3KzggwhZUAAauk=";
|
||||
hash = "sha256-JFXa72bPRYkNb/7XbBOnI1ay0WFVAoAssoNtGjSsW/s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BbPX+ZKMfLtKWBnrGBRfrl6d40rBQaWJLBg0Vv5UnZE=";
|
||||
cargoHash = "sha256-aDWDJ0uGAa/gdV6aelBd6tlRssd75EzeGbnw7qPzLDY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
protobuf,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
@@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-q3GMizdBupQSMVCuRqLjuw0Mof1q3UYOdUBugmrTDMU=";
|
||||
|
||||
env.FALLBACK_INCLUDE_PATH = "${protobuf}/include";
|
||||
|
||||
meta = {
|
||||
description = "Protocol Buffers language server written in Rust";
|
||||
homepage = "https://github.com/coder3101/protols";
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python3Packages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyprland";
|
||||
version = "2.4.7";
|
||||
version = "2.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.10";
|
||||
@@ -17,19 +16,9 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "hyprland-community";
|
||||
repo = "pyprland";
|
||||
tag = version;
|
||||
hash = "sha256-rtAw6tdZY0BKb6Qjk/LHYYMB9nCPzkmw95wdjhJ191s=";
|
||||
hash = "sha256-k/7Z5QGRIpGZjPeO1Em3wYcX27nxR0V2UeKZaPwAM40=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove this patch from versions higher than 2.4.7-17.
|
||||
# Fixes integration with pyprland 0.52.0+.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hyprland-community/pyprland/commit/21c0479a52df41f15bb798e28f67daab8b1ad0e3.patch";
|
||||
hash = "sha256-QwEGdraSZmz9goCBTKQLArqQse1TP8b188uiIISshWc=";
|
||||
includes = [ "pyprland/plugins/pyprland.py" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ aiofiles ];
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
python3Packages,
|
||||
versionCheckHook,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tgeraser";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "en9inerd";
|
||||
repo = "tgeraser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xB6bdB6ndyS3EOb3D2h9mRbelUXSQXkBkDvzCm7m5TY=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
docopt
|
||||
pyaes
|
||||
pyasn1
|
||||
rsa
|
||||
telethon
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tgeraser" ];
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
description = "Tool to delete all your messages from Telegram";
|
||||
longDescription = ''
|
||||
TgEraser is a Python tool that allows you to delete all your messages from
|
||||
a chat, channel, or conversation on Telegram without requiring admin
|
||||
privileges.
|
||||
'';
|
||||
homepage = "https://github.com/en9inerd/tgeraser";
|
||||
changelog = "https://github.com/en9inerd/tgeraser/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.azahi ];
|
||||
mainProgram = "tgeraser";
|
||||
};
|
||||
}
|
||||
@@ -41,14 +41,14 @@ let
|
||||
# Pin the specific version of prisma to the one used by upstream
|
||||
# to guarantee compatibility.
|
||||
prisma-engines' = prisma-engines.overrideAttrs (old: rec {
|
||||
version = "6.18.0";
|
||||
version = "6.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
hash = "sha256-p198o8ON5mGPCxK+gE0mW+JVyQlNsCsqwa8D4MNBkpA=";
|
||||
hash = "sha256-icFgoKIrr3fGSVmSczlMJiT5KSb746kVldtrk+Q0wW8=";
|
||||
};
|
||||
cargoHash = "sha256-bNl04GoxLX+B8dPgqWL/VarreBVebjwNDwQjtQcJnsg=";
|
||||
cargoHash = "sha256-PgCfBcmK9RCA5BMacJ5oYEpo2DnBKx2xPbdLb79yCCY=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (old) pname;
|
||||
@@ -57,22 +57,22 @@ let
|
||||
};
|
||||
});
|
||||
prisma' = (prisma.override { prisma-engines = prisma-engines'; }).overrideAttrs (old: rec {
|
||||
version = "6.18.0";
|
||||
version = "6.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma";
|
||||
rev = version;
|
||||
hash = "sha256-+WRWa59HlHN2CsYZfr/ptdW3iOuOPfDil8sLR5dWRA4=";
|
||||
hash = "sha256-lFPAu296cQMDnEcLTReSHuLuOz13kd7n0GV+ifcX+lQ=";
|
||||
};
|
||||
pnpmDeps = old.pnpmDeps.override {
|
||||
inherit src version;
|
||||
hash = "sha256-Et1UiZO2zyw9FHW0OuYK7AMfhIy5j7Q7GDQjaL6gjyg=";
|
||||
hash = "sha256-9v30vhclD+sPcui/VG8dwaC8XGU6QFs/Gu8rjjoQy/w=";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "umami";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "umami-software";
|
||||
repo = "umami";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M2SWsmvXzOe6ob46ntQ8X8/uOx6/Q5On6zSnkv83uj8=";
|
||||
hash = "sha256-6ega3ShfZlEnoFuFSh420hB8sp2qoJuAYnzeoOdpODs=";
|
||||
};
|
||||
|
||||
# install dev dependencies as well, for rollup
|
||||
@@ -98,7 +98,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
src
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-Gpl57tTV4ML4ukRMzRu8taO75kyzYwa5PyM0jGbrhHI=";
|
||||
hash = "sha256-zHpIqhxfvJ/so7bKvrGMqVGGnquJNnSI/0q3PE+VQ1Y=";
|
||||
};
|
||||
|
||||
env.CYPRESS_INSTALL_BINARY = "0";
|
||||
@@ -109,6 +109,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
env.TRACKER_SCRIPT_NAME = lib.concatStringsSep "," trackerScriptNames;
|
||||
env.BASE_PATH = basePath;
|
||||
|
||||
# Needs to be non-empty during build
|
||||
env.DATABASE_URL = "postgresql://";
|
||||
|
||||
# Allow prisma-cli to find prisma-engines without having to download them
|
||||
# Only needed at build time for `prisma generate`.
|
||||
env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines'}/lib/libquery_engine.node";
|
||||
@@ -128,8 +131,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# Skip broken test: https://github.com/umami-software/umami/issues/3773
|
||||
pnpm test --testPathIgnorePatterns="src/lib/__tests__/detect.test.ts"
|
||||
pnpm test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"geocities": {
|
||||
"rev": "b8e72beea52d6f23f12b1a554342f29b101a252e",
|
||||
"date": "2025-11-17",
|
||||
"hash": "sha256-mdhOsfuYIKoellpv/M4LM5drTdimvMfFOCYYacbTuJU="
|
||||
"rev": "6ba4792cd60bfab42cab9ff0b0614106a6f98cb9",
|
||||
"date": "2025-12-04",
|
||||
"hash": "sha256-1NJbjXHk2jL18FTyN5CpWYIe1JO4bCqrgb/YTobDniY="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ clangStdenv.mkDerivation {
|
||||
owner = "tihmstar";
|
||||
repo = "usbmuxd2";
|
||||
rev = "2ce399ddbacb110bd5a83a6b8232d42c9a9b6e84";
|
||||
hash = "sha256-UVLLE73XuWTgGlpTMxUDykFmiBDqz6NCRO2rpRAYfow=";
|
||||
hash = "sha256-u7qRKH5y+Q1HnnumjVm3Ce4SlT3YaEVSPUXYOAiFBes=";
|
||||
# Leave DotGit so that autoconfigure can read version from git tags
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xk6";
|
||||
version = "1.2.6";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "xk6";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-t+zindC9mCYE5H/rqJ0AGB7alymYRNubDLQvkc5vZmo=";
|
||||
hash = "sha256-uCjUzVDlqstHDvGEsXCkWgsUthrBM6MlK78IAEpogqU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "dockerfile";
|
||||
version = "8.3.3";
|
||||
version = "8.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocurrent";
|
||||
repo = "ocaml-dockerfile";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-F58KnC4YpsS0ehmi6efFMT+WG5BDuYfQOA1RsFVtO/8=";
|
||||
hash = "sha256-q8yzuRkGVe/t0N0HFLFqOPNyvWSxf4WHApZVk1CG1qw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoft";
|
||||
repo = "debugpy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-U9WeWAX0qDusWcMsFaI1ct4YKlGQEHUYlKZfRiYhma0=";
|
||||
hash = "sha256-eAiCtSJUqLASapxnYCyq1UCiGz6QmKQum7Vs3MoU1s8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-sdk";
|
||||
version = "0.2.10";
|
||||
version = "0.2.12";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "sdk==${version}";
|
||||
hash = "sha256-nNEfXAEwAJijM/5NgJK8nyoJBJG0Qt8vGRD6qsJ2+so=";
|
||||
hash = "sha256-RD+P34ksvZj8cCv4GpTGB00mZUQK9sgIzzVZoTmDowk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/sdk-py";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "pgmq";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tembo-io";
|
||||
repo = "pgmq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CnXweDsLO2yE+z1tPADqz54Q1rswsKoUVYbdiZFEbPs=";
|
||||
hash = "sha256-oXsThqRs+nrNCb9A560gW3sm6LPQFucrlSolNCi0z3w=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pgmq-extension";
|
||||
|
||||
Reference in New Issue
Block a user