diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c4c58b..e89f4ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## v0.3.6 - 2023-01-24 + +### Features + +- `--fallback` to specify a fetcher to fall back to +- `fetchPypi` support +- `builtins.fetchGit` support + ## v0.3.5 - 2023-01-13 ### Features diff --git a/Cargo.lock b/Cargo.lock index feef74c..132ec55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -591,7 +591,7 @@ dependencies = [ [[package]] name = "nurl" -version = "0.3.5" +version = "0.3.6" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index 322ca1c..366e3e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nurl" -version = "0.3.5" +version = "0.3.6" authors = ["figsoda "] edition = "2021" description = "Generate Nix fetcher calls from repository URLs" diff --git a/README.md b/README.md index abf1da7..575e910 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ fetchFromGitHub { ## Supported Fetchers +- builtins.fetchGit - fetchCrate - fetchFromBitbucket - fetchFromGitHub @@ -29,6 +30,7 @@ fetchFromGitHub { - fetchFromRepoOrCz - fetchFromSourcehut - fetchHex +- fetchPypi - fetchgit - fetchhg - fetchsvn @@ -44,10 +46,17 @@ Arguments: Options: -f, --fetcher Specify the fetcher function instead of inferring from the - URL [possible values: fetchCrate, fetchFromBitbucket, + URL [possible values: builtins.fetchGit, fetchCrate, + fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, + fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, + fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, + fetchsvn] + -F, --fallback The fetcher to fall back to when nurl fails to infer it from + the URL [default: fetchgit] [possible values: + builtins.fetchGit, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, - fetchHex, fetchgit, fetchhg, fetchsvn] + fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn] -i, --indent Extra indentation (in number of spaces) [default: 0] -H, --hash Only output the hash -j, --json Output in json format @@ -64,8 +73,8 @@ Options: -s, --list-sep Print out the listed fetchers with the specified separator, only used when --list-fetchers or --list-possible-fetchers is specified - -h, --help Print help information - -V, --version Print version information + -h, --help Print help + -V, --version Print version ``` ## Comparison to [nix-prefetch](https://github.com/msteen/nix-prefetch)