technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: Re-apply style normalisation

Browse source 
Originally this was manually applied with;

```sh
nixpkgs-fmt **.nix && statix fix
```

but I overlooked the fact that `**.nix` would only expand to files in
the root (I should have used `**/*.nix`).

Previous commit adds `nix fmt` support which passes `.` to `nixpkgs-fmt`
(if no other path is explicitly specified when running `nix fmt`).

This commit includes the changes made by running `nix fmt`.
This commit is contained in:
Chris Scutcher 2023-02-07 15:56:08 +00:00
parent a393654c3b
commit ff5127ea0a
No known key found for this signature in database
GPG key ID: 19C0BED130CD39CE
12 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
example/stand-alone/configuration.nix
View file

@ -1,8 +1,8 @@
{ { pkgs
pkgs, , lib
lib, , ...
... }:
}: let let
# We just import from the repository for testing here: # We just import from the repository for testing here:
disko = import ../../. { disko = import ../../. {
inherit lib; inherit lib;
@ -41,7 +41,8 @@
}; };
}; };
}; };
in { in
{
imports = [ imports = [
(disko.config cfg) (disko.config cfg)
]; ];

6
tests/bcachefs.nix
View file

@ -14,11 +14,13 @@ makeDiskoTest {
extraConfig = { extraConfig = {
boot.supportedFilesystems = [ "bcachefs" ]; boot.supportedFilesystems = [ "bcachefs" ];
# disable zfs so we can support latest kernel # disable zfs so we can support latest kernel
nixpkgs.overlays = [(final: super: { nixpkgs.overlays = [
(final: super: {
zfs = super.zfs.overrideAttrs (_: { zfs = super.zfs.overrideAttrs (_: {
meta.platforms = [ ]; meta.platforms = [ ];
}); });
})]; })
];
boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux-bcachefs)); boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux-bcachefs));
}; };
} }

6
tests/default.nix
View file

@ -6,9 +6,11 @@ let
lib = pkgs.lib; lib = pkgs.lib;
makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest; makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest;
evalTest = name: configFile: let evalTest = name: configFile:
let
disko-config = import configFile; disko-config = import configFile;
in { in
{
"${name}-tsp-create" = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config); "${name}-tsp-create" = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config);
"${name}-tsp-mount" = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config); "${name}-tsp-mount" = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config);
}; };