Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-07-02 14:29:29 +00:00
committed by GitHub
18 changed files with 1046 additions and 802 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ let
in
rec {
inherit pkgs fmt;
inherit pkgs docPkgs fmt;
codeownersValidator = pkgs.callPackage ./codeowners-validator { };
# FIXME(lf-): it might be useful to test other Nix implementations
+1 -1
View File
@@ -1,5 +1,5 @@
{
pkgs ? (import ../ci { }).pkgs,
pkgs ? (import ../ci { }).docPkgs,
nixpkgs ? { },
}:
+15 -2
View File
@@ -120,7 +120,17 @@ in
assert config.merged.positive == { yay = 100; };
assert config.merged.extensi-foo == { extensible = "foo"; };
assert config.merged.extensi-bar == { extensible = "bar"; };
assert config.docs."submodules.<name>.foo.bar".declarations == [ __curPos.file ];
assert config.docs."submodules.<name>.foo.bar".type == "signed integer";
assert
lib.length
(options.submodules.type.nestedTypes.elemType.nestedTypes.foo.type.getSubOptions [ ])
.bar.declarationPositions == 1;
assert
(lib.head
(options.submodules.type.nestedTypes.elemType.nestedTypes.foo.type.getSubOptions [ ])
.bar.declarationPositions
).file == __curPos.file;
assert config.docs."submodules.<name>.qux".type == "string";
assert config.docs."submodules.<name>.qux".declarations == [ __curPos.file ];
assert
@@ -133,8 +143,11 @@ in
assert config.docs."submodules.<name>.qux".description == "A qux for when you don't want a foo";
assert config.docs."submodules.<name>.qux".readOnly == false;
assert config.docs."submodules.<name>.qux".visible == true;
# Not available (yet?)
# assert config.docs."submodules.<name>.qux".declarationsWithPositions == [ ... ];
assert
lib.length options.submodules.type.nestedTypes.elemType.nestedTypes.qux.declarationPositions == 1;
assert
(lib.head options.submodules.type.nestedTypes.elemType.nestedTypes.qux.declarationPositions).file
== __curPos.file;
assert options.submodules.declarations == [ __curPos.file ];
assert lib.length options.submodules.declarationPositions == 1;
assert (lib.head options.submodules.declarationPositions).file == __curPos.file;
+21
View File
@@ -1140,6 +1140,27 @@ rec {
else
throw "The option `${showOption loc}` is defined as ${lib.strings.escapeNixIdentifier choice}, but ${lib.strings.escapeNixIdentifier choice} is not among the valid choices (${choicesStr}). Value ${choice} was defined in ${showFiles (getFiles defs)}.";
nestedTypes = tags;
getSubModules =
let
tagsWithSubModules = filterAttrs (_: mods: mods != null) (
mapAttrs (_: opt: opt.type.getSubModules) tags
);
in
if tagsWithSubModules == { } then null else [ tagsWithSubModules ];
substSubModules =
allWrappedModules:
let
tagsWithNewTypes = zipAttrsWith (tag: tags.${tag}.type.substSubModules) (
concatMap (
{ _file, imports }: map (mapAttrs (_: imports: { inherit _file imports; })) imports
) allWrappedModules
);
in
attrTag (
mapAttrs (
tag: opt: opt // (optionalAttrs (tagsWithNewTypes ? ${tag}) { type = tagsWithNewTypes.${tag}; })
) tags
);
functor = defaultFunctor "attrTag" // {
type = { tags, ... }: lib.types.attrTag tags;
payload = { inherit tags; };
+5
View File
@@ -23382,6 +23382,11 @@
githubId = 77415970;
name = "Redhawk";
};
redhood = {
name = "Alice Liddell";
github = "petalmaya";
githubId = 258934709;
};
redianthus = {
github = "redianthus";
githubId = 16472988;
@@ -30,7 +30,7 @@ in
settings = lib.mkOption {
description = ''
Configuration of Chhoto URL.
See <https://github.com/SinTan1729/chhoto-url/blob/main/compose.yaml> for a list of options.
See <https://github.com/SinTan1729/chhoto-url/blob/main/docs/INSTALLATION.md#configuration-options> for a list of options.
'';
example = {
port = 4567;
@@ -152,7 +152,7 @@ in
description = ''
Files to load environment variables from in addition to [](#opt-services.chhoto-url.settings).
This is useful to avoid putting secrets into the nix store.
See <https://github.com/SinTan1729/chhoto-url/blob/main/compose.yaml> for a list of options.
See <https://github.com/SinTan1729/chhoto-url/blob/main/docs/INSTALLATION.md#configuration-options> for a list of options.
'';
};
};
+6 -1
View File
@@ -18,7 +18,6 @@
};
interactive.nodes.machine = {
services.glitchtip.listenAddress = "0.0.0.0";
networking.firewall.allowedTCPPorts = [ 8000 ];
virtualisation.forwardPorts = [
{
@@ -29,9 +28,13 @@
];
};
interactive.sshBackdoor.enable = true;
interactive.defaults.virtualisation.graphics = false;
testScript = ''
import json
import re
import time
machine.wait_for_unit("chhoto-url.service")
machine.wait_for_open_port(8000)
@@ -53,8 +56,10 @@
assert (match := re.search(r"(?m)^location: (.+?)\r?$", resp))
assert match[1] == "https://nixos.org/"
time.sleep(2)
resp = json.loads(machine.succeed(f"curl -H 'X-API-Key: api_key' localhost:8000/api/expand -d '{slug}'"))
assert resp["success"] is True
assert resp["longurl"] == "https://nixos.org/"
assert resp["hits"] == 1
'';
}
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-fgIxS3c3+teMTMCXzRINFuV1aebJAQFIXfXC7Q2zHhg=";
hash = "sha256-0iSA2ck0tJdOiiDlhwp7XaqYDFEAMZyI9mALIvYD6Zw=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-LdSx/7CspsT5hff6oQKRFmxQS+vi0kpvCgbcq8OQSAA=";
hash = "sha256-35dMOAr9pb7Tb5gkiDp2K0xdodGduOEcJ9IFSenD03s=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-ct7RcbzKHiZ/PRl42IFoHroR4i4gDVuHSX1t4FDN+R0=";
hash = "sha256-rojFi5393B56j86IAtWWVP0XiNeCsnAvTFIr3CcGZYY=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-N/AeA4E0tSHH3lrPhuyqPDl5nE+aNK/ntsW4ai+Sf5s=";
hash = "sha256-X8nXfpfaM9KtZLvL4ACyevrtdm+eihtjXVlYHSSas78=";
};
};
in
{
name = "claude-code";
publisher = "anthropic";
version = "2.1.197";
version = "2.1.198";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
+8 -6
View File
@@ -8,28 +8,30 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chhoto-url";
version = "7.2.1";
version = "7.4.1";
src = fetchFromGitHub {
owner = "SinTan1729";
repo = "chhoto-url";
tag = finalAttrs.version;
hash = "sha256-n8fCQeY0gIyZuACKWa8Fk9TQ680PpVS2MHMFy7UgDwk=";
hash = "sha256-1kPXsN5gOfY8JyaV6J5X2cEH00Xm06nsU5GNuVDxBJo=";
fetchLFS = true;
};
sourceRoot = "${finalAttrs.src.name}/actix";
sourceRoot = "${finalAttrs.src.name}/backend";
postPatch = ''
substituteInPlace src/{main.rs,services/get.rs,services/utils.rs} \
--replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
--replace-fail "./frontend/" "${placeholder "out"}/share/chhoto-url/frontend/"
substituteInPlace Cargo.toml \
--replace-fail 'rust-version = "1.96"' 'rust-version = "1.95"'
'';
cargoHash = "sha256-9EVGsOipx9ObygpM37iZYLnhYjSMHFhHTDvjHkLWLz8=";
cargoHash = "sha256-H3HrHu1y8wIc0j3cCIPOUnFe1jzpx1vCSfZvushIf70=";
postInstall = ''
mkdir -p $out/share/chhoto-url
cp -r ${finalAttrs.src}/resources $out/share/chhoto-url/resources
cp -r ${finalAttrs.src}/frontend $out/share/chhoto-url/frontend
'';
passthru = {
+19 -19
View File
@@ -1,47 +1,47 @@
{
"version": "2.1.197",
"commit": "c8fd8048f30950a21d28734718275aa7e97f5143",
"buildDate": "2026-06-29T19:16:30Z",
"version": "2.1.198",
"commit": "b80c496480ebf28e6dfe755cf0b8e3dd1d7cba1f",
"buildDate": "2026-07-01T06:17:25Z",
"platforms": {
"darwin-arm64": {
"binary": "claude",
"checksum": "8cc0c4d1e4eb1dca3b0cc92ab02ee3505de764e023f8c901761c167b72041fb8",
"size": 227251472
"checksum": "ab6f7ee109816ede414f7c285446633f805b623aa609f425609a64266451d61e",
"size": 229328464
},
"darwin-x64": {
"binary": "claude",
"checksum": "5e8a57cc7a92377f0744fa4c79191cf93d4b26c79cb919b07a407511fed1be26",
"size": 235288016
"checksum": "280b6cfc60dacc4caed31af1249e53c259c01759556e60633944c02405c82dd0",
"size": 238706000
},
"linux-arm64": {
"binary": "claude",
"checksum": "fb48473c467c27615ac799a754f4ef0b68c363e4596cefbb59c3815d51a0cc8a",
"size": 242334448
"checksum": "99b50a6f2b1f3ef07bcaf1e58a2f9883c470c84e428afa321972b1aa20372e9a",
"size": 245742320
},
"linux-x64": {
"binary": "claude",
"checksum": "f54e69cbc89b2da61a415700af7ff52a147e862517d4f1b0eecf768448cf7f83",
"size": 245517112
"checksum": "7066af42a5fe93038c13af5072d4c034dc3928092cb121fdd892c76b94b6b84d",
"size": 248900408
},
"linux-arm64-musl": {
"binary": "claude",
"checksum": "acb885610ba06d90c46206ded9b14121bc30e96affecbfb3c37d511bf02af2bd",
"size": 235582648
"checksum": "88cb391085e419457569bcc57a672f734f30b424e17df7323f3bbb421238e801",
"size": 238990520
},
"linux-x64-musl": {
"binary": "claude",
"checksum": "2f610c0f81341052426981b5dc59277a33e6ec3df924071b24edbc05e6a096dc",
"size": 240202112
"checksum": "42892159a03bee492926b616b1270313544f7a52b68d32cb680e91984a4c6659",
"size": 243589504
},
"win32-x64": {
"binary": "claude.exe",
"checksum": "038bd9fe90c60304601e19751269a50d62925c541dd6a2b3da5274549e9416ee",
"size": 236121248
"checksum": "6afd07cb03aa981c5e918808f53a1e2b729015b695122a944f6e41aaf5393933",
"size": 239292064
},
"win32-arm64": {
"binary": "claude.exe",
"checksum": "8d2baeaf77b0e79ea33cf5ce78a37e64804c3a26d63d35355a830fda404a4f61",
"size": 230588064
"checksum": "10a6d21332f674c87f52b1dc09926945d0169f1bb82aced84ada100639ab70bc",
"size": 233758880
}
}
}
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "egctl";
version = "1.8.0";
version = "1.8.2";
src = fetchFromGitHub {
owner = "envoyproxy";
repo = "gateway";
tag = "v${finalAttrs.version}";
hash = "sha256-KvXOLyMWtl4ycz6P4LQalODD95ptCY7tQtxtYG2x+28=";
hash = "sha256-givYesuucfw/gumEwxpU/NTtyfZQgmGXg7u+xg9Yx0s=";
};
vendorHash = "sha256-wiehH9qmDVLho+ZDQH5IbckO0LP3FLxHhYXBMA8aBjs=";
vendorHash = "sha256-5Hlycq0+/wvboP81MKlKBFLEgxa545eyXwPtueHONNE=";
# Fix case-insensitive conflicts producing platform-dependent checksums
# https://github.com/microsoft/go-mssqldb/issues/234
proxyVendor = true;
+3 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "iina";
version = "1.4.2";
version = "1.4.4";
src = fetchurl {
url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg";
hash = "sha256-Lg/Yn7uhySpsEVFx5bUZBIg7tJf75ROmlh0ID7qwj/Y=";
hash = "sha256-3Q/AvUs3+1ehyNMNbjIBs6ZLr9KZWf5WlTlkYTI3vrE=";
};
nativeBuildInputs = [ undmg ];
@@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [
arkivm
FlameFlag
kinnrai
stepbrobd
];
mainProgram = "iina";
+89
View File
@@ -0,0 +1,89 @@
{
lib,
stdenv,
fetchurl,
gtk3,
gtk2,
gdk-pixbuf,
dbus-glib,
libx11,
libxcomposite,
libxcursor,
libxdamage,
libxext,
libxi,
libxrender,
libxt,
libpulseaudio,
libGL,
pango,
freetype,
fontconfig,
autoPatchelfHook,
makeWrapper,
wrapGAppsHook3,
}:
stdenv.mkDerivation rec {
pname = "seamonkey";
version = "2.53.23";
strictDeps = true;
__structuredAttrs = true;
# Upstream requires highly deprecated build tools to compile from source
src = fetchurl {
url = "https://archive.seamonkey-project.org/releases/${version}/linux-x86_64/en-US/seamonkey-${version}.en-US.linux-x86_64.tar.bz2";
sha256 = "1si5vqprq7hgm366db76yziqxcqdvxj675kgxb6lp2ppprl8rlkw";
};
nativeBuildInputs = [
wrapGAppsHook3
autoPatchelfHook
makeWrapper
];
buildInputs = [
gtk2
gtk3
gdk-pixbuf
dbus-glib
libpulseaudio
libGL
pango
freetype
fontconfig
libxi
libxcursor
libxdamage
libxrender
libxcomposite
libxext
libx11
libxt
];
installPhase = ''
mkdir -p $out/lib/seamonkey $out/bin
cp -r * $out/lib/seamonkey/
ln -s $out/lib/seamonkey/seamonkey $out/bin/seamonkey
wrapProgram $out/bin/seamonkey \
--prefix LD_LIBRARY_PATH : "${
lib.makeLibraryPath [
libpulseaudio
libGL
]
}"
'';
meta = with lib; {
description = "The SeaMonkey project is a community effort to deliver production-quality releases of code names previously known as 'Mozilla Application Suite'";
homepage = "https://www.seamonkey-project.org/";
license = licenses.mpl20;
platforms = [ "x86_64-linux" ];
maintainers = [ lib.maintainers.redhood ];
mainProgram = "seamonkey";
};
}
+42
View File
@@ -0,0 +1,42 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "xacro";
version = "2.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "ros";
repo = "xacro";
tag = finalAttrs.version;
hash = "sha256-xYFwVM5qpy2/cYKtcf/v5sSlL2e/taIC4IQ48ZiRxiw=";
};
build-system = [
python3Packages.setuptools
python3Packages.setuptools-scm
];
dependencies = [
python3Packages.pyyaml
];
pythonImportsCheck = [ "xacro" ];
strictDeps = true;
__structuredAttrs = true;
meta = {
description = "Xacro is an XML macro language. With xacro, you can construct shorter and more readable XML files by using macros that expand to larger XML expressions";
homepage = "https://github.com/ros/xacro";
changelog = "https://github.com/ros/xacro/blob/${finalAttrs.src.rev}/CHANGELOG.rst";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ nim65s ];
mainProgram = "xacro";
};
})
+54
View File
@@ -0,0 +1,54 @@
{
lib,
fetchFromGitHub,
python3Packages,
xacro,
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "xacrodoc";
version = "2.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "adamheins";
repo = "xacrodoc";
tag = "v${finalAttrs.version}";
hash = "sha256-zuyd+lVcrz06yEgapoTjOZP+mxfOsk52rQE33aKV0qI=";
};
build-system = [
python3Packages.hatchling
];
dependencies = [
python3Packages.rospkg
xacro
];
optional-dependencies = {
mujoco = [
python3Packages.mujoco
];
};
nativeCheckInputs = [
python3Packages.pytestCheckHook
];
pythonImportsCheck = [
"xacrodoc"
];
strictDeps = true;
__structuredAttrs = true;
meta = {
description = "Compile xacro files to plain URDF or MJCF from Python or the command line (no ROS required)";
homepage = "https://github.com/adamheins/xacrodoc";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nim65s ];
mainProgram = "xacrodoc";
};
})
@@ -112,6 +112,11 @@ buildPythonPackage (finalAttrs: {
webcolors
];
disabledTests = [
# flaky, timeout
"test_plot_trace_dist"
];
meta = {
description = "ArviZ modular plotting";
homepage = "https://github.com/arviz-devs/arviz-plots";
@@ -2,30 +2,37 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
versioneer,
numpy,
pytestCheckHook,
python,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "bottleneck";
version = "1.6.0";
format = "setuptools";
pyproject = true;
__structuredAttrs = true;
src = fetchPypi {
inherit pname version;
inherit (finalAttrs) pname version;
hash = "sha256-Ao1G7ksCWtmrTXmSQROBb4JfYrF7h8nh0NjOFEpKDjE=";
};
propagatedBuildInputs = [ numpy ];
build-system = [
setuptools
versioneer
];
dependencies = [ numpy ];
nativeCheckInputs = [ pytestCheckHook ];
preCheck = "pushd $out";
postCheck = "popd";
disabledTests = [ "test_make_c_files" ];
pythonImportsCheck = [ "bottleneck" ];
meta = {
@@ -34,4 +41,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd2;
maintainers = [ ];
};
}
})
File diff suppressed because it is too large Load Diff