diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-05-31 10:38:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 10:38:04 +0200 |
| commit | e8f585be70b22c11db5356f886049f432699eac3 (patch) | |
| tree | 4950e8915ff53479424aeb34e73be6dab59a72e8 | |
| parent | 1f390922d0e34382265205f6895c2b71c5a8e6f7 (diff) | |
| parent | 4da9ec772c54f17ac04bbc5bcb75140d13a29500 (diff) | |
Merge pull request #4855 from timothyklim/master
Add .tar.zst support for TarballInputScheme
| -rw-r--r-- | src/libfetchers/tarball.cc | 3 | ||||
| -rw-r--r-- | src/nix/flake.md | 4 | ||||
| -rw-r--r-- | tests/lang/parse-okay-url.nix | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc index b8d7d2c70..257465bae 100644 --- a/src/libfetchers/tarball.cc +++ b/src/libfetchers/tarball.cc @@ -178,7 +178,8 @@ struct TarballInputScheme : InputScheme && !hasSuffix(url.path, ".tar") && !hasSuffix(url.path, ".tar.gz") && !hasSuffix(url.path, ".tar.xz") - && !hasSuffix(url.path, ".tar.bz2")) + && !hasSuffix(url.path, ".tar.bz2") + && !hasSuffix(url.path, ".tar.zst")) return {}; Input input; diff --git a/src/nix/flake.md b/src/nix/flake.md index 9e936a049..3d273100b 100644 --- a/src/nix/flake.md +++ b/src/nix/flake.md @@ -186,8 +186,8 @@ Currently the `type` attribute can be one of the following: attribute `url`. In URL form, the schema must be `http://`, `https://` or `file://` - URLs and the extension must be `.zip`, `.tar`, `.tar.gz`, `.tar.xz` - or `.tar.bz2`. + URLs and the extension must be `.zip`, `.tar`, `.tar.gz`, `.tar.xz`, + `.tar.bz2` or `.tar.zst`. * `github`: A more efficient way to fetch repositories from GitHub. The following attributes are required: diff --git a/tests/lang/parse-okay-url.nix b/tests/lang/parse-okay-url.nix index fce3b13ee..08de27d0a 100644 --- a/tests/lang/parse-okay-url.nix +++ b/tests/lang/parse-okay-url.nix @@ -3,5 +3,6 @@ http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 http://losser.st-lab.cs.uu.nl/~armijn/.nix/gcc-3.3.4-static-nix.tar.gz http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz + https://ftp5.gwdg.de/pub/linux/archlinux/extra/os/x86_64/unzip-6.0-14-x86_64.pkg.tar.zst ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz ] |