From 18f36a25c553eb9062b2351cce0157105d5217c9 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 28 Mar 2022 08:18:15 +0800 Subject: [PATCH] pkgs: format files with nixfmt --- pkgs/auto-editor.nix | 12 ++++------ pkgs/default.nix | 7 ++++-- pkgs/devdocs-desktop.nix | 8 +++---- pkgs/gnome-search-provider-browser-tabs.nix | 8 +++---- pkgs/guile-hall.nix | 26 ++++++++------------- pkgs/ictree.nix | 6 ++--- pkgs/junction.nix | 21 ++++------------- pkgs/mopidy-beets.nix | 11 +++------ pkgs/mopidy-funkwhale.nix | 12 ++++------ pkgs/mopidy-internetarchive.nix | 17 ++++---------- pkgs/text-engine.nix | 17 ++++---------- pkgs/wayback.nix | 3 ++- 12 files changed, 51 insertions(+), 97 deletions(-) diff --git a/pkgs/auto-editor.nix b/pkgs/auto-editor.nix index 03d12ed9..27835a89 100644 --- a/pkgs/auto-editor.nix +++ b/pkgs/auto-editor.nix @@ -19,8 +19,7 @@ let }; buildInputs = super.buildInputs ++ [ python310Packages.cython ]; }); -in -python310Packages.buildPythonApplication rec { +in 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; [ - numpy - yt-dlp - ] ++ [ av pillow ]; + propagatedBuildInputs = with python310Packages; + [ numpy 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; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 84345b84..cc8386d7 100644 --- a/pkgs/default.nix +++ b/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-recoll = callPackage ./gnome-search-provider-recoll.nix { }; + gnome-search-provider-browser-tabs = + 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 { }; diff --git a/pkgs/devdocs-desktop.nix b/pkgs/devdocs-desktop.nix index 6a3638cd..9f43cdf2 100644 --- a/pkgs/devdocs-desktop.nix +++ b/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; [ - dbus-python - pygobject3 - ]; + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ glib gtk3 webkitgtk ]; diff --git a/pkgs/gnome-search-provider-browser-tabs.nix b/pkgs/gnome-search-provider-browser-tabs.nix index a1bcf1d6..491fccc1 100644 --- a/pkgs/gnome-search-provider-browser-tabs.nix +++ b/pkgs/gnome-search-provider-browser-tabs.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, mkYarnPackage -, meson, ninja, yarn, zip }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, mkYarnPackage, meson, ninja, yarn +, zip }: let version = "0.1.1"; @@ -86,8 +86,6 @@ in lib.recurseIntoAttrs { sha256 = "sha256-SULUONFmsnEiWoAWpGOLynSXF032qW+QcYfzxQrAFLQ="; }; - mesonFlags = [ - "-Drelease-bindir=${placeholder "out"}/bin" - ]; + mesonFlags = [ "-Drelease-bindir=${placeholder "out"}/bin" ]; }; } diff --git a/pkgs/guile-hall.nix b/pkgs/guile-hall.nix index eb220356..35a9dd4d 100644 --- a/pkgs/guile-hall.nix +++ b/pkgs/guile-hall.nix @@ -1,10 +1,8 @@ { stdenv, lib, guile_3_0, guile-config, fetchFromGitLab, autoreconfHook , pkg-config, texinfo, makeWrapper }: -let - modules = [ guile-config ]; -in -stdenv.mkDerivation rec { +let modules = [ guile-config ]; +in stdenv.mkDerivation rec { pname = "guile-hall"; version = "0.4.1"; @@ -26,9 +24,7 @@ stdenv.mkDerivation rec { ''; GUILE_LOAD_PATH = let - guilePath = [ - "\${out}/share/guile/site" - ] ++ (lib.concatMap (module: [ + guilePath = [ "\${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 = [ - "\${out}/share/guile/ccache" - "\${out}/share/guile/site" - ] ++ (lib.concatMap (module: [ - "${module}/share/guile/ccache" - "${module}/share/guile/site" - "${module}/share/guile" - "${module}/share" - ]) modules); + guilePath = [ "\${out}/share/guile/ccache" "\${out}/share/guile/site" ] + ++ (lib.concatMap (module: [ + "${module}/share/guile/ccache" + "${module}/share/guile/site" + "${module}/share/guile" + "${module}/share" + ]) modules); in lib.concatStringsSep ":" guilePath; postInstall = '' diff --git a/pkgs/ictree.nix b/pkgs/ictree.nix index 0ec0d608..c90521de 100644 --- a/pkgs/ictree.nix +++ b/pkgs/ictree.nix @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - makeFlags = [ - "PREFIX=$(out)" - ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "Like 'tree' but interactive"; + description = "Like 'tree' but interactive"; homepage = "https://github.com/NikitaIvanovV/ictree"; }; } diff --git a/pkgs/junction.nix b/pkgs/junction.nix index 299023d3..b47fed98 100644 --- a/pkgs/junction.nix +++ b/pkgs/junction.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, desktop-file-utils, gjs, appstream-glib -, gobject-introspection, gsettings-desktop-schemas, libadwaita, meson -, ninja, wrapGAppsHook4, glib, libportal }: +, gobject-introspection, gsettings-desktop-schemas, libadwaita, meson, ninja +, wrapGAppsHook4, glib, libportal }: stdenv.mkDerivation rec { pname = "junction"; @@ -13,23 +13,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-jS4SHh1BB8jk/4EP070X44C4n3GjyCz8ozgK8v5lbqc="; }; - nativeBuildInputs = [ - meson - ninja - wrapGAppsHook4 - desktop-file-utils - ]; + nativeBuildInputs = [ meson ninja wrapGAppsHook4 desktop-file-utils ]; buildInputs = [ gsettings-desktop-schemas ]; - propagatedBuildInputs = [ - appstream-glib - gjs - gobject-introspection - libadwaita - glib - libportal - ]; + propagatedBuildInputs = + [ appstream-glib gjs gobject-introspection libadwaita glib libportal ]; preFixup = '' substituteInPlace $out/bin/re.sonny.Junction --replace "#!/usr/bin/env -S gjs" "#!${gjs}/bin/gjs" diff --git a/pkgs/mopidy-beets.nix b/pkgs/mopidy-beets.nix index 12d4bf06..f2b3da60 100644 --- a/pkgs/mopidy-beets.nix +++ b/pkgs/mopidy-beets.nix @@ -11,15 +11,10 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-HvhYAGtgf2rpzIJwMspGtHcrk4IZxPX1jZbNNwQCJA4="; }; - propagatedBuildInputs = with python3.pkgs; [ - pykka - requests - ] ++ [ mopidy beets ]; + propagatedBuildInputs = with python3.pkgs; + [ pykka requests ] ++ [ mopidy beets ]; - checkInputs = with python3.pkgs; [ - pytest - pytest-cov - ]; + checkInputs = with python3.pkgs; [ pytest pytest-cov ]; meta = with lib; { description = "Mopidy extension for playing music from a Beets collection"; diff --git a/pkgs/mopidy-funkwhale.nix b/pkgs/mopidy-funkwhale.nix index 779b79ac..19e8a423 100644 --- a/pkgs/mopidy-funkwhale.nix +++ b/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; [ - pykka - requests - requests_oauthlib - pygobject3 - ] ++ [ mopidy ]; + propagatedBuildInputs = with python3.pkgs; + [ pykka 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; }; diff --git a/pkgs/mopidy-internetarchive.nix b/pkgs/mopidy-internetarchive.nix index c4775b05..a73df5b6 100644 --- a/pkgs/mopidy-internetarchive.nix +++ b/pkgs/mopidy-internetarchive.nix @@ -11,21 +11,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-kFkqqI9E6cKrRtSO433EpFPy/QYuqaorCEplBCwuXhU="; }; - propagatedBuildInputs = with python3.pkgs; [ - cachetools - pykka - requests - setuptools - uritools - ] ++ [ mopidy ]; + propagatedBuildInputs = with python3.pkgs; + [ cachetools pykka requests setuptools uritools ] ++ [ mopidy ]; - checkInputs = with python3.pkgs; [ - pytest - pytest-cov - ]; + checkInputs = with python3.pkgs; [ 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; }; diff --git a/pkgs/text-engine.nix b/pkgs/text-engine.nix index 9bea1238..6b913ae6 100644 --- a/pkgs/text-engine.nix +++ b/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 = [ - gobject-introspection - gtk4 - meson - ninja - pkg-config - ]; + nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ]; - buildInputs = [ - libadwaita - json-glib - libxml2 - ]; + buildInputs = [ libadwaita json-glib libxml2 ]; meta = with lib; { description = "Rich text framework for GTK"; diff --git a/pkgs/wayback.nix b/pkgs/wayback.nix index 32c869a0..5826cc3f 100644 --- a/pkgs/wayback.nix +++ b/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; };