NixOS · Jul 8, 2019 · Jul 8, 2019 · Jul 22, 2019 · Jul 22, 2019 · Jul 22, 2019
diff --git a/README.md b/README.md
@@ -16,25 +16,37 @@ machines in a network or cloud.
 To start developing on nixops, you can run:
 
 ```bash
-  $ ./dev-shell
+  $ ./dev-shell --arg p "(p: [ p.plugin1 ])"
 ```
 
+Where plugin1 can be any available nixops plugin, and where
+none or more than one can be specified, including local plugins.  An example is:
+
+
+```bash
+  $ ./dev-shell --arg p "(p: [ p.aws p.packet (p.callPackage ../myplugin/release.nix {})])"
+```
+
+To update the available nixops plugins, edit the
+all-plugins.txt file with any new plugin repos and
+then execute the update-all script.  This will refresh
+the data.nix file.
+
 ## Building from source
 
-The command to build NixOps depends on your platform:
+The command to build NixOps depends on your platform and which plugins you choose:
 
-- `nix-build release.nix -A build.x86_64-linux` on 64 bit linux.
-- `nix-build release.nix -A build.i686-linux` on 32 bit linux.
-- `nix-build release.nix -A build.x86_64-darwin` on OSX.
+- `nix-build release.nix -A build.x86_64-linux --arg p "(p: [ p.plugin1 ])"` on 64 bit linux.
+- `nix-build release.nix -A build.i686-linux --arg p "(p: [ p.plugin1 ])"` on 32 bit linux.
+- `nix-build release.nix -A build.x86_64-darwin --arg p "(p: [ p.plugin1 ])"` on OSX.
 
-Similarly, using NixOps from another project (for instance a
-nix-shell) can be done using:
+Similarly, using NixOps from another project (for instance a nix-shell) can be done using:
 
 ```nix
 stdenv.mkDerivation {
   name = "my-nixops-env";
   buildInputs = [
-    (import /path/to/nixops/release.nix {}).build.x86_64-linux
+    (import /path/to/nixops/release.nix { p = (p: [ p.plugin1 ]); }).build.x86_64-linux
   ];
 }
 ```
diff --git a/all-plugins.txt b/all-plugins.txt
@@ -0,0 +1,16 @@
+# lines starting with a # are comments
+
+# The accepted format (double escape all grep expresssions):
+#  <organisation>         [grep-expression] [grep-v-expression]  - include all repositories in the organisation.
+#                                                                   grep-expression:   filter repo matching the expression
+#                                                                   grep-v-expression: filter repo not matching the expression
+#  <organisation>/<repo>                                         - include only the named repository.
+
+# include all nixos providers
+# nixos nixops-\\(aws\\|packet\\)
+
+# include nixops-aws
+nixos/nixops-aws
+
+# include nixops-hetzner
+nixos/nixops-hetzner
diff --git a/data.nix b/data.nix
@@ -0,0 +1,17 @@
+# Generated with ./update-all
+{
+  aws =
+    {
+      owner   = "nixos";
+      repo    = "nixops-aws";
+      version = "1.0.0";
+      sha256  = "1if6spscsgd6ckivgvbqza5fvvn5hbafi1n8q0fw98s3xpz2hjfm";
+    };
+  hetzner =
+    {
+      owner   = "nixos";
+      repo    = "nixops-hetzner";
+      version = "1.0.0";
+      sha256  = "0cxfjpk2daczv3m7q5bsgfvd30qgmm1y7dnvz6nd7s7l7l0gsvas";
+    };
+}
diff --git a/doc/manual/default.nix b/doc/manual/default.nix
@@ -13,16 +13,20 @@ let
   options = pkgs.lib.filter (opt: opt.visible && !opt.internal)
     (pkgs.lib.optionAttrSetToDocList systemModule.options);
 
-  optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
-    (builtins.toXML options));
+  backwardsCompat = { options }: let
+    optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext
+      (builtins.toXML options));
+  in {
+    optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
+      ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
+        --stringparam revision '${revision}' \
+        --stringparam program 'nixops' \
+        -o intermediate.xml ${nixpkgs + "/nixos/doc/manual/options-to-docbook.xsl"} ${optionsXML}
+      ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
+        -o $out ${nixpkgs + "/nixos/doc/manual/postprocess-option-descriptions.xsl"} intermediate.xml
+  ''; };
 
-  optionsDocBook = pkgs.runCommand "options-db.xml" {} ''
-    ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
-      --stringparam revision '${revision}' \
-      --stringparam program 'nixops' \
-      -o intermediate.xml ${nixpkgs + /nixos/doc/manual/options-to-docbook.xsl} ${optionsXML}
-    ${pkgs.libxslt.bin or pkgs.libxslt}/bin/xsltproc \
-      -o $out ${nixpkgs + /nixos/doc/manual/postprocess-option-descriptions.xsl} intermediate.xml
-  '';
 
-in optionsDocBook
+in (pkgs.nixosOptionsDoc or backwardsCompat) {
+  inherit options;
+}