diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-22 20:11:21 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-22 20:11:21 +0200 |
commit | a1a8649a2be768685eb04c246c114fce36b8096f (patch) | |
tree | 4ea5416ec8b3ba30b5538acfd0472c360c595e2c /nixops/modules | |
parent | 4288c2f2431fb782b0d512b1b3749187f2374b6a (diff) | |
download | Nix-a1a8649a2be768685eb04c246c114fce36b8096f.tar.gz Nix-a1a8649a2be768685eb04c246c114fce36b8096f.tar.zst Nix-a1a8649a2be768685eb04c246c114fce36b8096f.zip |
Remove mylibs from module dependencies
Diffstat (limited to 'nixops/modules')
-rw-r--r-- | nixops/modules/buildbot/default.nix | 2 | ||||
-rw-r--r-- | nixops/modules/gitolite/default.nix | 4 | ||||
-rw-r--r-- | nixops/modules/ssh/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix index 89a0dea..60279b7 100644 --- a/nixops/modules/buildbot/default.nix +++ b/nixops/modules/buildbot/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | varDir = "/var/lib/buildbot"; | 3 | varDir = "/var/lib/buildbot"; |
4 | buildbot_common = pkgs.python3Packages.buildPythonPackage rec { | 4 | buildbot_common = pkgs.python3Packages.buildPythonPackage rec { |
diff --git a/nixops/modules/gitolite/default.nix b/nixops/modules/gitolite/default.nix index 8703fbb..f085b55 100644 --- a/nixops/modules/gitolite/default.nix +++ b/nixops/modules/gitolite/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | let | 2 | let |
3 | cfg = config.services.myGitolite; | 3 | cfg = config.services.myGitolite; |
4 | in { | 4 | in { |
@@ -21,7 +21,7 @@ in { | |||
21 | }; | 21 | }; |
22 | 22 | ||
23 | system.activationScripts.gitolite = let | 23 | system.activationScripts.gitolite = let |
24 | gitolite_ldap_groups = mylibs.wrap { | 24 | gitolite_ldap_groups = pkgs.mylibs.wrap { |
25 | name = "gitolite_ldap_groups.sh"; | 25 | name = "gitolite_ldap_groups.sh"; |
26 | file = ./gitolite_ldap_groups.sh; | 26 | file = ./gitolite_ldap_groups.sh; |
27 | vars = { | 27 | vars = { |
diff --git a/nixops/modules/ssh/default.nix b/nixops/modules/ssh/default.nix index e8d6063..beedaff 100644 --- a/nixops/modules/ssh/default.nix +++ b/nixops/modules/ssh/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, mylibs, myconfig, ... }: | 1 | { lib, pkgs, config, myconfig, ... }: |
2 | { | 2 | { |
3 | config = { | 3 | config = { |
4 | networking.firewall.allowedTCPPorts = [ 22 ]; | 4 | networking.firewall.allowedTCPPorts = [ 22 ]; |
@@ -25,7 +25,7 @@ | |||
25 | # move it in the nix store. | 25 | # move it in the nix store. |
26 | environment.etc."ssh/ldap_authorized_keys" = let | 26 | environment.etc."ssh/ldap_authorized_keys" = let |
27 | ldap_authorized_keys = | 27 | ldap_authorized_keys = |
28 | mylibs.wrap { | 28 | pkgs.mylibs.wrap { |
29 | name = "ldap_authorized_keys"; | 29 | name = "ldap_authorized_keys"; |
30 | file = ./ldap_authorized_keys.sh; | 30 | file = ./ldap_authorized_keys.sh; |
31 | paths = [ pkgs.which pkgs.gitolite pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.gnused pkgs.coreutils ]; | 31 | paths = [ pkgs.which pkgs.gitolite pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.gnused pkgs.coreutils ]; |