Skip to content

gitea: fix passthru.data-compressed #335670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philiptaron merged 1 commit into from
Aug 19, 2024
Merged

gitea: fix passthru.data-compressed #335670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkgs/build-support/compress-drv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
lib,
xorg,
runCommand,
}:
{ lib, runCommand }:
/**
Compresses files of a given derivation, and returns a new derivation with
compressed files
Expand Down Expand Up @@ -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,
Copy link
Member

@SuperSandro2000 SuperSandro2000 Aug 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That comment is wrong. lndir never symlinks directories directly. Only if they are a symlink and then the input file is technically not a directory but a symlink to a directory.

# 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/{} ';')
Comment on lines +72 to +75
Copy link
Contributor

@philiptaron philiptaron Aug 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also just find this so much easier to reason about than lndir. I'm glad to see the return.

Copy link
Member

@SuperSandro2000 SuperSandro2000 Aug 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is just how lndir functions, that it doesn't recurse into other symlinks. Probably mainly to avoid symlink loops?


${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)}
''
2 changes: 1 addition & 1 deletion pkgs/by-name/gi/gitea/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down