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/Deps/inspekt3d.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'Omni/Bild/Deps/inspekt3d.nix') diff --git a/Omni/Bild/Deps/inspekt3d.nix b/Omni/Bild/Deps/inspekt3d.nix index 3146350..de3db4e 100644 --- a/Omni/Bild/Deps/inspekt3d.nix +++ b/Omni/Bild/Deps/inspekt3d.nix @@ -1,15 +1,24 @@ -{ stdenv, lib, autoreconfHook, pkg-config, guile, guile-opengl, mesa -, glibcLocales, libfive, sources }: - +{ + stdenv, + lib, + autoreconfHook, + pkg-config, + guile, + guile-opengl, + mesa, + glibcLocales, + libfive, + sources, +}: stdenv.mkDerivation { name = "inspekt3d-unstable"; src = sources.inspekt3d; version = "unstable-2018-10-17"; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ guile glibcLocales mesa ]; - propagatedBuildInputs = [ guile-opengl libfive ]; + nativeBuildInputs = [pkg-config autoreconfHook]; + buildInputs = [guile glibcLocales mesa]; + propagatedBuildInputs = [guile-opengl libfive]; preBuild = '' substituteInPlace inspekt3d/library.scm \ @@ -24,7 +33,7 @@ stdenv.mkDerivation { description = "Lightweight 3D viewer for Libfive written in Guile Scheme"; homepage = "https://sr.ht/~morgansmith/inspekt3d"; license = licenses.gpl3; - maintainers = with maintainers; [ bsima ]; + maintainers = with maintainers; [bsima]; platforms = platforms.all; }; } -- cgit v1.2.3