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
|
|
@ -1,42 +1,56 @@
|
|||
# Helper functions for instantiating depot-compatible NixOS machines.
|
||||
{ depot, lib, pkgs, ... }@args:
|
||||
{
|
||||
depot,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}@args:
|
||||
|
||||
let inherit (lib) findFirst;
|
||||
in rec {
|
||||
let
|
||||
inherit (lib) findFirst;
|
||||
in
|
||||
rec {
|
||||
# This provides our standard set of arguments to all NixOS modules.
|
||||
baseModule = { ... }: {
|
||||
nix.nixPath =
|
||||
let
|
||||
# Due to nixpkgsBisectPath, pkgs.path is not always in the nix store
|
||||
nixpkgsStorePath =
|
||||
if lib.hasPrefix builtins.storeDir (toString pkgs.path)
|
||||
then builtins.storePath pkgs.path # nixpkgs is already in the store
|
||||
else pkgs.path; # we need to dump nixpkgs to the store either way
|
||||
in
|
||||
[
|
||||
("nixos=" + nixpkgsStorePath)
|
||||
("nixpkgs=" + nixpkgsStorePath)
|
||||
];
|
||||
};
|
||||
|
||||
nixosFor = configuration: (depot.third_party.nixos {
|
||||
configuration = { ... }: {
|
||||
imports = [
|
||||
baseModule
|
||||
configuration
|
||||
];
|
||||
baseModule =
|
||||
{ ... }:
|
||||
{
|
||||
nix.nixPath =
|
||||
let
|
||||
# Due to nixpkgsBisectPath, pkgs.path is not always in the nix store
|
||||
nixpkgsStorePath =
|
||||
if lib.hasPrefix builtins.storeDir (toString pkgs.path) then
|
||||
builtins.storePath pkgs.path # nixpkgs is already in the store
|
||||
else
|
||||
pkgs.path; # we need to dump nixpkgs to the store either way
|
||||
in
|
||||
[
|
||||
("nixos=" + nixpkgsStorePath)
|
||||
("nixpkgs=" + nixpkgsStorePath)
|
||||
];
|
||||
};
|
||||
|
||||
specialArgs = {
|
||||
inherit (args) depot;
|
||||
};
|
||||
});
|
||||
nixosFor =
|
||||
configuration:
|
||||
(depot.third_party.nixos {
|
||||
configuration =
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
baseModule
|
||||
configuration
|
||||
];
|
||||
};
|
||||
|
||||
findSystem = hostname:
|
||||
(findFirst
|
||||
(system: system.config.networking.hostName == hostname)
|
||||
(throw "${hostname} is not a known NixOS host")
|
||||
(map nixosFor depot.ops.machines.all-systems));
|
||||
specialArgs = {
|
||||
inherit (args) depot;
|
||||
};
|
||||
});
|
||||
|
||||
findSystem =
|
||||
hostname:
|
||||
(findFirst (
|
||||
system: system.config.networking.hostName == hostname
|
||||
) (throw "${hostname} is not a known NixOS host") (map nixosFor depot.ops.machines.all-systems));
|
||||
|
||||
# Systems that should be built in CI
|
||||
archivistEC2System = nixosFor depot.ops.machines.archivist-ec2;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue