Unverified Commit b7d9ab22 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

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

gitea: fix passthru.data-compressed
parents 778c4041 1bd35044
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
{
  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)}
''
+1 −1
Original line number Diff line number Diff line
@@ -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;
  };