diff options
| author | Delan Azabani <delan@azabani.com> | 2024-07-02 07:20:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-07-02 07:20:01 +0000 |
| commit | 865a3732faca16a79bf24982011adf100de04463 (patch) | |
| tree | 8021062dbf69743071847d4f3337f4be6ee984b1 /tests/functional/flakes | |
| parent | d3286d0990da111c536c2f879d8f9cbbd650ebae (diff) | |
| parent | b2944d93a6d95810f0aef09e9ac44b95e2712554 (diff) | |
Merge "Reject fully-qualified URLs in 'from' argument of `nix registry add`" into main
Diffstat (limited to 'tests/functional/flakes')
| -rw-r--r-- | tests/functional/flakes/flakes.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh index 68a2fd2ce..97dc6d818 100644 --- a/tests/functional/flakes/flakes.sh +++ b/tests/functional/flakes/flakes.sh @@ -366,6 +366,17 @@ nix registry pin flake1 flake3 nix registry remove flake1 [[ $(nix registry list | wc -l) == 5 ]] +# 'nix registry add' should accept flake shorthands (with or without branch or rev) +# in the from argument, but reject fully-qualified from-urls (direct or indirect). +nix registry add nixpkgz github:NixOS/nixpkgz +nix registry remove nixpkgz +nix registry add nixpkgz/branch github:NixOS/nixpkgz +nix registry remove nixpkgz/branch +nix registry add nixpkgz/branch/1db42b7fe3878f3f5f7a4f2dc210772fd080e205 github:NixOS/nixpkgz +nix registry remove nixpkgz/branch/1db42b7fe3878f3f5f7a4f2dc210772fd080e205 +! nix registry add flake:nixpkgz github:NixOS/nixpkgz +! nix registry add github:NixOS/nixpkgz github:NixOS/nixpkgz + # Test 'nix registry list' with a disabled global registry. nix registry add user-flake1 git+file://$flake1Dir nix registry add user-flake2 git+file://$flake2Dir |