chore(marmel): bump to afcc1dc (main), give checks a usable TMPDIR
CI / check (push) Has been cancelled
CI / check (push) Has been cancelled
Track upstream main at afcc1dc971ae4acd59b157f031d4bdbc9d52a7d0 (2026-11-07), 22 commits past the de3e99c8 pin. Upstream still ships no tags or releases and Cargo.toml still reads version 1.0.0, so the dated 0-unstable-* string stays. cargoHash moves on its own: the new crates/zim-search workspace member grew Cargo.lock from 399 to 621 entries, and cargo vendor hashes the whole workspace. The real packaging work is the TMPDIR override appended to preCheck. Upstream's new harness::fs::path_tests scratch-root helper puts its scratch dirs under <cwd>/target/ and first asserts that root lies outside std::env::temp_dir(). The build sandbox exports TMPDIR=/build, which is an ancestor of the unpacked source at /build/source, so that premise check tripped and all 8 path-security tests failed with "scoped root /build/source/target/marmel-path-tests-N sits inside the temp allow-list entry /build". Pointing TMPDIR at /tmp/marmel-check-tmp, outside $NIX_BUILD_TOP, restores upstream's premise, so all 8 tests keep running for real instead of being filtered out of cargoTestFlags. Build-time only; the installed binary is untouched. Two derivation comments carried stale facts and are corrected: - meta.license claimed the repository shipped no LICENSE file and that Cargo.toml had no license field. Upstream c98179d023 (Na1w/marmel#40) added a root LICENSE file and declared license = "MIT" in Cargo.toml, so the comment now records that MIT is asserted in the README, Cargo.toml and LICENSE alike; lib.licenses.mit was already the right value. - the cargoTestFlags comment quoted "the lib suite passes at 1055 tests". Roughly 500 test fns landed since (TUI, fs-path, PTY and dispatch-integrity suites), so the figure is dropped rather than refreshed: nothing checks it and it rots on every bump. Also adds the two research notes behind the bump under docs/: the de3e99c8..afcc1dc9 upstream delta audit and the update-tooling findings. Verified: clean nix build .#marmel including the serialised test suite (--test-threads=1) — 2146 passed, 0 failed.
This commit is contained in:
@@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec {
|
||||
# says 1.0.0, so the version is meaningless and the source is tracked by
|
||||
# branch head, dated by nix-update's 0-unstable-* scheme. Bump with
|
||||
# nix-update (see passthru.updateScript).
|
||||
version = "0-unstable-2026-10-23";
|
||||
version = "0-unstable-2026-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Na1w";
|
||||
repo = "marmel";
|
||||
rev = "de3e99c89b18bf43fbb471930bd9f7a40e1ca1b2";
|
||||
hash = "sha256-Z8qvzwSTpri9M05xZ07PJi9xSYIgBOos9bDh0NijSZg=";
|
||||
rev = "afcc1dc971ae4acd59b157f031d4bdbc9d52a7d0";
|
||||
hash = "sha256-OiF2Lc4s01MuXX2HfWMePBJ9M/uuhI69gInqqDPhbgQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FbtY6K+0tG7JymhG/PnK+SU7SW/IFjG8Wswt+EnWPhg=";
|
||||
cargoHash = "sha256-Xw9OT8HXVlnZ0XqIMnnFwQ/y9xKxOtmcwomJsRxUx5E=";
|
||||
|
||||
nativeCheckInputs = [ cacert ];
|
||||
|
||||
@@ -38,8 +38,18 @@ rustPlatform.buildRustPackage rec {
|
||||
# system") and every request fails terminally with ChatError::TrustStore, so
|
||||
# point the tests at nixpkgs' bundle. Build-time only; the installed binary
|
||||
# still uses the host's trust store at runtime.
|
||||
# Upstream's harness::fs::path_tests scratch-root helper puts its scratch
|
||||
# dirs under <cwd>/target/ and asserts that root lies outside
|
||||
# std::env::temp_dir(). In the build sandbox TMPDIR is /build, which is an
|
||||
# ancestor of the unpacked source dir /build/source, so that premise check
|
||||
# fails for all 8 tests ("scoped root /build/source/target/marmel-path-tests-N
|
||||
# sits inside the temp allow-list entry /build"). Pointing TMPDIR at a
|
||||
# directory outside $NIX_BUILD_TOP restores the premise, so all 8
|
||||
# path-security tests keep running instead of being skipped.
|
||||
preCheck = ''
|
||||
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
mkdir -p /tmp/marmel-check-tmp
|
||||
export TMPDIR=/tmp/marmel-check-tmp
|
||||
'';
|
||||
|
||||
# Serialise the test harness. The lib suite shares process-global worker
|
||||
@@ -57,8 +67,9 @@ rustPlatform.buildRustPackage rec {
|
||||
# the resolv.conf half is a fixture question). Upstream now lists
|
||||
# /nix/store and /gnu/store in BUILTIN_READONLY_PATHS, so the cross-directory
|
||||
# rename test and test_internal_sandbox_extra_readonly_paths_never_grant_write
|
||||
# run for real here: no SKIP line is printed and the lib suite passes at 1055
|
||||
# tests with that single filter.
|
||||
# run for real here: no SKIP line is printed and the lib suite passes with that
|
||||
# single filter. No test count is quoted here on purpose: the suite grows on
|
||||
# almost every bump, so any hard-coded number rots immediately.
|
||||
cargoTestFlags = [
|
||||
"--"
|
||||
"--test-threads=1"
|
||||
@@ -91,8 +102,10 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Autonomous agentic coding assistant with Manager + specialist subagent orchestration over any OpenAI-compatible LLM backend";
|
||||
homepage = "https://github.com/Na1w/marmel";
|
||||
# Upstream README states MIT, but the repository ships no LICENSE file and
|
||||
# Cargo.toml has no license field.
|
||||
# Upstream README states MIT, and since c98179d023 ("docs: add MIT license and
|
||||
# update license metadata", Na1w/marmel#40) the repository also ships a
|
||||
# LICENSE file at the root and Cargo.toml declares `license = "MIT"`, which
|
||||
# both agree with lib.licenses.mit.
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
mainProgram = "marmel";
|
||||
|
||||
Reference in New Issue
Block a user