public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fix string escapes

Browse Source
This commit is contained in:
volth 2019-09-16 22:15:21 +00:00
parent b9ed9c7fed
commit 8276314608
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/kino/default.nix
View File

@ -80,7 +80,7 @@ stdenv.mkDerivation {
postInstall = " postInstall = "
rpath=`patchelf --print-rpath \$out/bin/kino`; rpath=`patchelf --print-rpath \$out/bin/kino`;
for i in $\buildInputs; do for i in $buildInputs; do
echo adding \$i/lib echo adding \$i/lib
rpath=\$rpath\${rpath:+:}\$i/lib rpath=\$rpath\${rpath:+:}\$i/lib
done done

4
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -57630,7 +57630,7 @@ self: {
version = "0.1.0.1"; version = "0.1.0.1";
sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha"; sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
libraryHaskellDepends = [ base ]; libraryHaskellDepends = [ base ];
description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`."; description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {}; }) {};
@ -251536,7 +251536,7 @@ self: {
base containers exceptions free spiros split text transformers base containers exceptions free spiros split text transformers
]; ];
executableHaskellDepends = [ base ]; executableHaskellDepends = [ base ];
description = "Automate keyboard\/mouse\/clipboard\/application interaction"; description = "Automate keyboard/mouse/clipboard/application interaction";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
broken = true; broken = true;

14
pkgs/development/tools/misc/ctags/wrapped.nix
View File

@ -27,10 +27,10 @@ with pkgs.stdenv.lib;
# don't scan version control directories # don't scan version control directories
defaultArgs = [ defaultArgs = [
"--exclude=\.svn" "--exclude=.svn"
"--exclude=\.hg" "--exclude=.hg"
"--exclude=\.git" "--exclude=.git"
"--exclude=\_darcs" "--exclude=_darcs"
"--sort=yes" "--sort=yes"
]; ];
@ -38,8 +38,8 @@ with pkgs.stdenv.lib;
asLang = [ asLang = [
"--langdef=ActionScript" "--langdef=ActionScript"
"--langmap=ActionScript:.as" "--langmap=ActionScript:.as"
"--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/" "--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]+(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=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
"--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
"--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
@ -67,7 +67,7 @@ with pkgs.stdenv.lib;
nixLang = [ nixLang = [
"--langdef=NIX" "--langdef=NIX"
"--langmap=NIX:.nix" "--langmap=NIX:.nix"
"--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/" "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
]; ];
rubyLang = [ rubyLang = [

4
pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
View File

@ -14,8 +14,8 @@ appleDerivation {
# + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; # + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1" NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
"-DDAEMON_GID=1" "-DDAEMON_GID=1"
"-DDEFAULT_AT_QUEUE=\'a\'" "-DDEFAULT_AT_QUEUE='a'"
"-DDEFAULT_BATCH_QUEUE=\'b\'" "-DDEFAULT_BATCH_QUEUE='b'"
"-DPERM_PATH=\"/usr/lib/cron/\"" "-DPERM_PATH=\"/usr/lib/cron/\""
"-DOPEN_DIRECTORY" "-DOPEN_DIRECTORY"
"-DNO_DIRECT_RPC" "-DNO_DIRECT_RPC"

4
pkgs/tools/typesetting/tex/texlive/combine.nix
View File

@ -136,9 +136,9 @@ in buildEnv {
script = script =
writeText "hyphens.sed" ( writeText "hyphens.sed" (
# pick up the header # pick up the header
"1,/^\% from/p;" "1,/^% from/p;"
# pick up all sections matching packages that we combine # 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 '' in ''
( (