Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-09-23 06:15:59 +00:00
committed by GitHub
20 changed files with 186 additions and 127 deletions

View File

@@ -6,8 +6,8 @@
versionCheckHook,
}:
let
version = "1.2.3";
buildId = "6402006605234176";
version = "1.2.9";
buildId = "6237955799515136";
wholeVersion = "${version}-${buildId}";
throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
@@ -15,15 +15,15 @@ let
sourceData = {
x86_64-linux = fetchurl {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-x64/cli_linux_x64.tar.gz";
hash = "sha256-lsZgrjuF/+/avYqMqxHsILXvAbGkF7nXO6BCWJ79LPQ=";
hash = "sha256-TleXrQChVKEkYr0V7a6mMFRAE8q5fj/6kjUz7qCj284=";
};
aarch64-linux = fetchurl {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-arm/cli_linux_arm64.tar.gz";
hash = "sha256-Fic4n3O1BfgBSFpz4cPsd+jZvocMMsjaA1pJNpW2lPk=";
hash = "sha256-bq1XoRRtIy6SYTl82dfHpfwgiFlGcuMJbPyezyS8F2c=";
};
aarch64-darwin = fetchurl {
url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz";
hash = "sha256-YSMl+5ZkEC22pvw/0HfrMW1pQlkxK7OZsgaZwPJb82E=";
hash = "sha256-7kPA1JzN4giRClGq9AObYIM+KkYdq0U5F+mK2PF70U4=";
};
};
in

View File

@@ -68,8 +68,7 @@ let
-t $out/share/applications
substituteInPlace $out/share/applications/caido.desktop \
--replace-fail "Exec=AppRun --no-sandbox %U" "Exec=caido-desktop %U"
install -m 444 -D ${appimageContents}/caido.png \
$out/share/icons/hicolor/512x512/apps/caido.png
cp -r ${appimageContents}/usr/share/icons $out/share
wrapProgram $out/bin/${pname} \
--set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"

View File

@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.27.0";
version = "2.27.1";
dontConfigure = true;
dontBuild = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
hash = "sha256-8WhsburnhVWvVLTNOmAwmkjwN45exmKmw7Q5elTjYiI=";
hash = "sha256-JUqJ9nsCYa8UIeuj+cPw2vAep0lJry6QcaSn20cokDU=";
};
nativeBuildInputs = [

View File

@@ -4,6 +4,7 @@
fetchurl,
bun,
makeWrapper,
installAgentSkills,
nix-update-script,
}:
@@ -23,6 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeWrapper
installAgentSkills
];
dontBuild = true;

View File

@@ -0,0 +1,16 @@
{
lib,
python3Packages,
# flags for optional dependencies
withRustBackend ? true,
withDbDeps ? true,
}:
python3Packages.toPythonApplication (
python3Packages.dirsearch.overridePythonAttrs (prevAttrs: {
dependencies =
prevAttrs.dependencies or [ ]
++ lib.optionals withRustBackend prevAttrs.optional-dependencies.rustbackend
++ lib.optionals withDbDeps prevAttrs.optional-dependencies.db;
})
)

View File

@@ -9,16 +9,16 @@
buildGo127Module (finalAttrs: {
pname = "dnscontrol";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "DNSControl";
repo = "dnscontrol";
tag = "v${finalAttrs.version}";
hash = "sha256-StdVGROKsXJa5F7CEno3T516lVJbXToBxLx6AqKz9+I=";
hash = "sha256-LG6VBzmABJUTpYZQ5L4vI5LXMu4o2Pg90gRdq9s+65c=";
};
vendorHash = "sha256-qIb/hUn/ROWBaSAnEleeLDWQlCvFapBwKcZjdHlNpF8=";
vendorHash = "sha256-YIO5aNmrFL4agsey6TZpkeP3jmFIbqQW6Du7ps0QjEo=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -24,24 +24,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "feather";
version = "2.8.1";
version = "2.9.1";
src = fetchFromGitHub {
owner = "feather-wallet";
repo = "feather";
tag = finalAttrs.version;
hash = "sha256-DZBRZBcoba32Z/bFThn/9siC8VESg5gdfoFO4Nw8JqM=";
hash = "sha256-/rnQw+SNMpFROJln/Sv2RgJlRxa8PnZMs4HfIAxP9VY=";
fetchSubmodules = true;
};
patches = [
(fetchpatch2 {
name = "0001-zxing-3-compat.patch";
url = "https://github.com/feather-wallet/feather/commit/9b17ffd1f783689c835da3ce22996a25d8221806.patch?full_index=1";
hash = "sha256-o4Tq6Dg5xrkF1eoGw0uuN9GiW4+FCnswx6//PYYA34w=";
})
];
nativeBuildInputs = [
cmake
pkg-config

View File

@@ -23,20 +23,20 @@
let
pname = "github-copilot-app";
version = "1.1.20";
version = "1.1.23";
sources = {
x86_64-linux = fetchurl {
url = "https://github.com/github/app/releases/download/v${version}/GitHub-Copilot-linux-x64.deb";
hash = "sha256-rdPNf0n8vilzakQPObp0l24iaj3alEjLVnKDvF9Xbv8=";
hash = "sha256-HWNnLEliPzGzq8YySicZHNJqzoUr+9PxsRWdCw3pBmM=";
};
aarch64-linux = fetchurl {
url = "https://github.com/github/app/releases/download/v${version}/GitHub-Copilot-linux-arm64.deb";
hash = "sha256-an6DWY97e2JUIIoEURy1kdXEwERpyUrf380k9RQEc14=";
hash = "sha256-ah2XDAM4HE/myCdVoJ8ErCIAmpw2F8yvO87P5El9RLY=";
};
aarch64-darwin = fetchurl {
url = "https://github.com/github/app/releases/download/v${version}/GitHub-Copilot-darwin-arm64.dmg";
hash = "sha256-CrH3jpKpZ7vizDAwlZlQa5XyOZ2C0+cFwN5zymwjFKM=";
hash = "sha256-f7QvkGpuDMixBZF4DJKyK9zmaig5LgGOqcNyucqZALw=";
};
};

View File

@@ -9,15 +9,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jsonschema-cli";
version = "0.56.0";
version = "0.57.0";
src = fetchCrate {
pname = "jsonschema-cli";
inherit (finalAttrs) version;
hash = "sha256-RqTWoTeswkHQgX3AlHpMfDk23UP1g+M8+nVkWt9oqBs=";
hash = "sha256-ZV0kGr3SmiAli7uUuXp1o3VGYVOxPSxsCwrcUx3yX+Y=";
};
cargoHash = "sha256-0MllKQrW9sQ0E4OF4RdB2sIZDdt0xNvJ4jtb4jC2eU8=";
cargoHash = "sha256-SBDfPCZqlJ0V4lq8LW4vc1QNh86ML+Wb75Y/sBiKaVs=";
preCheck = ''
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt

View File

@@ -6,7 +6,7 @@
python3Packages.buildPythonApplication (finalAttrs: {
pname = "mcp-reva";
version = "7.3.0";
version = "7.3.1";
pyproject = true;
__structuredAttrs = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
owner = "cyberkaida";
repo = "reverse-engineering-assistant";
rev = "v${finalAttrs.version}";
hash = "sha256-5DVHEcZHq7Thi4L1OJuaOwK/nAqntolYCBEE2acHNHw=";
hash = "sha256-eYZeyhXlGwLVa/k77Y5x2OeGo/m9fh3VauzAqB+obxw=";
};
# setuptools_scm derives the version from git tags, which the tarball lacks.

View File

@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nixpkgs-vet";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs-vet";
tag = "v${finalAttrs.version}";
hash = "sha256-+A4KmOIOC7glVOdW+jxSwQnrBHVej4QqwxTsOQin07U=";
hash = "sha256-/nsrAxoZIVzpDFcg7m1frR6NrrmagHyxGfuQG7IunEw=";
};
cargoHash = "sha256-bWmI79H6yQjxoWxcZ7GgqbxIc8fCLB1I4g9WF2IejVI=";
cargoHash = "sha256-7B3xRkbHTLuz3SuhdCDeWyTAjmaNivTOKy/FwVUT1V8=";
doCheck = false;

View File

@@ -18,16 +18,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "openmeters";
version = "1.14.0";
version = "1.15.1";
src = fetchFromGitHub {
owner = "httpsworldview";
repo = "openmeters";
tag = "v${finalAttrs.version}";
hash = "sha256-WgOn/Beawd3uyi+GinYjlCUsAos2/J4eaT/9qKLpVWM=";
hash = "sha256-zo1auXpOxSEZvgQgHvbIMT2hdQlWND2mQzPITNBkYZw=";
};
cargoHash = "sha256-qMltAR+MTWeC4zkzEjmrERUjaCKNx2qjCKnVXV2qqPk=";
cargoHash = "sha256-EOJAMNNs/iSO5O/xWaw6ZZVtKdmozUCWo/P+LhToFf8=";
nativeBuildInputs = [
pkg-config

View File

@@ -5,17 +5,17 @@
}:
buildGoModule (finalAttrs: {
pname = "pfcpsim";
version = "1.5.2";
version = "1.5.3";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "omec-project";
repo = "pfcpsim";
tag = "v${finalAttrs.version}";
hash = "sha256-wwZ5DHpl55dWnFMlO7LgCL+wSWyGSLCOnKHT77qW/+Y=";
hash = "sha256-YvqzuQn7srWH5QSPCeaxQKHPwjtmuiIo+l3v6QWIZko=";
};
vendorHash = "sha256-/G6HCdCFAXPaI/M/WF+JMyZtz2RK56IYJYSZUZ0jfp4=";
vendorHash = "sha256-Q6ex6/O/gb8KDoOr9TNBkkj95/lJ8YLQLGpOlA1dxG4=";
# Fuzzing cannot be performed without user plane function (upf)
checkFlags = [ "-skip=^Fuzz$" ];

View File

@@ -13,16 +13,16 @@
}:
buildNpmPackage (finalAttrs: {
pname = "pi-coding-agent";
version = "0.87.0";
version = "0.87.1";
src = fetchFromGitHub {
owner = "earendil-works";
repo = "pi";
tag = "v${finalAttrs.version}";
hash = "sha256-7YkIA5IEs4U0qnoaO3IzlY+p/M7j30fSVelLeyoV+F8=";
hash = "sha256-GUhlq6t+l6iiViOZ0bkV28v3ZDqcLvEwpZpYZ5JAyDk=";
};
npmDepsHash = "sha256-fbxwpQHnrUihO9MU72m331Uwt9dv0fQtEjdJ9hU8UxA=";
npmDepsHash = "sha256-JBIYoP2vvRNz1HONNvDJ1U3c+nmCJ7/VgNthRTkrkIA=";
# The provider model catalog (packages/ai/src/providers/data/) is generated by
# a network fetch (models.dev plus provider APIs) and is gitignored upstream,
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
# under dist/providers/data/. Bump this hash alongside version.
modelData = fetchurl {
url = "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-${finalAttrs.version}.tgz";
hash = "sha256-8q353oCdA192+NrfPRSHIOvu9GBqhIqzbug02JWugS8=";
hash = "sha256-NbRDLyfMJmX4a+67mvajmxJRlwiDwwRL2L5PToxzHKA=";
};
preConfigure = ''

View File

@@ -2,7 +2,7 @@ diff --git a/build/version.ts b/build/version.ts
index 0b1a2159..1234abcd 100644
--- a/build/version.ts
+++ b/build/version.ts
@@ -31,51 +31,15 @@
@@ -10,47 +10,15 @@
*/
export function updateVersionFile(): Promise<void> {
return new Promise<void>((resolve, reject) => {
@@ -11,7 +11,7 @@ index 0b1a2159..1234abcd 100644
- });
+ const versionFilePath = "./version.json";
+ const versionContent = `${JSON.stringify({ version: "@version@" })}\n`;
- let stdout = "";
-
- gitProcess.stdout?.on("data", (data) => {
@@ -22,18 +22,14 @@ index 0b1a2159..1234abcd 100644
- let commitVersion = stdout.trim();
-
- if (!commitVersion || code !== 0) {
- // Probably no valid .git repo, fallback to GITHUB_SHA env var (used in CI)
- commitVersion = `${version}-${process.env.GITHUB_SHA || "unknown"}`;
- }
-
- // Keep the existing string when it was minted for this same commit, so
- // repeated builds stay byte-identical (see the note above).
- if (isForCommit(await readVersionFile(), commitVersion)) {
- resolve();
- return;
- }
-
- // Attach the build date in YYYY-MM-DDTHH-MM-SSZ format to the version.
- const publicVersion = `${commitVersion}-${new Date()
- .toISOString()
- .split(".")[0]
@@ -61,4 +57,4 @@ index 0b1a2159..1234abcd 100644
+ }
});
}

View File

@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "silverbullet";
version = "2.10.0";
version = "2.11.0";
src = fetchFromGitHub {
owner = "silverbulletmd";
repo = "silverbullet";
rev = finalAttrs.version;
hash = "sha256-tcn0NrABLnX22OWJ3PzYJ5xbTLyNH5p6JtJ6CujkpQQ=";
hash = "sha256-aEqmvxtWzvXM8Cv8YrHK9o0G2jlbeqqahAveKr6M+Ps=";
};
cargoHash = "sha256-M/bX9oj76kmXGkCzvBJZMeI7/4UJ+yvz84KrysyPOLA=";
cargoHash = "sha256-t2RDrdZsCMReDGUUu3r59OAosZNY3TMlvjo/uM2xL8g=";
cargoBuildFlags = [
"-p"
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
pname = "silverbullet-frontend";
inherit (finalAttrs) version src;
npmDepsHash = "sha256-We3K4jZGcC5Q1WBgEOKDKhn8M83srNLP3C36WCOX5Qs=";
npmDepsHash = "sha256-EseKAqUJbpIAfJhG1hNlvLgMie/jsXbbVqwea8bEuJQ=";
patches = [
(replaceVars ./override-version.patch { inherit (finalAttrs) version; })

View File

@@ -1,117 +1,113 @@
{
lib,
callPackage,
fetchFromGitHub,
buildPythonPackage,
python,
pytestCheckHook,
# deps
/*
ntlm-auth is in the requirements.txt, however nixpkgs tells me
> ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.
Not sure if pyspnego is a drop in replacement.
The simple functionality dirsearch seems not to depend on this package.
*/
#ntlm-auth,
#pyspnego,
fetchpatch,
# build-system
setuptools,
# dependencies
beautifulsoup4,
certifi,
cffi,
chardet,
charset-normalizer,
colorama,
cryptography,
defusedcsv,
defusedxml,
idna,
httpx,
httpx-ntlm,
jinja2,
markupsafe,
pyopenssl,
pyparsing,
pysocks,
requests,
requests-ntlm,
setuptools,
urllib3,
requests-toolbelt,
# optional dependencies
mysql-connector-python,
psycopg,
# tests
pytestCheckHook,
nix-update-script,
}:
buildPythonPackage (finalAttrs: {
pname = "dirsearch";
version = "0.4.3";
version = "0.5.0";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "maurosoria";
repo = "dirsearch";
tag = "v${finalAttrs.version}";
hash = "sha256-eXB103qUB3m7V/9hlq2xv3Y3bIz89/pGJsbPZQ+AZXs=";
hash = "sha256-WKQjtJ5fMVLzX92gOFLqmBLkeM4o2XfVYW9Wz4OmjP4=";
};
# setup.py does some weird stuff with mktemp
postPatch = ''
substituteInPlace setup.py \
--replace-fail 'os.chdir(env_dir)' "" \
--replace-fail 'shutil.copytree(os.path.abspath(os.getcwd()), os.path.join(env_dir, "dirsearch"))' ""
'';
patches = [
# fixes test_detect_scheme not working without network
# see https://github.com/maurosoria/dirsearch/issues/1592
(fetchpatch {
url = "https://github.com/maurosoria/dirsearch/commit/8f2b3cceee0a27c0670ed9471b70dd666c73d6a6.patch";
hash = "sha256-KnVYiQftq8DgbSdXPxsCCOTxS1e7vOqf/4sDqYXkX9A=";
})
];
pyproject = true;
build-system = [ setuptools ];
dependencies = [
# maybe needed, see above
#pyspnego
#ntlm-auth
beautifulsoup4
certifi
cffi
chardet
charset-normalizer
colorama
cryptography
defusedcsv
defusedxml
idna
httpx
httpx-ntlm
jinja2
markupsafe
pyopenssl
pyparsing
pysocks
requests
requests-ntlm
setuptools
urllib3
requests-toolbelt
];
# the library files get installed in the wrong location
# and dirsearch.py, __init__.py and db/ are missing
optional-dependencies = {
rustbackend = [ finalAttrs.passthru.dirsearch-native ];
db = [
mysql-connector-python
psycopg
];
};
# dirsearch-build-native builds the rust backend when called
# this is meant for venvs and doesn't work for the nix package
postInstall = ''
dirsearchpath=$out/lib/python${lib.versions.majorMinor python.version}/site-packages/
mkdir -p $dirsearchpath/dirsearch
mv $dirsearchpath/{lib,dirsearch}
cp $src/{dirsearch,__init__}.py $dirsearchpath/dirsearch
cp -r $src/db $dirsearchpath/dirsearch
rm $out/bin/dirsearch-build-native
rm -r $out/lib/python*/site-packages/dirsearch/native
'';
# tests
nativeCheckInputs = [
pytestCheckHook
];
disabledTestPaths = [
# needs network?
"tests/reports/test_reports.py"
];
disabledTests = [
# failing for unknown reason
"test_detect_scheme"
];
pythonRemoveDeps = [
# not available, see above
"ntlm_auth"
];
pythonRelaxDeps = [
# version checker doesn't recognize 0.8.0.rc2 as >=0.7.0
"defusedxml"
# probably not but we don't have old charset-normalizer versions in nixpkgs
# and requests also depends on it so we can't just override it with an
# older version due to package duplication
"charset_normalizer"
];
]
++ lib.flatten (lib.attrValues finalAttrs.passthru.optional-dependencies);
pythonImportsCheck = [ "dirsearch" ];
__darwinAllowLocalNetworking = true;
# relax all deps because upstream pins versions "to prevent supply chain attacks"
pythonRelaxDeps = true;
passthru = {
dirsearch-native = callPackage ./dirsearch-native.nix { inherit (finalAttrs) src meta; };
updateScript = nix-update-script {
extraArgs = [
"--subpackage"
"dirsearch-native"
];
};
};
meta = {
changelog = "https://github.com/maurosoria/dirsearch/releases/tag/${finalAttrs.src.tag}";

View File

@@ -0,0 +1,52 @@
{
buildPythonPackage,
rustPlatform,
pythonOlder,
# attributes from dirsearch
src,
meta,
}:
buildPythonPackage (finalAttrs: {
pname = "dirsearch-native";
# dirsearchs updateScript will fail if upstream bumps the version string for dirsearch_native.
# I don't think there is anything I can do about until upstream either releases the 2 python
# packages separately or versions them alongside each other
# upstream issue https://github.com/maurosoria/dirsearch/issues/1640
version = "0.1.0";
disabled = pythonOlder "3.14";
inherit src;
sourceRoot = "${finalAttrs.src.name}/native";
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
pname
version
src
sourceRoot
;
hash = "sha256-5LgxxVknZXMYkh9ozuUx0UGfDeuU2dzFy7nLPhlrvJs=";
};
pyproject = true;
build-system = [
rustPlatform.cargoSetupHook
rustPlatform.maturinBuildHook
];
nativeCheckInputs = [
rustPlatform.cargoCheckHook
];
pythonImportsCheck = [ "dirsearch_native" ];
meta = {
description = "Rust native backend for dirsearch";
inherit (meta)
homepage
changelog
license
maintainers
;
};
})

View File

@@ -11,6 +11,7 @@
grpcio-tools,
grpclib,
httpx,
installAgentSkills,
invoke,
ipython,
mypy,
@@ -64,6 +65,7 @@ buildPythonPackage (finalAttrs: {
];
nativeBuildInputs = [
installAgentSkills
invoke
ipython
grpcio-tools
@@ -111,6 +113,10 @@ buildPythonPackage (finalAttrs: {
versionCheckHook
];
preInstall = ''
rm -rf build/lib/modal/skills
'';
disabledTestPaths = [
# Fail due to not finding /bin/bash
"test/app_composition_test.py"

View File

@@ -13,14 +13,14 @@
buildPythonPackage (finalAttrs: {
pname = "python-pooldose";
version = "0.9.11";
version = "0.9.14";
pyproject = true;
src = fetchFromGitHub {
owner = "lmaertin";
repo = "python-pooldose";
tag = finalAttrs.version;
hash = "sha256-4KHc9WUT3zlu6RvuEYTcZrKqS+Z32khRb9PDMhOz1XQ=";
hash = "sha256-P/pINGef0bQJ+147/heOf4l/12Vdwd6F67vany9vFZY=";
};
build-system = [ setuptools ];