chore(marmel): bump to 981b35b (main)
CI / check (push) Has been cancelled

Track upstream main at 981b35b0d356e56de429ab4198e427ccfbe7d85f
(2026-10-17). Cargo.lock is unchanged between the two revisions, so
cargoHash stays; src hash regenerated by nix-update. Version string
follows nix-update's 0-unstable-* dated scheme now.

Both downstream patches still apply and upstream issues stay open
(Na1w/marmel#14, #13, fix PR #16 unmerged), so nix-overlay-pnb and
nix-overlay-nn2 remain blocked. Lib suite now passes at 1030 tests
with the same single DNS sandbox filter; comment updated.
This commit is contained in:
2026-10-18 14:51:58 +03:00
parent 5a032f4182
commit cb3f338e57
+6 -5
View File
@@ -9,14 +9,15 @@ rustPlatform.buildRustPackage rec {
pname = "marmel"; pname = "marmel";
# Upstream publishes no git tags and no GitHub releases, and Cargo.toml still # Upstream publishes no git tags and no GitHub releases, and Cargo.toml still
# says 1.0.0, so the version is meaningless and the source is tracked by # says 1.0.0, so the version is meaningless and the source is tracked by
# branch head. Bump with nix-update (see passthru.updateScript). # branch head, dated by nix-update's 0-unstable-* scheme. Bump with
version = "1.0.0"; # nix-update (see passthru.updateScript).
version = "0-unstable-2026-10-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Na1w"; owner = "Na1w";
repo = "marmel"; repo = "marmel";
rev = "3f238ff217ee2e1033c937c840bd2d33ec57abc4"; rev = "981b35b0d356e56de429ab4198e427ccfbe7d85f";
hash = "sha256-ijSsUAJom/uIiE09PM1kfXqNVCRqnipAQo72KXlr8sQ="; hash = "sha256-Z72o5LsjwTIk1EsiTYfNO+WIFzOSOEmCzzfyJKksYF4=";
}; };
cargoHash = "sha256-etqW3xcxkiNfkiPxl/Emt5pQCkNnoIhHFkX0Zqfs4rc="; cargoHash = "sha256-etqW3xcxkiNfkiPxl/Emt5pQCkNnoIhHFkX0Zqfs4rc=";
@@ -56,7 +57,7 @@ rustPlatform.buildRustPackage rec {
# no-network build sandbox does not provide. landlock-nix-store.patch fixed the # no-network build sandbox does not provide. landlock-nix-store.patch fixed the
# exec half for both sandbox-exec tests: with it, the cross-directory rename # exec half for both sandbox-exec tests: with it, the cross-directory rename
# test runs for real (no SKIP printed by `integration_host`) and the lib suite # test runs for real (no SKIP printed by `integration_host`) and the lib suite
# passes at 966 tests with that single filter. # passes at 1030 tests with that single filter.
cargoTestFlags = [ cargoTestFlags = [
"--" "--"
"--test-threads=1" "--test-threads=1"