diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/DecompressorValue.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/DecompressorValue.java index 134f1a0e37cb60..adb2300ceafbc5 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/DecompressorValue.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/DecompressorValue.java @@ -101,7 +101,8 @@ static Decompressor getDecompressor(Path archivePath) throws RepositoryFunctionE if (baseName.endsWith(".zip") || baseName.endsWith(".jar") || baseName.endsWith(".war") - || baseName.endsWith(".aar")) { + || baseName.endsWith(".aar") + || baseName.endsWith(".nupkg")) { return ZipDecompressor.INSTANCE; } else if (baseName.endsWith(".tar")) { return TarFunction.INSTANCE; @@ -118,8 +119,8 @@ static Decompressor getDecompressor(Path archivePath) throws RepositoryFunctionE } else { throw new RepositoryFunctionException( Starlark.errorf( - "Expected a file with a .zip, .jar, .war, .aar, .tar, .tar.gz, .tgz, .tar.xz, .txz," - + " .tar.zst, .tzst, .tar.bz2, .tbz, .ar or .deb suffix (got %s)", + "Expected a file with a .zip, .jar, .war, .aar, .nupkg, .tar, .tar.gz, .tgz, .tar.xz," + + " , .tar.zst, .tzst, .tar.bz2, .tbz, .ar or .deb suffix (got %s)", archivePath), Transience.PERSISTENT); } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkBaseExternalContext.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkBaseExternalContext.java index e295a2b45892dd..9e98b0570d822a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkBaseExternalContext.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkBaseExternalContext.java @@ -861,7 +861,7 @@ public Object download( The archive type of the downloaded file. By default, the archive type is \ determined from the file extension of the URL. If the file has no \ extension, you can explicitly specify either "zip", "jar", "war", \ - "aar", "tar", "tar.gz", "tgz", "tar.xz", "txz", ".tar.zst", \ + "aar", "nupkg", "tar", "tar.gz", "tgz", "tar.xz", "txz", ".tar.zst", \ ".tzst", "tar.bz2", ".tbz", ".ar", or ".deb" here. """), @Param( diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/DecompressorValueTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/DecompressorValueTest.java index 755c381c8e7fe1..70c098974c1d90 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/repository/DecompressorValueTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/DecompressorValueTest.java @@ -43,6 +43,8 @@ public void testKnownFileExtensionsDoNotThrow() throws Exception { unused = DecompressorValue.getDecompressor(path); path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.zip"); unused = DecompressorValue.getDecompressor(path); + path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.nupkg"); + unused = DecompressorValue.getDecompressor(path); path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.tar.gz"); unused = DecompressorValue.getDecompressor(path); path = fs.getPath("/foo/.external-repositories/some-repo/bar.baz.tgz");