flake: enforce nixpkgs-fmt

9 files changed, 110 insertions, 70 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index bed50a3..a0fc1c7 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,18 +1,20 @@
-final: prev: let
+final: prev:
+let
   inherit (final) callPackage fetchpatch;
-in {
-  btclone = callPackage ./btclone {};
-  git-aliases = callPackage ./git-aliases.nix {};
-  mssql-tools = callPackage ./mssql-tools.nix {};
-  oregano = callPackage ./oregano {};
-  rqlite = callPackage ./rqlite.nix {};
-  rv8 = callPackage ./rv8.nix {};
-  scripts = callPackage ./scripts {};
-  tmux-lift = callPackage ./tmux-lift {};
-  
+in
+{
+  btclone = callPackage ./btclone { };
+  git-aliases = callPackage ./git-aliases.nix { };
+  mssql-tools = callPackage ./mssql-tools.nix { };
+  oregano = callPackage ./oregano { };
+  rqlite = callPackage ./rqlite.nix { };
+  rv8 = callPackage ./rv8.nix { };
+  scripts = callPackage ./scripts { };
+  tmux-lift = callPackage ./tmux-lift { };
+
   st = prev.st.override {
-    conf = import ./st.nix {};
-  
+    conf = import ./st.nix { };
+
     patches = [
       (fetchpatch {
         url = "https://st.suckless.org/patches/clipboard/st-clipboard-0.8.3.diff";
diff --git a/pkgs/mssql-tools.nix b/pkgs/mssql-tools.nix
index a2de629..9213c16 100644
--- a/pkgs/mssql-tools.nix
+++ b/pkgs/mssql-tools.nix
@@ -5,7 +5,8 @@
 let
   version = "17.9.1.1-1";
   ubuntuRelease = "21.10";
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   pname = "mssql-tools";
   inherit version;
 
@@ -13,10 +14,11 @@ in stdenv.mkDerivation {
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://packages.microsoft.com/ubuntu/${ubuntuRelease}/prod/pool/main/m/mssql-tools/mssql-tools_${version}_amd64.deb";
-        sha256 = "0ya9643assr80yh6g0nd3i6iw819frhbb1m421khwplk9iq793kk";
-      }
+      fetchurl
+        {
+          url = "https://packages.microsoft.com/ubuntu/${ubuntuRelease}/prod/pool/main/m/mssql-tools/mssql-tools_${version}_amd64.deb";
+          sha256 = "0ya9643assr80yh6g0nd3i6iw819frhbb1m421khwplk9iq793kk";
+        }
     else
       throw "mssql-tools is not supported on ${stdenv.hostPlatform.system}";
 
@@ -32,14 +34,16 @@ in stdenv.mkDerivation {
     rm -r $out/opt $out/usr
   '';
 
-  postFixup = let
-    rpath = lib.makeLibraryPath [ glibc stdenv.cc.cc unixODBC ];
-  in ''
-    for file in $(find $out/bin -type f); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file"
-      patchelf --set-rpath ${rpath} $file
-    done
-  '';
+  postFixup =
+    let
+      rpath = lib.makeLibraryPath [ glibc stdenv.cc.cc unixODBC ];
+    in
+    ''
+      for file in $(find $out/bin -type f); do
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file"
+        patchelf --set-rpath ${rpath} $file
+      done
+    '';
 
   meta = with lib; {
     license = licenses.unfree;
diff --git a/pkgs/oregano/default.nix b/pkgs/oregano/default.nix
index e85dded..82303f4 100644
--- a/pkgs/oregano/default.nix
+++ b/pkgs/oregano/default.nix
@@ -1,9 +1,23 @@
-{ lib, fetchFromGitHub, glib, goocanvas2, groff
-, gtk3, gtksourceview, intltool, libxml2, perl
-, pkg-config, python, stdenv, wafHook, wrapGAppsHook }:
+{ lib
+, fetchFromGitHub
+, glib
+, goocanvas2
+, groff
+, gtk3
+, gtksourceview
+, intltool
+, libxml2
+, perl
+, pkg-config
+, python
+, stdenv
+, wafHook
+, wrapGAppsHook
+}:
 let
   version = "0.84.43";
-in stdenv.mkDerivation {
+in
+stdenv.mkDerivation {
   pname = "oregano";
   inherit version;
 
@@ -18,7 +32,15 @@ in stdenv.mkDerivation {
   patches = [ ./gio-unix.patch ];
 
   buildInputs = [
-    intltool glib goocanvas2 groff gtk3 gtksourceview
-    libxml2 perl pkg-config python
+    intltool
+    glib
+    goocanvas2
+    groff
+    gtk3
+    gtksourceview
+    libxml2
+    perl
+    pkg-config
+    python
   ];
 }
diff --git a/pkgs/rqlite.nix b/pkgs/rqlite.nix
index a56d288..19d0fa3 100644
--- a/pkgs/rqlite.nix
+++ b/pkgs/rqlite.nix
@@ -1,7 +1,8 @@
 { lib, buildGoModule, fetchFromGitHub }:
 let
   version = "7.5.0";
-in buildGoModule {
+in
+buildGoModule {
   pname = "rqlite";
   inherit version;
 
diff --git a/pkgs/rv8.nix b/pkgs/rv8.nix
index 61cb91f..8527601 100644
--- a/pkgs/rv8.nix
+++ b/pkgs/rv8.nix
@@ -17,30 +17,32 @@ stdenv.mkDerivation {
     mkdir -p $out/bin $out/lib
   '';
 
-  patches = [ (writeText "rv8-include-limits.patch" ''
-    diff --git a/src/gen/gen-cc.cc b/src/gen/gen-cc.cc
-    index fd9f948..44c8bf7 100644
-    --- a/src/gen/gen-cc.cc
-    +++ b/src/gen/gen-cc.cc
-    @@ -12,6 +12,7 @@
-     #include <deque>
-     #include <map>
-     #include <set>
-    +#include <limits>
+  patches = [
+    (writeText "rv8-include-limits.patch" ''
+      diff --git a/src/gen/gen-cc.cc b/src/gen/gen-cc.cc
+      index fd9f948..44c8bf7 100644
+      --- a/src/gen/gen-cc.cc
+      +++ b/src/gen/gen-cc.cc
+      @@ -12,6 +12,7 @@
+       #include <deque>
+       #include <map>
+       #include <set>
+      +#include <limits>
      
-     #include "util.h"
-     #include "cmdline.h"
-    diff --git a/src/gen/gen-fpu-test.cc b/src/gen/gen-fpu-test.cc
-    index f1b8f84..d0a2f32 100644
-    --- a/src/gen/gen-fpu-test.cc
-    +++ b/src/gen/gen-fpu-test.cc
-    @@ -12,6 +12,7 @@
-     #include <deque>
-     #include <map>
-     #include <set>
-    +#include <limits>
+       #include "util.h"
+       #include "cmdline.h"
+      diff --git a/src/gen/gen-fpu-test.cc b/src/gen/gen-fpu-test.cc
+      index f1b8f84..d0a2f32 100644
+      --- a/src/gen/gen-fpu-test.cc
+      +++ b/src/gen/gen-fpu-test.cc
+      @@ -12,6 +12,7 @@
+       #include <deque>
+       #include <map>
+       #include <set>
+      +#include <limits>
      
-     #include "util.h"
-     #include "cmdline.h"
-  '') ];
+       #include "util.h"
+       #include "cmdline.h"
+    '')
+  ];
 }
diff --git a/pkgs/scripts/clip.nix b/pkgs/scripts/clip.nix
index 862d82e..501bb3b 100644
--- a/pkgs/scripts/clip.nix
+++ b/pkgs/scripts/clip.nix
@@ -1,5 +1,12 @@
-{ lib ,writeShellScriptBin, gnome, xclip
-, file, imagemagick, toPDF, ... }:
+{ lib
+, writeShellScriptBin
+, gnome
+, xclip
+, file
+, imagemagick
+, toPDF
+, ...
+}:
 with lib; let
   name = if toPDF then "clip-pdf" else "clip";
 
@@ -13,13 +20,15 @@ with lib; let
     shift
   '';
 
-  copyOut = if toPDF then ''
-    ${imagemagick}/bin/convert "$CLIP" "$OUT"
-  '' else ''
-    ${xclip}/bin/xclip -selection clipboard \
-      -t $(${file}/bin/file -b --mime-type $CLIP) <"$CLIP"
-  '';
-in writeShellScriptBin name ''
+  copyOut =
+    if toPDF then ''
+      ${imagemagick}/bin/convert "$CLIP" "$OUT"
+    '' else ''
+      ${xclip}/bin/xclip -selection clipboard \
+        -t $(${file}/bin/file -b --mime-type $CLIP) <"$CLIP"
+    '';
+in
+writeShellScriptBin name ''
   ${pdfCmdline}
 
   OPTIONS=-a
diff --git a/pkgs/scripts/default.nix b/pkgs/scripts/default.nix
index 18900f6..43eae89 100644
--- a/pkgs/scripts/default.nix
+++ b/pkgs/scripts/default.nix
@@ -4,6 +4,6 @@ symlinkJoin {
   paths = [
     (callPackage ./clip.nix { toPDF = false; })
     (callPackage ./clip.nix { toPDF = true; })
-    (callPackage ./merge-pdfs.nix {})
+    (callPackage ./merge-pdfs.nix { })
   ];
 }
diff --git a/pkgs/st.nix b/pkgs/st.nix
index a19bcea..117b94c 100644
--- a/pkgs/st.nix
+++ b/pkgs/st.nix
@@ -1,4 +1,4 @@
-{ }:
+{}:
 ''
   /* See LICENSE file for copyright and license details. */
 
diff --git a/pkgs/tmux-lift/default.nix b/pkgs/tmux-lift/default.nix
index 9d1adf2..e353494 100644
--- a/pkgs/tmux-lift/default.nix
+++ b/pkgs/tmux-lift/default.nix
@@ -5,7 +5,7 @@
   src = ./.;
 
   installPhase = ''
-    mkdir -p $out/bin
-	cp lift unlift $out/bin
+        mkdir -p $out/bin
+    	cp lift unlift $out/bin
   '';
 }