confctl 2.2.2 → 3.0.0

data/tests/suite/deploy/flakes.nix

@@ -0,0 +1 @@
+import ./base.nix { deployMode = "flakes"; }

data/tests/suite/deploy/swpins.nix

@@ -0,0 +1 @@
+import ./base.nix { deployMode = "swpins"; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confctl
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Jakub Skokan
@@ -199,18 +199,52 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".git-hooks/pre_commit/nixfmt.rb"
+- ".github/workflows/rspec.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".overcommit.yml"
+- ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- AGENTS.md
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/confctl
 - confctl.gemspec
 - docs/carrier.md
+- docs/flake-inputs.md
+- docs/swpins-to-flakes.md
+- example-flake/.gitignore
+- example-flake/README.md
+- example-flake/cluster/cluster.nix
+- example-flake/cluster/module-list.nix
+- example-flake/cluster/nested/nixos-machine/config.nix
+- example-flake/cluster/nested/nixos-machine/hardware.nix
+- example-flake/cluster/nested/nixos-machine/module.nix
+- example-flake/cluster/nixos-machine/config.nix
+- example-flake/cluster/nixos-machine/hardware.nix
+- example-flake/cluster/nixos-machine/module.nix
+- example-flake/cluster/vpsadminos-container/config.nix
+- example-flake/cluster/vpsadminos-container/module.nix
+- example-flake/cluster/vpsadminos-machine/config.nix
+- example-flake/cluster/vpsadminos-machine/hardware.nix
+- example-flake/cluster/vpsadminos-machine/module.nix
+- example-flake/cluster/vpsfreecz-vps/config.nix
+- example-flake/cluster/vpsfreecz-vps/module.nix
+- example-flake/configs/confctl.nix
+- example-flake/data/default.nix
+- example-flake/data/ssh-keys.nix
+- example-flake/environments/base.nix
+- example-flake/flake.lock
+- example-flake/flake.nix
+- example-flake/modules/module-list.nix
+- example-flake/shell.nix
 - example/.gitignore
 - example/README.md
 - example/cluster/cluster.nix
@@ -234,6 +268,10 @@ files:
 - example/shell.nix
 - example/swpins/channels/nixos-unstable.json
 - example/swpins/channels/vpsadminos-staging.json
+- example/swpins/core.json
+- flake.lock
+- flake.nix
+- gemset.nix
 - lib/confctl.rb
 - lib/confctl/cli.rb
 - lib/confctl/cli/app.rb
@@ -243,7 +281,13 @@ files:
 - lib/confctl/cli/configuration.rb
 - lib/confctl/cli/gen_data.rb
 - lib/confctl/cli/generation.rb
+- lib/confctl/cli/inputs.rb
+- lib/confctl/cli/inputs/channels.rb
+- lib/confctl/cli/inputs/machines.rb
+- lib/confctl/cli/inputs/root.rb
 - lib/confctl/cli/log_view.rb
+- lib/confctl/cli/migrate.rb
+- lib/confctl/cli/migrate/swpins_to_flakes.rb
 - lib/confctl/cli/output_formatter.rb
 - lib/confctl/cli/swpins.rb
 - lib/confctl/cli/swpins/base.rb
@@ -254,8 +298,11 @@ files:
 - lib/confctl/cli/tag_filters.rb
 - lib/confctl/conf_cache.rb
 - lib/confctl/conf_dir.rb
+- lib/confctl/config_type.rb
 - lib/confctl/erb_template.rb
 - lib/confctl/exceptions.rb
+- lib/confctl/flake_lock.rb
+- lib/confctl/flake_lock_diff.rb
 - lib/confctl/gcroot.rb
 - lib/confctl/generation/build.rb
 - lib/confctl/generation/build_list.rb
@@ -271,6 +318,13 @@ files:
 - lib/confctl/health_checks/systemd/property_check.rb
 - lib/confctl/health_checks/systemd/property_list.rb
 - lib/confctl/hook.rb
+- lib/confctl/inputs.rb
+- lib/confctl/inputs/commit_message.rb
+- lib/confctl/inputs/git_commit.rb
+- lib/confctl/inputs/nix_output_guard.rb
+- lib/confctl/inputs/setter.rb
+- lib/confctl/inputs/updater.rb
+- lib/confctl/inputs_info.rb
 - lib/confctl/line_buffer.rb
 - lib/confctl/logger.rb
 - lib/confctl/machine.rb
@@ -279,10 +333,14 @@ files:
 - lib/confctl/machine_status.rb
 - lib/confctl/module_options.rb
 - lib/confctl/nix.rb
+- lib/confctl/nix/args.rb
 - lib/confctl/nix_build.rb
+- lib/confctl/nix_build_flake.rb
 - lib/confctl/nix_collect_garbage.rb
 - lib/confctl/nix_copy.rb
+- lib/confctl/nix_flake.rb
 - lib/confctl/nix_format.rb
+- lib/confctl/nix_legacy.rb
 - lib/confctl/nix_literal_expression.rb
 - lib/confctl/null_logger.rb
 - lib/confctl/parallel_executor.rb
@@ -303,16 +361,24 @@ files:
 - lib/confctl/swpins/specs/git.rb
 - lib/confctl/swpins/specs/git_rev.rb
 - lib/confctl/system_command.rb
+- lib/confctl/ui.rb
 - lib/confctl/user_script.rb
 - lib/confctl/user_scripts.rb
 - lib/confctl/utils/file.rb
 - lib/confctl/version.rb
 - libexec/auto-rollback.rb
+- man/index.html
 - man/man8/confctl-options.nix.8
+- man/man8/confctl-options.nix.8.html
 - man/man8/confctl-options.nix.8.md
 - man/man8/confctl.8
+- man/man8/confctl.8.html
 - man/man8/confctl.8.md
+- man/style.css
 - nix/evaluator.nix
+- nix/flake/mk-confctl-devshell.nix
+- nix/flake/mk-confctl-outputs.nix
+- nix/flake/mk-config-devshell.nix
 - nix/lib/default.nix
 - nix/lib/machine/default.nix
 - nix/lib/machine/info.nix
@@ -325,18 +391,52 @@ files:
 - nix/modules/confctl/carrier/netboot/build-netboot-server.rb
 - nix/modules/confctl/carrier/netboot/nixos.nix
 - nix/modules/confctl/cli.nix
+- nix/modules/confctl/configuration-info.nix
 - nix/modules/confctl/generations.nix
+- nix/modules/confctl/host.nix
+- nix/modules/confctl/inputs-info.nix
 - nix/modules/confctl/kexec-netboot/default.nix
 - nix/modules/confctl/kexec-netboot/kexec-netboot.8.adoc
 - nix/modules/confctl/kexec-netboot/kexec-netboot.rb
 - nix/modules/confctl/nix.nix
-- nix/modules/confctl/overlays.nix
 - nix/modules/confctl/swpins.nix
 - nix/modules/module-list.nix
 - nix/modules/system-list.nix
+- nix/package.nix
 - shell.nix
+- skills/confctl-configuration-update/SKILL.md
+- skills/confctl-configuration-update/agents/openai.yaml
+- skills/confctl-release/SKILL.md
+- skills/confctl-release/agents/openai.yaml
+- spec/confctl/cli/cluster_health_check_spec.rb
+- spec/confctl/cli/cluster_skip_current_deploy_spec.rb
+- spec/confctl/cli/cluster_status_flake_spec.rb
+- spec/confctl/cli/inputs_set_output_spec.rb
+- spec/confctl/configuration_spec.rb
+- spec/confctl/inputs_spec.rb
+- spec/confctl/machine_control_spec.rb
+- spec/confctl/machine_list_spec.rb
+- spec/confctl/nix_flake_spec.rb
+- spec/confctl/swpins_spec.rb
+- spec/generation/build_modes_spec.rb
+- spec/inputs/commit_message_spec.rb
+- spec/inputs/nix_cached_fallback_spec.rb
+- spec/inputs/nix_output_guard_spec.rb
+- spec/spec_helper.rb
+- spec/support/cli_helper.rb
 - template/confctl-options.nix/main.erb
 - template/confctl-options.nix/options.erb
+- test-runner.sh
+- tests/all-tests.nix
+- tests/make-test.nix
+- tests/runner/extensions/confctl_helpers.rb
+- tests/runner/extensions/hostfwd_ports.rb
+- tests/suite/auto_rollback.nix
+- tests/suite/carrier/deploy.nix
+- tests/suite/carrier/netboot.nix
+- tests/suite/deploy/base.nix
+- tests/suite/deploy/flakes.nix
+- tests/suite/deploy/swpins.nix
 licenses:
 - GPL-3.0-only
 metadata: {}
@@ -347,14 +447,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Nix deployment management tool
 test_files: []

data/nix/modules/confctl/overlays.nix

@@ -1,15 +0,0 @@
-{ config, ... }:
-{
-  nixpkgs.overlays = [
-    (self: super: {
-      # nixos-unstable removed pkgs.substituteAll, but nixos-25.05 does not
-      # include the new function pkgs.replaceVarsWith
-      confReplaceVarsWith =
-        { replacements, ... } @ args:
-        if builtins.hasAttr "replaceVarsWith" self then
-          self.replaceVarsWith args
-        else
-          self.substituteAll ((builtins.removeAttrs args [ "replacements" ]) // replacements);
-    })
-  ];
-}