From 932941b79c3dbbef2de9440e1631dfec43956261 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 21 Jan 2021 10:55:55 +1000 Subject: [PATCH] treewide: editorconfig fixes - remove trailing whitespace - use spaces for indentation --- .../science/biology/blast/default.nix | 8 +++--- .../science/biology/ncbi-tools/default.nix | 4 +-- .../science/chemistry/molden/default.nix | 3 +- .../science/electronics/geda/default.nix | 2 +- .../schemas/xml-dtd/xhtml1/default.nix | 2 +- .../compilers/apache-flex-sdk/default.nix | 4 +-- pkgs/development/compilers/bigloo/default.nix | 8 +++--- pkgs/development/compilers/opendylan/bin.nix | 4 +-- .../interpreters/angelscript/2.22.nix | 2 +- pkgs/development/libraries/amrnb/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 4 +-- .../libraries/waylandpp/default.nix | 4 +-- .../mobile/androidenv/emulator.nix | 2 +- .../development/mobile/xcodeenv/build-app.nix | 4 +-- .../ocaml-modules/mlgmp/default.nix | 2 +- .../ocaml-modules/mysql/default.nix | 4 +-- .../python-modules/pyregion/default.nix | 4 +-- .../tools/database/squirrel-sql/default.nix | 4 +-- pkgs/development/tools/dtools/default.nix | 2 +- .../tools/gtk-mac-bundler/default.nix | 2 +- pkgs/development/tools/micronaut/default.nix | 8 +++--- pkgs/development/tools/misc/gede/default.nix | 2 +- .../tools/ocaml/obelisk/default.nix | 28 +++++++++---------- pkgs/development/tools/qtcreator/default.nix | 12 ++++---- pkgs/development/tools/vagrant/default.nix | 2 +- pkgs/games/mrrescue/default.nix | 4 +-- pkgs/games/sienna/default.nix | 2 +- pkgs/games/vapor/default.nix | 4 +-- pkgs/misc/emulators/wine/util.nix | 2 +- pkgs/misc/source-and-tags/default.nix | 6 ++-- .../networking/guardian-agent/default.nix | 6 ++-- pkgs/tools/system/cm-rgb/default.nix | 2 +- 32 files changed, 74 insertions(+), 75 deletions(-) diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index a72f16938d4..6fd061f1402 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { }; sourceRoot = "ncbi-blast-${version}+-src/c++"; - - configureFlags = [ + + configureFlags = [ # With flat Makefile we can use all_projects in order not to build extra. # These extra cause clang to hang on Darwin. "--with-flat-makefile" - "--without-makefile-auto-update" + "--without-makefile-auto-update" "--with-dll" # build dynamic libraries (static are default) ]; - + makeFlags = [ "all_projects=app/" ]; preConfigure = '' diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index cc8ebf7f37d..c5220ebc83b 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; - configureFlags = [ + configureFlags = [ "--without-debug" "--with-bin-release" "--with-dll" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; - homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; + homepage = "http://www.ncbi.nlm.nih.gov/IEB/ToolBox/"; license = "GPL"; priority = 5; # zlib.so gives a conflict with zlib broken = true; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index ac3dd513f34..32e8f6ee56e 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace '-I/usr/X11R6/include' "" \ --replace '/usr/local/' $out/ \ --replace 'sudo' "" \ - --replace '-C surf depend' '-C surf' + --replace '-C surf depend' '-C surf' sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile ''; @@ -41,4 +41,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ markuskowa ]; }; } - diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 053211f52ad..cf98e6963e1 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; configureFlags = [ - "--disable-update-xdg-database" + "--disable-update-xdg-database" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ guile gtk2 flex gawk perl ]; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index a000c424906..c698098e6c1 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { xmlcatalog --noout --create $cat grep PUBLIC DTD/*.soc | while read x; do eval a=($x) - xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat + xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat done ''; # */ diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix index ed6b2b2ff24..337d5a4e26d 100644 --- a/pkgs/development/compilers/apache-flex-sdk/default.nix +++ b/pkgs/development/compilers/apache-flex-sdk/default.nix @@ -38,13 +38,13 @@ in stdenv.mkDerivation rec { for i in $out/bin/!(aasdoc|acompc|amxmlc); do wrapProgram $i \ --set FLEX_HOME $t \ - --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ + --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ done mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/ cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc ''; - + fixupPhase = ":"; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index a3bac2b1722..ced7dd07a22 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { # Fix absolute paths. sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ -e 's=/tmp=$TMPDIR=g' -i autoconf/* \ - [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ - */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ - comptime/Cc/cc.scm gc/install-* + [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ + */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ + comptime/Cc/cc.scm gc/install-* # Make sure we don't change string lengths in the generated # C files. sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \ - -i comptime/Cc/cc.c + -i comptime/Cc/cc.c ''; checkTarget = "test"; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index dbe7e44b1d7..7636b251e62 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation { tar --strip-components=1 -xjf "$src" -C "$out" interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for a in "$out"/bin/*; do + for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done - for a in "$out"/lib/*.so; do + for a in "$out"/lib/*.so; do patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index 0449572da02..15e7f4dd5c1 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = '' cd angelscript/projects/gnuc sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" - export SHARED=1 + export SHARED=1 export VERSION="${s.version}" mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" ''; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index aaee86c62ef..4e8aab263eb 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; postConfigure = '' - cp $srcAmr 26104-b00.zip + cp $srcAmr 26104-b00.zip ''; meta = { diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 2297fd07eb1..e9af9f6d537 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out - make install DESTDIR="$out" + make install DESTDIR="$out" ''; - meta = { + meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = "http://www.speech.kth.se/snack/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 923329ab3fd..d528d51ed79 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; }; - cmakeFlags = [ - "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + cmakeFlags = [ + "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 5840598d1c3..e08078ea672 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -38,7 +38,7 @@ deployAndroidPackage { # Wrap emulator so that it can load required libraries at runtime wrapProgram $out/libexec/android-sdk/emulator/emulator \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus pkgs.systemd ]} \ diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index fa108c8e470..adf64f9561c 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation ({ # Be sure that the Xcode wrapper has priority over everything else. # When using buildInputs this does not seem to be the case. export PATH=${xcodewrapper}/bin:$PATH - + ${stdenv.lib.optionalString release '' export HOME=/Users/$(whoami) keychainName="$(basename $out)" @@ -69,7 +69,7 @@ stdenv.mkDerivation ({ security unlock-keychain -p "" $keychainName # Import the certificate into the keychain - security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A + security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A # Grant the codesign utility permissions to read from the keychain security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index d2aeb1a37b8..ffd78150689 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24"; }; - makeFlags = [ + makeFlags = [ "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp" ]; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 29720ce1148..6ccdfa9cf81 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; }; - configureFlags = [ - "--prefix=$out" + configureFlags = [ + "--prefix=$out" "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index b1868e7edde..86a5ef6bfe0 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -33,8 +33,8 @@ buildPythonPackage rec { name = "conftest-astropy-3-fix.patch"; url = "https://github.com/astropy/pyregion/pull/136.patch"; sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m"; - }) - ]; + }) + ]; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 924a82bfd85..c773db7509f 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -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 ''; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 5efa579ec5a..fabd2b2f775 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -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"; diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index df21f414ecb..c4ac76f4612 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -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 diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index ddf9d84f3bf..1139215fbf8 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -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/"; diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index b27c3a515bb..39954b458b4 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -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; { diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 483e9c45df0..d5e9d33d5db 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -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"; + }; } diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index a750a21c1b4..40e3e42d84c 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -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 \ diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index b3f1bf1a5b8..701b973ad4f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -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 diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index d3caa986b85..c5b2b7d20eb 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -13,13 +13,13 @@ let name = "mrrescue"; exec = pname; icon = icon; - comment = "Arcade-style fire fighting game"; + comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; genericName = "mrrescue"; categories = "Game;"; }; -in +in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 0a38723368e..1a1e82b7d64 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -13,7 +13,7 @@ let name = "sienna"; exec = pname; icon = icon; - comment = "Fast-paced one button platformer"; + comment = "Fast-paced one button platformer"; desktopName = "Sienna"; genericName = "sienna"; categories = "Game;"; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index e79c49779af..71028065263 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -14,13 +14,13 @@ let name = "Vapor"; exec = pname; icon = icon; - comment = "LÖVE Distribution Client"; + comment = "LÖVE Distribution Client"; desktopName = "Vapor"; genericName = "vapor"; categories = "Game;"; }; -in +in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/misc/emulators/wine/util.nix index b90a68e72df..cd5bd03130b 100644 --- a/pkgs/misc/emulators/wine/util.nix +++ b/pkgs/misc/emulators/wine/util.nix @@ -3,7 +3,7 @@ rec { toPackages = pkgNames: pkgs: map (pn: lib.getAttr pn pkgs) pkgNames; toBuildInputs = pkgArches: archPkgs: - lib.concatLists (map archPkgs pkgArches); + lib.concatLists (map archPkgs pkgArches); mkBuildInputs = pkgArches: pkgNames: toBuildInputs pkgArches (toPackages pkgNames); } diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 7c082cbbbb0..c82b96b82f9 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { # optional srcDir - annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags + annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags || x ? meta && x.meta ? sourceWithTags ); # hack because passthru doesn't work the way I'd expect. Don't have time to spend on this right now # that's why I'm abusing meta for the same purpose in ghcsAndLibs @@ -10,7 +10,7 @@ # createTagFiles = [ { name = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ] # tag command must create file named $TAG_FILE - sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} : + sourceWithTagsDerivation = {name, src, srcDir ? ".", tagSuffix ? "_tags", createTagFiles ? []} : stdenv.mkDerivation { phases = "unpackPhase buildPhase"; inherit src srcDir tagSuffix; @@ -72,7 +72,7 @@ addCTaggingInfo = deriv : - deriv // { + deriv // { passthru = { sourceWithTags = { inherit (deriv) src; diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix index a736aa4df18..57080d223fa 100644 --- a/pkgs/tools/networking/guardian-agent/default.nix +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -30,9 +30,9 @@ buildGoPackage rec { ''; postFixup = '' - wrapProgram $out/bin/sga-guard \ - --prefix PATH : "$out/bin" \ - --prefix PATH : "${autossh}/bin" + wrapProgram $out/bin/sga-guard \ + --prefix PATH : "$out/bin" \ + --prefix PATH : "${autossh}/bin" ''; meta = with lib; { diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index a50fa60197a..9c75fe78c99 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { postInstall = '' # Remove this line when/if this PR gets merged: - # https://github.com/gfduszynski/cm-rgb/pull/43 + # https://github.com/gfduszynski/cm-rgb/pull/43 install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui mkdir -p $out/etc/udev/rules.d