From 4e0f3b562f14ea7a0706e5af119e837216dfd733 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:22:37 +0200 Subject: [PATCH 1/8] kdlfmt: use finalAttrs pattern --- pkgs/by-name/kd/kdlfmt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 2cd565874e0f..0050f24292b2 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "kdlfmt"; version = "0.1.0"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qc2wU/borl3h2fop6Sav0zCrg8WdvHrB3uMA72uwPis="; }; @@ -21,9 +21,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Formatter for kdl documents"; homepage = "https://github.com/hougesen/kdlfmt.git"; - changelog = "https://github.com/hougesen/kdlfmt/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/hougesen/kdlfmt/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ airrnot ]; mainProgram = "kdlfmt"; }; -} +}) From 89b56a70d9c20ab9c4102d0cb9f83fde68024230 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:23:03 +0200 Subject: [PATCH 2/8] kdlfmt: use tag in fetchFromGitHub --- pkgs/by-name/kd/kdlfmt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 0050f24292b2..41798e0039ac 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-qc2wU/borl3h2fop6Sav0zCrg8WdvHrB3uMA72uwPis="; }; From 0f5114eaafa3cf072dfbc1a496bc02718a24dd02 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:24:51 +0200 Subject: [PATCH 3/8] kdlfmt: fix meta.homepage --- pkgs/by-name/kd/kdlfmt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 41798e0039ac..df18e865f1a5 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Formatter for kdl documents"; - homepage = "https://github.com/hougesen/kdlfmt.git"; + homepage = "https://github.com/hougesen/kdlfmt"; changelog = "https://github.com/hougesen/kdlfmt/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ airrnot ]; From 9613eaa68ca867783b66cae49d745aab8fc8cdec Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:33:43 +0200 Subject: [PATCH 4/8] kdlfmt: install shell completions --- pkgs/by-name/kd/kdlfmt/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index df18e865f1a5..dc60d8f7c842 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + stdenv, + installShellFiles, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -18,6 +20,15 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-xoOnFJqDucg3fUDx5XbXsZT4rSjZhzt5rNbH+DZ1kGA="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd kdlfmt \ + --bash <($out/bin/kdlfmt completions bash) \ + --fish <($out/bin/kdlfmt completions fish) \ + --zsh <($out/bin/kdlfmt completions zsh) + ''; + meta = { description = "Formatter for kdl documents"; homepage = "https://github.com/hougesen/kdlfmt"; From 2ddafa4845d3b5bc5e041ba0fada08866cd40a33 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:27:03 +0200 Subject: [PATCH 5/8] kdlfmt: add versionCheckHook --- pkgs/by-name/kd/kdlfmt/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index dc60d8f7c842..0e0347d974d3 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, stdenv, installShellFiles, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -29,6 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/kdlfmt completions zsh) ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "Formatter for kdl documents"; homepage = "https://github.com/hougesen/kdlfmt"; From 5ccdcf0fecc912cd697896d53aedd5763a7a6a91 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:27:17 +0200 Subject: [PATCH 6/8] kdlfmt: add updateScript --- pkgs/by-name/kd/kdlfmt/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 0e0347d974d3..6b6d2e101195 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -5,6 +5,7 @@ stdenv, installShellFiles, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -34,6 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Formatter for kdl documents"; homepage = "https://github.com/hougesen/kdlfmt"; From ba5e9fa34116940470ad04c4d3aaedf76bf91494 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 13:42:12 +0000 Subject: [PATCH 7/8] kdlfmt: 0.1.0 -> 0.1.2 Changelog: https://github.com/hougesen/kdlfmt/blob/v0.1.2/CHANGELOG.md Diff: https://github.com/hougesen/kdlfmt/compare/v0.1.0...v0.1.2 --- pkgs/by-name/kd/kdlfmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 6b6d2e101195..35a2ece7386c 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kdlfmt"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "hougesen"; repo = "kdlfmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-qc2wU/borl3h2fop6Sav0zCrg8WdvHrB3uMA72uwPis="; + hash = "sha256-xDv93cxCEaBybexleyTtcCCKHy2OL3z/BG2gJ7uqIrU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xoOnFJqDucg3fUDx5XbXsZT4rSjZhzt5rNbH+DZ1kGA="; + cargoHash = "sha256-TwZ/0G3lTCoj01e/qGFRxJCfe4spOpG/55GKhoI0img="; nativeBuildInputs = [ installShellFiles ]; From 2b6e4190c0b6128cfde96649f872d4eed9c47de4 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 20 Jun 2025 15:26:29 +0200 Subject: [PATCH 8/8] kdlfmt: add defelo as maintainer --- pkgs/by-name/kd/kdlfmt/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index 35a2ece7386c..53bcc3f445a3 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -42,7 +42,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/hougesen/kdlfmt"; changelog = "https://github.com/hougesen/kdlfmt/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ airrnot ]; + maintainers = with lib.maintainers; [ + airrnot + defelo + ]; mainProgram = "kdlfmt"; }; })