diff --git a/pkgs/compress-drv.nix b/pkgs/compress-drv.nix index 4e54db8..290a717 100644 --- a/pkgs/compress-drv.nix +++ b/pkgs/compress-drv.nix @@ -141,6 +141,10 @@ in { Default: ["gz" "br"] + - extraCompressors :: [String] + + Extra compressors in addition to `compressors`. + - compressor- :: String Map a desired extension (e.g. `gz`) to a compress program. @@ -154,17 +158,19 @@ in { compressor-gz = "${zopfli}/bin/zopfli --keep {}"; compressor-br = "${brotli}/bin/brotli --keep --no-copy-stat {}"; + */ compressDrvWeb = drv: { formats ? ["css" "js" "svg" "ttf" "eot" "txt" "xml" "map" "html" "json" "webmanifest"], extraFormats ? [], compressors ? ["gz" "br"], + extraCompressors ? [], ... } @ args: compressDrv drv ({ formats = formats ++ extraFormats; - compressors = compressors; + compressors = compressors ++ extraCompressors; compressor-gz = "${zopfli}/bin/zopfli --keep {}"; compressor-br = "${brotli}/bin/brotli --keep --no-copy-stat {}"; } diff --git a/statix.toml b/statix.toml index 0b220fd..c2c0666 100644 --- a/statix.toml +++ b/statix.toml @@ -1,11 +1 @@ ignore = ['modules/base/boot'] - -# If the attrset has an optional field, `inherit` will not inherit it: -# compressDrvWeb = drv: { -# compressors ? ["gz" "br"], -# ... -# } @ args: -# compressDrv drv { -# inherit (compressors) <<- function 'compressDrv' called without required argument 'compressors' -# } -disabled = ["manual_inherit"]