diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 08:14:07 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 08:14:26 +0100 |
| commit | 6b67186fe9a8c05ba3dca00cd7f3434e97c5c0f3 (patch) | |
| tree | c40727f67b4ac1f249ee61aee61db419b1b27341 /nixos/tests | |
| parent | 08d2b1131869e00946d351050f1b92f259f25cff (diff) | |
| parent | db8d5902ad3666208236a685c82e50bc8bc47706 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/crownstone-cloud/default.nix - pkgs/development/python-modules/exrex/default.nix - pkgs/development/python-modules/mkdocs-minify/default.nix - pkgs/development/python-modules/myjwt/default.nix - pkgs/development/tools/analysis/checkov/default.nix
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/garage/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/garage/default.nix b/nixos/tests/garage/default.nix index 4c38ea1bc898e..0a1ccde056b28 100644 --- a/nixos/tests/garage/default.nix +++ b/nixos/tests/garage/default.nix @@ -49,5 +49,5 @@ in }) {} [ - "0_8_0" + "0_8" ] |