diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index f781aad905d0..2a2e15d9849a 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; longDescription = '' - Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. - Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. - ALSA, on the other hand, only provides routing facilities for MIDI clients. + Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA clients. + Because JACK can provide both audio and MIDI support to programs, aj-snapshot can store both types of connections for JACK. + ALSA, on the other hand, only provides routing facilities for MIDI clients. You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. ''; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 08263f2abddc..18915329ca9f 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mv jack_oscrolloscope $out/bin/ ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { description = "A simple waveform viewer for JACK"; homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 2a75b384af5c..d049cf81b11d 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 ]; - meta = { + meta = { description = "Console jack loudness meter"; homepage = "https://www.aelius.com/njh/jackmeter/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index 7205e882c314..c108304ee378 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - + pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; version = "0.15.2"; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 6d6f881ae65f..eb4651e586e2 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -4,7 +4,7 @@ , util-linux, qtbase ? null, qttools ? null , enableUpnp ? false , disableWallet ? false -, disableDaemon ? false +, disableDaemon ? false , withGui ? false }: with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ++ optionals withGui [ "--with-gui=yes" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - + enableParallelBuilding = true; doChecks = true; postBuild = '' diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index f16dd62bb1a4..d36c54189326 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, linux-pam }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "ly"; version = "0.2.1"; @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { rev = version; sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d"; fetchSubmodules = true; - }; + }; buildInputs = [ linux-pam ]; makeFlags = [ "FLAGS=-Wno-error" ]; installPhase = '' mkdir -p $out/bin - cp bin/ly $out/bin + cp bin/ly $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index 0a635b7ba82e..c4f43e71fe63 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses ]; - + installPhase = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index e4b739af0517..61749a89fde4 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation { name = "session-management-for-emacs-2.2a"; - + src = fetchurl { url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; buildInputs = [emacs]; - + installPhase = '' mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; - meta = { + meta = { /* installation: add to your ~/.emacs (require 'session) (add-hook 'after-init-hook 'session-initialize) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index ad83bd43af2f..40e46d9295f9 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -7,14 +7,14 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - + src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; }; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; - + buildInputs = [ qtbase ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 3a21eec07f42..527228742c4c 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > + > EOF done diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e6865d2d8f07..84a005445316 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. # `RUNPATH` doesn't propagate throughout the whole application, but only # from the module performing the `dlopen()`. - # + # # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` # files in $out/lib/apitrace/wrappers. - # + # # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` # and other dispatcher libraries, and run `dlopen()` by themselves. - # + # # As `RUNPATH` doesn't propagate through the whole library, and they're now the # library doing the real `dlopen()`, they also need to have # `/run-opengl-driver[-32]` added to their `RUNPATH`. diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index fb68276b168c..a0d28689ae7b 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.4.13"; format = "other"; - + src = fetchFromGitHub { owner = "maoschanz"; repo = pname; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c96ea765d43f..75c43f06d2c3 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { preBuild = '' qmake qt/fstl.pro ''; - + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix index da3589189725..bbbd4ed351bc 100644 --- a/pkgs/applications/graphics/kcc/default.nix +++ b/pkgs/applications/graphics/kcc/default.nix @@ -14,7 +14,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "KindleComicConverter"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; }; - + propagatedBuildInputs = with python3Packages ; [ pillow pyqt5 diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 2ada41ac98a1..4ad5c24ddd68 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { name = "brscan4-0.4.8-1"; - src = + src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index ebb04a30ab86..7f8ff3d6d219 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; unpackPhase = '' - tar -zxf $src + tar -zxf $src ''; installPhase = '' diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 842ef2262d9f..eb4ac9c9b34d 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ qmake ]; - + sourceRoot = "source/src"; installPhase = '' diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 98fe799b1100..00820874bce4 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp $src $out/bin/deadd-notification-center chmod +x $out/bin/deadd-notification-center - sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service + sed "s|##PREFIX##|$out|g" ${dbusService} > $out/share/dbus-1/services/com.ph-uhl.deadd.notification.service ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 34d5a45b8ea1..5af6ae03f24c 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "fme"; version = "1.1.3"; - + src = fetchurl { url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index 91a7b0ed37fd..90ab3b11c13d 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -1,40 +1,40 @@ -{ stdenv , fetchFromGitHub , python3 , makeWrapper }: +{ stdenv , fetchFromGitHub , python3 , makeWrapper }: -let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); -in stdenv.mkDerivation rec { +let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); +in stdenv.mkDerivation rec { pname = "fusee-interfacee-tk"; version = "1.0.1"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "nh-server"; repo = pname; - rev = "V${version}"; + rev = "V${version}"; sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - installPhase = '' + installPhase = '' mkdir -p $out/bin - - # The program isn't just called app, so I'm renaming it based on the repo name + + # The program isn't just called app, so I'm renaming it based on the repo name # It also isn't a standard program, so we need to append the shebang to the top - echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk + echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk cat app.py >> $out/bin/fusee-interfacee-tk - chmod +x $out/bin/fusee-interfacee-tk - - # app.py depends on these to run - cp *.py $out/bin/ + chmod +x $out/bin/fusee-interfacee-tk + + # app.py depends on these to run + cp *.py $out/bin/ cp intermezzo.bin $out/bin/intermezzo.bin ''; - meta = with stdenv.lib; { + meta = with stdenv.lib; { homepage = "https://github.com/nh-server/fusee-interfacee-tk"; description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; - longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. + longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. Must be run as sudo."; maintainers = with maintainers; [ kristian-brucaj ]; license = licenses.gpl2; }; -} +} diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh index 04485b146a04..dec7367379e4 100755 --- a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh +++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh @@ -43,7 +43,7 @@ if [ "ico" = "$rscFileExt" ]; then else wrestool -x --output=$tmp/ico -t14 $rscFile fi - + icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico mkdir -p $out diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index 61b900c40122..67ce53262864 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 patchelf --set-interpreter "$interpreter" $pgm - wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} + wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} rm $out/usr/bin/minergate-cli mkdir -p $out/bin diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index cf7689367bd3..a4969a34a86f 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r * $out - cat > $out/bin/nb << EOF + cat > $out/bin/nb << EOF #!${bash}/bin/bash $out/nb "\$@" EOF diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 017383a79a2d..5800bcebef90 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; - + patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" ''; - + installPhase = '' mkdir -p $out/bin $out/share/applications ./install.sh diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 3acb77545055..42412820c486 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -27,7 +27,7 @@ let version = "4.4"; - binpath = stdenv.lib.makeBinPath [ + binpath = stdenv.lib.makeBinPath [ cabextract python gettext @@ -70,7 +70,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ + buildInputs = [ xorg.libX11 libGL python diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 17c5ec9be265..56063c737ab4 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -24,7 +24,7 @@ in mkDerivation { patchPhase = '' patchShebangs configure ''; - + installPhase = if stdenv.isDarwin then '' mkdir -p $out/Applications cp -r sleepyhead/SleepyHead.app $out/Applications diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index c52573785ef6..d3a5eb7ec24f 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7"; }; - nativeBuildInputs = [ imlib2 libX11 ]; + nativeBuildInputs = [ imlib2 libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 9d57b4fcfac0..dabdad137af3 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -22,5 +22,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [stdenv.lib.maintainers.magnetophon ]; platforms = platforms.linux; - }; + }; }