mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Code Issues Wiki Activity

treewide: editorconfig fixes

Browse source 
- remove trailing whitespace
- use spaces for indentation
This commit is contained in:
zowoq 2021-01-21 10:55:55 +10:00
parent fa2e1dd70a
commit 932941b79c
32 changed files with 74 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/science/biology/blast/default.nix
View file

@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
}; };
sourceRoot = "ncbi-blast-${version}+-src/c++"; sourceRoot = "ncbi-blast-${version}+-src/c++";
configureFlags = [ configureFlags = [
# With flat Makefile we can use all_projects in order not to build extra. # With flat Makefile we can use all_projects in order not to build extra.
# These extra cause clang to hang on Darwin. # These extra cause clang to hang on Darwin.
"--with-flat-makefile" "--with-flat-makefile"
"--without-makefile-auto-update" "--without-makefile-auto-update"
"--with-dll" # build dynamic libraries (static are default) "--with-dll" # build dynamic libraries (static are default)
]; ];
makeFlags = [ "all_projects=app/" ]; makeFlags = [ "all_projects=app/" ];
preConfigure = '' preConfigure = ''

4
pkgs/applications/science/biology/ncbi-tools/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
}; };
configureFlags = [ configureFlags = [
"--without-debug" "--without-debug"
"--with-bin-release" "--with-bin-release"
"--with-dll" "--with-dll"
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; description = ''NCBI Bioinformatics toolbox (incl. BLAST)'';
longDescription = ''The NCBI Bioinformatics toolsbox, including command-line utilties, libraries and include files. No X11 support''; 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"; license = "GPL";
priority = 5; # zlib.so gives a conflict with zlib priority = 5; # zlib.so gives a conflict with zlib
broken = true; broken = true;

3
pkgs/applications/science/chemistry/molden/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace '-I/usr/X11R6/include' "" \ --replace '-I/usr/X11R6/include' "" \
--replace '/usr/local/' $out/ \ --replace '/usr/local/' $out/ \
--replace 'sudo' "" \ --replace 'sudo' "" \
--replace '-C surf depend' '-C surf' --replace '-C surf depend' '-C surf'
sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile
''; '';
@ -41,4 +41,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ markuskowa ]; maintainers = with maintainers; [ markuskowa ];
}; };
} }

2
pkgs/applications/science/electronics/geda/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
}; };
configureFlags = [ configureFlags = [
"--disable-update-xdg-database" "--disable-update-xdg-database"
]; ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ guile gtk2 flex gawk perl ]; buildInputs = [ guile gtk2 flex gawk perl ];

2
pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
xmlcatalog --noout --create $cat xmlcatalog --noout --create $cat
grep PUBLIC DTD/*.soc | while read x; do grep PUBLIC DTD/*.soc | while read x; do
eval a=($x) eval a=($x)
xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat xmlcatalog --noout --add public "''${a[1]}" "''${a[2]}" $cat
done done
''; # */ ''; # */

4
pkgs/development/compilers/apache-flex-sdk/default.nix
View file

@ -38,13 +38,13 @@ in stdenv.mkDerivation rec {
for i in $out/bin/!(aasdoc|acompc|amxmlc); do for i in $out/bin/!(aasdoc|acompc|amxmlc); do
wrapProgram $i \ wrapProgram $i \
--set FLEX_HOME $t \ --set FLEX_HOME $t \
--set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/
done done
mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/ mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/
cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
''; '';
fixupPhase = ":"; fixupPhase = ":";
meta = with stdenv.lib; { meta = with stdenv.lib; {

8
pkgs/development/compilers/bigloo/default.nix
View file

@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
# Fix absolute paths. # Fix absolute paths.
sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \ sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g' \
-e 's=/tmp=$TMPDIR=g' -i autoconf/* \ -e 's=/tmp=$TMPDIR=g' -i autoconf/* \
[Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \ [Mm]akefile* */[Mm]akefile* */*/[Mm]akefile* \
*/*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \ */*/*/[Mm]akefile* */*/*/*/[Mm]akefile* \
comptime/Cc/cc.scm gc/install-* comptime/Cc/cc.scm gc/install-*
# Make sure we don't change string lengths in the generated # Make sure we don't change string lengths in the generated
# C files. # C files.
sed -e 's=/bin/rm= rm=g' -e 's=/bin/mv= mv=g' \ 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"; checkTarget = "test";

4
pkgs/development/compilers/opendylan/bin.nix
View file

@ -22,11 +22,11 @@ stdenv.mkDerivation {
tar --strip-components=1 -xjf "$src" -C "$out" tar --strip-components=1 -xjf "$src" -C "$out"
interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" 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-interpreter "$interpreter" "$a"
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done done
for a in "$out"/lib/*.so; do for a in "$out"/lib/*.so; do
patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
done done
sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam

2
pkgs/development/interpreters/angelscript/2.22.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
cd angelscript/projects/gnuc cd angelscript/projects/gnuc
sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
export SHARED=1 export SHARED=1
export VERSION="${s.version}" export VERSION="${s.version}"
mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
''; '';

2
pkgs/development/libraries/amrnb/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation {
configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ]; configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
postConfigure = '' postConfigure = ''
cp $srcAmr 26104-b00.zip cp $srcAmr 26104-b00.zip
''; '';
meta = { meta = {

4
pkgs/development/libraries/snack/default.nix
View file

@ -23,10 +23,10 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
make install DESTDIR="$out" make install DESTDIR="$out"
''; '';
meta = { meta = {
description = "The Snack Sound Toolkit (Tcl)"; description = "The Snack Sound Toolkit (Tcl)";
homepage = "http://www.speech.kth.se/snack/"; homepage = "http://www.speech.kth.se/snack/";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;

4
pkgs/development/libraries/waylandpp/default.nix
View file

@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq";
}; };
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"
]; ];

2
pkgs/development/mobile/androidenv/emulator.nix
View file

@ -38,7 +38,7 @@ deployAndroidPackage {
# Wrap emulator so that it can load required libraries at runtime # Wrap emulator so that it can load required libraries at runtime
wrapProgram $out/libexec/android-sdk/emulator/emulator \ wrapProgram $out/libexec/android-sdk/emulator/emulator \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
pkgs.dbus pkgs.dbus
pkgs.systemd pkgs.systemd
]} \ ]} \

4
pkgs/development/mobile/xcodeenv/build-app.nix
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation ({
# Be sure that the Xcode wrapper has priority over everything else. # Be sure that the Xcode wrapper has priority over everything else.
# When using buildInputs this does not seem to be the case. # When using buildInputs this does not seem to be the case.
export PATH=${xcodewrapper}/bin:$PATH export PATH=${xcodewrapper}/bin:$PATH
${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString release ''
export HOME=/Users/$(whoami) export HOME=/Users/$(whoami)
keychainName="$(basename $out)" keychainName="$(basename $out)"
@ -69,7 +69,7 @@ stdenv.mkDerivation ({
security unlock-keychain -p "" $keychainName security unlock-keychain -p "" $keychainName
# Import the certificate into the keychain # 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 # Grant the codesign utility permissions to read from the keychain
security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName

2
pkgs/development/ocaml-modules/mlgmp/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24"; sha256 = "3ce1a53fa452ff5a9ba618864d3bc46ef32190b57202d1e996ca7df837ad4f24";
}; };
makeFlags = [ makeFlags = [
"DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp" "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp"
]; ];

4
pkgs/development/ocaml-modules/mysql/default.nix
View file

@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2";
}; };
configureFlags = [ configureFlags = [
"--prefix=$out" "--prefix=$out"
"--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
]; ];

4
pkgs/development/python-modules/pyregion/default.nix
View file

@ -33,8 +33,8 @@ buildPythonPackage rec {
name = "conftest-astropy-3-fix.patch"; name = "conftest-astropy-3-fix.patch";
url = "https://github.com/astropy/pyregion/pull/136.patch"; url = "https://github.com/astropy/pyregion/pull/136.patch";
sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m"; sha256 = "13yxjxiqnhjy9gh24hvv6pnwx7qic2mcx3ccr1igjrc3f881d59m";
}) })
]; ];
nativeBuildInputs = [ astropy-helpers ]; nativeBuildInputs = [ astropy-helpers ];

4
pkgs/development/tools/database/squirrel-sql/default.nix
View file

@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/share/squirrel-sql mkdir -p $out/share/squirrel-sql
cp -r . $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 \ ln -s $out/share/squirrel-sql/icons/acorn.png \
$out/share/icons/hicolor/32x32/apps/squirrel-sql.png $out/share/icons/hicolor/32x32/apps/squirrel-sql.png
ln -s ${desktopItem}/share/applications $out/share ln -s ${desktopItem}/share/applications $out/share
runHook postInstall runHook postInstall
''; '';

2
pkgs/development/tools/dtools/default.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
$makeCmd INSTALL_DIR=$out install $makeCmd INSTALL_DIR=$out install
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Ancillary tools for the D programming language compiler"; description = "Ancillary tools for the D programming language compiler";

2
pkgs/development/tools/gtk-mac-bundler/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \ substitute gtk-mac-bundler.in $out/bin/gtk-mac-bundler \
--subst-var-by PATH $out/share --subst-var-by PATH $out/share
chmod a+x $out/bin/gtk-mac-bundler chmod a+x $out/bin/gtk-mac-bundler

8
pkgs/development/tools/micronaut/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
rm bin/mn.bat rm bin/mn.bat
cp -r . $out cp -r . $out
wrapProgram $out/bin/mn \ wrapProgram $out/bin/mn \
--prefix JAVA_HOME : ${jdk} --prefix JAVA_HOME : ${jdk}
installShellCompletion --bash --name mn.bash bin/mn_completion installShellCompletion --bash --name mn.bash bin/mn_completion
runHook postInstall runHook postInstall
''; '';
@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
longDescription = '' longDescription = ''
Micronaut is a modern, JVM-based, full stack microservices framework Micronaut is a modern, JVM-based, full stack microservices framework
designed for building modular, easily testable microservice applications. designed for building modular, easily testable microservice applications.
Reflection-based IoC frameworks load and cache reflection data for Reflection-based IoC frameworks load and cache reflection data for
every single field, method, and constructor in your code, whereas with every single field, method, and constructor in your code, whereas with
Micronaut, your application startup time and memory consumption are Micronaut, your application startup time and memory consumption are
not bound to the size of your codebase. not bound to the size of your codebase.
''; '';
homepage = "https://micronaut.io/"; homepage = "https://micronaut.io/";

2
pkgs/development/tools/misc/gede/default.nix
View file

@ -20,7 +20,7 @@ mkDerivation rec {
installPhase = '' installPhase = ''
python build.py install --verbose --prefix="$out" python build.py install --verbose --prefix="$out"
wrapProgram $out/bin/gede \ wrapProgram $out/bin/gede \
--prefix PATH : ${lib.makeBinPath [ ctags gdb ]} --prefix PATH : ${lib.makeBinPath [ ctags gdb ]}
''; '';
meta = with lib; { meta = with lib; {

28
pkgs/development/tools/ocaml/obelisk/default.nix
View file

@ -1,20 +1,20 @@
{ lib, fetchurl, ocamlPackages }: { lib, fetchurl, ocamlPackages }:
ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage rec {
pname = "obelisk"; pname = "obelisk";
version = "0.5.2"; version = "0.5.2";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz"; url = "https://github.com/Lelio-Brun/Obelisk/releases/download/v${version}/obelisk-v${version}.tbz";
sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6"; sha256 = "0s86gkypyrkrp83xnay258ijri3yjwj3marsjnjf8mz58z0zd9g6";
}; };
buildInputs = with ocamlPackages; [ menhir re ]; buildInputs = with ocamlPackages; [ menhir re ];
meta = { meta = {
description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Lelio-Brun/Obelisk"; homepage = "https://github.com/Lelio-Brun/Obelisk";
}; };
} }

12
pkgs/development/tools/qtcreator/default.nix
View file

@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch { mkDerivation, lib, fetchurl, fetchgit, fetchpatch
, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8 , qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
, withDocumentation ? false, withClangPlugins ? true , withDocumentation ? false, withClangPlugins ? true
}: }:
with lib; with lib;
@ -28,9 +28,9 @@ mkDerivation rec {
sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
}; };
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
optionals withClangPlugins [ llvmPackages_8.libclang optionals withClangPlugins [ llvmPackages_8.libclang
clang_qt_vendor clang_qt_vendor
llvmPackages_8.llvm ]; llvmPackages_8.llvm ];
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
@ -38,7 +38,7 @@ mkDerivation rec {
# 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to # 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 # 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. # 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. # remove system clang include paths.
patches = [ ./0001-Fix-clang-libcpp-regexp.patch patches = [ ./0001-Fix-clang-libcpp-regexp.patch
./0002-Dont-remove-clang-header-paths.patch ]; ./0002-Dont-remove-clang-header-paths.patch ];
@ -53,7 +53,7 @@ mkDerivation rec {
preConfigure = '' preConfigure = ''
substituteInPlace src/plugins/plugins.pro \ 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 '' '' + optionalString withClangPlugins ''
# Fix paths for llvm/clang includes directories. # Fix paths for llvm/clang includes directories.
substituteInPlace src/shared/clang/clang_defines.pri \ substituteInPlace src/shared/clang/clang_defines.pri \

2
pkgs/development/tools/vagrant/default.nix
View file

@ -34,7 +34,7 @@ let
for gem in "$out"/lib/ruby/gems/*/gems/*; do for gem in "$out"/lib/ruby/gems/*/gems/*; do
cp -a "$gem/" "$gem.new" cp -a "$gem/" "$gem.new"
rm "$gem" rm "$gem"
# needed on macOS, otherwise the mv yields permission denied # needed on macOS, otherwise the mv yields permission denied
chmod +w "$gem.new" chmod +w "$gem.new"
mv "$gem.new" "$gem" mv "$gem.new" "$gem"
done done

4
pkgs/games/mrrescue/default.nix
View file

@ -13,13 +13,13 @@ let
name = "mrrescue"; name = "mrrescue";
exec = pname; exec = pname;
icon = icon; icon = icon;
comment = "Arcade-style fire fighting game"; comment = "Arcade-style fire fighting game";
desktopName = "Mr. Rescue"; desktopName = "Mr. Rescue";
genericName = "mrrescue"; genericName = "mrrescue";
categories = "Game;"; categories = "Game;";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";

2
pkgs/games/sienna/default.nix
View file

@ -13,7 +13,7 @@ let
name = "sienna"; name = "sienna";
exec = pname; exec = pname;
icon = icon; icon = icon;
comment = "Fast-paced one button platformer"; comment = "Fast-paced one button platformer";
desktopName = "Sienna"; desktopName = "Sienna";
genericName = "sienna"; genericName = "sienna";
categories = "Game;"; categories = "Game;";

4
pkgs/games/vapor/default.nix
View file

@ -14,13 +14,13 @@ let
name = "Vapor"; name = "Vapor";
exec = pname; exec = pname;
icon = icon; icon = icon;
comment = "LÖVE Distribution Client"; comment = "LÖVE Distribution Client";
desktopName = "Vapor"; desktopName = "Vapor";
genericName = "vapor"; genericName = "vapor";
categories = "Game;"; categories = "Game;";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";

2
pkgs/misc/emulators/wine/util.nix
View file

@ -3,7 +3,7 @@ rec {
toPackages = pkgNames: pkgs: toPackages = pkgNames: pkgs:
map (pn: lib.getAttr pn pkgs) pkgNames; map (pn: lib.getAttr pn pkgs) pkgNames;
toBuildInputs = pkgArches: archPkgs: toBuildInputs = pkgArches: archPkgs:
lib.concatLists (map archPkgs pkgArches); lib.concatLists (map archPkgs pkgArches);
mkBuildInputs = pkgArches: pkgNames: mkBuildInputs = pkgArches: pkgNames:
toBuildInputs pkgArches (toPackages pkgNames); toBuildInputs pkgArches (toPackages pkgNames);
} }

6
pkgs/misc/source-and-tags/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : { { stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
# optional srcDir # optional srcDir
annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags
|| x ? meta && x.meta ? 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 # 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 # 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"; } ] # createTagFiles = [ { name = "my_tag_name_without_suffix", tagCmd = "ctags -R . -o \$TAG_FILE"; } ]
# tag command must create file named $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 { stdenv.mkDerivation {
phases = "unpackPhase buildPhase"; phases = "unpackPhase buildPhase";
inherit src srcDir tagSuffix; inherit src srcDir tagSuffix;
@ -72,7 +72,7 @@
addCTaggingInfo = deriv : addCTaggingInfo = deriv :
deriv // { deriv // {
passthru = { passthru = {
sourceWithTags = { sourceWithTags = {
inherit (deriv) src; inherit (deriv) src;

6
pkgs/tools/networking/guardian-agent/default.nix
View file

@ -30,9 +30,9 @@ buildGoPackage rec {
''; '';
postFixup = '' postFixup = ''
wrapProgram $out/bin/sga-guard \ wrapProgram $out/bin/sga-guard \
--prefix PATH : "$out/bin" \ --prefix PATH : "$out/bin" \
--prefix PATH : "${autossh}/bin" --prefix PATH : "${autossh}/bin"
''; '';
meta = with lib; { meta = with lib; {

2
pkgs/tools/system/cm-rgb/default.nix
View file

@ -38,7 +38,7 @@ buildPythonApplication rec {
postInstall = '' postInstall = ''
# Remove this line when/if this PR gets merged: # 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 install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui
mkdir -p $out/etc/udev/rules.d mkdir -p $out/etc/udev/rules.d