From 1bd350449a98cf4f85d717831f0df3a62aeb4873 Mon Sep 17 00:00:00 2001 From: Motiejus Jakštys Date: Sun, 18 Aug 2024 22:40:18 +0300 Subject: gitea: fix passthru.data-compressed Fixes two bugs: - pass a forgotten `{}` to `compressDrv`. - remove incorrect usage of `lndir` in `compressDrv`. I added a brief comment on why, see [this comment][1] for more details. Tested with: ``` $ nix build .#legacyPackages.x86_64-linux.gitea.passthru.data-compressed $ ls -lh result/public/assets/licenses.txt* lrwxrwxrwx 1 root root 90 Jan 1 1970 result/public/assets/licenses.txt -> /nix/store/p21irsr57hckd3x3ym18aa0cr9zmm3an-gitea-1.22.1-data/./public/assets/licenses.txt -r--r--r-- 1 root root 30K Jan 1 1970 result/public/assets/licenses.txt.br -r--r--r-- 1 root root 82K Jan 1 1970 result/public/assets/licenses.txt.gz ``` [1]: https://github.com/NixOS/nixpkgs/pull/332752#discussion_r1721043286 --- pkgs/by-name/gi/gitea/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 81625263a356..6c6bd91ad717 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -88,7 +88,7 @@ in buildGoModule rec { ''; passthru = { - data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data); + data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data {}); tests = nixosTests.gitea; }; -- cgit 1.4.1