pkgs: format files with nixfmt

pkgs/auto-editor.nix

@@ -19,8 +19,7 @@ let
     };
     buildInputs = super.buildInputs ++ [ python310Packages.cython ];
   });
-in
+in python310Packages.buildPythonApplication rec {
-python310Packages.buildPythonApplication rec {
   pname = "auto-editor";
   version = "22w12a";
   doCheck = false;
@@ -32,13 +31,12 @@ python310Packages.buildPythonApplication rec {
     sha256 = "sha256-mtVL/X6mh+0Paa6yuth9DGbqewsSBopV5/VXoC0DN4M=";
   };
 
-  propagatedBuildInputs = with python310Packages; [
+  propagatedBuildInputs = with python310Packages;
-    numpy
+    [ numpy yt-dlp ] ++ [ av pillow ];
-    yt-dlp
-  ] ++ [ av pillow ];
 
   meta = with lib; {
-    description = "Command-line application for automating video and audio editing with a variety of methods";
+    description =
+      "Command-line application for automating video and audio editing with a variety of methods";
     homepage = "https://auto-editor.com/cli";
     license = licenses.unlicense;
   };

pkgs/default.nix

@@ -15,8 +15,10 @@ let
       doggo = callPackage ./doggo.nix { };
       emulsion-palette = callPackage ./emulsion-palette.nix { };
       gol-c = callPackage ./gol-c.nix { };
-      gnome-search-provider-browser-tabs = callPackage ./gnome-search-provider-browser-tabs.nix { };
+      gnome-search-provider-browser-tabs =
-      gnome-search-provider-recoll = callPackage ./gnome-search-provider-recoll.nix { };
+        callPackage ./gnome-search-provider-browser-tabs.nix { };
+      gnome-search-provider-recoll =
+        callPackage ./gnome-search-provider-recoll.nix { };
       gnome-shell-extension-burn-my-windows =
         callPackage ./gnome-shell-extension-burn-my-windows.nix { };
       gnome-extension-manager = callPackage ./gnome-extension-manager.nix { };
@@ -39,6 +41,7 @@ let
       pop-launcher = callPackage ./pop-launcher.nix { };
       pop-launcher-plugin-duckduckgo-bangs =
         callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { };
+      #trex = callPackage ./trex.nix { };
       text-engine = callPackage ./text-engine.nix { };
       tic-80 = callPackage ./tic-80 { };
       segno = libsForQt5.callPackage ./segno.nix { };

pkgs/devdocs-desktop.nix

@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages, gtk3, glib, gobject-introspection, wrapGAppsHook, webkitgtk }:
+{ stdenv, lib, fetchFromGitHub, python3Packages, gtk3, glib
+, gobject-introspection, wrapGAppsHook, webkitgtk }:
 
 python3Packages.buildPythonApplication rec {
   pname = "devdocs-desktop";
@@ -13,10 +14,7 @@ python3Packages.buildPythonApplication rec {
 
   format = "other";
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ];
-    dbus-python
-    pygobject3
-  ];
 
   nativeBuildInputs = [ wrapGAppsHook gobject-introspection ];
   buildInputs = [ glib gtk3 webkitgtk ];

pkgs/gnome-search-provider-browser-tabs.nix

@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, mkYarnPackage
+{ stdenv, lib, fetchFromGitHub, rustPlatform, mkYarnPackage, meson, ninja, yarn
-, meson, ninja, yarn, zip }:
+, zip }:
 
 let
   version = "0.1.1";
@@ -86,8 +86,6 @@ in lib.recurseIntoAttrs {
       sha256 = "sha256-SULUONFmsnEiWoAWpGOLynSXF032qW+QcYfzxQrAFLQ=";
     };
 
-    mesonFlags = [
+    mesonFlags = [ "-Drelease-bindir=${placeholder "out"}/bin" ];
-      "-Drelease-bindir=${placeholder "out"}/bin"
-    ];
   };
 }

pkgs/guile-hall.nix

@@ -1,10 +1,8 @@
 { stdenv, lib, guile_3_0, guile-config, fetchFromGitLab, autoreconfHook
 , pkg-config, texinfo, makeWrapper }:
 
-let
+let modules = [ guile-config ];
-  modules = [ guile-config ];
+in stdenv.mkDerivation rec {
-in
-stdenv.mkDerivation rec {
   pname = "guile-hall";
   version = "0.4.1";
 
@@ -26,9 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   GUILE_LOAD_PATH = let
-    guilePath = [
+    guilePath = [ "\${out}/share/guile/site" ] ++ (lib.concatMap (module: [
-      "\${out}/share/guile/site"
-    ] ++ (lib.concatMap (module: [
       "${module}/share/guile/site"
       "${module}/share/guile"
       "${module}/share"
@@ -36,15 +32,13 @@ stdenv.mkDerivation rec {
   in lib.concatStringsSep ":" guilePath;
 
   GUILE_LOAD_COMPILED_PATH = let
-    guilePath = [
+    guilePath = [ "\${out}/share/guile/ccache" "\${out}/share/guile/site" ]
-      "\${out}/share/guile/ccache"
+      ++ (lib.concatMap (module: [
-      "\${out}/share/guile/site"
+        "${module}/share/guile/ccache"
-    ] ++ (lib.concatMap (module: [
+        "${module}/share/guile/site"
-      "${module}/share/guile/ccache"
+        "${module}/share/guile"
-      "${module}/share/guile/site"
+        "${module}/share"
-      "${module}/share/guile"
+      ]) modules);
-      "${module}/share"
-    ]) modules);
   in lib.concatStringsSep ":" guilePath;
 
   postInstall = ''

pkgs/ictree.nix

@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  makeFlags = [
+  makeFlags = [ "PREFIX=$(out)" ];
-    "PREFIX=$(out)"
-  ];
 
   meta = with lib; {
-  	description = "Like 'tree' but interactive";
+    description = "Like 'tree' but interactive";
     homepage = "https://github.com/NikitaIvanovV/ictree";
   };
 }

pkgs/junction.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, desktop-file-utils, gjs, appstream-glib
-, gobject-introspection, gsettings-desktop-schemas, libadwaita, meson
+, gobject-introspection, gsettings-desktop-schemas, libadwaita, meson, ninja
-, ninja, wrapGAppsHook4, glib, libportal }:
+, wrapGAppsHook4, glib, libportal }:
 
 stdenv.mkDerivation rec {
   pname = "junction";
@@ -13,23 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-jS4SHh1BB8jk/4EP070X44C4n3GjyCz8ozgK8v5lbqc=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ meson ninja wrapGAppsHook4 desktop-file-utils ];
-    meson
-    ninja
-    wrapGAppsHook4
-    desktop-file-utils
-  ];
 
   buildInputs = [ gsettings-desktop-schemas ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs =
-    appstream-glib
+    [ appstream-glib gjs gobject-introspection libadwaita glib libportal ];
-    gjs
-    gobject-introspection
-    libadwaita
-    glib
-    libportal
-  ];
 
   preFixup = ''
     substituteInPlace $out/bin/re.sonny.Junction --replace "#!/usr/bin/env -S gjs" "#!${gjs}/bin/gjs"

pkgs/mopidy-beets.nix

@@ -11,15 +11,10 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-HvhYAGtgf2rpzIJwMspGtHcrk4IZxPX1jZbNNwQCJA4=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3.pkgs;
-    pykka
+    [ pykka requests ] ++ [ mopidy beets ];
-    requests
-  ] ++ [ mopidy beets ];
 
-  checkInputs = with python3.pkgs; [
+  checkInputs = with python3.pkgs; [ pytest pytest-cov ];
-    pytest
-    pytest-cov
-  ];
 
   meta = with lib; {
     description = "Mopidy extension for playing music from a Beets collection";

pkgs/mopidy-funkwhale.nix

@@ -1,4 +1,3 @@
-
 { lib, fetchgit, python3, mopidy }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -15,12 +14,8 @@ python3.pkgs.buildPythonApplication rec {
     sed -i 's/vext/pykka/' setup.cfg
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3.pkgs;
-    pykka
+    [ pykka requests requests_oauthlib pygobject3 ] ++ [ mopidy ];
-    requests
-    requests_oauthlib
-    pygobject3
-  ] ++ [ mopidy ];
 
   checkInputs = with python3.pkgs; [
     pytest
@@ -31,7 +26,8 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   meta = with lib; {
-    description = "Mopidy extension for streaming music from a Funkwhale server";
+    description =
+      "Mopidy extension for streaming music from a Funkwhale server";
     homepage = "https://funkwhale.audio";
     license = licenses.gpl3Plus;
   };

pkgs/mopidy-internetarchive.nix

@@ -11,21 +11,14 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "sha256-kFkqqI9E6cKrRtSO433EpFPy/QYuqaorCEplBCwuXhU=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3.pkgs;
-    cachetools
+    [ cachetools pykka requests setuptools uritools ] ++ [ mopidy ];
-    pykka
-    requests
-    setuptools
-    uritools
-  ] ++ [ mopidy ];
 
-  checkInputs = with python3.pkgs; [
+  checkInputs = with python3.pkgs; [ pytest pytest-cov ];
-    pytest
-    pytest-cov
-  ];
 
   meta = with lib; {
-    description = "Mopidy extension for listening to audio from Internet Archive";
+    description =
+      "Mopidy extension for listening to audio from Internet Archive";
     homepage = "https://github.com/tkem/mopidy-internetarchive";
     license = licenses.asl20;
   };

pkgs/text-engine.nix

@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, meson, ninja, json-glib, gtk4, libxml2, gobject-introspection, pkg-config, libadwaita }:
+{ stdenv, lib, fetchFromGitHub, meson, ninja, json-glib, gtk4, libxml2
+, gobject-introspection, pkg-config, libadwaita }:
 
 stdenv.mkDerivation rec {
   pname = "text-engine";
@@ -10,19 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-TVQD5sAJJkcs/w4K5B3e+hvfTcoGXunsceada6k/Hjs=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ];
-    gobject-introspection
-    gtk4
-    meson
-    ninja
-    pkg-config
-  ];
 
-  buildInputs = [
+  buildInputs = [ libadwaita json-glib libxml2 ];
-    libadwaita
-    json-glib
-    libxml2
-  ];
 
   meta = with lib; {
     description = "Rich text framework for GTK";

pkgs/wayback.nix

@@ -15,7 +15,8 @@ buildGoModule rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "Self-hosted toolkit for archiving webpages to the Internet Archive";
+    description =
+      "Self-hosted toolkit for archiving webpages to the Internet Archive";
     homepage = "https://wabarc.eu.org/";
     license = licenses.gpl3Only;
   };