From 4e2eb4aa397f293a67872edcd67cf510f444310b Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Mon, 27 Jul 2026 14:16:18 +0100 Subject: [PATCH] rename leaf to leaf-markdown to not collide with existing package --- flake.nix | 2 +- overlays.nix | 2 +- pkgs/leaf.nix | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a33c2af..1ef8cb2 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ { inherit (moppkgs) edalize - leaf + leaf-markdown naturaldocs slang-server ttf2psf diff --git a/overlays.nix b/overlays.nix index eba8e05..bcd1e48 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,7 +1,7 @@ let overlays = (builtins.mapAttrs (name: value: (final: prev: { "${name}" = value final prev; })) { - leaf = final: _: final.callPackage ./pkgs/leaf.nix { }; + leaf-markdown = final: _: final.callPackage ./pkgs/leaf.nix { }; comic-code = final: _: final.callPackage ./pkgs/comic-code.nix { }; edalize = final: _: final.callPackage ./pkgs/edalize.nix { }; naturaldocs = final: _: final.callPackage ./pkgs/naturaldocs.nix { }; diff --git a/pkgs/leaf.nix b/pkgs/leaf.nix index 00651c3..e7f453d 100644 --- a/pkgs/leaf.nix +++ b/pkgs/leaf.nix @@ -4,7 +4,7 @@ rustPlatform, }: rustPlatform.buildRustPackage (finalAttrs: { - pname = "leaf"; + pname = "leaf-markdown"; version = "1.26.2"; src = fetchFromGitHub { owner = "RivoLink"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; cargoHash = "sha256-/IGQ0UTvQGU4KQKl5mocGeGEDx4AdMQQTv4B3bkpIJ0="; meta = { + mainProgram = "leaf"; description = "Terminal Markdown previewer"; homepage = "https://leaf.rivolink.mg"; license = lib.licenses.mit; -- 2.51.2