dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #335670 from motiejus/gitea.passthru.data-compressed

Browse Source 
gitea: fix passthru.data-compressed
This commit is contained in:
Philip Taron 2024-08-18 17:05:25 -07:00 committed by GitHub
commit b7d9ab22ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/compress-drv/default.nix
View File

@ -1,8 +1,4 @@
{
lib,
xorg,
runCommand,
}:
{ lib, runCommand }:
/**
Compresses files of a given derivation, and returns a new derivation with
compressed files
@ -72,7 +68,11 @@ let
in
runCommand "${drv.name}-compressed" { } ''
mkdir $out
(cd $out; ${xorg.lndir}/bin/lndir ${drv})
# cannot use lndir here, because it also symlinks directories,
# which we do not need; we only need to symlink files.
(cd ${drv}; find -L -type d -exec mkdir -p $out/{} ';')
(cd ${drv}; find -L -type f -exec ln -s ${drv}/{} $out/{} ';')
${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)}
''

2
pkgs/by-name/gi/gitea/package.nix
View File

@ -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;
};