summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Sagnes <eric.sagnes@gmail.com>2016-04-12 19:46:12 +0900
committerEric Sagnes <eric.sagnes@gmail.com>2016-04-12 19:50:26 +0900
commite6ae05dd8ac9e42b1394701b65452e1e9cef6529 (patch)
tree5ec6ac166f5a68c2523ee6818058a281fc81b3ca
parentde78fe8f2d78a5ef20d0d355c5dbe9d21b4be22c (diff)
downloadnixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.tar
nixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.tar.gz
nixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.tar.bz2
nixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.tar.lz
nixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.tar.xz
nixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.tar.zst
nixlib-e6ae05dd8ac9e42b1394701b65452e1e9cef6529.zip
input-method module: fix folder case
-rw-r--r--nixos/doc/manual/default.nix2
-rw-r--r--nixos/doc/manual/release-notes/rl-1603.xml10
-rw-r--r--nixos/modules/i18n/input-method/default.nix (renamed from nixos/modules/i18n/inputMethod/default.nix)0
-rw-r--r--nixos/modules/i18n/input-method/default.xml (renamed from nixos/modules/i18n/inputMethod/default.xml)0
-rw-r--r--nixos/modules/i18n/input-method/fcitx.nix (renamed from nixos/modules/i18n/inputMethod/fcitx.nix)0
-rw-r--r--nixos/modules/i18n/input-method/ibus.nix (renamed from nixos/modules/i18n/inputMethod/ibus.nix)0
-rw-r--r--nixos/modules/i18n/input-method/nabi.nix (renamed from nixos/modules/i18n/inputMethod/nabi.nix)0
-rw-r--r--nixos/modules/i18n/input-method/uim.nix (renamed from nixos/modules/i18n/inputMethod/uim.nix)0
-rw-r--r--nixos/modules/module-list.nix10
-rw-r--r--nixos/modules/rename.nix2
10 files changed, 12 insertions, 12 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 89a95f3b3564..7d26dd73a2b7 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -58,7 +58,7 @@ let
       cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
       cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml
       cp ${../../modules/security/acme.xml} configuration/acme.xml
-      cp ${../../modules/i18n/inputMethod/default.xml} configuration/input-methods.xml
+      cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml
       ln -s ${optionsDocBook} options-db.xml
       echo "${version}" > version
     '';
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 1528c8a72463..620c3e362a65 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -63,11 +63,11 @@ has the following highlights:</para>
   <itemizedlist>
     <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
     <listitem><para><literal>hardware/video/webcam/facetimehd.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/inputMethod/fcitx.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/inputMethod/ibus.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/inputMethod/nabi.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/inputMethod/uim.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/input-method/default.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/input-method/fcitx.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/input-method/ibus.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/input-method/nabi.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/input-method/uim.nix</literal></para></listitem>
     <listitem><para><literal>programs/fish.nix</literal></para></listitem>
     <listitem><para><literal>security/acme.nix</literal></para></listitem>
     <listitem><para><literal>security/audit.nix</literal></para></listitem>
diff --git a/nixos/modules/i18n/inputMethod/default.nix b/nixos/modules/i18n/input-method/default.nix
index 7e6a25bfb084..7e6a25bfb084 100644
--- a/nixos/modules/i18n/inputMethod/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
diff --git a/nixos/modules/i18n/inputMethod/default.xml b/nixos/modules/i18n/input-method/default.xml
index c55ac1ec2456..c55ac1ec2456 100644
--- a/nixos/modules/i18n/inputMethod/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix
index 8e31743504f1..8e31743504f1 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/input-method/fcitx.nix
diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index bb80f43634d3..bb80f43634d3 100644
--- a/nixos/modules/i18n/inputMethod/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/input-method/nabi.nix
index c6708365effa..c6708365effa 100644
--- a/nixos/modules/i18n/inputMethod/nabi.nix
+++ b/nixos/modules/i18n/input-method/nabi.nix
diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/input-method/uim.nix
index f8a3e560656d..f8a3e560656d 100644
--- a/nixos/modules/i18n/inputMethod/uim.nix
+++ b/nixos/modules/i18n/input-method/uim.nix
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 65f0ea9b65dd..a23e787bd08e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -41,11 +41,11 @@
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
   ./hardware/video/webcam/facetimehd.nix
-  ./i18n/inputMethod/default.nix
-  ./i18n/inputMethod/fcitx.nix
-  ./i18n/inputMethod/ibus.nix
-  ./i18n/inputMethod/nabi.nix
-  ./i18n/inputMethod/uim.nix
+  ./i18n/input-method/default.nix
+  ./i18n/input-method/fcitx.nix
+  ./i18n/input-method/ibus.nix
+  ./i18n/input-method/nabi.nix
+  ./i18n/input-method/uim.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 84eccfd51292..aaec13d6bea5 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -63,7 +63,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
 
     # ibus
-    (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])
+    (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "input-method" "ibus" "engines" ])
 
     # proxy
     (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ])