Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-06-19 07:53:46 +00:00
committed by GitHub
25 changed files with 205 additions and 147 deletions
@@ -28,7 +28,7 @@
- Rustical migrates from `settings.http.host` and `settings.http.port` to `settings.http.bind` to support UNIX domain sockets as well as TCP sockets in one setting.
- `services.llama-cpp` is now configured using structured `services.llama-cpp.settings` attribute.
- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options.
- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
+10 -5
View File
@@ -50,6 +50,7 @@ in
serviceConfig = {
User = "sing-box";
Group = "sing-box";
ConfigurationDirectory = "sing-box";
StateDirectory = "sing-box";
StateDirectoryMode = "0700";
RuntimeDirectory = "sing-box";
@@ -62,11 +63,15 @@ in
chown --reference=/run/sing-box /run/sing-box/config.json
'';
in
"+${script}";
ExecStart = [
""
"${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run"
];
lib.mkIf (cfg.settings != { }) "+${script}";
ExecStart =
let
configDir = if cfg.settings != { } then "RUNTIME_DIRECTORY" else "CONFIGURATION_DIRECTORY";
in
[
""
"${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${${configDir}} run"
];
};
# After= is specified by upstream
requires = [ "network-online.target" ];
+28
View File
@@ -511,6 +511,31 @@ in
};
};
};
empty_settings =
{ ... }:
{
environment.etc."sing-box/config.json".text = builtins.toJSON {
inbounds = [
{
type = "mixed";
listen = "127.0.0.1";
listen_port = 1088;
}
];
outbounds = [
{
type = "direct";
tag = "outbound:direct";
}
];
};
services.sing-box = {
enable = true;
settings = { };
};
};
};
testScript = ''
@@ -558,6 +583,9 @@ in
fakeip.wait_for_unit("sing-box.service")
fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'")
fakeip.succeed("dig +short A ${target_host} @${target_host} | grep '^198.18.'")
with subtest("empty settings"):
empty_settings.wait_for_unit("sing-box.service")
'';
}
@@ -905,13 +905,13 @@
"vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58="
},
"metio_migadu": {
"hash": "sha256-q+7tTBMxqGlN6GyosnL70/qGtnwueWr1n+WI5BhnV4E=",
"hash": "sha256-F/eTAR0Du0NeRwH9m8hHzjIkx31xv8aRGNWuVrntxjQ=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
"owner": "metio",
"repo": "terraform-provider-migadu",
"rev": "2026.5.28",
"rev": "2026.6.18",
"spdx": "0BSD",
"vendorHash": "sha256-ap1+0luy/9OQYNkYh1Aj+2LPMt7JdhKNn0ENrQMz3Uk="
"vendorHash": "sha256-7/2iHstATnmeuvoIFIQw2Gi3QSIoXp5W69fnUYHipxc="
},
"mongey_kafka": {
"hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
@@ -1139,11 +1139,11 @@
"vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A="
},
"rootlyhq_rootly": {
"hash": "sha256-lGd864ugC5hfgN86ByEIJhjkMJVCPDNCKzoXx6pKjS0=",
"hash": "sha256-eJKJedLDp6CdFNimI8artmKYMsgURFXxS/RpMEJnVWk=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
"rev": "v5.16.0",
"rev": "v5.16.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM="
},
+20 -20
View File
@@ -1,56 +1,56 @@
{
"stable": {
"linux": {
"version": "8.12.22",
"version": "8.12.24",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.22.x64.tar.gz",
"hash": "sha256-dec+oqixlPAbHYWqOBEBNB9IU8+Hfz2W4bm1y6/CbuM="
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.24.x64.tar.gz",
"hash": "sha256-XzxS1fLuqA1gxddrMToeqO/MI1RT2s5ntaPQ3trxieI="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.22.arm64.tar.gz",
"hash": "sha256-qPQbEkXZs0/D/PgDbepUWm5po/Jg42YvxT0a2A+9mOk="
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.24.arm64.tar.gz",
"hash": "sha256-Ebdezv4dZcT3035hf9PQsm1ahnJLXpxQWc4vVcUvjRg="
}
}
},
"darwin": {
"version": "8.12.22",
"version": "8.12.24",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.22-x86_64.zip",
"hash": "sha256-UR1urZS2WuTRrE3Tn3P/QaXKze6Wjrw0ZKEZc06Up8I="
"url": "https://downloads.1password.com/mac/1Password-8.12.24-x86_64.zip",
"hash": "sha256-ofZhY3fsQ86N+ooQYwv6ZYEGE/fpx5nWvRLosgLIToI="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.22-aarch64.zip",
"hash": "sha256-Rbac0JcB2kbH6EfEGkuKwhaIW0Bgkhyw7olSjqe1euE="
"url": "https://downloads.1password.com/mac/1Password-8.12.24-aarch64.zip",
"hash": "sha256-6mCv+YbIXqp57t/E/3Xv+lsWDjlUmoOHQS/hh+ma0WY="
}
}
}
},
"beta": {
"linux": {
"version": "8.12.24-24.BETA",
"version": "8.12.26-31.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.24-24.BETA.x64.tar.gz",
"hash": "sha256-2pdVY7X2qfSkxhSEIKod9+8zGsJ91r9rY3ODTjA4Bw8="
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.26-31.BETA.x64.tar.gz",
"hash": "sha256-jlBvt2QEOgoisC1u8WY7cEXuCgk3wKcgQ1owu02rEio="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.24-24.BETA.arm64.tar.gz",
"hash": "sha256-HIFlrclzIHZftUtYKyMRX9s1UjS//sibTFyhi0NU4pE="
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.26-31.BETA.arm64.tar.gz",
"hash": "sha256-jCI5G9xGdXChGW8388BMpMfyYwxzNxYNoV2sYBj8eV4="
}
}
},
"darwin": {
"version": "8.12.24-24.BETA",
"version": "8.12.26-31.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-x86_64.zip",
"hash": "sha256-KXgqH7bFCIMdmruqnCel7tCWa8YdwKtajFv/HGxb7AE="
"url": "https://downloads.1password.com/mac/1Password-8.12.26-31.BETA-x86_64.zip",
"hash": "sha256-TBNhnCrKVZD1CVeBZ3dZ0TVeldrRotUpXEycFnvPfZo="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-aarch64.zip",
"hash": "sha256-u8uRcR7z65Hs0jq3dXz4HNgI4UH4+AJjtPBH2keUXZI="
"url": "https://downloads.1password.com/mac/1Password-8.12.26-31.BETA-aarch64.zip",
"hash": "sha256-8+H9+Z7/uqlnMP2eUm7z493S6ZCEV0a5Sorw3AGTDCc="
}
}
}
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.498.0";
version = "1.509.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-WpZKsi8OgF72cuAxSD4AHJBZkvRsPtveiG5AmaQH320=";
hash = "sha256-PY4pr9FHKHSJjNctq7bGlsZ1yvDM6IqbmfobI1WsDP0=";
stripRoot = false;
};
+11 -18
View File
@@ -1,7 +1,6 @@
{
stdenv,
fetchFromGitHub,
fetchpatch,
applyPatches,
libuuid,
bc,
@@ -29,18 +28,23 @@ let
"LOONGARCH64"
else
throw "Unsupported architecture";
# The toolchain definition uses different variables for different architectures.
targetPrefixes = lib.genAttrs [ "GCC_BIN" "GCC_${targetArch}_PREFIX" ] (
lib.const stdenv.cc.targetPrefix
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "edk2";
version = "202602";
version = "202605";
srcWithVendoring = fetchFromGitHub {
owner = "tianocore";
repo = "edk2";
tag = "edk2-stable${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-TeMGpqVpXYRaeLjjg/aWHjtvfJpEfauA7Xg7dfe3XNg=";
hash = "sha256-sUqLocdX7lxN2pEdn84Cjh8pOzYqIeKqO144XhwKA30=";
};
src = applyPatches {
@@ -48,12 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
src = finalAttrs.srcWithVendoring;
patches = [
# pass targetPrefix as an env var
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch";
hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw=";
})
./fix-cross-compilation-antlr-dlg.patch
];
@@ -106,10 +104,8 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"
+ lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined";
PYTHON_COMMAND = lib.getExe pythonEnv;
# trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319
${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;
};
}
// targetPrefixes;
hardeningDisable = [
"format"
@@ -169,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
finalAttrsInner:
let
attrs = lib.toFunction attrsOrFun finalAttrsInner;
buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5");
buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC");
in
{
inherit (finalAttrs) src;
@@ -212,10 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
"env"
]
// {
env = {
${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;
}
// (attrs.env or { });
env = targetPrefixes // (attrs.env or { });
}
);
};
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication (finalAttrs: {
pname = "getmail6";
version = "6.19.12";
version = "6.20.00";
pyproject = true;
src = fetchFromGitHub {
owner = "getmail6";
repo = "getmail6";
tag = "v${finalAttrs.version}";
hash = "sha256-E+S6p12eqVDkzTv6RdeBpUJqPd4a4LMVoGaYOr2XKVo=";
hash = "sha256-f0IH0wI7Ue/HjvMIhBRGaMoO9BYDJoH/3fWRDsFD9+8=";
};
build-system = with python3.pkgs; [
+2 -2
View File
@@ -14,13 +14,13 @@
let
pnpm = pnpm_10;
version = "0.63.15";
version = "0.63.17";
src = fetchFromGitHub {
owner = "pommee";
repo = "goaway";
tag = "v${version}";
hash = "sha256-jtUAMCGdFmt89kchHdy9AnSMKu1rZeTLPcFIzqipOyw=";
hash = "sha256-cRx7XN8eaxqqI5+CWF93U4rgP8sH3HY4MPOA6VtqXK8=";
};
goaway-web = stdenvNoCC.mkDerivation (finalAttrs: {
+2 -2
View File
@@ -36,11 +36,11 @@ let
# TODO: we could cut the `let` short here, but it would de-indent everything.
unwrapped = stdenv.mkDerivation (finalAttrs: {
pname = "knot-resolver_6";
version = "6.3.0";
version = "6.4.0";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz";
hash = "sha256-uHMGGX90NrSQecYzNkvF33GjkyNvsl6fzn0ESAvHUY4=";
hash = "sha256-T0v+CfjXOw7n1nDdHJD18qwOkGD5sUeDVfJvJzdGrIA=";
};
outputs = [
+11 -2
View File
@@ -6,12 +6,17 @@
vala,
glib,
libsndfile,
flac,
libogg,
libvorbis,
libopus,
zlib,
bzip2,
xz,
libsamplerate,
libgcrypt,
libgpg-error,
intltool,
pcre,
util-linux,
libselinux,
libsepol,
@@ -37,10 +42,15 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
glib
libsndfile
flac
libogg
libvorbis
zlib
bzip2
xz
libsamplerate
libgcrypt
libgpg-error
];
nativeBuildInputs = [
@@ -52,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
];
propagatedBuildInputs = [
pcre
util-linux
libselinux
libsepol
+5 -5
View File
@@ -1,11 +1,11 @@
{
"packageVersion": "152.0-1",
"packageVersion": "152.0.1-2",
"source": {
"rev": "152.0-1",
"hash": "sha256-T7ZRCmHx3jnFz7zzXS8btEepP9HRtKS8CWTehxdxIlM="
"rev": "152.0.1-2",
"hash": "sha256-qr0eO+ucXguTb2QDhbsI9jjlx9fzfZVAI++87UfXcXE="
},
"firefox": {
"version": "152.0",
"hash": "sha512-LHrfNnAEBj7p8zheaS9hLY5cDBBmK/KUmWwRgAHkPewSyoy0/XDmeiWpA9v1rfg9IuSH8Evz+TDaKoFcgDeM6w=="
"version": "152.0.1",
"hash": "sha512-myWVFI7ZdwQOorIefW7OcPDlP6yblrMRWxE76nbq1sBCL26UsVQCg7Qw/tXo6aIndxpjV78W9W1TCn+ufcdVOg=="
}
}
+2 -2
View File
@@ -39,13 +39,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "linyaps";
version = "1.12.3";
version = "1.13.0";
src = fetchFromGitHub {
owner = "OpenAtom-Linyaps";
repo = finalAttrs.pname;
tag = finalAttrs.version;
hash = "sha256-AbiUHoNRaz2yL6pV5D1R0kmDGcV8+nmEa+EDDK6soe0=";
hash = "sha256-fHT6z0ZGDbhih3Qe1xdXmFqEAZNe+MfqEpD/5SjmTzk=";
};
patches = [
+56 -54
View File
@@ -54,7 +54,7 @@ let
'' allRuntimeInputs;
};
in
treefmtWithConfig.overrideAttrs {
treefmtWithConfig.overrideAttrs (prevAttrs: {
meta = {
mainProgram = "treefmt";
description = "Official Nix formatter zero-setup starter using treefmt";
@@ -118,63 +118,65 @@ treefmtWithConfig.overrideAttrs {
platforms = lib.platforms.all;
};
passthru.tests.simple =
runCommand "nixfmt-tree-test-simple"
{
nativeBuildInputs = [
git
nixfmt-tree
writableTmpDirAsHomeHook
];
}
''
git config --global user.email "nix-builder@nixos.org"
git config --global user.name "Nix Builder"
passthru = prevAttrs.passthru // {
tests.simple =
runCommand "nixfmt-tree-test-simple"
{
nativeBuildInputs = [
git
nixfmt-tree
writableTmpDirAsHomeHook
];
}
''
git config --global user.email "nix-builder@nixos.org"
git config --global user.name "Nix Builder"
cat > unformatted.nix <<EOF
let to = "be formatted"; in to
EOF
cat > unformatted.nix <<EOF
let to = "be formatted"; in to
EOF
cat > formatted.nix <<EOF
let
to = "be formatted";
in
to
EOF
mkdir -p repo
(
cd repo
mkdir dir
cp ../unformatted.nix a.nix
cp ../unformatted.nix dir/b.nix
git init
git add .
git commit -m "Initial commit"
treefmt dir
if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
exit 1
elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
echo "File a.nix was formatted when only dir was requested to be formatted"
exit 1
fi
cat > formatted.nix <<EOF
let
to = "be formatted";
in
to
EOF
mkdir -p repo
(
cd dir
treefmt
cd repo
mkdir dir
cp ../unformatted.nix a.nix
cp ../unformatted.nix dir/b.nix
git init
git add .
git commit -m "Initial commit"
treefmt dir
if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
exit 1
elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
echo "File a.nix was formatted when only dir was requested to be formatted"
exit 1
fi
(
cd dir
treefmt
)
if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
exit 1
fi
)
if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
exit 1
fi
)
echo "Success!"
echo "Success!"
touch $out
'';
}
touch $out
'';
};
})
+3 -3
View File
@@ -12,18 +12,18 @@
buildGoModule (finalAttrs: {
pname = "shellhub-agent";
version = "0.25.0";
version = "0.25.1";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${finalAttrs.version}";
hash = "sha256-9hA3Sxz0SwkpyYJsIrnT/7B2S1px6f+GgT6yvM3VZ8Q=";
hash = "sha256-JN8taYPj8GOCeDw08c2fLZmQr4IACWum5whfycaG9go=";
};
modRoot = "./agent";
vendorHash = "sha256-Cm/xApEJR94qtXFD5ASU8oPG/VwWbeq91B7Znn/dQdY=";
vendorHash = "sha256-iuXGBYvcNK91RmbfKfMyiMbW4LmBpVI5oE8EEyP7jps=";
ldflags = [
"-s"
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "trufflehog";
version = "3.95.5";
version = "3.95.6";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${finalAttrs.version}";
hash = "sha256-6n3gVr6+P5hWLFUAWByIYtlUkmpOmBF9Ffy5GC8awT0=";
hash = "sha256-VGN8penYtwX0conIl6pjm6YhM0yYl3dpmKUT6YijXuI=";
};
vendorHash = "sha256-zA5CYHNhpbRhFrnjDNUV30sw+qXAJupMl7uvgOu62lU=";
vendorHash = "sha256-KVocEbpKYN/PE1Dnx4KO4V8AGEfYoNMKWZsAtXhLXv4=";
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "uv";
version = "0.11.21";
version = "0.11.22";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = finalAttrs.version;
hash = "sha256-2PhGJbgCSqOiDVv8ktVkAaADhPxvKp1/JqkNQspt2Pc=";
hash = "sha256-/MDEo86070RYMxaZ/whXWIiI2hxt3b5eTYSb43RB5Vg=";
};
cargoHash = "sha256-0hfLpfU2WaWFkqcSMJctLM5UDeTnIibuog/0U+DBzmI=";
cargoHash = "sha256-zStSTwpFWWc4sC59VPK7wYjQl77B+FvY/4E3zlppQjo=";
buildInputs = [
rust-jemalloc-sys
@@ -12,19 +12,19 @@
buildPythonPackage (finalAttrs: {
pname = "django-vcache";
version = "2.2.0";
version = "2.3.0";
pyproject = true;
src = fetchFromGitLab {
owner = "glitchtip";
repo = "django-vcache";
tag = "v${finalAttrs.version}";
hash = "sha256-7KeSnOJQOb766kYFh6+qeL3csPNuhk63C6NBsoS1dvc=";
hash = "sha256-/LyNJlz3Tx6tgQAwY4vIIsDlL2nCvKM6bna2bXyP5So=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-rQ5nCzWw6AUU9KimNJX3pdnRE4kg86kDTZq0TCBEp8s=";
hash = "sha256-a9+3k6YTotmj+LBO6OyVd2NUh3hpLwpKXJsX7pBxXNE=";
};
build-system = [ hatchling ];
@@ -14,6 +14,7 @@
requests,
requests-toolbelt,
uuid-utils,
websockets,
xxhash,
zstandard,
@@ -32,14 +33,14 @@
buildPythonPackage (finalAttrs: {
pname = "langsmith";
version = "0.7.37";
version = "0.8.15";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langsmith-sdk";
tag = "v${finalAttrs.version}";
hash = "sha256-E3bszn3w7MaNLVjpgSfEQEyzzqWQp056BjXIcY9YJCM=";
hash = "sha256-T/ts7YRD2kUulzcRVBSgH6XXwEpDRwbZUfxx4ELv7nA=";
};
sourceRoot = "${finalAttrs.src.name}/python";
@@ -55,6 +56,7 @@ buildPythonPackage (finalAttrs: {
requests
requests-toolbelt
uuid-utils
websockets
xxhash
zstandard
];
@@ -101,6 +103,9 @@ buildPythonPackage (finalAttrs: {
# google-adk isn't packaged (and has an enormous number of dependencies)
"tests/unit_tests/wrappers/test_google_adk.py"
# strands-agents isn't packaged
"tests/unit_tests/wrappers/test_strands_agents.py"
];
pythonImportsCheck = [ "langsmith" ];
@@ -31,14 +31,14 @@
buildPythonPackage (finalAttrs: {
pname = "ngff-zarr";
version = "0.35.0";
version = "0.36.0";
pyproject = true;
src = fetchFromGitHub {
owner = "fideus-labs";
repo = "ngff-zarr";
tag = "py-v${finalAttrs.version}";
hash = "sha256-GJt6N5xMmlCHSzKZhHKsZaD4P8fWnTQi4tqP/YnPkQk=";
hash = "sha256-TsPyW815ITcBtAvRyQgEqgHhp9MqtRlkmKLFNVdnKR8=";
};
sourceRoot = "${finalAttrs.src.name}/py/";
@@ -11,14 +11,14 @@
buildPythonPackage (finalAttrs: {
pname = "pypck";
version = "0.9.12";
version = "0.9.13";
pyproject = true;
src = fetchFromGitHub {
owner = "alengwenus";
repo = "pypck";
tag = finalAttrs.version;
hash = "sha256-h7y7LYQg9VZxRUu8m1zV0rV6q3rldxe4TSmLJhTkFGM=";
hash = "sha256-b8uTY4UtyhKN7JDvu/wC1jXAN/oKs2cJ6sSRBC22vS0=";
};
postPatch = ''
@@ -10,16 +10,16 @@
six,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "python-owasp-zap-v2-4";
version = "0.5.0";
version = "0.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "zaproxy";
repo = "zap-api-python";
tag = version;
hash = "sha256-8aZbnUoS9lrqM0XQg4PD/j1JFKzGh9dyzWF89Szdzao=";
tag = finalAttrs.version;
hash = "sha256-a0F6asx8Dl1T/OqNhHukHRbq+LUqsl3im+y1k096pfE=";
};
build-system = [ poetry-core ];
@@ -43,4 +43,4 @@ buildPythonPackage rec {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};
}
})
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "wolf-comm";
version = "0.0.49";
version = "0.0.52";
pyproject = true;
src = fetchFromGitHub {
owner = "janrothkegel";
repo = "wolf-comm";
tag = version;
hash = "sha256-sbW0ZwCNjrFsI8pKWiWEUgQN7toP/OthvsZxTGI5x/I=";
hash = "sha256-IdV52+/2GTsAtlN3mvdtSf6B2WS6w3SvAOaZyZA/e+I=";
};
build-system = [ setuptools ];
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "yara-python";
version = "4.5.4";
version = "4.5.5";
pyproject = true;
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-python";
tag = "v${version}";
hash = "sha256-2ZwLpkT46KNTQ1ymvMGjnrfHQaIy/rXid0kXoCBixXA=";
hash = "sha256-3MElqZALdwmyUA7xTWp6mG8mhRJuUZbYTkvvQc4UfVc=";
};
# undefined symbol: yr_finalize
+16
View File
@@ -609,6 +609,8 @@ optionalAttrs allowAliases aliases
elixirMap value
else if _elixirType == "tuple" then
tuple value
else if _elixirType == "charlist" then
charlist value
else
abort "formats.elixirConf: should never happen (_elixirType = ${_elixirType})";
@@ -622,6 +624,8 @@ optionalAttrs allowAliases aliases
tuple = values: "{${listContent values}}";
charlist = value: "~c\"${value}\"";
toConf =
let
keyConfig =
@@ -689,6 +693,12 @@ optionalAttrs allowAliases aliases
_elixirType = "atom";
};
# Make an Elixir charlist out of a string.
mkCharlist = value: {
inherit value;
_elixirType = "charlist";
};
# Make an Elixir tuple out of a list.
mkTuple = value: {
inherit value;
@@ -729,6 +739,12 @@ optionalAttrs allowAliases aliases
check = isElixirType "atom";
});
charlist = elixirOr (mkOptionType {
name = "elixirCharlist";
description = "elixir charlist";
check = isElixirType "charlist";
});
tuple = elixirOr (mkOptionType {
name = "elixirTuple";
description = "elixir tuple";