wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Merge pull request #12033 from Mic92/various-picks

Browse source 
Various packaging improvements
This commit is contained in:
Eelco Dolstra 2024-12-11 17:01:39 +01:00 • committed by GitHub
commit da2c2547a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
maintainers/flake-module.nix
View file

@ -12,6 +12,8 @@
hooks = { hooks = {
clang-format = { clang-format = {
enable = true; enable = true;
# https://github.com/cachix/git-hooks.nix/pull/532
package = pkgs.llvmPackages_latest.clang-tools;
excludes = [ excludes = [
# We don't want to format test data # We don't want to format test data
# ''tests/(?!nixos/).*\.nix'' # ''tests/(?!nixos/).*\.nix''

12
src/libstore-test-support/tests/libstore.hh
View file

@ -19,12 +19,12 @@ public:
protected: protected:
LibStoreTest() LibStoreTest()
: store(openStore({ : store(openStore({
.variant = .variant =
StoreReference::Specified{ StoreReference::Specified{
.scheme = "dummy", .scheme = "dummy",
}, },
.params = {}, .params = {},
})) }))
{ {
} }

3
tests/nixos/default.nix
View file

@ -23,6 +23,9 @@ let
nix.checkAllErrors = false; 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? # 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; nix.package = nixpkgsFor.${system}.native.nixComponents.nix-cli;
# Evaluate VMs faster
documentation.enable = false;
}; };
_module.args.nixpkgs = nixpkgs; _module.args.nixpkgs = nixpkgs;
_module.args.system = system; _module.args.system = system;