From e6085fe4dec8f3084824b5317a72ddff6594e0e5 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 16 Jul 2022 16:45:27 +0800 Subject: [PATCH] chore: reformat `pkgs/` with nixpkgs-fmt --- pkgs/artem.nix | 3 +- pkgs/auto-editor.nix | 3 +- pkgs/default.nix | 3 +- pkgs/devdocs-desktop.nix | 12 +++++- pkgs/domterm/default.nix | 35 ++++++++++------- pkgs/emulsion-palette.nix | 16 +++++++- pkgs/freerct.nix | 15 ++------ pkgs/gnome-extension-manager.nix | 24 ++++++++++-- pkgs/gnome-search-provider-recoll.nix | 13 ++++++- pkgs/gnome-shell-extension-fly-pie.nix | 26 +++++++------ pkgs/guile-config.nix | 8 +++- pkgs/guile-hall.nix | 52 +++++++++++++++++--------- pkgs/junction.nix | 18 +++++++-- pkgs/nautilus-annotations/default.nix | 24 ++++++------ pkgs/onagre/default.nix | 27 ++++++------- pkgs/text-engine.nix | 14 ++++++- pkgs/tic-80/default.nix | 33 ++++++++++++++-- 17 files changed, 224 insertions(+), 102 deletions(-) diff --git a/pkgs/artem.nix b/pkgs/artem.nix index 1ba5fc5e..d59c1ae7 100644 --- a/pkgs/artem.nix +++ b/pkgs/artem.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/FineFindus/artem"; - description = "Command-line application for converting images to ASCII art."; + description = + "Command-line application for converting images to ASCII art."; license = licenses.mpl20; }; } diff --git a/pkgs/auto-editor.nix b/pkgs/auto-editor.nix index c61965a8..62665d84 100644 --- a/pkgs/auto-editor.nix +++ b/pkgs/auto-editor.nix @@ -12,8 +12,7 @@ python310Packages.buildPythonApplication rec { sha256 = "sha256-SKlAgGqowFvvenhbFiTWbVLYAB5CChQ+EdPXxsWxNgE="; }; - propagatedBuildInputs = with python310Packages; - [ numpy yt-dlp av pillow ]; + propagatedBuildInputs = with python310Packages; [ numpy yt-dlp av pillow ]; meta = with lib; { description = diff --git a/pkgs/default.nix b/pkgs/default.nix index 45a77667..64d3ea4b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -53,4 +53,5 @@ let wayback = callPackage ./wayback.nix { }; wzmach = callPackage ./wzmach { }; }; -in lib.fix (lib.extends overrides packages) +in +lib.fix (lib.extends overrides packages) diff --git a/pkgs/devdocs-desktop.nix b/pkgs/devdocs-desktop.nix index 9f43cdf2..9bad43ad 100644 --- a/pkgs/devdocs-desktop.nix +++ b/pkgs/devdocs-desktop.nix @@ -1,5 +1,13 @@ -{ 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"; diff --git a/pkgs/domterm/default.nix b/pkgs/domterm/default.nix index a0f902de..68cca1d7 100644 --- a/pkgs/domterm/default.nix +++ b/pkgs/domterm/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, desktop-file-utils, pkg-config -, libwebsockets, json_c, openssl, asciidoctor, unixtools, zlib, - -# For including Java classes. Take note it doesn't compile them properly and it -# still builds successfully so including them is disabled by default. -openjdk, - -# For Qt backend which is included by default. -qt5, - -enableQt ? true, enableJava ? false }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, desktop-file-utils +, pkg-config +, libwebsockets +, json_c +, openssl +, asciidoctor +, unixtools +, zlib +, # For including Java classes. Take note it doesn't compile them properly and it + # still builds successfully so including them is disabled by default. + openjdk +, # For Qt backend which is included by default. + qt5 +, enableQt ? true +, enableJava ? false +}: # TODO: Compile with the experimental wry backend. # * Wait until gdk-pixbuf is >=3.0. @@ -35,7 +44,7 @@ stdenv.mkDerivation rec { unixtools.xxd zlib ] ++ lib.optionals enableQt (with qt5; [ qtbase qtwebengine qtwebchannel ]) - ++ lib.optional enableJava openjdk; + ++ lib.optional enableJava openjdk; configureFlags = [ "--disable-java-pty" @@ -45,7 +54,7 @@ stdenv.mkDerivation rec { # going to be painful to build. "--without-wry" ] ++ lib.optional enableJava "--with-java" - ++ lib.optional enableQt "--with-qt"; + ++ lib.optional enableQt "--with-qt"; # Force Java to take input as UTF-8 instead of ASCII. JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; diff --git a/pkgs/emulsion-palette.nix b/pkgs/emulsion-palette.nix index 566b3441..c6542e6d 100644 --- a/pkgs/emulsion-palette.nix +++ b/pkgs/emulsion-palette.nix @@ -1,5 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, vala, wrapGAppsHook4, libadwaita -, json-glib, libgee, pkg-config, gtk3, desktop-file-utils }: +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, vala +, wrapGAppsHook4 +, libadwaita +, json-glib +, libgee +, pkg-config +, gtk3 +, desktop-file-utils +}: stdenv.mkDerivation rec { pname = "emulsion-palette"; diff --git a/pkgs/freerct.nix b/pkgs/freerct.nix index f15cd13e..7aa91ceb 100644 --- a/pkgs/freerct.nix +++ b/pkgs/freerct.nix @@ -11,21 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-kftKFB/78LR6aO1ey8G3JQIVfdvp3lS7J9c5gpnw/Os="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ - libpng - SDL2 - SDL2_ttf - flex - bison - ]; + buildInputs = [ libpng SDL2 SDL2_ttf flex bison ]; meta = with lib; { homepage = "https://freerct.net/"; - description = "Free and open source game aiming to capture the look and feel of RollerCoaster Tycoon."; + description = + "Free and open source game aiming to capture the look and feel of RollerCoaster Tycoon."; license = licenses.gpl2Only; }; } diff --git a/pkgs/gnome-extension-manager.nix b/pkgs/gnome-extension-manager.nix index 50b8706c..f3a90a64 100644 --- a/pkgs/gnome-extension-manager.nix +++ b/pkgs/gnome-extension-manager.nix @@ -1,7 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, wrapGAppsHook4, libadwaita, meson, ninja -, gettext, gtk4, appstream-glib, desktop-file-utils, gobject-introspection -, blueprint-compiler, pkg-config, json-glib, libsoup_3, glib, python3 -, text-engine }: +{ stdenv +, lib +, fetchFromGitHub +, wrapGAppsHook4 +, libadwaita +, meson +, ninja +, gettext +, gtk4 +, appstream-glib +, desktop-file-utils +, gobject-introspection +, blueprint-compiler +, pkg-config +, json-glib +, libsoup_3 +, glib +, python3 +, text-engine +}: stdenv.mkDerivation rec { pname = "gnome-extension-manager"; diff --git a/pkgs/gnome-search-provider-recoll.nix b/pkgs/gnome-search-provider-recoll.nix index 9a04b48e..1832de6e 100644 --- a/pkgs/gnome-search-provider-recoll.nix +++ b/pkgs/gnome-search-provider-recoll.nix @@ -1,5 +1,14 @@ -{ stdenv, lib, fetchurl, autoreconfHook, recoll, python3Packages, glib -, gobject-introspection, wrapGAppsHook, gnome }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, recoll +, python3Packages +, glib +, gobject-introspection +, wrapGAppsHook +, gnome +}: python3Packages.buildPythonPackage rec { pname = "gnome-search-provider-recoll"; diff --git a/pkgs/gnome-shell-extension-fly-pie.nix b/pkgs/gnome-shell-extension-fly-pie.nix index e7cf2b04..2516d2f8 100644 --- a/pkgs/gnome-shell-extension-fly-pie.nix +++ b/pkgs/gnome-shell-extension-fly-pie.nix @@ -27,19 +27,21 @@ stdenv.mkDerivation rec { make SHELL=${bash}/bin/bash ${passthru.extensionUuid}.zip ''; - installPhase = let - extensionDir = - "$out/share/gnome-shell/extensions/${passthru.extensionUuid}"; - in '' - # Install the required extensions file. - mkdir -p ${extensionDir} - ${unzip}/bin/unzip ${passthru.extensionUuid}.zip -d ${extensionDir} + installPhase = + let + extensionDir = + "$out/share/gnome-shell/extensions/${passthru.extensionUuid}"; + in + '' + # Install the required extensions file. + mkdir -p ${extensionDir} + ${unzip}/bin/unzip ${passthru.extensionUuid}.zip -d ${extensionDir} - # Install the GSchema. - install -Dm644 schemas/* -t "${ - glib.makeSchemaPath "$out" "${pname}-${version}" - }" - ''; + # Install the GSchema. + install -Dm644 schemas/* -t "${ + glib.makeSchemaPath "$out" "${pname}-${version}" + }" + ''; passthru.extensionUuid = "flypie@schneegans.github.com"; diff --git a/pkgs/guile-config.nix b/pkgs/guile-config.nix index 77e4bd31..fc755426 100644 --- a/pkgs/guile-config.nix +++ b/pkgs/guile-config.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, guile_3_0, fetchFromGitLab, autoreconfHook, pkg-config, texinfo +{ stdenv +, lib +, guile_3_0 +, fetchFromGitLab +, autoreconfHook +, pkg-config +, texinfo }: stdenv.mkDerivation rec { diff --git a/pkgs/guile-hall.nix b/pkgs/guile-hall.nix index 35a9dd4d..2c03e59a 100644 --- a/pkgs/guile-hall.nix +++ b/pkgs/guile-hall.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, guile_3_0, guile-config, fetchFromGitLab, autoreconfHook -, pkg-config, texinfo, makeWrapper }: +{ stdenv +, lib +, guile_3_0 +, guile-config +, fetchFromGitLab +, autoreconfHook +, pkg-config +, texinfo +, makeWrapper +}: let modules = [ guile-config ]; in stdenv.mkDerivation rec { @@ -23,23 +31,31 @@ in stdenv.mkDerivation rec { sed -i '/ccachedir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile ''; - GUILE_LOAD_PATH = let - guilePath = [ "\${out}/share/guile/site" ] ++ (lib.concatMap (module: [ - "${module}/share/guile/site" - "${module}/share/guile" - "${module}/share" - ]) modules); - in lib.concatStringsSep ":" guilePath; + GUILE_LOAD_PATH = + let + guilePath = [ "\${out}/share/guile/site" ] ++ (lib.concatMap + (module: [ + "${module}/share/guile/site" + "${module}/share/guile" + "${module}/share" + ]) + modules); + 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); - 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); + in + lib.concatStringsSep ":" guilePath; postInstall = '' wrapProgram $out/bin/hall \ diff --git a/pkgs/junction.nix b/pkgs/junction.nix index b47fed98..1c791713 100644 --- a/pkgs/junction.nix +++ b/pkgs/junction.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, desktop-file-utils, gjs, appstream-glib -, gobject-introspection, gsettings-desktop-schemas, libadwaita, meson, ninja -, wrapGAppsHook4, glib, libportal }: +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, gjs +, appstream-glib +, gobject-introspection +, gsettings-desktop-schemas +, libadwaita +, meson +, ninja +, wrapGAppsHook4 +, glib +, libportal +}: stdenv.mkDerivation rec { pname = "junction"; diff --git a/pkgs/nautilus-annotations/default.nix b/pkgs/nautilus-annotations/default.nix index d9756f30..5c2e587d 100644 --- a/pkgs/nautilus-annotations/default.nix +++ b/pkgs/nautilus-annotations/default.nix @@ -1,4 +1,13 @@ -{ stdenv, lib, fetchgit, glib, gnome, gtksourceview4, autoreconfHook, wrapGAppsHook, pkg-config }: +{ stdenv +, lib +, fetchgit +, glib +, gnome +, gtksourceview4 +, autoreconfHook +, wrapGAppsHook +, pkg-config +}: stdenv.mkDerivation rec { pname = "nautilus-annotations"; @@ -10,17 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-wHM+ny4vhrV1Jyk9L6Qb8D556jntYAPG+ynGZLqpe6Q="; }; - nativeBuildInputs = [ - autoreconfHook - glib - gnome.nautilus - pkg-config - wrapGAppsHook - ]; + nativeBuildInputs = + [ autoreconfHook glib gnome.nautilus pkg-config wrapGAppsHook ]; - buildInputs = [ - gtksourceview4 - ]; + buildInputs = [ gtksourceview4 ]; preConfigure = '' ./bootstrap diff --git a/pkgs/onagre/default.nix b/pkgs/onagre/default.nix index 08dede60..a2983d28 100644 --- a/pkgs/onagre/default.nix +++ b/pkgs/onagre/default.nix @@ -1,4 +1,14 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, cmake, pkg-config, freetype, expat, wayland, libX11 }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, freetype +, expat +, wayland +, libX11 +}: rustPlatform.buildRustPackage rec { pname = "onagre"; @@ -13,20 +23,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-IOhAGrAiT2mnScNP7k7XK9CETUr6BjGdQVdEUvTYQT4="; - nativeBuildInputs = [ - cmake - pkg-config - ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - freetype - expat - ]; + buildInputs = [ freetype expat ]; - propagatedBuildInputs = [ - wayland - libX11 - ]; + propagatedBuildInputs = [ wayland libX11 ]; meta = with lib; { homepage = "https://github.com/oknozor/onagre"; diff --git a/pkgs/text-engine.nix b/pkgs/text-engine.nix index 6b913ae6..b5baebf4 100644 --- a/pkgs/text-engine.nix +++ b/pkgs/text-engine.nix @@ -1,5 +1,15 @@ -{ 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"; diff --git a/pkgs/tic-80/default.nix b/pkgs/tic-80/default.nix index deb35189..eab46473 100644 --- a/pkgs/tic-80/default.nix +++ b/pkgs/tic-80/default.nix @@ -1,10 +1,35 @@ # Build the TIC-80 virtual computer console with the PRO version. The # developers are kind enough to make it easy to compile it if you know # how. -{ stdenv, lib, alsaLib, cmake, fetchFromGitHub, freeglut, gtk3, libGLU, git -, libglvnd, mesa, rake, mruby, SDL2, pkgconfig, valgrind, sndio, libsamplerate -, zlib, pulseaudioSupport ? stdenv.isLinux, libpulseaudio, waylandSupport ? true -, wayland, libxkbcommon, esoundSupport ? true, espeak, jackSupport ? true, jack2 +{ stdenv +, lib +, alsaLib +, cmake +, fetchFromGitHub +, freeglut +, gtk3 +, libGLU +, git +, libglvnd +, mesa +, SDL2 +, pkgconfig +, valgrind +, sndio +, libsamplerate +, zlib +, pulseaudioSupport ? stdenv.isLinux +, libpulseaudio +, waylandSupport ? true +, wayland +, libxkbcommon +, esoundSupport ? true +, espeak +, jackSupport ? true +, jack2 +, rubySupport ? false +, mruby +, rake }: # TODO: Fix the timestamp in the help section.