diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-12 13:48:19 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-12 13:48:30 +0100 |
| commit | 785eaf2cea3c57daef96bb209f44589e3f48a7ff (patch) | |
| tree | 3324d7de769b7a5c063107b09b294b6af2b823e1 /nixos/modules/services/misc | |
| parent | 39e9fabae0fe5476ad682a52dba42b2c6dbe1a57 (diff) | |
| download | nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.tar nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.tar.gz nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.tar.bz2 nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.tar.lz nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.tar.xz nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.tar.zst nixlib-785eaf2cea3c57daef96bb209f44589e3f48a7ff.zip | |
Add some primops to lib
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/disnix.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 72b98d1f84a5..82526b154e7a 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -111,7 +111,7 @@ in // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; } // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; } // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) ( - optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) + optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = readFile config.services.mysql.rootPassword; }) ) ; @@ -152,7 +152,7 @@ in ${concatMapStrings (infrastructureAttrName: let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure); in - if builtins.isInt infrastructureAttrValue then + if isInt infrastructureAttrValue then ''${infrastructureAttrName}=${toString infrastructureAttrValue} \ '' else |