From bd833f85916619f179aaa919c1c0c9c7e07ce3d1 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 8 May 2025 03:58:09 +0800 Subject: [PATCH] jailer: 16.2 -> 16.6.1 --- pkgs/by-name/ja/jailer/package.nix | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ja/jailer/package.nix b/pkgs/by-name/ja/jailer/package.nix index 3f465f002c01..62e1c2d36cab 100644 --- a/pkgs/by-name/ja/jailer/package.nix +++ b/pkgs/by-name/ja/jailer/package.nix @@ -1,34 +1,28 @@ { lib, + stdenv, + fetchFromGitHub, ant, copyDesktopItems, - fetchFromGitHub, jdk, jre, makeDesktopItem, makeWrapper, - stdenv, stripJavaArchivesHook, wrapGAppsHook4, }: + stdenv.mkDerivation (finalAttrs: { pname = "jailer"; - version = "16.2"; + version = "16.6.1"; src = fetchFromGitHub { owner = "Wisser"; repo = "Jailer"; - rev = "bc00c6883bac0d09b549e35a10e202da477e4cb1"; - hash = "sha256-nXxTKbhvrBlorNqiF3wZDEgf1VrBamWw8ZSQSUqpGT8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-HyhozW8lMsC/LxExKfxG64L6ZKKqrgYQ8PX0606B6O0="; }; - buildPhase = '' - runHook preBuild - rm jailer.jar - ant - runHook postBuild - ''; - nativeBuildInputs = [ ant jdk @@ -38,6 +32,15 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; + buildPhase = '' + runHook preBuild + + rm jailer.jar + ant + + runHook postBuild + ''; + installPhase = '' runHook preInstall @@ -82,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool for database subsetting and relational data browsing"; license = lib.licenses.asl20; homepage = "https://github.com/Wisser/Jailer"; - changelog = "https://github.com/Wisser/Jailer/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Wisser/Jailer/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ guillaumematheron ]; mainProgram = "jailer"; };