mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-09-19 16:08:05 +03:00
Add pre-commit hook and make format target
I've added the new local.mk to the package sources. While this should not be needed for the build, it is the simplest solution, and won't cause many extra rebuilds, because the file won't change very often.
This commit is contained in:
Robert Hensing
parent
8c4c2156bd
commit
5b36ee4c95
8 changed files with 608 additions and 4 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -154,6 +154,8 @@ result-*
|
||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
|
.pre-commit-config.yaml
|
||||||
|
|
||||||
# clangd and possibly more
|
# clangd and possibly more
|
||||||
.cache/
|
.cache/
|
||||||
|
|
||||||
|
|
|
||||||
1
Makefile
1
Makefile
|
|
@ -27,6 +27,7 @@ makefiles = \
|
||||||
ifdef HOST_UNIX
|
ifdef HOST_UNIX
|
||||||
makefiles += \
|
makefiles += \
|
||||||
scripts/local.mk \
|
scripts/local.mk \
|
||||||
|
maintainers/local.mk \
|
||||||
misc/bash/local.mk \
|
misc/bash/local.mk \
|
||||||
misc/fish/local.mk \
|
misc/fish/local.mk \
|
||||||
misc/zsh/local.mk \
|
misc/zsh/local.mk \
|
||||||
|
|
|
||||||
|
|
@ -273,6 +273,29 @@ Configure your editor to use the `clangd` from the `.#native-clangStdenvPackages
|
||||||
> Some other editors (e.g. Emacs, Vim) need a plugin to support LSP servers in general (e.g. [lsp-mode](https://github.com/emacs-lsp/lsp-mode) for Emacs and [vim-lsp](https://github.com/prabirshrestha/vim-lsp) for vim).
|
> Some other editors (e.g. Emacs, Vim) need a plugin to support LSP servers in general (e.g. [lsp-mode](https://github.com/emacs-lsp/lsp-mode) for Emacs and [vim-lsp](https://github.com/prabirshrestha/vim-lsp) for vim).
|
||||||
> Editor-specific setup is typically opinionated, so we will not cover it here in more detail.
|
> Editor-specific setup is typically opinionated, so we will not cover it here in more detail.
|
||||||
|
|
||||||
|
## Formatting and pre-commit
|
||||||
|
|
||||||
|
You may run the formatters as a one-off using:
|
||||||
|
|
||||||
|
```console
|
||||||
|
make format
|
||||||
|
```
|
||||||
|
|
||||||
|
If you'd like to run the formatters before every commit, install the hooks:
|
||||||
|
|
||||||
|
```
|
||||||
|
pre-commit-hooks-install
|
||||||
|
```
|
||||||
|
|
||||||
|
This installs [pre-commit](https://pre-commit.com) using [cachix/git-hooks.nix](https://github.com/cachix/git-hooks.nix).
|
||||||
|
|
||||||
|
When making a commit, pay attention to the console output.
|
||||||
|
If it fails, run `git add --patch` to approve the suggestions _and commit again_.
|
||||||
|
|
||||||
|
To refresh the config, do the following:
|
||||||
|
- if you use `make format`: stop and start your `nix develop` shell.
|
||||||
|
- if you use the pre-commit hook: stop and start, and run `pre-commit-hooks-install` again.
|
||||||
|
|
||||||
## Add a release note
|
## Add a release note
|
||||||
|
|
||||||
`doc/manual/rl-next` contains release notes entries for all unreleased changes.
|
`doc/manual/rl-next` contains release notes entries for all unreleased changes.
|
||||||
|
|
|
||||||
65
flake.lock
65
flake.lock
|
|
@ -16,6 +16,41 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-parts": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1712014858,
|
||||||
|
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1667395993,
|
||||||
|
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"libgit2": {
|
"libgit2": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -64,12 +99,40 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"pre-commit-hooks": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": [],
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"gitignore": [],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1712897695,
|
||||||
|
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "pre-commit-hooks.nix",
|
||||||
|
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "pre-commit-hooks.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
"libgit2": "libgit2",
|
"libgit2": "libgit2",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-regression": "nixpkgs-regression"
|
"nixpkgs-regression": "nixpkgs-regression",
|
||||||
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
50
flake.nix
50
flake.nix
|
|
@ -8,7 +8,19 @@
|
||||||
inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
|
inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
|
||||||
inputs.libgit2 = { url = "github:libgit2/libgit2"; flake = false; };
|
inputs.libgit2 = { url = "github:libgit2/libgit2"; flake = false; };
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-regression, libgit2, ... }:
|
# dev tooling
|
||||||
|
inputs.flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
|
inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||||
|
# work around https://github.com/NixOS/nix/issues/7730
|
||||||
|
inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||||
|
inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.pre-commit-hooks.inputs.nixpkgs-stable.follows = "nixpkgs";
|
||||||
|
# work around 7730 and https://github.com/NixOS/nix/issues/7807
|
||||||
|
inputs.pre-commit-hooks.inputs.flake-compat.follows = "";
|
||||||
|
inputs.pre-commit-hooks.inputs.gitignore.follows = "";
|
||||||
|
|
||||||
|
outputs = inputs@{ self, nixpkgs, nixpkgs-regression, libgit2, ... }:
|
||||||
|
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (nixpkgs) lib;
|
inherit (nixpkgs) lib;
|
||||||
|
|
@ -57,6 +69,17 @@
|
||||||
})
|
})
|
||||||
stdenvs);
|
stdenvs);
|
||||||
|
|
||||||
|
|
||||||
|
# We don't apply flake-parts to the whole flake so that non-development attributes
|
||||||
|
# load without fetching any development inputs.
|
||||||
|
devFlake = inputs.flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
|
imports = [ ./maintainers/flake-module.nix ];
|
||||||
|
systems = lib.subtractLists crossSystems systems;
|
||||||
|
perSystem = { system, ... }: {
|
||||||
|
_module.args.pkgs = nixpkgsFor.${system}.native;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Memoize nixpkgs for different platforms for efficiency.
|
# Memoize nixpkgs for different platforms for efficiency.
|
||||||
nixpkgsFor = forAllSystems
|
nixpkgsFor = forAllSystems
|
||||||
(system: let
|
(system: let
|
||||||
|
|
@ -186,6 +209,12 @@
|
||||||
inherit fileset stdenv;
|
inherit fileset stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/214409
|
||||||
|
pre-commit =
|
||||||
|
if prev.stdenv.hostPlatform.system == "i686-linux"
|
||||||
|
then (prev.pre-commit.override (o: { dotnet-sdk = ""; })).overridePythonAttrs (o: { doCheck = false; })
|
||||||
|
else prev.pre-commit;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
@ -361,7 +390,8 @@
|
||||||
# Since the support is only best-effort there, disable the perl
|
# Since the support is only best-effort there, disable the perl
|
||||||
# bindings
|
# bindings
|
||||||
perlBindings = self.hydraJobs.perlBindings.${system};
|
perlBindings = self.hydraJobs.perlBindings.${system};
|
||||||
});
|
} // devFlake.checks.${system} or {}
|
||||||
|
);
|
||||||
|
|
||||||
packages = forAllSystems (system: rec {
|
packages = forAllSystems (system: rec {
|
||||||
inherit (nixpkgsFor.${system}.native) nix changelog-d-nix;
|
inherit (nixpkgsFor.${system}.native) nix changelog-d-nix;
|
||||||
|
|
@ -396,7 +426,10 @@
|
||||||
stdenvs)));
|
stdenvs)));
|
||||||
|
|
||||||
devShells = let
|
devShells = let
|
||||||
makeShell = pkgs: stdenv: (pkgs.nix.override { inherit stdenv; forDevShell = true; }).overrideAttrs (attrs: {
|
makeShell = pkgs: stdenv: (pkgs.nix.override { inherit stdenv; forDevShell = true; }).overrideAttrs (attrs:
|
||||||
|
let
|
||||||
|
modular = devFlake.getSystem stdenv.buildPlatform.system;
|
||||||
|
in {
|
||||||
installFlags = "sysconfdir=$(out)/etc";
|
installFlags = "sysconfdir=$(out)/etc";
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
PATH=$prefix/bin:$PATH
|
PATH=$prefix/bin:$PATH
|
||||||
|
|
@ -407,7 +440,18 @@
|
||||||
XDG_DATA_DIRS+=:$out/share
|
XDG_DATA_DIRS+=:$out/share
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
env = {
|
||||||
|
# For `make format`, to work without installing pre-commit
|
||||||
|
_NIX_PRE_COMMIT_HOOKS_CONFIG =
|
||||||
|
"${(pkgs.formats.yaml { }).generate "pre-commit-config.yaml" modular.pre-commit.settings.rawConfig}";
|
||||||
|
};
|
||||||
|
|
||||||
nativeBuildInputs = attrs.nativeBuildInputs or []
|
nativeBuildInputs = attrs.nativeBuildInputs or []
|
||||||
|
++ [
|
||||||
|
modular.pre-commit.settings.package
|
||||||
|
(pkgs.writeScriptBin "pre-commit-hooks-install"
|
||||||
|
modular.pre-commit.settings.installationScript)
|
||||||
|
]
|
||||||
# TODO: Remove the darwin check once
|
# TODO: Remove the darwin check once
|
||||||
# https://github.com/NixOS/nixpkgs/pull/291814 is available
|
# https://github.com/NixOS/nixpkgs/pull/291814 is available
|
||||||
++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear
|
++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear
|
||||||
|
|
|
||||||
454
maintainers/flake-module.nix
Normal file
454
maintainers/flake-module.nix
Normal file
|
|
@ -0,0 +1,454 @@
|
||||||
|
{ lib, getSystem, inputs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
inputs.pre-commit-hooks.flakeModule
|
||||||
|
];
|
||||||
|
|
||||||
|
perSystem = { config, pkgs, ... }: {
|
||||||
|
|
||||||
|
# https://flake.parts/options/pre-commit-hooks-nix.html#options
|
||||||
|
pre-commit.settings = {
|
||||||
|
hooks = {
|
||||||
|
clang-format.enable = true;
|
||||||
|
nixpkgs-fmt.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
excludes = [
|
||||||
|
# We don't want to format test data
|
||||||
|
# ''tests/(?!nixos/).*\.nix''
|
||||||
|
''^tests/.*''
|
||||||
|
|
||||||
|
# Don't format vendored code
|
||||||
|
''^src/toml11/.*''
|
||||||
|
''^doc/manual/redirects\.js$''
|
||||||
|
''^doc/manual/theme/highlight\.js$''
|
||||||
|
|
||||||
|
# We haven't applied formatting to these files yet
|
||||||
|
''^doc/manual/generate-manpage\.nix$''
|
||||||
|
''^doc/manual/generate-settings\.nix$''
|
||||||
|
''^doc/manual/generate-store-info\.nix$''
|
||||||
|
''^doc/manual/generate-xp-features-shortlist\.nix$''
|
||||||
|
''^doc/manual/redirects\.js$''
|
||||||
|
''^doc/manual/theme/highlight\.js$''
|
||||||
|
''^doc/manual/utils\.nix$''
|
||||||
|
''^docker\.nix$''
|
||||||
|
''^flake\.nix$''
|
||||||
|
''^maintainers/flake-module\.nix$''
|
||||||
|
''^maintainers/flake-module\.nix$''
|
||||||
|
''^misc/changelog-d\.cabal\.nix$''
|
||||||
|
''^misc/changelog-d\.nix$''
|
||||||
|
''^package\.nix$''
|
||||||
|
''^perl/default\.nix$''
|
||||||
|
''^precompiled-headers\.h$''
|
||||||
|
''^scripts/installer\.nix$''
|
||||||
|
''^src/build-remote/build-remote\.cc$''
|
||||||
|
''^src/libcmd/built-path\.cc$''
|
||||||
|
''^src/libcmd/built-path\.hh$''
|
||||||
|
''^src/libcmd/command\.cc$''
|
||||||
|
''^src/libcmd/command\.hh$''
|
||||||
|
''^src/libcmd/common-eval-args\.cc$''
|
||||||
|
''^src/libcmd/common-eval-args\.hh$''
|
||||||
|
''^src/libcmd/editor-for\.cc$''
|
||||||
|
''^src/libcmd/installable-attr-path\.cc$''
|
||||||
|
''^src/libcmd/installable-attr-path\.hh$''
|
||||||
|
''^src/libcmd/installable-derived-path\.cc$''
|
||||||
|
''^src/libcmd/installable-derived-path\.hh$''
|
||||||
|
''^src/libcmd/installable-flake\.cc$''
|
||||||
|
''^src/libcmd/installable-flake\.hh$''
|
||||||
|
''^src/libcmd/installable-value\.cc$''
|
||||||
|
''^src/libcmd/installable-value\.hh$''
|
||||||
|
''^src/libcmd/installables\.cc$''
|
||||||
|
''^src/libcmd/installables\.hh$''
|
||||||
|
''^src/libcmd/legacy\.hh$''
|
||||||
|
''^src/libcmd/markdown\.cc$''
|
||||||
|
''^src/libcmd/misc-store-flags\.cc$''
|
||||||
|
''^src/libcmd/repl-interacter\.cc$''
|
||||||
|
''^src/libcmd/repl-interacter\.hh$''
|
||||||
|
''^src/libcmd/repl\.cc$''
|
||||||
|
''^src/libcmd/repl\.hh$''
|
||||||
|
''^src/libexpr-c/nix_api_expr\.cc$''
|
||||||
|
''^src/libexpr-c/nix_api_external\.cc$''
|
||||||
|
''^src/libexpr/attr-path\.cc$''
|
||||||
|
''^src/libexpr/attr-path\.hh$''
|
||||||
|
''^src/libexpr/attr-set\.cc$''
|
||||||
|
''^src/libexpr/attr-set\.hh$''
|
||||||
|
''^src/libexpr/eval-cache\.cc$''
|
||||||
|
''^src/libexpr/eval-cache\.hh$''
|
||||||
|
''^src/libexpr/eval-error\.cc$''
|
||||||
|
''^src/libexpr/eval-inline\.hh$''
|
||||||
|
''^src/libexpr/eval-settings\.cc$''
|
||||||
|
''^src/libexpr/eval-settings\.hh$''
|
||||||
|
''^src/libexpr/eval\.cc$''
|
||||||
|
''^src/libexpr/eval\.hh$''
|
||||||
|
''^src/libexpr/fetchurl\.nix$''
|
||||||
|
''^src/libexpr/flake/call-flake\.nix$''
|
||||||
|
''^src/libexpr/flake/config\.cc$''
|
||||||
|
''^src/libexpr/flake/flake\.cc$''
|
||||||
|
''^src/libexpr/flake/flake\.hh$''
|
||||||
|
''^src/libexpr/flake/flakeref\.cc$''
|
||||||
|
''^src/libexpr/flake/flakeref\.hh$''
|
||||||
|
''^src/libexpr/flake/lockfile\.cc$''
|
||||||
|
''^src/libexpr/flake/lockfile\.hh$''
|
||||||
|
''^src/libexpr/flake/url-name\.cc$''
|
||||||
|
''^src/libexpr/function-trace\.cc$''
|
||||||
|
''^src/libexpr/gc-small-vector\.hh$''
|
||||||
|
''^src/libexpr/get-drvs\.cc$''
|
||||||
|
''^src/libexpr/get-drvs\.hh$''
|
||||||
|
''^src/libexpr/imported-drv-to-derivation\.nix$''
|
||||||
|
''^src/libexpr/json-to-value\.cc$''
|
||||||
|
''^src/libexpr/nixexpr\.cc$''
|
||||||
|
''^src/libexpr/nixexpr\.hh$''
|
||||||
|
''^src/libexpr/parser-state\.hh$''
|
||||||
|
''^src/libexpr/pos-table\.hh$''
|
||||||
|
''^src/libexpr/primops\.cc$''
|
||||||
|
''^src/libexpr/primops\.hh$''
|
||||||
|
''^src/libexpr/primops/context\.cc$''
|
||||||
|
''^src/libexpr/primops/derivation\.nix$''
|
||||||
|
''^src/libexpr/primops/fetchClosure\.cc$''
|
||||||
|
''^src/libexpr/primops/fetchMercurial\.cc$''
|
||||||
|
''^src/libexpr/primops/fetchTree\.cc$''
|
||||||
|
''^src/libexpr/primops/fromTOML\.cc$''
|
||||||
|
''^src/libexpr/print-ambiguous\.cc$''
|
||||||
|
''^src/libexpr/print-ambiguous\.hh$''
|
||||||
|
''^src/libexpr/print-options\.hh$''
|
||||||
|
''^src/libexpr/print\.cc$''
|
||||||
|
''^src/libexpr/print\.hh$''
|
||||||
|
''^src/libexpr/search-path\.cc$''
|
||||||
|
''^src/libexpr/symbol-table\.hh$''
|
||||||
|
''^src/libexpr/value-to-json\.cc$''
|
||||||
|
''^src/libexpr/value-to-json\.hh$''
|
||||||
|
''^src/libexpr/value-to-xml\.cc$''
|
||||||
|
''^src/libexpr/value-to-xml\.hh$''
|
||||||
|
''^src/libexpr/value\.hh$''
|
||||||
|
''^src/libexpr/value/context\.cc$''
|
||||||
|
''^src/libexpr/value/context\.hh$''
|
||||||
|
''^src/libfetchers/attrs\.cc$''
|
||||||
|
''^src/libfetchers/cache\.cc$''
|
||||||
|
''^src/libfetchers/cache\.hh$''
|
||||||
|
''^src/libfetchers/fetch-settings\.cc$''
|
||||||
|
''^src/libfetchers/fetch-settings\.hh$''
|
||||||
|
''^src/libfetchers/fetch-to-store\.cc$''
|
||||||
|
''^src/libfetchers/fetchers\.cc$''
|
||||||
|
''^src/libfetchers/fetchers\.hh$''
|
||||||
|
''^src/libfetchers/filtering-input-accessor\.cc$''
|
||||||
|
''^src/libfetchers/filtering-input-accessor\.hh$''
|
||||||
|
''^src/libfetchers/fs-input-accessor\.cc$''
|
||||||
|
''^src/libfetchers/fs-input-accessor\.hh$''
|
||||||
|
''^src/libfetchers/git-utils\.cc$''
|
||||||
|
''^src/libfetchers/git-utils\.hh$''
|
||||||
|
''^src/libfetchers/github\.cc$''
|
||||||
|
''^src/libfetchers/indirect\.cc$''
|
||||||
|
''^src/libfetchers/memory-input-accessor\.cc$''
|
||||||
|
''^src/libfetchers/path\.cc$''
|
||||||
|
''^src/libfetchers/registry\.cc$''
|
||||||
|
''^src/libfetchers/registry\.hh$''
|
||||||
|
''^src/libfetchers/tarball\.cc$''
|
||||||
|
''^src/libfetchers/tarball\.hh$''
|
||||||
|
''^src/libfetchers/unix/git\.cc$''
|
||||||
|
''^src/libfetchers/unix/mercurial\.cc$''
|
||||||
|
''^src/libmain/common-args\.cc$''
|
||||||
|
''^src/libmain/common-args\.hh$''
|
||||||
|
''^src/libmain/loggers\.cc$''
|
||||||
|
''^src/libmain/loggers\.hh$''
|
||||||
|
''^src/libmain/progress-bar\.cc$''
|
||||||
|
''^src/libmain/shared\.cc$''
|
||||||
|
''^src/libmain/shared\.hh$''
|
||||||
|
''^src/libmain/unix/stack\.cc$''
|
||||||
|
''^src/libstore/binary-cache-store\.cc$''
|
||||||
|
''^src/libstore/binary-cache-store\.hh$''
|
||||||
|
''^src/libstore/build-result\.hh$''
|
||||||
|
''^src/libstore/builtins\.hh$''
|
||||||
|
''^src/libstore/builtins/buildenv\.cc$''
|
||||||
|
''^src/libstore/builtins/buildenv\.hh$''
|
||||||
|
''^src/libstore/common-protocol-impl\.hh$''
|
||||||
|
''^src/libstore/common-protocol\.cc$''
|
||||||
|
''^src/libstore/common-protocol\.hh$''
|
||||||
|
''^src/libstore/content-address\.cc$''
|
||||||
|
''^src/libstore/content-address\.hh$''
|
||||||
|
''^src/libstore/daemon\.cc$''
|
||||||
|
''^src/libstore/daemon\.hh$''
|
||||||
|
''^src/libstore/derivations\.cc$''
|
||||||
|
''^src/libstore/derivations\.hh$''
|
||||||
|
''^src/libstore/derived-path-map\.cc$''
|
||||||
|
''^src/libstore/derived-path-map\.hh$''
|
||||||
|
''^src/libstore/derived-path\.cc$''
|
||||||
|
''^src/libstore/derived-path\.hh$''
|
||||||
|
''^src/libstore/downstream-placeholder\.cc$''
|
||||||
|
''^src/libstore/downstream-placeholder\.hh$''
|
||||||
|
''^src/libstore/dummy-store\.cc$''
|
||||||
|
''^src/libstore/export-import\.cc$''
|
||||||
|
''^src/libstore/filetransfer\.cc$''
|
||||||
|
''^src/libstore/filetransfer\.hh$''
|
||||||
|
''^src/libstore/gc-store\.hh$''
|
||||||
|
''^src/libstore/globals\.cc$''
|
||||||
|
''^src/libstore/globals\.hh$''
|
||||||
|
''^src/libstore/http-binary-cache-store\.cc$''
|
||||||
|
''^src/libstore/legacy-ssh-store\.cc$''
|
||||||
|
''^src/libstore/legacy-ssh-store\.hh$''
|
||||||
|
''^src/libstore/length-prefixed-protocol-helper\.hh$''
|
||||||
|
''^src/libstore/linux/personality\.cc$''
|
||||||
|
''^src/libstore/linux/personality\.hh$''
|
||||||
|
''^src/libstore/local-binary-cache-store\.cc$''
|
||||||
|
''^src/libstore/local-fs-store\.cc$''
|
||||||
|
''^src/libstore/local-fs-store\.hh$''
|
||||||
|
''^src/libstore/log-store\.cc$''
|
||||||
|
''^src/libstore/log-store\.hh$''
|
||||||
|
''^src/libstore/machines\.cc$''
|
||||||
|
''^src/libstore/machines\.hh$''
|
||||||
|
''^src/libstore/make-content-addressed\.cc$''
|
||||||
|
''^src/libstore/make-content-addressed\.hh$''
|
||||||
|
''^src/libstore/misc\.cc$''
|
||||||
|
''^src/libstore/names\.cc$''
|
||||||
|
''^src/libstore/names\.hh$''
|
||||||
|
''^src/libstore/nar-accessor\.cc$''
|
||||||
|
''^src/libstore/nar-accessor\.hh$''
|
||||||
|
''^src/libstore/nar-info-disk-cache\.cc$''
|
||||||
|
''^src/libstore/nar-info-disk-cache\.hh$''
|
||||||
|
''^src/libstore/nar-info\.cc$''
|
||||||
|
''^src/libstore/nar-info\.hh$''
|
||||||
|
''^src/libstore/outputs-spec\.cc$''
|
||||||
|
''^src/libstore/outputs-spec\.hh$''
|
||||||
|
''^src/libstore/parsed-derivations\.cc$''
|
||||||
|
''^src/libstore/path-info\.cc$''
|
||||||
|
''^src/libstore/path-info\.hh$''
|
||||||
|
''^src/libstore/path-references\.cc$''
|
||||||
|
''^src/libstore/path-regex\.hh$''
|
||||||
|
''^src/libstore/path-with-outputs\.cc$''
|
||||||
|
''^src/libstore/path\.cc$''
|
||||||
|
''^src/libstore/path\.hh$''
|
||||||
|
''^src/libstore/pathlocks\.cc$''
|
||||||
|
''^src/libstore/pathlocks\.hh$''
|
||||||
|
''^src/libstore/profiles\.cc$''
|
||||||
|
''^src/libstore/profiles\.hh$''
|
||||||
|
''^src/libstore/realisation\.cc$''
|
||||||
|
''^src/libstore/realisation\.hh$''
|
||||||
|
''^src/libstore/remote-fs-accessor\.cc$''
|
||||||
|
''^src/libstore/remote-fs-accessor\.hh$''
|
||||||
|
''^src/libstore/remote-store-connection\.hh$''
|
||||||
|
''^src/libstore/remote-store\.cc$''
|
||||||
|
''^src/libstore/remote-store\.hh$''
|
||||||
|
''^src/libstore/s3-binary-cache-store\.cc$''
|
||||||
|
''^src/libstore/s3\.hh$''
|
||||||
|
''^src/libstore/serve-protocol-impl\.cc$''
|
||||||
|
''^src/libstore/serve-protocol-impl\.hh$''
|
||||||
|
''^src/libstore/serve-protocol\.cc$''
|
||||||
|
''^src/libstore/serve-protocol\.hh$''
|
||||||
|
''^src/libstore/sqlite\.cc$''
|
||||||
|
''^src/libstore/sqlite\.hh$''
|
||||||
|
''^src/libstore/ssh-store-config\.hh$''
|
||||||
|
''^src/libstore/ssh-store\.cc$''
|
||||||
|
''^src/libstore/ssh\.cc$''
|
||||||
|
''^src/libstore/ssh\.hh$''
|
||||||
|
''^src/libstore/store-api\.cc$''
|
||||||
|
''^src/libstore/store-api\.hh$''
|
||||||
|
''^src/libstore/store-dir-config\.hh$''
|
||||||
|
''^src/libstore/unix/build/derivation-goal\.cc$''
|
||||||
|
''^src/libstore/unix/build/derivation-goal\.hh$''
|
||||||
|
''^src/libstore/unix/build/drv-output-substitution-goal\.cc$''
|
||||||
|
''^src/libstore/unix/build/drv-output-substitution-goal\.hh$''
|
||||||
|
''^src/libstore/unix/build/entry-points\.cc$''
|
||||||
|
''^src/libstore/unix/build/goal\.cc$''
|
||||||
|
''^src/libstore/unix/build/goal\.hh$''
|
||||||
|
''^src/libstore/unix/build/hook-instance\.cc$''
|
||||||
|
''^src/libstore/unix/build/local-derivation-goal\.cc$''
|
||||||
|
''^src/libstore/unix/build/local-derivation-goal\.hh$''
|
||||||
|
''^src/libstore/unix/build/substitution-goal\.cc$''
|
||||||
|
''^src/libstore/unix/build/substitution-goal\.hh$''
|
||||||
|
''^src/libstore/unix/build/worker\.cc$''
|
||||||
|
''^src/libstore/unix/build/worker\.hh$''
|
||||||
|
''^src/libstore/unix/builtins/fetchurl\.cc$''
|
||||||
|
''^src/libstore/unix/builtins/unpack-channel\.cc$''
|
||||||
|
''^src/libstore/unix/gc\.cc$''
|
||||||
|
''^src/libstore/unix/local-overlay-store\.cc$''
|
||||||
|
''^src/libstore/unix/local-overlay-store\.hh$''
|
||||||
|
''^src/libstore/unix/local-store\.cc$''
|
||||||
|
''^src/libstore/unix/local-store\.hh$''
|
||||||
|
''^src/libstore/unix/lock\.cc$''
|
||||||
|
''^src/libstore/unix/lock\.hh$''
|
||||||
|
''^src/libstore/unix/optimise-store\.cc$''
|
||||||
|
''^src/libstore/unix/pathlocks\.cc$''
|
||||||
|
''^src/libstore/unix/posix-fs-canonicalise\.cc$''
|
||||||
|
''^src/libstore/unix/posix-fs-canonicalise\.hh$''
|
||||||
|
''^src/libstore/unix/uds-remote-store\.cc$''
|
||||||
|
''^src/libstore/unix/uds-remote-store\.hh$''
|
||||||
|
''^src/libstore/windows/build\.cc$''
|
||||||
|
''^src/libstore/worker-protocol-impl\.hh$''
|
||||||
|
''^src/libstore/worker-protocol\.cc$''
|
||||||
|
''^src/libstore/worker-protocol\.hh$''
|
||||||
|
''^src/libutil-c/nix_api_util_internal\.h$''
|
||||||
|
''^src/libutil/archive\.cc$''
|
||||||
|
''^src/libutil/archive\.hh$''
|
||||||
|
''^src/libutil/args\.cc$''
|
||||||
|
''^src/libutil/args\.hh$''
|
||||||
|
''^src/libutil/args/root\.hh$''
|
||||||
|
''^src/libutil/callback\.hh$''
|
||||||
|
''^src/libutil/canon-path\.cc$''
|
||||||
|
''^src/libutil/canon-path\.hh$''
|
||||||
|
''^src/libutil/chunked-vector\.hh$''
|
||||||
|
''^src/libutil/closure\.hh$''
|
||||||
|
''^src/libutil/comparator\.hh$''
|
||||||
|
''^src/libutil/compute-levels\.cc$''
|
||||||
|
''^src/libutil/config-impl\.hh$''
|
||||||
|
''^src/libutil/config\.cc$''
|
||||||
|
''^src/libutil/config\.hh$''
|
||||||
|
''^src/libutil/current-process\.cc$''
|
||||||
|
''^src/libutil/current-process\.hh$''
|
||||||
|
''^src/libutil/english\.cc$''
|
||||||
|
''^src/libutil/english\.hh$''
|
||||||
|
''^src/libutil/environment-variables\.cc$''
|
||||||
|
''^src/libutil/error\.cc$''
|
||||||
|
''^src/libutil/error\.hh$''
|
||||||
|
''^src/libutil/exit\.hh$''
|
||||||
|
''^src/libutil/experimental-features\.cc$''
|
||||||
|
''^src/libutil/experimental-features\.hh$''
|
||||||
|
''^src/libutil/file-content-address\.cc$''
|
||||||
|
''^src/libutil/file-content-address\.hh$''
|
||||||
|
''^src/libutil/file-descriptor\.cc$''
|
||||||
|
''^src/libutil/file-descriptor\.hh$''
|
||||||
|
''^src/libutil/file-path-impl\.hh$''
|
||||||
|
''^src/libutil/file-path\.hh$''
|
||||||
|
''^src/libutil/file-system\.cc$''
|
||||||
|
''^src/libutil/file-system\.hh$''
|
||||||
|
''^src/libutil/finally\.hh$''
|
||||||
|
''^src/libutil/fmt\.hh$''
|
||||||
|
''^src/libutil/fs-sink\.cc$''
|
||||||
|
''^src/libutil/fs-sink\.hh$''
|
||||||
|
''^src/libutil/git\.cc$''
|
||||||
|
''^src/libutil/git\.hh$''
|
||||||
|
''^src/libutil/hash\.cc$''
|
||||||
|
''^src/libutil/hash\.hh$''
|
||||||
|
''^src/libutil/hilite\.cc$''
|
||||||
|
''^src/libutil/hilite\.hh$''
|
||||||
|
''^src/libutil/input-accessor\.hh$''
|
||||||
|
''^src/libutil/json-impls\.hh$''
|
||||||
|
''^src/libutil/json-utils\.cc$''
|
||||||
|
''^src/libutil/json-utils\.hh$''
|
||||||
|
''^src/libutil/linux/cgroup\.cc$''
|
||||||
|
''^src/libutil/linux/namespaces\.cc$''
|
||||||
|
''^src/libutil/logging\.cc$''
|
||||||
|
''^src/libutil/logging\.hh$''
|
||||||
|
''^src/libutil/lru-cache\.hh$''
|
||||||
|
''^src/libutil/memory-source-accessor\.cc$''
|
||||||
|
''^src/libutil/memory-source-accessor\.hh$''
|
||||||
|
''^src/libutil/pool\.hh$''
|
||||||
|
''^src/libutil/position\.cc$''
|
||||||
|
''^src/libutil/position\.hh$''
|
||||||
|
''^src/libutil/posix-source-accessor\.cc$''
|
||||||
|
''^src/libutil/posix-source-accessor\.hh$''
|
||||||
|
''^src/libutil/processes\.hh$''
|
||||||
|
''^src/libutil/ref\.hh$''
|
||||||
|
''^src/libutil/references\.cc$''
|
||||||
|
''^src/libutil/references\.hh$''
|
||||||
|
''^src/libutil/regex-combinators\.hh$''
|
||||||
|
''^src/libutil/serialise\.cc$''
|
||||||
|
''^src/libutil/serialise\.hh$''
|
||||||
|
''^src/libutil/signals\.hh$''
|
||||||
|
''^src/libutil/signature/local-keys\.cc$''
|
||||||
|
''^src/libutil/signature/local-keys\.hh$''
|
||||||
|
''^src/libutil/signature/signer\.cc$''
|
||||||
|
''^src/libutil/signature/signer\.hh$''
|
||||||
|
''^src/libutil/source-accessor\.cc$''
|
||||||
|
''^src/libutil/source-accessor\.hh$''
|
||||||
|
''^src/libutil/source-path\.cc$''
|
||||||
|
''^src/libutil/source-path\.hh$''
|
||||||
|
''^src/libutil/split\.hh$''
|
||||||
|
''^src/libutil/suggestions\.cc$''
|
||||||
|
''^src/libutil/suggestions\.hh$''
|
||||||
|
''^src/libutil/sync\.hh$''
|
||||||
|
''^src/libutil/terminal\.cc$''
|
||||||
|
''^src/libutil/terminal\.hh$''
|
||||||
|
''^src/libutil/thread-pool\.cc$''
|
||||||
|
''^src/libutil/thread-pool\.hh$''
|
||||||
|
''^src/libutil/topo-sort\.hh$''
|
||||||
|
''^src/libutil/types\.hh$''
|
||||||
|
''^src/libutil/unix/file-descriptor\.cc$''
|
||||||
|
''^src/libutil/unix/file-path\.cc$''
|
||||||
|
''^src/libutil/unix/monitor-fd\.hh$''
|
||||||
|
''^src/libutil/unix/processes\.cc$''
|
||||||
|
''^src/libutil/unix/signals-impl\.hh$''
|
||||||
|
''^src/libutil/unix/signals\.cc$''
|
||||||
|
''^src/libutil/unix/unix-domain-socket\.cc$''
|
||||||
|
''^src/libutil/unix/users\.cc$''
|
||||||
|
''^src/libutil/url-parts\.hh$''
|
||||||
|
''^src/libutil/url\.cc$''
|
||||||
|
''^src/libutil/url\.hh$''
|
||||||
|
''^src/libutil/users\.cc$''
|
||||||
|
''^src/libutil/users\.hh$''
|
||||||
|
''^src/libutil/util\.cc$''
|
||||||
|
''^src/libutil/util\.hh$''
|
||||||
|
''^src/libutil/variant-wrapper\.hh$''
|
||||||
|
''^src/libutil/windows/environment-variables\.cc$''
|
||||||
|
''^src/libutil/windows/file-descriptor\.cc$''
|
||||||
|
''^src/libutil/windows/file-path\.cc$''
|
||||||
|
''^src/libutil/windows/processes\.cc$''
|
||||||
|
''^src/libutil/windows/users\.cc$''
|
||||||
|
''^src/libutil/windows/windows-error\.cc$''
|
||||||
|
''^src/libutil/windows/windows-error\.hh$''
|
||||||
|
''^src/libutil/xml-writer\.cc$''
|
||||||
|
''^src/libutil/xml-writer\.hh$''
|
||||||
|
''^src/nix-build/nix-build\.cc$''
|
||||||
|
''^src/nix-channel/nix-channel\.cc$''
|
||||||
|
''^src/nix-collect-garbage/nix-collect-garbage\.cc$''
|
||||||
|
''^src/nix-env/buildenv.nix$''
|
||||||
|
''^src/nix-env/nix-env\.cc$''
|
||||||
|
''^src/nix-env/user-env\.cc$''
|
||||||
|
''^src/nix-env/user-env\.hh$''
|
||||||
|
''^src/nix-instantiate/nix-instantiate\.cc$''
|
||||||
|
''^src/nix-store/dotgraph\.cc$''
|
||||||
|
''^src/nix-store/graphml\.cc$''
|
||||||
|
''^src/nix-store/nix-store\.cc$''
|
||||||
|
''^src/nix/add-to-store\.cc$''
|
||||||
|
''^src/nix/app\.cc$''
|
||||||
|
''^src/nix/build\.cc$''
|
||||||
|
''^src/nix/bundle\.cc$''
|
||||||
|
''^src/nix/cat\.cc$''
|
||||||
|
''^src/nix/config-check\.cc$''
|
||||||
|
''^src/nix/config\.cc$''
|
||||||
|
''^src/nix/copy\.cc$''
|
||||||
|
''^src/nix/derivation-add\.cc$''
|
||||||
|
''^src/nix/derivation-show\.cc$''
|
||||||
|
''^src/nix/derivation\.cc$''
|
||||||
|
''^src/nix/develop\.cc$''
|
||||||
|
''^src/nix/diff-closures\.cc$''
|
||||||
|
''^src/nix/dump-path\.cc$''
|
||||||
|
''^src/nix/edit\.cc$''
|
||||||
|
''^src/nix/eval\.cc$''
|
||||||
|
''^src/nix/flake\.cc$''
|
||||||
|
''^src/nix/fmt\.cc$''
|
||||||
|
''^src/nix/hash\.cc$''
|
||||||
|
''^src/nix/log\.cc$''
|
||||||
|
''^src/nix/ls\.cc$''
|
||||||
|
''^src/nix/main\.cc$''
|
||||||
|
''^src/nix/make-content-addressed\.cc$''
|
||||||
|
''^src/nix/nar\.cc$''
|
||||||
|
''^src/nix/optimise-store\.cc$''
|
||||||
|
''^src/nix/path-from-hash-part\.cc$''
|
||||||
|
''^src/nix/path-info\.cc$''
|
||||||
|
''^src/nix/prefetch\.cc$''
|
||||||
|
''^src/nix/profile\.cc$''
|
||||||
|
''^src/nix/realisation\.cc$''
|
||||||
|
''^src/nix/registry\.cc$''
|
||||||
|
''^src/nix/repl\.cc$''
|
||||||
|
''^src/nix/run\.cc$''
|
||||||
|
''^src/nix/run\.hh$''
|
||||||
|
''^src/nix/search\.cc$''
|
||||||
|
''^src/nix/sigs\.cc$''
|
||||||
|
''^src/nix/store-copy-log\.cc$''
|
||||||
|
''^src/nix/store-delete\.cc$''
|
||||||
|
''^src/nix/store-gc\.cc$''
|
||||||
|
''^src/nix/store-info\.cc$''
|
||||||
|
''^src/nix/store-repair\.cc$''
|
||||||
|
''^src/nix/store\.cc$''
|
||||||
|
''^src/nix/unix/daemon\.cc$''
|
||||||
|
''^src/nix/upgrade-nix\.cc$''
|
||||||
|
''^src/nix/verify\.cc$''
|
||||||
|
''^src/nix/why-depends\.cc$''
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
# We'll be pulling from this in the main flake
|
||||||
|
flake.getSystem = getSystem;
|
||||||
|
}
|
||||||
15
maintainers/local.mk
Normal file
15
maintainers/local.mk
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
|
||||||
|
.PHONY: format
|
||||||
|
print-top-help += echo ' format: Format source code'
|
||||||
|
|
||||||
|
# This uses the cached .pre-commit-hooks.yaml file
|
||||||
|
format:
|
||||||
|
@if ! type -p pre-commit &>/dev/null; then \
|
||||||
|
echo "make format: pre-commit not found. Please use \`nix develop\`."; \
|
||||||
|
exit 1; \
|
||||||
|
fi; \
|
||||||
|
if test -z "$$_NIX_PRE_COMMIT_HOOKS_CONFIG"; then \
|
||||||
|
echo "make format: _NIX_PRE_COMMIT_HOOKS_CONFIG not set. Please use \`nix develop\`."; \
|
||||||
|
exit 1; \
|
||||||
|
fi; \
|
||||||
|
pre-commit run --config $$_NIX_PRE_COMMIT_HOOKS_CONFIG --all-files
|
||||||
|
|
@ -167,6 +167,8 @@ in {
|
||||||
./m4
|
./m4
|
||||||
# TODO: do we really need README.md? It doesn't seem used in the build.
|
# TODO: do we really need README.md? It doesn't seem used in the build.
|
||||||
./README.md
|
./README.md
|
||||||
|
# This could be put behind a conditional
|
||||||
|
./maintainers/local.mk
|
||||||
# For make, regardless of what we are building
|
# For make, regardless of what we are building
|
||||||
./local.mk
|
./local.mk
|
||||||
./Makefile
|
./Makefile
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue