From 0fb4ae72c5754761fd7666e4274f4beef0484c32 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Thu, 2 Jan 2025 16:20:21 -0500 Subject: Switch to alejandra for nix formatting I mostly wanted a formatter that would format `inherit` blocks vertically, because otherwise they are super hard to read when diffing or even just editing. Both alejandra and the new nixos/nixfmt format verically like this, but alejandra has slightly better format (I guess) and for some reason nixfmt did not respect my `GLOBIGNORE` setting when doing `nixfmt **/*.nix` so it was trying to format stuff in `_/nix`, and failed. So anyway I went with alejandra. - https://github.com/kamadorueda/alejandra - https://discourse.nixos.org/t/enforcing-nix-formatting-in-nixpkgs/49506 --- Omni/Bild/Nixpkgs.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Omni/Bild/Nixpkgs.nix') diff --git a/Omni/Bild/Nixpkgs.nix b/Omni/Bild/Nixpkgs.nix index 828021c..c4934ce 100644 --- a/Omni/Bild/Nixpkgs.nix +++ b/Omni/Bild/Nixpkgs.nix @@ -1,5 +1,5 @@ let - sources = import ./Sources.nix { sourcesFile = ./Sources.json; }; + sources = import ./Sources.nix {sourcesFile = ./Sources.json;}; config = { allowAliases = true; @@ -16,7 +16,7 @@ let depsOverlay = _: pkgs: pkgs.overridePinnedDeps pkgs.overrideSource; overlays = [ - (_: _: { inherit sources; }) + (_: _: {inherit sources;}) (import ./CcacheWrapper.nix) (import ./Functions.nix) depsOverlay @@ -24,16 +24,15 @@ let (import ./Python.nix) (import ./Haskell.nix) # backport newer packages from unstable - (_: _: { unstable = nixos-unstable-small.pkgs; }) + (_: _: {unstable = nixos-unstable-small.pkgs;}) ]; nixos-unstable-small = - import sources.nixos-unstable-small { inherit system config overlays; }; - + import sources.nixos-unstable-small {inherit system config overlays;}; in { - nixos-24_05 = import sources.nixos-24_05 { inherit system config overlays; }; + nixos-24_05 = import sources.nixos-24_05 {inherit system config overlays;}; - nixos-24_11 = import sources.nixos-24_11 { inherit system config overlays; }; + nixos-24_11 = import sources.nixos-24_11 {inherit system config overlays;}; inherit nixos-unstable-small; } -- cgit v1.2.3