treewide: remove trailing whitespaces

This commit is contained in:
Ben Siraphob 2021-01-01 20:46:40 +07:00 committed by Jonathan Ringer
parent 863054f9da
commit 3496ce2a0c
28 changed files with 55 additions and 55 deletions

View file

@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";
longDescription = '' longDescription = ''
Aj-snapshot is a small program that can be used to make snapshots of the connections made between JACK and/or ALSA 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. 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. 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. You can also run aj-snapshot in daemon mode if you want to have your connections continually restored.
''; '';

View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
mv jack_oscrolloscope $out/bin/ mv jack_oscrolloscope $out/bin/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple waveform viewer for JACK"; description = "A simple waveform viewer for JACK";
homepage = "http://das.nasophon.de/jack_oscrolloscope"; homepage = "http://das.nasophon.de/jack_oscrolloscope";
license = licenses.gpl2; license = licenses.gpl2;

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjack2 ]; buildInputs = [ libjack2 ];
meta = { meta = {
description = "Console jack loudness meter"; description = "Console jack loudness meter";
homepage = "https://www.aelius.com/njh/jackmeter/"; homepage = "https://www.aelius.com/njh/jackmeter/";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;

View file

@ -19,7 +19,7 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold";
version = "0.15.2"; version = "0.15.2";

View file

@ -4,7 +4,7 @@
, util-linux, qtbase ? null, qttools ? null , util-linux, qtbase ? null, qttools ? null
, enableUpnp ? false , enableUpnp ? false
, disableWallet ? false , disableWallet ? false
, disableDaemon ? false , disableDaemon ? false
, withGui ? false }: , withGui ? false }:
with stdenv.lib; with stdenv.lib;
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
++ optionals withGui [ "--with-gui=yes" ++ optionals withGui [ "--with-gui=yes"
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
doChecks = true; doChecks = true;
postBuild = '' postBuild = ''

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, linux-pam }: { stdenv, lib, fetchFromGitHub, linux-pam }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ly"; pname = "ly";
version = "0.2.1"; version = "0.2.1";
@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
rev = version; rev = version;
sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d"; sha256 = "16gjcrd4a6i4x8q8iwlgdildm7cpdsja8z22pf2izdm6rwfki97d";
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = [ linux-pam ]; buildInputs = [ linux-pam ];
makeFlags = [ "FLAGS=-Wno-error" ]; makeFlags = [ "FLAGS=-Wno-error" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp bin/ly $out/bin cp bin/ly $out/bin
''; '';
meta = with lib; { meta = with lib; {

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/share/man/man1 mkdir -p $out/share/man/man1

View file

@ -2,20 +2,20 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "session-management-for-emacs-2.2a"; name = "session-management-for-emacs-2.2a";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz";
sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
}; };
buildInputs = [emacs]; buildInputs = [emacs];
installPhase = '' installPhase = ''
mkdir -p "$out/share/emacs/site-lisp" mkdir -p "$out/share/emacs/site-lisp"
cp lisp/*.el "$out/share/emacs/site-lisp/" cp lisp/*.el "$out/share/emacs/site-lisp/"
''; '';
meta = { meta = {
/* installation: add to your ~/.emacs /* installation: add to your ~/.emacs
(require 'session) (require 'session)
(add-hook 'after-init-hook 'session-initialize) (add-hook 'after-init-hook 'session-initialize)

View file

@ -7,14 +7,14 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
}; };
nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
> export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX
> export PATH=${mono}/bin:\$PATH > 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 > 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 EOF
done done

View file

@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
# to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers.
# `RUNPATH` doesn't propagate throughout the whole application, but only # `RUNPATH` doesn't propagate throughout the whole application, but only
# from the module performing the `dlopen()`. # from the module performing the `dlopen()`.
# #
# Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so`
# files in $out/lib/apitrace/wrappers. # files in $out/lib/apitrace/wrappers.
# #
# Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd`
# and other dispatcher libraries, and run `dlopen()` by themselves. # and other dispatcher libraries, and run `dlopen()` by themselves.
# #
# As `RUNPATH` doesn't propagate through the whole library, and they're now the # As `RUNPATH` doesn't propagate through the whole library, and they're now the
# library doing the real `dlopen()`, they also need to have # library doing the real `dlopen()`, they also need to have
# `/run-opengl-driver[-32]` added to their `RUNPATH`. # `/run-opengl-driver[-32]` added to their `RUNPATH`.

View file

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
version = "0.4.13"; version = "0.4.13";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "maoschanz"; owner = "maoschanz";
repo = pname; repo = pname;

View file

@ -13,7 +13,7 @@ mkDerivation rec {
preBuild = '' preBuild = ''
qmake qt/fstl.pro qmake qt/fstl.pro
''; '';
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications mkdir -p $out/Applications
mv fstl.app $out/Applications mv fstl.app $out/Applications

View file

@ -14,7 +14,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "KindleComicConverter"; pname = "KindleComicConverter";
sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
}; };
propagatedBuildInputs = with python3Packages ; [ propagatedBuildInputs = with python3Packages ; [
pillow pillow
pyqt5 pyqt5

View file

@ -11,7 +11,7 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "brscan4-0.4.8-1"; name = "brscan4-0.4.8-1";
src = src =
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
unpackPhase = '' unpackPhase = ''
tar -zxf $src tar -zxf $src
''; '';
installPhase = '' installPhase = ''

View file

@ -12,7 +12,7 @@ mkDerivation rec {
}; };
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
sourceRoot = "source/src"; sourceRoot = "source/src";
installPhase = '' installPhase = ''

View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
cp $src $out/bin/deadd-notification-center cp $src $out/bin/deadd-notification-center
chmod +x $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; { meta = with stdenv.lib; {

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
pname = "fme"; pname = "fme";
version = "1.1.3"; version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz";
sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";

View file

@ -1,40 +1,40 @@
{ stdenv , fetchFromGitHub , python3 , makeWrapper }: { stdenv , fetchFromGitHub , python3 , makeWrapper }:
let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "fusee-interfacee-tk"; pname = "fusee-interfacee-tk";
version = "1.0.1"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nh-server"; owner = "nh-server";
repo = pname; repo = pname;
rev = "V${version}"; rev = "V${version}";
sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ]; buildInputs = [ pythonEnv ];
installPhase = '' installPhase = ''
mkdir -p $out/bin 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 # 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 cat app.py >> $out/bin/fusee-interfacee-tk
chmod +x $out/bin/fusee-interfacee-tk chmod +x $out/bin/fusee-interfacee-tk
# app.py depends on these to run # app.py depends on these to run
cp *.py $out/bin/ cp *.py $out/bin/
cp intermezzo.bin $out/bin/intermezzo.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"; homepage = "https://github.com/nh-server/fusee-interfacee-tk";
description = "A tool to send .bin files to a Nintendo Switch in RCM mode"; 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."; Must be run as sudo.";
maintainers = with maintainers; [ kristian-brucaj ]; maintainers = with maintainers; [ kristian-brucaj ];
license = licenses.gpl2; license = licenses.gpl2;
}; };
} }

View file

@ -43,7 +43,7 @@ if [ "ico" = "$rscFileExt" ]; then
else else
wrestool -x --output=$tmp/ico -t14 $rscFile wrestool -x --output=$tmp/ico -t14 $rscFile
fi fi
icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico
mkdir -p $out mkdir -p $out

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
patchelf --set-interpreter "$interpreter" $pgm 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 rm $out/usr/bin/minergate-cli
mkdir -p $out/bin mkdir -p $out/bin

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -r * $out cp -r * $out
cat > $out/bin/nb << EOF cat > $out/bin/nb << EOF
#!${bash}/bin/bash #!${bash}/bin/bash
$out/nb "\$@" $out/nb "\$@"
EOF EOF

View file

@ -16,11 +16,11 @@ stdenv.mkDerivation {
buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ];
pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ];
patchPhase = '' patchPhase = ''
substituteInPlace install.sh --replace "/usr/local" "$out" substituteInPlace install.sh --replace "/usr/local" "$out"
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/applications mkdir -p $out/bin $out/share/applications
./install.sh ./install.sh

View file

@ -27,7 +27,7 @@
let let
version = "4.4"; version = "4.4";
binpath = stdenv.lib.makeBinPath [ binpath = stdenv.lib.makeBinPath [
cabextract cabextract
python python
gettext gettext
@ -70,7 +70,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ buildInputs = [
xorg.libX11 xorg.libX11
libGL libGL
python python

View file

@ -24,7 +24,7 @@ in mkDerivation {
patchPhase = '' patchPhase = ''
patchShebangs configure patchShebangs configure
''; '';
installPhase = if stdenv.isDarwin then '' installPhase = if stdenv.isDarwin then ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r sleepyhead/SleepyHead.app $out/Applications cp -r sleepyhead/SleepyHead.app $out/Applications

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7"; sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7";
}; };
nativeBuildInputs = [ imlib2 libX11 ]; nativeBuildInputs = [ imlib2 libX11 ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];

View file

@ -22,5 +22,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/zoltanp/xrandr-invert-colors"; homepage = "https://github.com/zoltanp/xrandr-invert-colors";
maintainers = [stdenv.lib.maintainers.magnetophon ]; maintainers = [stdenv.lib.maintainers.magnetophon ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }