style: Switch to nixfmt from nixpkgs-fmt
Most of the ecosystem has moved to this formatter, and many people configured their editors to autoformat it with this formatter. Closes: https://git.snix.dev/snix/snix/issues/62 Change-Id: Icf39e7836c91fc2ae49fbe22a40a639105bfb0bd Reviewed-on: https://cl.snix.dev/c/snix/+/30671 Reviewed-by: Florian Klink <flokli@flokli.de> Tested-by: besadii Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
parent
3443e6bd08
commit
91d02d8c84
136 changed files with 39952 additions and 11007 deletions
68
third_party/nixpkgs/default.nix
vendored
68
third_party/nixpkgs/default.nix
vendored
|
|
@ -8,15 +8,16 @@
|
|||
# in //default.nix passes this attribute as the `pkgs` argument to all
|
||||
# readTree derivations.
|
||||
|
||||
{ depot ? { }
|
||||
, externalArgs ? { }
|
||||
, depotOverlays ? true
|
||||
, localSystem ? externalArgs.localSystem or builtins.currentSystem
|
||||
, crossSystem ? externalArgs.crossSystem or localSystem
|
||||
{
|
||||
depot ? { },
|
||||
externalArgs ? { },
|
||||
depotOverlays ? true,
|
||||
localSystem ? externalArgs.localSystem or builtins.currentSystem,
|
||||
crossSystem ? externalArgs.crossSystem or localSystem,
|
||||
# additional overlays to be applied.
|
||||
# Useful when calling this file in a view exported from depot.
|
||||
, additionalOverlays ? [ ]
|
||||
, ...
|
||||
additionalOverlays ? [ ],
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -24,20 +25,18 @@ let
|
|||
# Includes everything but overlays which are only passed to unstable nixpkgs.
|
||||
commonNixpkgsArgs = {
|
||||
# allow users to inject their config into builds (e.g. to test CA derivations)
|
||||
config =
|
||||
(if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { })
|
||||
// {
|
||||
allowUnfree = true;
|
||||
allowUnfreeRedistributable = true;
|
||||
allowBroken = true;
|
||||
# Forbids our meta.ci attribute
|
||||
# https://github.com/NixOS/nixpkgs/pull/191171#issuecomment-1260650771
|
||||
checkMeta = false;
|
||||
permittedInsecurePackages = [
|
||||
# only used inside tests
|
||||
"nix-2.3.18"
|
||||
];
|
||||
};
|
||||
config = (if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { }) // {
|
||||
allowUnfree = true;
|
||||
allowUnfreeRedistributable = true;
|
||||
allowBroken = true;
|
||||
# Forbids our meta.ci attribute
|
||||
# https://github.com/NixOS/nixpkgs/pull/191171#issuecomment-1260650771
|
||||
checkMeta = false;
|
||||
permittedInsecurePackages = [
|
||||
# only used inside tests
|
||||
"nix-2.3.18"
|
||||
];
|
||||
};
|
||||
|
||||
inherit localSystem crossSystem;
|
||||
};
|
||||
|
|
@ -69,12 +68,21 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
import nixpkgsSrc (commonNixpkgsArgs // {
|
||||
overlays = [
|
||||
commitsOverlay
|
||||
stableOverlay
|
||||
] ++ (if depotOverlays then [
|
||||
depot.third_party.overlays.tvl
|
||||
(import depot.third_party.sources.rust-overlay)
|
||||
] else [ ] ++ additionalOverlays);
|
||||
})
|
||||
import nixpkgsSrc (
|
||||
commonNixpkgsArgs
|
||||
// {
|
||||
overlays = [
|
||||
commitsOverlay
|
||||
stableOverlay
|
||||
]
|
||||
++ (
|
||||
if depotOverlays then
|
||||
[
|
||||
depot.third_party.overlays.tvl
|
||||
(import depot.third_party.sources.rust-overlay)
|
||||
]
|
||||
else
|
||||
[ ] ++ additionalOverlays
|
||||
);
|
||||
}
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue