diff options
Diffstat (limited to 'pkgs/applications')
47 files changed, 59 insertions, 65 deletions
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 6dc57cae0d61..a25c522e12f5 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "ETC_PATH=$(out)/etc" ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 233961ad1111..777ac79a22da 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 2dd9174d6dd1..cc39da90c237 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { --replace sample-projects $out/share/${pname}/sample-projects ''; - buildPhase = ''''; + buildPhase = ""; installPhase = '' mkdir -p $out/share/${pname} diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 97e8378d94e8..00d0259a7a9b 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -122,7 +122,7 @@ mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; - qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ]; + qtWrapperArgs = [ "--suffix PATH : ${gnumake}/bin" ]; postInstall = '' mkdir $out/share diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index e611e486288f..734b189d1e48 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -137,8 +137,7 @@ in stdenv.mkDerivation rec { ++ lib.optional tclSupport tcl ++ lib.optional rubySupport ruby; - preConfigure = '' - '' + lib.optionalString ftNixSupport '' + preConfigure = "" + lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 0a611515b0d5..0459d1d04ac2 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpthread"; - postPatch = ''patchShebangs version.sh''; + postPatch = "patchShebangs version.sh"; postInstall = '' wrapProgram $out/bin/ahoviewer \ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 2c9430ded730..1ea21506e314 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; + qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index 384ddac5b4c5..0800ee0c437d 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { sourceRoot = "${src.name}/mandelbulber2"; qmakeFlags = [ - "SHARED_PATH=${placeholder ''out''}" + "SHARED_PATH=${placeholder "out"}" (if withOpenCL then "qmake/mandelbulber-opencl.pro" else "qmake/mandelbulber.pro") diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index c3dd9f548d2d..8b6e581ae0b1 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -56,9 +56,9 @@ buildDotnetPackage rec { ''; makeWrapperArgs = [ - ''--prefix MONO_GAC_PREFIX : ${gtksharp}'' - ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib'' - ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib'' + "--prefix MONO_GAC_PREFIX : ${gtksharp}" + "--prefix LD_LIBRARY_PATH : ${gtksharp}/lib" + "--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib" ]; postInstall = '' diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 31da1e8d4955..89686e50d175 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { # prevent double wrapping from wrapGApps and wrapPythonProgram dontWrapGApps = true; makeWrapperArgs = [ - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" ]; strictDeps = false; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index ea78924574f5..4771cebc3411 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -94,7 +94,7 @@ in mkDerivation rec { "format" ]; - qtWrapperArgs = [ ''--prefix LD_LIBRARY_PATH : $out/lib'' ]; + qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : $out/lib" ]; postInstall = '' mkdir -p "$out/lib" diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 7a9e29396405..418658fec228 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" "NO_VENV=1" ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 161005d1280a..8865435339c3 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ - ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \ - ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \ - ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \ - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \ - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ - ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ + ${lib.optionalString gitSupport "--prefix PATH : ${git}/bin "} \ + ${lib.optionalString monotoneSupport "--prefix PATH : ${monotone}/bin "} \ + ${lib.optionalString bazaarSupport "--prefix PATH : ${breezy}/bin "} \ + ${lib.optionalString cvsSupport "--prefix PATH : ${cvs}/bin "} \ + ${lib.optionalString cvsSupport "--prefix PATH : ${cvsps}/bin "} \ + ${lib.optionalString subversionSupport "--prefix PATH : ${subversion.out}/bin "} \ + ${lib.optionalString mercurialSupport "--prefix PATH : ${mercurial}/bin "} \ ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index b3a68cffeff1..cb8494e1c48d 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -101,7 +101,7 @@ in buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ "--prefix PATH : ${binPath}" - ''''${gappsWrapperArgs[@]}'' + "\${gappsWrapperArgs[@]}" ]; # needed for glib-schemas to work correctly (will crash on dialogues otherwise) # see https://github.com/NixOS/nixpkgs/issues/56943 diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 858a8fa1475e..4f2af99ab14d 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { makeFlags = [ "GIT_VERSION=${version}" "GIT_TIMESTAMP=" - "SHAREDIR=${placeholder ''out''}/share/osm2xmap" - "INSTALL_BINDIR=${placeholder ''out''}/bin" - "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1" + "SHAREDIR=${placeholder "out"}/share/osm2xmap" + "INSTALL_BINDIR=${placeholder "out"}/bin" + "INSTALL_MANDIR=${placeholder "out"}/share/man/man1" ]; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index d9feb28c037b..57ec820a0902 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; patches = [ ./cmake.patch ]; - postPatch = '' rm build ''; + postPatch = "rm build "; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 77a7dcca7475..e3a8e682577a 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" - ''PREFIX=$(out)'' + "PREFIX=$(out)" "USE_VIDEO=1" "CCACHE_DISABLE=1" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 137ad4d49b04..5fa5c2a28641 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ ant jdk ]; - buildPhase = ''ant make''; + buildPhase = "ant make"; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 24369bfc8d55..c357e78ccf29 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://software.internet2.edu/owamp/"; - description = ''A tool for performing one-way active measurements''; + description = "A tool for performing one-way active measurements"; platforms = platforms.linux; maintainers = [maintainers.teto]; license = licenses.asl20; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dc828b588258..7441cdf4eef7 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -28,7 +28,7 @@ mkDerivation { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ ''--suffix PATH : ${nx-libs}/bin:${openssh}/libexec'' ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix index cedc85d53f60..683e66815731 100644 --- a/pkgs/applications/office/docear/default.nix +++ b/pkgs/applications/office/docear/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { # The wrapper ensures oraclejre is used makeWrapper ${runtimeShell} $out/bin/docear \ - --set _JAVA_OPTIONS "${lib.optionalString antialiasFont ''-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on''}" \ + --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \ --set JAVA_HOME ${oraclejre.home} \ --add-flags "$out/share/docear.sh" diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 0df6070319d3..f0237c4cecff 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - preConfigure = ''./autogen.sh''; + preConfigure = "./autogen.sh"; configureFlags = [ "--enable-python" "--enable-python-plugin" diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index a8f96fac44ac..a48efb9aa6d9 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -241,8 +241,7 @@ let # gr-fcd feature was dropped in 3.8 ++ lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] ; - preConfigure = '' - '' + preConfigure = "" # wxgui and pygtk are not looked up properly, so we force them to be # detected as found, if they are requested by the `features` attrset. + lib.optionalString (hasFeature "gr-wxgui" features) '' diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index e99a1bfd7a1b..9223f160db30 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -240,8 +240,7 @@ let ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; - preConfigure = '' - '' + preConfigure = "" # If python-support is disabled, don't install volk's (git submodule) # volk_modtool - it references python. # diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index e30831f87ee7..1d5d84f46495 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -83,8 +83,7 @@ rec { ++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ] ++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ] ; - postInstall = '' - '' + postInstall = "" # Gcc references + lib.optionalString (hasFeature "volk" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 41a2e89f02c5..36790b22b228 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -10,7 +10,7 @@ gccStdenv.mkDerivation rec { }; buildInputs = [ zlib mpi ]; - setSourceRoot = ''sourceRoot=$(echo */src)''; + setSourceRoot = "sourceRoot=$(echo */src)"; buildFlags = [ "thread" "mpis" ]; preInstall = "mkdir -p $out/man/man1"; diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index c5220ebc83b5..0e273dbefaac 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ cpio ]; meta = { - description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; - longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; + 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/"; license = "GPL"; priority = 5; # zlib.so gives a conflict with zlib diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 7a2dc2782ab0..d288edca9330 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; - longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; + longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; license = "non-commercial"; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; }; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 1f02d30cf253..ff88586e0353 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml eprover zlib ]; - preConfigure = ''patchShebangs .''; + preConfigure = "patchShebangs ."; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/applications/science/logic/lci/default.nix index a0897135fbba..593b2c54c5cf 100644 --- a/pkgs/applications/science/logic/lci/default.nix +++ b/ |