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

Merge pull request #61052 from deliciouslytyped/patch-2

Browse Source 
trivial-builders: add writeShellScript and minor cleaning
This commit is contained in:
Alyssa Ross 2019-05-12 17:43:35 +00:00 committed by GitHub
commit 5c36a8d556
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/build-support/trivial-builders.nix
View File

@ -79,7 +79,6 @@ rec {
(test -n "$executable" && chmod +x "$n") || true (test -n "$executable" && chmod +x "$n") || true
''; '';
/* /*
* Writes a text file to nix store with no optional parameters available. * Writes a text file to nix store with no optional parameters available.
* *
@ -92,6 +91,7 @@ rec {
* *
*/ */
writeText = name: text: writeTextFile {inherit name text;}; writeText = name: text: writeTextFile {inherit name text;};
/* /*
* Writes a text file to nix store in a specific directory with no * Writes a text file to nix store in a specific directory with no
* optional parameters available. Name passed is the destination. * optional parameters available. Name passed is the destination.
@ -105,6 +105,7 @@ rec {
* *
*/ */
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";}; writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
/* /*
* Writes a text file to /nix/store/<store path> and marks the file as executable. * Writes a text file to /nix/store/<store path> and marks the file as executable.
* *
@ -117,13 +118,14 @@ rec {
* *
*/ */
writeScript = name: text: writeTextFile {inherit name text; executable = true;}; writeScript = name: text: writeTextFile {inherit name text; executable = true;};
/* /*
* Writes a text file to /nix/store/<store path>/bin/<name> and * Writes a text file to /nix/store/<store path>/bin/<name> and
* marks the file as executable. * marks the file as executable.
* *
* Example: * Example:
* # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable. * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
* writeScript "my-file" * writeScriptBin "my-file"
* '' * ''
* Contents of File * Contents of File
* ''; * '';
@ -132,12 +134,38 @@ rec {
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
/* /*
* Writes a Shell script and check its syntax. Automatically includes interpreter * Similar to writeScript. Writes a Shell script and checks its syntax.
* above the contents passed. * Automatically includes interpreter above the contents passed.
*
* Example:
* # Writes my-file to /nix/store/<store path>/my-file and makes executable.
* writeShellScript "my-file"
* ''
* Contents of File
* '';
*
*/
writeShellScript = name: text:
writeTextFile {
inherit name;
executable = true;
text = ''
#!${runtimeShell}
${text}
'';
checkPhase = ''
${stdenv.shell} -n $out
'';
};
/*
* Similar to writeShellScript and writeScriptBin.
* Writes an executable Shell script to /nix/store/<store path>/bin/<name> and checks its syntax.
* Automatically includes interpreter above the contents passed.
* *
* Example: * Example:
* # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable. * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
* writeScript "my-file" * writeShellScriptBin "my-file"
* '' * ''
* Contents of File * Contents of File
* ''; * '';