Skip to content

Commit

Permalink
treewide: fix string escapes
Browse files Browse the repository at this point in the history
  • Loading branch information
volth committed Sep 16, 2019
1 parent b9ed9c7 commit 8276314
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pkgs/applications/video/kino/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ stdenv.mkDerivation {

postInstall = "
rpath=`patchelf --print-rpath \$out/bin/kino`;
for i in $\buildInputs; do
for i in $buildInputs; do
echo adding \$i/lib
rpath=\$rpath\${rpath:+:}\$i/lib
done
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkgs/development/tools/misc/ctags/wrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ with pkgs.stdenv.lib;

# don't scan version control directories
defaultArgs = [
"--exclude=\.svn"
"--exclude=\.hg"
"--exclude=\.git"
"--exclude=\_darcs"
"--exclude=.svn"
"--exclude=.hg"
"--exclude=.git"
"--exclude=_darcs"
"--sort=yes"
];

# actionscript
asLang = [
"--langdef=ActionScript"
"--langmap=ActionScript:.as"
"--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/"
"--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/"
"--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
"--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
"--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
"--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
"--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
Expand Down Expand Up @@ -67,7 +67,7 @@ with pkgs.stdenv.lib;
nixLang = [
"--langdef=NIX"
"--langmap=NIX:.nix"
"--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/"
"--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
];

rubyLang = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ appleDerivation {
# + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
"-DDAEMON_GID=1"
"-DDEFAULT_AT_QUEUE=\'a\'"
"-DDEFAULT_BATCH_QUEUE=\'b\'"
"-DDEFAULT_AT_QUEUE='a'"
"-DDEFAULT_BATCH_QUEUE='b'"
"-DPERM_PATH=\"/usr/lib/cron/\""
"-DOPEN_DIRECTORY"
"-DNO_DIRECT_RPC"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/typesetting/tex/texlive/combine.nix
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ in buildEnv {
script =
writeText "hyphens.sed" (
# pick up the header
"1,/^\% from/p;"
"1,/^% from/p;"
# pick up all sections matching packages that we combine
+ lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames
+ lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames
);
in ''
(
Expand Down

0 comments on commit 8276314

Please sign in to comment.