Revert "Don't compress already-compressed files."

Dependencies

• [2] H7RT7EM6 Revert "Doh"
• [3] ALIOF64I * Use IO::Handles instead of old school filehandles. This ensures
• [4] 57Y7RG2A Update queryPathInfo calls
• [5] UCJEI7YZ Don't compress already-compressed files.
• [6] 3PNG7NIB Remove trailing whitespace
• [7] E55AMIV2 Doh
• [8] IDT3SO3P Generate *.narinfo files on the fly to support the binary cache substituter
• [9] NYC3LZKH * Generate NAR archives on the fly. Necessary for producing channels

Change contents

• edit in src/lib/Hydra/View/NARInfo.pm at line 5
  [3.742]→[3.0:25](∅→∅)
  − use Hydra::View::NixNAR;
• replacement in src/lib/Hydra/View/NARInfo.pm at line 20
  [3.1135]→[3.26:93](∅→∅)
  − $info .= "Compression: " . file_compression $storePath . "\n";
  [3.1135]

  [3.1269]
  + $info .= "Compression: bzip2\n";
• edit in src/lib/Hydra/View/NixNAR.pm at line 5
  [3.556]→[3.94:118](∅→∅),[3.118]→[2.0:22](∅→∅),[3.21]→[3.140:216](∅→∅),[2.22]→[3.140:216](∅→∅),[3.140]→[3.140:216](∅→∅)
  −

  − sub file_compression {

  − my ($file) = $@_;

  −

  − if /\\.(gz|bz2|xz|lz|zip)/

  − return "none";

  − else

  − return "bzip2";

  − }
• edit in src/lib/Hydra/View/NixNAR.pm at line 10
  [3.641]→[3.217:269](∅→∅)
  − my $compression = file_compression($storePath);
• edit in src/lib/Hydra/View/NixNAR.pm at line 12
  [3.729]→[3.270:347](∅→∅)
  − $c->response->content_length(-s $storePath) if ($compression == "none");
• replacement in src/lib/Hydra/View/NixNAR.pm at line 15
  [3.3115]→[3.348:489](∅→∅)
  − if ($compression == "none")

  − open $fh, "nix-store --dump '$storePath' |";

  − else

  − open $fh, "nix-store --dump '$storePath' | bzip2 |";
  [3.3115]

  [3.866]
  + open $fh, "nix-store --dump '$storePath' | bzip2 |";