chore: reformat pkgs/ with nixpkgs-fmt

This commit is contained in:
Gabriel Arazas 2022-07-16 16:45:27 +08:00
parent 37b0b6ac77
commit e6085fe4de
17 changed files with 224 additions and 102 deletions

View File

@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/FineFindus/artem"; 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; license = licenses.mpl20;
}; };
} }

View File

@ -12,8 +12,7 @@ python310Packages.buildPythonApplication rec {
sha256 = "sha256-SKlAgGqowFvvenhbFiTWbVLYAB5CChQ+EdPXxsWxNgE="; sha256 = "sha256-SKlAgGqowFvvenhbFiTWbVLYAB5CChQ+EdPXxsWxNgE=";
}; };
propagatedBuildInputs = with python310Packages; propagatedBuildInputs = with python310Packages; [ numpy yt-dlp av pillow ];
[ numpy yt-dlp av pillow ];
meta = with lib; { meta = with lib; {
description = description =

View File

@ -53,4 +53,5 @@ let
wayback = callPackage ./wayback.nix { }; wayback = callPackage ./wayback.nix { };
wzmach = callPackage ./wzmach { }; wzmach = callPackage ./wzmach { };
}; };
in lib.fix (lib.extends overrides packages) in
lib.fix (lib.extends overrides packages)

View File

@ -1,5 +1,13 @@
{ stdenv, lib, fetchFromGitHub, python3Packages, gtk3, glib { stdenv
, gobject-introspection, wrapGAppsHook, webkitgtk }: , lib
, fetchFromGitHub
, python3Packages
, gtk3
, glib
, gobject-introspection
, wrapGAppsHook
, webkitgtk
}:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "devdocs-desktop"; pname = "devdocs-desktop";

View File

@ -1,14 +1,23 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, desktop-file-utils, pkg-config { lib
, libwebsockets, json_c, openssl, asciidoctor, unixtools, zlib, , stdenv
, fetchFromGitHub
# For including Java classes. Take note it doesn't compile them properly and it , autoreconfHook
# still builds successfully so including them is disabled by default. , desktop-file-utils
openjdk, , pkg-config
, libwebsockets
# For Qt backend which is included by default. , json_c
qt5, , openssl
, asciidoctor
enableQt ? true, enableJava ? false }: , 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. # TODO: Compile with the experimental wry backend.
# * Wait until gdk-pixbuf is >=3.0. # * Wait until gdk-pixbuf is >=3.0.
@ -35,7 +44,7 @@ stdenv.mkDerivation rec {
unixtools.xxd unixtools.xxd
zlib zlib
] ++ lib.optionals enableQt (with qt5; [ qtbase qtwebengine qtwebchannel ]) ] ++ lib.optionals enableQt (with qt5; [ qtbase qtwebengine qtwebchannel ])
++ lib.optional enableJava openjdk; ++ lib.optional enableJava openjdk;
configureFlags = [ configureFlags = [
"--disable-java-pty" "--disable-java-pty"
@ -45,7 +54,7 @@ stdenv.mkDerivation rec {
# going to be painful to build. # going to be painful to build.
"--without-wry" "--without-wry"
] ++ lib.optional enableJava "--with-java" ] ++ 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. # Force Java to take input as UTF-8 instead of ASCII.
JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";

View File

@ -1,5 +1,17 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, vala, wrapGAppsHook4, libadwaita { stdenv
, json-glib, libgee, pkg-config, gtk3, desktop-file-utils }: , lib
, fetchFromGitHub
, meson
, ninja
, vala
, wrapGAppsHook4
, libadwaita
, json-glib
, libgee
, pkg-config
, gtk3
, desktop-file-utils
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "emulsion-palette"; pname = "emulsion-palette";

View File

@ -11,21 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-kftKFB/78LR6aO1ey8G3JQIVfdvp3lS7J9c5gpnw/Os="; sha256 = "sha256-kftKFB/78LR6aO1ey8G3JQIVfdvp3lS7J9c5gpnw/Os=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ cmake ];
cmake
];
buildInputs = [ buildInputs = [ libpng SDL2 SDL2_ttf flex bison ];
libpng
SDL2
SDL2_ttf
flex
bison
];
meta = with lib; { meta = with lib; {
homepage = "https://freerct.net/"; 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; license = licenses.gpl2Only;
}; };
} }

View File

@ -1,7 +1,23 @@
{ stdenv, lib, fetchFromGitHub, wrapGAppsHook4, libadwaita, meson, ninja { stdenv
, gettext, gtk4, appstream-glib, desktop-file-utils, gobject-introspection , lib
, blueprint-compiler, pkg-config, json-glib, libsoup_3, glib, python3 , fetchFromGitHub
, text-engine }: , 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 { stdenv.mkDerivation rec {
pname = "gnome-extension-manager"; pname = "gnome-extension-manager";

View File

@ -1,5 +1,14 @@
{ stdenv, lib, fetchurl, autoreconfHook, recoll, python3Packages, glib { stdenv
, gobject-introspection, wrapGAppsHook, gnome }: , lib
, fetchurl
, autoreconfHook
, recoll
, python3Packages
, glib
, gobject-introspection
, wrapGAppsHook
, gnome
}:
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "gnome-search-provider-recoll"; pname = "gnome-search-provider-recoll";

View File

@ -27,19 +27,21 @@ stdenv.mkDerivation rec {
make SHELL=${bash}/bin/bash ${passthru.extensionUuid}.zip make SHELL=${bash}/bin/bash ${passthru.extensionUuid}.zip
''; '';
installPhase = let installPhase =
extensionDir = let
"$out/share/gnome-shell/extensions/${passthru.extensionUuid}"; extensionDir =
in '' "$out/share/gnome-shell/extensions/${passthru.extensionUuid}";
# Install the required extensions file. in
mkdir -p ${extensionDir} ''
${unzip}/bin/unzip ${passthru.extensionUuid}.zip -d ${extensionDir} # Install the required extensions file.
mkdir -p ${extensionDir}
${unzip}/bin/unzip ${passthru.extensionUuid}.zip -d ${extensionDir}
# Install the GSchema. # Install the GSchema.
install -Dm644 schemas/* -t "${ install -Dm644 schemas/* -t "${
glib.makeSchemaPath "$out" "${pname}-${version}" glib.makeSchemaPath "$out" "${pname}-${version}"
}" }"
''; '';
passthru.extensionUuid = "flypie@schneegans.github.com"; passthru.extensionUuid = "flypie@schneegans.github.com";

View File

@ -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 { stdenv.mkDerivation rec {

View File

@ -1,5 +1,13 @@
{ stdenv, lib, guile_3_0, guile-config, fetchFromGitLab, autoreconfHook { stdenv
, pkg-config, texinfo, makeWrapper }: , lib
, guile_3_0
, guile-config
, fetchFromGitLab
, autoreconfHook
, pkg-config
, texinfo
, makeWrapper
}:
let modules = [ guile-config ]; let modules = [ guile-config ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -23,23 +31,31 @@ in stdenv.mkDerivation rec {
sed -i '/ccachedir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile sed -i '/ccachedir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile
''; '';
GUILE_LOAD_PATH = let GUILE_LOAD_PATH =
guilePath = [ "\${out}/share/guile/site" ] ++ (lib.concatMap (module: [ let
"${module}/share/guile/site" guilePath = [ "\${out}/share/guile/site" ] ++ (lib.concatMap
"${module}/share/guile" (module: [
"${module}/share" "${module}/share/guile/site"
]) modules); "${module}/share/guile"
in lib.concatStringsSep ":" guilePath; "${module}/share"
])
modules);
in
lib.concatStringsSep ":" guilePath;
GUILE_LOAD_COMPILED_PATH = let GUILE_LOAD_COMPILED_PATH =
guilePath = [ "\${out}/share/guile/ccache" "\${out}/share/guile/site" ] let
++ (lib.concatMap (module: [ guilePath = [ "\${out}/share/guile/ccache" "\${out}/share/guile/site" ]
"${module}/share/guile/ccache" ++ (lib.concatMap
"${module}/share/guile/site" (module: [
"${module}/share/guile" "${module}/share/guile/ccache"
"${module}/share" "${module}/share/guile/site"
]) modules); "${module}/share/guile"
in lib.concatStringsSep ":" guilePath; "${module}/share"
])
modules);
in
lib.concatStringsSep ":" guilePath;
postInstall = '' postInstall = ''
wrapProgram $out/bin/hall \ wrapProgram $out/bin/hall \

View File

@ -1,6 +1,18 @@
{ lib, stdenv, fetchFromGitHub, desktop-file-utils, gjs, appstream-glib { lib
, gobject-introspection, gsettings-desktop-schemas, libadwaita, meson, ninja , stdenv
, wrapGAppsHook4, glib, libportal }: , fetchFromGitHub
, desktop-file-utils
, gjs
, appstream-glib
, gobject-introspection
, gsettings-desktop-schemas
, libadwaita
, meson
, ninja
, wrapGAppsHook4
, glib
, libportal
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "junction"; pname = "junction";

View File

@ -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 { stdenv.mkDerivation rec {
pname = "nautilus-annotations"; pname = "nautilus-annotations";
@ -10,17 +19,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wHM+ny4vhrV1Jyk9L6Qb8D556jntYAPG+ynGZLqpe6Q="; sha256 = "sha256-wHM+ny4vhrV1Jyk9L6Qb8D556jntYAPG+ynGZLqpe6Q=";
}; };
nativeBuildInputs = [ nativeBuildInputs =
autoreconfHook [ autoreconfHook glib gnome.nautilus pkg-config wrapGAppsHook ];
glib
gnome.nautilus
pkg-config
wrapGAppsHook
];
buildInputs = [ buildInputs = [ gtksourceview4 ];
gtksourceview4
];
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap

View File

@ -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 { rustPlatform.buildRustPackage rec {
pname = "onagre"; pname = "onagre";
@ -13,20 +23,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-IOhAGrAiT2mnScNP7k7XK9CETUr6BjGdQVdEUvTYQT4="; cargoSha256 = "sha256-IOhAGrAiT2mnScNP7k7XK9CETUr6BjGdQVdEUvTYQT4=";
nativeBuildInputs = [ nativeBuildInputs = [ cmake pkg-config ];
cmake
pkg-config
];
buildInputs = [ buildInputs = [ freetype expat ];
freetype
expat
];
propagatedBuildInputs = [ propagatedBuildInputs = [ wayland libX11 ];
wayland
libX11
];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/oknozor/onagre"; homepage = "https://github.com/oknozor/onagre";

View File

@ -1,5 +1,15 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, json-glib, gtk4, libxml2 { stdenv
, gobject-introspection, pkg-config, libadwaita }: , lib
, fetchFromGitHub
, meson
, ninja
, json-glib
, gtk4
, libxml2
, gobject-introspection
, pkg-config
, libadwaita
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "text-engine"; pname = "text-engine";

View File

@ -1,10 +1,35 @@
# Build the TIC-80 virtual computer console with the PRO version. The # 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 # developers are kind enough to make it easy to compile it if you know
# how. # how.
{ stdenv, lib, alsaLib, cmake, fetchFromGitHub, freeglut, gtk3, libGLU, git { stdenv
, libglvnd, mesa, rake, mruby, SDL2, pkgconfig, valgrind, sndio, libsamplerate , lib
, zlib, pulseaudioSupport ? stdenv.isLinux, libpulseaudio, waylandSupport ? true , alsaLib
, wayland, libxkbcommon, esoundSupport ? true, espeak, jackSupport ? true, jack2 , 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. # TODO: Fix the timestamp in the help section.