From 0a4516997569f38781df30c62a80be5044ef4e0f Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Sun, 29 Mar 2026 19:05:12 -0700 Subject: [PATCH] engage: 0.2.1 -> 0.3.0 --- .../en/engage/mdbook-0.5-support.patch | 16 -------- pkgs/by-name/en/engage/package.nix | 38 ++++++------------- 2 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 pkgs/by-name/en/engage/mdbook-0.5-support.patch diff --git a/pkgs/by-name/en/engage/mdbook-0.5-support.patch b/pkgs/by-name/en/engage/mdbook-0.5-support.patch deleted file mode 100644 index 0082bf5e7a37..000000000000 --- a/pkgs/by-name/en/engage/mdbook-0.5-support.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/book.toml -+++ b/book.toml -@@ -1,6 +1,5 @@ - [book] - language = "en" --multilingual = false - src = "book" - title = "Engage" - -@@ -8,5 +7,5 @@ build-dir = "public" - - [output.html] --git-repository-icon = "fa-git-square" -+git-repository-icon = "fab-square-git" - git-repository-url = "https://gitlab.computer.surgery/charles/engage" - diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 7c1fc1f965ae..f84600272bdd 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -3,21 +3,15 @@ installShellFiles, rustPlatform, fetchFromGitLab, - stdenv, mdbook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "engage"; - version = "0.2.1"; - - outputs = [ - "out" - "doc" - ]; + version = "0.3.0"; env = { - ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/engage/index.html"; + ENGAGE_BOOK_PATH = "${placeholder "out"}/share/doc/${finalAttrs.pname}"; }; src = fetchFromGitLab { @@ -25,29 +19,21 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "charles"; repo = "engage"; rev = "v${finalAttrs.version}"; - hash = "sha256-n7ypFJBYT712Uzh1NnWWSOIpEDKR0e6sQxbiIN6pZgo="; + hash = "sha256-dKnpovsBcx3fyDK2eSVf4vzJaQ0uNGcKoYSE56kUDEg="; }; - patches = [ - # Support mdbook 0.5.x - remove deprecated multilingual field - ./mdbook-0.5-support.patch - ]; - - cargoHash = "sha256-UTIxxPBtxzsZilxriAT8ksl2ovoDzIhB+8f+b2cGN3k="; + cargoHash = "sha256-wHPjVP/hzMdmKVYDzjUGoaSKwcf7A9nYeM5HhvBQ+bc="; nativeBuildInputs = [ installShellFiles ]; - checkFlags = [ - # Upstream doesn't set `ENGAGE_DOCS_LINK` during tests so the output differs. - "--skip=long_help" - ]; + buildAndTestSubdir = "crates/engage"; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + postInstall = '' installShellCompletion --cmd engage ${ builtins.concatStringsSep " " ( - map (shell: "--${shell} <($out/bin/engage completions ${shell})") [ + map (shell: "--${shell} <(cargo xtask completions ${shell})") [ "bash" "zsh" "fish" @@ -56,15 +42,15 @@ rustPlatform.buildRustPackage (finalAttrs: { } ${lib.getExe mdbook} build - mkdir -p "$doc/share/doc" - mv public "$doc/share/doc/engage" + mkdir -p $out/share/doc + mv public $out/share/doc/${finalAttrs.pname} ''; meta = { - description = "Task runner with DAG-based parallelism"; + description = "Process composer with ordering and parallelism based on directed acyclic graphs"; mainProgram = "engage"; - homepage = "https://gitlab.computer.surgery/charles/engage"; - changelog = "https://charles.gitlab-pages.computer.surgery/engage/changelog.html"; + homepage = "https://engage.computer.surgery"; + changelog = "https://engage.computer.surgery/changelog.html"; license = with lib.licenses; [ asl20 mit