treewide: editorconfig fixes

- remove trailing whitespace
- use spaces for indentation
This commit is contained in:
zowoq
2021-01-21 13:29:54 +10:00
parent fa2e1dd70a
commit 932941b79c
32 changed files with 74 additions and 75 deletions
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/squirrel-sql
cp -r . $out/share/squirrel-sql
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
ln -s $out/share/squirrel-sql/icons/acorn.png \
$out/share/icons/hicolor/32x32/apps/squirrel-sql.png
ln -s ${desktopItem}/share/applications $out/share
runHook postInstall
'';
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
installPhase = ''
$makeCmd INSTALL_DIR=$out install
'';
'';
meta = with stdenv.lib; {
description = "Ancillary tools for the D programming language compiler";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/bin
substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
--subst-var-by PATH $out/share
chmod a+x $out/bin/gtk-mac-bundler
+4 -4
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
rm bin/mn.bat
cp -r . $out
wrapProgram $out/bin/mn \
--prefix JAVA_HOME : ${jdk}
--prefix JAVA_HOME : ${jdk}
installShellCompletion --bash --name mn.bash bin/mn_completion
runHook postInstall
'';
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
longDescription = ''
Micronaut is a modern, JVM-based, full stack microservices framework
designed for building modular, easily testable microservice applications.
Reflection-based IoC frameworks load and cache reflection data for
every single field, method, and constructor in your code, whereas with
Micronaut, your application startup time and memory consumption are
Reflection-based IoC frameworks load and cache reflection data for
every single field, method, and constructor in your code, whereas with
Micronaut, your application startup time and memory consumption are
not bound to the size of your codebase.
'';
homepage = "https://micronaut.io/";
+1 -1
View File
@@ -20,7 +20,7 @@ mkDerivation rec {
installPhase = ''
python build.py install --verbose --prefix="$out"
wrapProgram $out/bin/gede \
--prefix PATH : ${lib.makeBinPath [ ctags gdb ]}
--prefix PATH : ${lib.makeBinPath [ ctags gdb ]}
'';
meta = with lib; {
@@ -1,20 +1,20 @@
{ lib, fetchurl, ocamlPackages }:
ocamlPackages.buildDunePackage rec {
pname = "obelisk";
version = "0.5.2";
useDune2 = true;
src = fetchurl {
url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
};
pname = "obelisk";
version = "0.5.2";
useDune2 = true;
src = fetchurl {
url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
};
buildInputs = with ocamlPackages; [ menhir re ];
buildInputs = with ocamlPackages; [ menhir re ];
meta = {
description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Lelio-Brun/Obelisk";
};
meta = {
description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Lelio-Brun/Obelisk";
};
}
+6 -6
View File
@@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch
, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
, withDocumentation ? false, withClangPlugins ? true
, withDocumentation ? false, withClangPlugins ? true
}:
with lib;
@@ -28,9 +28,9 @@ mkDerivation rec {
sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
optionals withClangPlugins [ llvmPackages_8.libclang
clang_qt_vendor
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
optionals withClangPlugins [ llvmPackages_8.libclang
clang_qt_vendor
llvmPackages_8.llvm ];
nativeBuildInputs = [ qmake ];
@@ -38,7 +38,7 @@ mkDerivation rec {
# 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to
# find clang libc++ library include paths. By default it's not covering paths
# like libc++-version, which is default name for libc++ folder in nixos.
# ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
# ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
# remove system clang include paths.
patches = [ ./0001-Fix-clang-libcpp-regexp.patch
./0002-Dont-remove-clang-header-paths.patch ];
@@ -53,7 +53,7 @@ mkDerivation rec {
preConfigure = ''
substituteInPlace src/plugins/plugins.pro \
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
'' + optionalString withClangPlugins ''
# Fix paths for llvm/clang includes directories.
substituteInPlace src/shared/clang/clang_defines.pri \
+1 -1
View File
@@ -34,7 +34,7 @@ let
for gem in "$out"/lib/ruby/gems/*/gems/*; do
cp -a "$gem/" "$gem.new"
rm "$gem"
# needed on macOS, otherwise the mv yields permission denied
# needed on macOS, otherwise the mv yields permission denied
chmod +w "$gem.new"
mv "$gem.new" "$gem"
done