aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/webapps/webstats/default.nix2
-rw-r--r--nixops/eldiron.nix3
-rw-r--r--nixops/modules/buildbot/default.nix2
-rw-r--r--nixops/modules/gitolite/default.nix4
-rw-r--r--nixops/modules/ssh/default.nix4
5 files changed, 7 insertions, 8 deletions
diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index 3650e1e..924d72d 100644
--- a/modules/webapps/webstats/default.nix
+++ b/modules/webapps/webstats/default.nix
@@ -1,4 +1,4 @@
1{ lib, pkgs, config, mylibs, ... }: 1{ lib, pkgs, config, ... }:
2let 2let
3 name = "goaccess"; 3 name = "goaccess";
4 cfg = config.services.webstats; 4 cfg = config.services.webstats;
diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 59ff85a..69231d1 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -5,13 +5,12 @@
5 enableRollback = true; 5 enableRollback = true;
6 }; 6 };
7 7
8 eldiron = { config, pkgs, mylibs, myconfig, ... }: 8 eldiron = { config, pkgs, myconfig, ... }:
9 { 9 {
10 nixpkgs.overlays = builtins.attrValues (import ../overlays); 10 nixpkgs.overlays = builtins.attrValues (import ../overlays);
11 _module.args = { 11 _module.args = {
12 pkgsNext = import <nixpkgsNext> {}; 12 pkgsNext = import <nixpkgsNext> {};
13 pkgsPrevious = import <nixpkgsPrevious> {}; 13 pkgsPrevious = import <nixpkgsPrevious> {};
14 mylibs = import ../libs.nix { inherit pkgs; };
15 myconfig = { 14 myconfig = {
16 inherit privateFiles; 15 inherit privateFiles;
17 env = import "${privateFiles}/environment.nix"; 16 env = import "${privateFiles}/environment.nix";
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, ... }:
2let 2let
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, ... }:
2let 2let
3 cfg = config.services.myGitolite; 3 cfg = config.services.myGitolite;
4in { 4in {
@@ -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 ];