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

Merge pull request #80462 from Profpatsch/writers-use-runCommandLocal-for-scripts

Browse Source 
writers: use run command local for scripts
This commit is contained in:
Lassulus 2020-02-18 20:40:58 +01:00 committed by GitHub
commit d6b7e5493a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/CODEOWNERS vendored
View File

@ -31,6 +31,9 @@
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej /pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch
# NixOS Internals # NixOS Internals
/nixos/default.nix @nbp @infinisil /nixos/default.nix @nbp @infinisil
/nixos/lib/from-env.nix @nbp @infinisil /nixos/lib/from-env.nix @nbp @infinisil

4
pkgs/build-support/writers/default.nix
View File

@ -15,7 +15,7 @@ rec {
name = last (builtins.split "/" nameOrPath); name = last (builtins.split "/" nameOrPath);
in in
pkgs.runCommand name (if (types.str.check content) then { pkgs.runCommandLocal name (if (types.str.check content) then {
inherit content interpreter; inherit content interpreter;
passAsFile = [ "content" ]; passAsFile = [ "content" ];
} else { } else {
@ -192,7 +192,7 @@ rec {
{id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
''; '';
writeNginxConfig = name: text: pkgs.runCommand name { writeNginxConfig = name: text: pkgs.runCommandLocal name {
inherit text; inherit text;
passAsFile = [ "text" ]; passAsFile = [ "text" ];
} /* sh */ '' } /* sh */ ''