From 0acbc1917df26a28a2739fc697e2b6706ffe7321 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 12 Jan 2025 11:33:35 +0100 Subject: [PATCH 1/2] reposilite: add uku3lig to maintainers --- pkgs/by-name/re/reposilite/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index 426da3db55eb..a0f78b2fc201 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -35,7 +35,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/dzikoysk/reposilite"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jamalam ]; + maintainers = with lib.maintainers; [ + jamalam + uku3lig + ]; inherit (jre_headless.meta) platforms; mainProgram = "reposilite"; }; From b32ad5613f29a7e4c2b6870c35ae0a4988428210 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 12 Jan 2025 11:26:07 +0100 Subject: [PATCH 2/2] reposilite: add proper plugin support --- pkgs/by-name/re/reposilite/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/reposilite/package.nix b/pkgs/by-name/re/reposilite/package.nix index a0f78b2fc201..15ff73caa47a 100644 --- a/pkgs/by-name/re/reposilite/package.nix +++ b/pkgs/by-name/re/reposilite/package.nix @@ -1,11 +1,20 @@ { - stdenv, lib, + stdenv, fetchurl, - makeWrapper, jre_headless, + linkFarm, + makeWrapper, + plugins ? [ ], }: - +let + pluginsDir = linkFarm "reposilite-plugins" ( + builtins.map (p: { + name = (builtins.parseDrvName p.name).name + ".jar"; + path = p.outPath or p; + }) plugins + ); +in stdenv.mkDerivation (finalAttrs: { pname = "Reposilite"; version = "3.5.20"; @@ -25,7 +34,9 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/lib cp $src $out/lib/reposilite makeWrapper ${jre_headless}/bin/java $out/bin/reposilite \ - --add-flags "-Xmx40m -jar $out/lib/reposilite" + --add-flags "-Xmx40m -jar $out/lib/reposilite ${ + lib.optionalString (plugins != [ ]) "--plugin-directory ${pluginsDir}" + }" runHook postInstall '';