From d97365e05e847554a7c51146a059a750cc9ceed4 Mon Sep 17 00:00:00 2001 From: Motiejus Jakštys Date: Thu, 29 Feb 2024 14:14:38 +0200 Subject: gitea.passthru.data-compressed: switch to compressDrvWeb --- pkgs/by-name/gi/gitea/package.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'pkgs/by-name/gi') diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 4bb7c0014c0d..81625263a356 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -6,15 +6,13 @@ , git , bash , coreutils +, compressDrvWeb , gitea , gzip , openssh , pam , sqliteSupport ? true , pamSupport ? stdenv.hostPlatform.isLinux -, runCommand -, brotli -, xorg , nixosTests , buildNpmPackage }: @@ -90,19 +88,7 @@ in buildGoModule rec { ''; passthru = { - data-compressed = runCommand "gitea-data-compressed" { - nativeBuildInputs = [ brotli xorg.lndir ]; - } '' - mkdir -p $out/{options,public,templates} - lndir ${frontend}/public $out/public - lndir ${gitea.data}/options $out/options - lndir ${gitea.data}/templates $out/templates - - # Create static gzip and brotli files - find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \ - -exec gzip --best --keep --force {} ';' \ - -exec brotli --best --keep --no-copy-stat {} ';' - ''; + data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data); tests = nixosTests.gitea; }; -- cgit 1.4.1