Add --default and --no-default option

This commit is contained in:
Michal Sojka 2024-09-22 09:39:01 +02:00
parent 38d2f17d89
commit c6b1a2c507
2 changed files with 12 additions and 3 deletions

View file

@ -103,8 +103,9 @@ usage: ros2nix [-h]
[--extra-propagated-build-inputs DEP1,DEP2,...] [--extra-propagated-build-inputs DEP1,DEP2,...]
[--extra-check-inputs DEP1,DEP2,...] [--extra-check-inputs DEP1,DEP2,...]
[--extra-native-build-inputs DEP1,DEP2,...] [--flake] [--extra-native-build-inputs DEP1,DEP2,...] [--flake]
[--overlay | --no-overlay] [--nixfmt] [--compare] [--default | --no-default] [--overlay | --no-overlay]
[--copyright-holder COPYRIGHT_HOLDER] [--license LICENSE] [--nixfmt] [--compare] [--copyright-holder COPYRIGHT_HOLDER]
[--license LICENSE]
package.xml [package.xml ...] package.xml [package.xml ...]
positional arguments: positional arguments:
@ -159,6 +160,9 @@ options:
--flake Generate top-level flake.nix instead of default.nix. --flake Generate top-level flake.nix instead of default.nix.
Use with --fetch if some package.xml files are outside Use with --fetch if some package.xml files are outside
of the flake repo (default: False) of the flake repo (default: False)
--default, --no-default
Enforce/suppress generation of default.nix (default:
None)
--overlay, --no-overlay --overlay, --no-overlay
Generate overlay.nix (default: True) Generate overlay.nix (default: True)
--nixfmt Format the resulting expressions with nixfmt (default: --nixfmt Format the resulting expressions with nixfmt (default:

View file

@ -255,6 +255,11 @@ def ros2nix(args):
help="Generate top-level flake.nix instead of default.nix. " help="Generate top-level flake.nix instead of default.nix. "
"Use with --fetch if some package.xml files are outside of the flake repo", "Use with --fetch if some package.xml files are outside of the flake repo",
) )
parser.add_argument(
"--default",
action=argparse.BooleanOptionalAction,
help="Enforce/suppress generation of default.nix",
)
parser.add_argument( parser.add_argument(
"--overlay", "--overlay",
action=argparse.BooleanOptionalAction, action=argparse.BooleanOptionalAction,
@ -442,7 +447,7 @@ def ros2nix(args):
if args.flake: if args.flake:
generate_flake(args) generate_flake(args)
else: if args.default or (args.default is None and not args.flake):
generate_default(args) generate_default(args)
# TODO generate also release.nix (for testing/CI)? # TODO generate also release.nix (for testing/CI)?