From 0f068090001d7f850f6266480146f682d7973ea1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 3 Jun 2025 17:34:48 -0700 Subject: [PATCH] certificate-ripper: refactor to finalAttrs style --- .../by-name/ce/certificate-ripper/package.nix | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix index 97e43c693096..ece2a2fa1186 100644 --- a/pkgs/by-name/ce/certificate-ripper/package.nix +++ b/pkgs/by-name/ce/certificate-ripper/package.nix @@ -5,18 +5,18 @@ buildGraalvmNativeImage, }: -let +buildGraalvmNativeImage (finalAttrs: { pname = "certificate-ripper"; version = "2.4.1"; - jar = maven.buildMavenPackage { - pname = "${pname}-jar"; - inherit version; + src = maven.buildMavenPackage { + pname = "certificate-ripper-jar"; + inherit (finalAttrs) version; src = fetchFromGitHub { owner = "Hakky54"; repo = "certificate-ripper"; - tag = version; + tag = finalAttrs.version; hash = "sha256-qQ5BHH+DT1sGNDGzSbclqc6+byBxyP16qvm3k9E/Yks="; }; @@ -46,13 +46,6 @@ let install -Dm644 target/crip.jar $out ''; }; -in -buildGraalvmNativeImage { - inherit pname version; - - src = jar; - - executable = "crip"; # Copied from pom.xml extraNativeImageBuildArgs = [ @@ -62,10 +55,11 @@ buildGraalvmNativeImage { ]; meta = { - changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${jar.src.tag}"; + changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${finalAttrs.version}"; description = "CLI tool to extract server certificates"; homepage = "https://github.com/Hakky54/certificate-ripper"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tomasajt ]; + mainProgram = "crip"; }; -} +})