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

nixos/modules: Remove all usages of types.string

Browse Source 
And replace them with a more appropriate type

Also fix up some minor module problems along the way
This commit is contained in:
Silvan Mosberger
2019-08-31 18:19:00 +02:00
parent 69d58ee245
commit 478e7184f8
118 changed files with 325 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/writers/default.nix
+4 -4
View File
@@ -10,12 +10,12 @@ rec {
# makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world"
makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
assert lib.or (types.path.check content) (types.string.check content);
assert lib.or (types.path.check content) (types.str.check content);
let
name = last (builtins.split "/" nameOrPath);
in
pkgs.runCommand name (if (types.string.check content) then {
pkgs.runCommand name (if (types.str.check content) then {
inherit content interpreter;
passAsFile = [ "content" ];
} else {
@@ -42,11 +42,11 @@ rec {
# writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; }
makeBinWriter = { compileScript }: nameOrPath: content:
assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null);
assert lib.or (types.path.check content) (types.string.check content);
assert lib.or (types.path.check content) (types.str.check content);
let
name = last (builtins.split "/" nameOrPath);
in
pkgs.runCommand name (if (types.string.check content) then {
pkgs.runCommand name (if (types.str.check content) then {
inherit content;
passAsFile = [ "content" ];
} else {