clan/clan-core
12
4
Fork 19
Code Issues 108 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

fix: forward meta attributes in flake-parts module #1852

Merged
kenji merged 1 commits from kenji/clan-core:forward-meta into main 2024-08-07 09:33:49 +00:00
Conversation 1 Commits 1 Files Changed 4 +26 -29
kenji commented 2024-08-06 11:11:21 +00:00
Owner
Copy Link

This fixes building machines with the flake-parts module.

This fixes building machines with the `flake-parts` module.
kenji added 1 commit 2024-08-06 11:11:21 +00:00
fix: forward meta attributes in flake-parts module
Some checks failed
buildbot/nix-build .#checks.x86_64-linux.package-clan-ts-api Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-editor Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-default Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.module-schema Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.lib-jsonschema-nix-unit-tests Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-clan-cli Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-impure-checks Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-clan-cli-docs Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-merge-after-ci Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.postgresql Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-moonlight-sunshine-accept Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-tea-create-pr Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-webview-ui Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-zerotier-members Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.template-minimal Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-zt-tcp-relay Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixos-test_install_machine Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-zerotierone Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixos-flash-installer Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-pending-reviews Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.secrets Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-function-schema Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-module-schema Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.syncthing Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.zt-tcp-relay Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.wayland-proxy-virtwl Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.flash Build done.
Details
checks / checks-impure (pull_request) Failing after 4m20s
Details
buildbot/nix-eval Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.test-installation Build done.
Details
8ffc7e76bb 
This fixes building machines with the `flake-parts` module.
kenji added 1 commit 2024-08-06 12:18:47 +00:00
Fix: forward meta attributes in flake-parts module
All checks were successful
buildbot/nix-build .#checks.x86_64-linux.lib-inventory-eval Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixos-test-inventory-machine Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-inventory-schema-pretty Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-moonlight-sunshine-accept Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.lib-build-clan-eval Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.module-clan-vars-eval Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-pending-reviews Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-tea-create-pr Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-webview-ui Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-zerotier-members Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.mumble Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-zt-tcp-relay Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-zerotierone Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-impure-checks Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-inventory-api-docs Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixos-flash-installer Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.postgresql Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-function-schema Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.template-minimal Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.secrets Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-module-schema Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.zt-tcp-relay Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.wayland-proxy-virtwl Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.syncthing Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-gui-install-test-ubuntu-22-04 Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.test-backups Build done.
Details
checks / checks-impure (pull_request) Successful in 2m26s
Details
buildbot/nix-build .#checks.x86_64-linux.flash Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.test-installation Build done.
Details
buildbot/nix-eval Build done.
Details
55dcfa85a8 
This fixes building machines with the flake-parts module.

Since the inventory merges the machines, the `clan.core.meta` attribute
is now a submodule and conditionally imported.

Also drops the following attributes:
- clan.core.meta.icon
- clan.core.meta.description

In favor of specifying them inside the inventory.

This doesn't use `mkRemovedOptionsModule`, because in our case it would
cause infinite recursion.
kenji force-pushed forward-meta from 55dcfa85a8 to 2c6c97c618 2024-08-06 12:19:04 +00:00 Compare
kenji requested review from DavHau 2024-08-06 12:19:25 +00:00
hsjobeki reviewed 2024-08-06 12:21:23 +00:00
lib/build-clan/default.nix Outdated
@ -11,7 +11,6 @@
directory, # The directory containing the machines subdirectory # allows to include machine-specific modules i.e. machines.${name} = { ... }
# A map from arch to pkgs, if specified this nixpkgs will be only imported once for each system.
# This improves performance, but all nipxkgs.* options will be ignored.
inventory ? { },
hsjobeki commented 2024-08-06 12:21:23 +00:00
Owner
Copy Link

@kenji Das können wir aber lassen, sonst bekommt man fehler imt build clan, wenn man kein inventory definiert.

@kenji Das können wir aber lassen, sonst bekommt man fehler imt build clan, wenn man kein inventory definiert.
👍 1
kenji commented 2024-08-06 12:26:26 +00:00
Author
Owner
Copy Link

Ich glaube das macht nix fmt raus, bin ich mir aber nicht sicher.

Ich glaube das macht `nix fmt` raus, bin ich mir aber nicht sicher.
kenji commented 2024-08-06 12:27:38 +00:00
Author
Owner
Copy Link

Jo, muessen nix fmt irgendwie sagen, dass er das nicht wegnehmen soll.

Jo, muessen `nix fmt` irgendwie sagen, dass er das nicht wegnehmen soll.
hsjobeki commented 2024-08-06 14:21:57 +00:00
Owner
Copy Link

Ich glaube das ist deadnix.

# deadnix: skip

in der zeile davor

Ich glaube das ist deadnix. `# deadnix: skip` in der zeile davor
👍 1
kenji marked this conversation as resolved
kenji added the
needs-review
 label 2024-08-06 12:25:53 +00:00
kenji force-pushed forward-meta from 2c6c97c618 to 32f2348ba0 2024-08-07 09:04:28 +00:00 Compare
kenji force-pushed forward-meta from 32f2348ba0 to df0934b655 2024-08-07 09:13:29 +00:00 Compare
kenji force-pushed forward-meta from df0934b655 to 4d5c1a7b63 2024-08-07 09:15:28 +00:00 Compare
DavHau was assigned by kenji 2024-08-07 09:18:09 +00:00
kenji commented 2024-08-07 09:33:30 +00:00
Author
Owner
Copy Link

Tested this on multiple machines, but all of them were using the flake-parts module.

Tested this on multiple machines, but all of them were using the `flake-parts` module.
kenji merged commit 04422850b0 into main 2024-08-07 09:33:49 +00:00
kenji deleted branch forward-meta 2024-08-07 09:33:49 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
DavHau
Labels
Clear labels   
backups

   
blog

   
bootstrapping

Issues regarding bootstrapping, or onboarding

  
bug

Something is not working.

  
changes-requested

Please fix this.

  
cli

   
documentation

   
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
facts

Issues regarding facts and secrets setting and generation

  
help wanted

Need some help

  
invalid

Something is wrong

  
Inventory

Inventory

  
low_prio

   
manager

   
modules

   
needs-review

This PR needs to be reviewed. Use the request-changes label to request changes

  
networking

   
packaging

   
question

More information is needed

  
secrets

   
template

Issues regarding templates.

  
test

Issues regarding testing

  
tooling

Issues regarding internal devtools

  
user-testing

Issues that cristallised after hands on user testing.

  
vm

Issues regarding virtual machines.

  
wontfix

This won't be fixed

No Label
backups
blog
bootstrapping
bug
changes-requested
cli
documentation
duplicate
enhancement
facts
help wanted
invalid
Inventory
low_prio
manager
modules
needs-review
networking
packaging
question
secrets
template
test
tooling
user-testing
vm
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
DavHau
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: clan/clan-core#1852
No description provided.
Delete Branch "kenji/clan-core:forward-meta"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?