regroupement des options éparses en configurationOptions et renommage

2017-05-31 00:23:10 +02:00
parent c43adc80cb
commit ac91ce4492
74 changed files with 91 additions and 89 deletions
--- a/services/default.nix
+++ b/services/default.nix
@@ -4,7 +4,7 @@ let
  #inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 {
--- a/services/docker.nix
+++ b/services/docker.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.docker {
--- a/services/elasticsearch.nix
+++ b/services/elasticsearch.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.elasticsearch {
--- a/services/haveged.nix
+++ b/services/haveged.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf true {
--- a/services/hoogle.nix
+++ b/services/hoogle.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.developpement-haskell {
--- a/services/hydra-build.nix
+++ b/services/hydra-build.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 # TODO: ménage
 mkIf flags.hydra-builder {
--- a/services/hydra-core.nix
+++ b/services/hydra-core.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;


  #### https://github.com/NixOS/hydra/issues/413
--- a/services/kibana.nix
+++ b/services/kibana.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.kibana {
--- a/services/locate.nix
+++ b/services/locate.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.locate {
--- a/services/monitoring-munin.nix
+++ b/services/monitoring-munin.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 # TODO: changer adresse mail
--- a/services/print.nix
+++ b/services/print.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.print {
--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.pulseaudio {
--- a/services/scanner.nix
+++ b/services/scanner.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.scanner {
--- a/services/ssh.nix
+++ b/services/ssh.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf true {
--- a/services/virtualbox.nix
+++ b/services/virtualbox.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.virtualbox {
--- a/services/x11.nix
+++ b/services/x11.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 /**
--- a/services/xmonad/xmonad.nix
+++ b/services/xmonad/xmonad.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf flags.xmonad {
--- a/services/yubikey.nix
+++ b/services/yubikey.nix
@@ -4,7 +4,7 @@ let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 mkIf true {