From a59f276e8c2d8b8cb9fad37016ffa5a4f56c178d Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 7 Nov 2024 05:17:45 +0000 Subject: [PATCH 1/3] gradle-completion: format with nixfmt-rfc-style --- pkgs/by-name/gr/gradle-completion/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix index f02977de87ef..e8a78492859f 100644 --- a/pkgs/by-name/gr/gradle-completion/package.nix +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "gradle-completion"; From 5c0fef8f1374b6357fbdb8119a568b85d5ffa5b8 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 7 Nov 2024 05:53:51 +0000 Subject: [PATCH 2/3] gradle-completion: fix finding by nixpkgs-hammering * use `installShellFiles` to avoid reinventing the wheel * use stdenvNoCC.mkDerivation to avoid pulling in a compiler * use `finalAttrs` * remove `with lib;` in `meta` --- pkgs/by-name/gr/gradle-completion/package.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix index e8a78492859f..f43f7c2c847d 100644 --- a/pkgs/by-name/gr/gradle-completion/package.nix +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -1,20 +1,25 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, + installShellFiles, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gradle-completion"; version = "1.4.1"; src = fetchFromGitHub { owner = "gradle"; repo = "gradle-completion"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2"; }; + nativeBuildInputs = [ + installShellFiles + ]; + strictDeps = true; # we just move two files into $out, @@ -22,20 +27,21 @@ stdenv.mkDerivation rec { preferLocalBuild = true; dontBuild = true; + installPhase = '' runHook preInstall - mkdir -p $out - install -Dm0644 ./_gradle $out/share/zsh/site-functions/_gradle - install -Dm0644 ./gradle-completion.bash $out/share/bash-completion/completions/gradle + installShellCompletion --name gradle \ + --bash gradle-completion.bash \ + --zsh _gradle runHook postInstall ''; - meta = with lib; { + meta = { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion"; - license = licenses.mit; - maintainers = [ ] ++ teams.java.members; + license = lib.licenses.mit; + maintainers = [ ] ++ lib.teams.java.members; }; -} +}) From a49f4cf7f51b6767d7ecd6dcc6c5bf3f10eb128f Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 7 Nov 2024 05:55:51 +0000 Subject: [PATCH 3/3] gradle-completion: add update script --- pkgs/by-name/gr/gradle-completion/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix index f43f7c2c847d..66df62b76538 100644 --- a/pkgs/by-name/gr/gradle-completion/package.nix +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchFromGitHub, installShellFiles, + gitUpdater, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -38,6 +39,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion";