diff options
author | Ben Sima <ben@bsima.me> | 2025-01-02 16:20:21 -0500 |
---|---|---|
committer | Ben Sima <ben@bsima.me> | 2025-01-02 16:20:21 -0500 |
commit | 0fb4ae72c5754761fd7666e4274f4beef0484c32 (patch) | |
tree | d8820c808f31f287c3fcc266c02e3a26ddcdfbc3 /Omni/Bild/Functions.nix | |
parent | 3790d334c994db7a0e1eac9c130c2b1316c78c35 (diff) |
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
Diffstat (limited to 'Omni/Bild/Functions.nix')
-rw-r--r-- | Omni/Bild/Functions.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Omni/Bild/Functions.nix b/Omni/Bild/Functions.nix index 8b87f86..2a40da2 100644 --- a/Omni/Bild/Functions.nix +++ b/Omni/Bild/Functions.nix @@ -10,24 +10,25 @@ _: super: { # rules. This will fail if build steps have changed, or if no build # rules are available upstream. overrideSource = depName: - if super ? "${depName}" && super.${depName} ? overrideAttrs then + if super ? "${depName}" && super.${depName} ? overrideAttrs + then super.${depName}.overrideAttrs (attrs: - attrs // rec { + attrs + // rec { version = super.sources.${depName}.version or super.sources.${depName}.rev; src = super.sources.${depName}; }) - else - null; + else null; # Simply override the 'src' attr on a drv. This is meant to be a simpler # alternative to 'overrideSource' above. In an overlay, use it like: # mypkg = super.overrideSrc super.mypkg super.sources.mypkg; overrideSrc = dep: src: dep.overrideAttrs (attrs: - attrs // { + attrs + // { version = src.version or src.rev; src = src; }); } - |