Skip to content

Various packaging improvements #12033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edolstra merged 3 commits into from
Dec 11, 2024
Merged

Various packaging improvements #12033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35dd19d
ensure clang-format is using the same version on all platforms
Mic92 Dec 9, 2024
9b40618
tests/nixos: disable documentation to improve eval speed
Mic92 Dec 9, 2024
41a464c
tests/libstore.hh: reformat with clang-format after update
Mic92 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions maintainers/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
hooks = {
clang-format = {
enable = true;
# https://github.com/cachix/git-hooks.nix/pull/532
package = pkgs.llvmPackages_latest.clang-tools;
Copy link
Copy Markdown
Member

@edolstra edolstra Dec 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the impact of this on the devshell closure size? (It's already pretty big, depending on gcc, clang and a lot of other stuff.)

Copy link
Copy Markdown
Member Author

@Mic92 Mic92 Dec 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the current clang-tools version. But we need both macOS and Linux to use the same version. Open for other suggestions, but it will increase the closure size on some platform for sure if it's not the same as default included one on one platform or the other. I sticked to _latest because it will never go out-of-date compared to pinning a version.

Copy link
Copy Markdown
Member Author

@Mic92 Mic92 Dec 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not having this will block our nixpkgs upgrade.

Copy link
Copy Markdown
Member Author

@Mic92 Mic92 Dec 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on Linux it will likely not change anything, I assume. Because there shouldn't be clang included in the gcc build anyway. It will increase it for macOS.

excludes = [
# We don't want to format test data
# ''tests/(?!nixos/).*\.nix''
Expand Down
12 changes: 6 additions & 6 deletions src/libstore-test-support/tests/libstore.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public:
protected:
LibStoreTest()
: store(openStore({
.variant =
StoreReference::Specified{
.scheme = "dummy",
},
.params = {},
}))
.variant =
StoreReference::Specified{
.scheme = "dummy",
},
.params = {},
}))
{
}

Expand Down
3 changes: 3 additions & 0 deletions tests/nixos/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ let
nix.checkAllErrors = false;
# TODO: decide which packaging stage to use. `nix-cli` is efficient, but not the same as the user-facing `everything.nix` package (`default`). Perhaps a good compromise is `everything.nix` + `noTests` defined above?
nix.package = nixpkgsFor.${system}.native.nixComponents.nix-cli;

# Evaluate VMs faster
documentation.enable = false;
};
_module.args.nixpkgs = nixpkgs;
_module.args.system = system;
Expand Down