Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: 7c90552879da
Choose a base ref
...
head repository: NixOS/nix
compare: 538575522781
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 22, 2021

  1. libutil: allow decompression with none/empty method 

    The S3 store relies on the ability to be able to decompress things with
an empty method, because it just passes the value of the Content-Encoding
directly to decompress.

If the file is not compressed, then this will cause the compression
routine to get confused.

This caused NixOS/nixpkgs#120120.
    @lukegb
    lukegb committed Apr 22, 2021
    Copy the full SHA
    97dde3c View commit details
    Browse the repository at this point in the history

  2. Merge branch 's3-decompress' of https://github.com/lukegb/nix

    @edolstra
    edolstra committed Apr 22, 2021
    Copy the full SHA
    a6eebcf View commit details
    Browse the repository at this point in the history

  3. Remove makeDecompressionSource() 

    This function doesn't support all compression methods (i.e. 'none' and
'br') so it shouldn't be exposed.

Also restore the original decompress() as a wrapper around
makeDecompressionSink().
    @edolstra
    edolstra committed Apr 22, 2021
    1
    Copy the full SHA
    5385755 View commit details
    Browse the repository at this point in the history