From e4e3aa82c6ae2e6ca4401bad82a8f4a7a0610455 Mon Sep 17 00:00:00 2001 From: Chris Wells Date: Mon, 6 Oct 2025 13:56:07 -0500 Subject: Updated cooklang-chef --- pkgs/chef/default.nix | 26 +++++++++++++------------- pkgs/cook-import/default.nix | 17 ----------------- 2 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 pkgs/cook-import/default.nix (limited to 'pkgs') diff --git a/pkgs/chef/default.nix b/pkgs/chef/default.nix index b765966..2830cae 100644 --- a/pkgs/chef/default.nix +++ b/pkgs/chef/default.nix @@ -1,39 +1,39 @@ -{ rustPlatform, fetchFromGitHub, lib, installShellFiles -, ... }: -let +{ rustPlatform, fetchFromGitHub, lib, installShellFiles }: +rustPlatform.buildRustPackage rec { pname = "cooklang-chef"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Zheoni"; repo = "cooklang-chef"; rev = "v${version}"; - hash = "sha256-YPsofecsdiJE4rWVy82ao99YZiCPEPoF14XavTAhq+w="; + hash = "sha256-U/zEtDHIAjBakMjIqpJeFzTxof8SHSgLj9zjgND6q1Q="; }; -in rustPlatform.buildRustPackage { - inherit pname version src; - cargoHash = "sha256-77KPW4SQ9KI0H+ND3mFITJjftLjpLMXi7qp0PUZOINw="; + cargoLock.lockFile = "${src}/Cargo.lock"; nativeBuildInputs = [ installShellFiles ]; postInstall = '' + # Without setting $XDG_CONFIG_HOME, `chef` will complain when trying to generate completion scripts export XDG_CONFIG_HOME=$out/share for s in bash fish zsh; do - installShellCompletion --cmd chef --$s <($out/bin/chef generate-completions $s) + installShellCompletion --cmd ${meta.mainProgram} --$s <($out/bin/chef generate-completions $s) done ''; - # passthru = { - # inherit ui; - # }; - meta = with lib; { homepage = "https://github.com/Zheoni/cooklang-chef"; description = "A CLI to manage cooklang recipes with extensions"; license = licenses.mit; mainProgram = "chef"; + maintainer = { + name = "Chris Wells"; + github = "the-mathematicaster"; + email = "chris@mathematicaster.org"; + githubId = 99217745; + }; }; } diff --git a/pkgs/cook-import/default.nix b/pkgs/cook-import/default.nix deleted file mode 100644 index 512745e..0000000 --- a/pkgs/cook-import/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ poetry2nix, fetchFromGitHub, lib, ... }: -poetry2nix.mkPoetryApplication { - projectDir = fetchFromGitHub { - owner = "cooklang"; - repo = "cook-import"; - rev = "d92e44a"; - hash = "sha256-SSrLN0qhHNalF8RrsZvezqZvAkcKCLukSGW9f3IHIIE="; - }; - - meta = with lib; { - homepage = "https://github.com/cooklang/cook-import"; - description = "A command-line tool to import recipes into Cooklang format"; - license = licenses.mit; - mainProgram = "cook-import"; - broken = true; - }; -} -- cgit v1.2.3