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

Get all lib functions from lib, not pkgs.lib, in modules

Browse Source
This commit is contained in:
Shea Levy
2014-07-02 12:28:18 -04:00
parent 80709b141c
commit b3cfb9084b
64 changed files with 135 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-servers/apache-httpd/mercurial.nix
+2 -2
View File
@@ -1,8 +1,8 @@
{ config, pkgs, serverInfo, ... }:
{ config, pkgs, serverInfo, lib, ... }:
let
inherit (pkgs) mercurial;
inherit (pkgs.lib) mkOption;
inherit (lib) mkOption;
urlPrefix = config.urlPrefix;
nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ config, pkgs, serverInfo, ... }:
{ config, pkgs, serverInfo, lib, ... }:
let
extraWorkersProperties = pkgs.lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties;
extraWorkersProperties = lib.optionalString (config ? extraWorkersProperties) config.extraWorkersProperties;
workersProperties = pkgs.writeText "workers.properties" ''
# Define list of workers that will be used