Standardize flake naming conventions (#1698)

Author: jaroeichler

flake.lock

@@ -4,7 +4,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    flake-utils.url = "github:numtide/flake-utils";
     git-hooks = {
       url = "github:cachix/git-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -20,7 +19,6 @@
       # TODO(SchahinRohani): Use a specific commit hash until nix2container is stable.
       url = "github:nlewo/nix2container/cc96df7c3747c61c584d757cfc083922b4f4b33e";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
   };
 
@@ -46,6 +44,18 @@
         ./tools/nixos/flake-module.nix
         ./flake-module.nix
       ];
+      flake = {
+        flakeModules = {
+          default = ./flake-module.nix;
+          darwin = ./tools/darwin/flake-module.nix;
+          lre = ./local-remote-execution/flake-module.nix;
+          nixos = ./tools/nixos/flake-module.nix;
+        };
+        overlays = {
+          lre = import ./local-remote-execution/overlays/default.nix {inherit nix2container;};
+          tools = import ./tools/public/default.nix {inherit nix2container;};
+        };
+      };
       perSystem = {
         config,
         pkgs,
@@ -363,7 +373,7 @@
             nightly-rust = pkgs.rust-bin.nightly.${pkgs.lre.nightly-rust.meta.version};
           };
         };
-        local-remote-execution.settings = {
+        lre.settings = {
           Env = with pkgs.lre;
             if pkgs.stdenv.isDarwin
             then lre-rs.meta.Env # C++ doesn't support Darwin yet.
@@ -373,18 +383,16 @@
             then "macos"
             else "linux";
         };
-        nixos.settings = {
-          path = with pkgs; [
-            "/run/current-system/sw/bin"
-            "${binutils.bintools}/bin"
-            "${uutils-coreutils-noprefix}/bin"
-            "${pkgs.lre.clang}/bin"
-            "${git}/bin"
-            "${python3}/bin"
-          ];
-        };
+        nixos.settings.path = with pkgs; [
+          "/run/current-system/sw/bin"
+          "${binutils.bintools}/bin"
+          "${uutils-coreutils-noprefix}/bin"
+          "${pkgs.lre.clang}/bin"
+          "${git}/bin"
+          "${python3}/bin"
+        ];
         devShells.default = pkgs.mkShell {
-          nativeBuildInputs = let
+          packages = let
             bazel = pkgs.writeShellScriptBin "bazel" ''
               unset TMPDIR TMP
               exec ${pkgs.bazelisk}/bin/bazelisk "$@"
@@ -456,7 +464,7 @@
 
               # Generate lre.bazelrc which configures LRE toolchains when
               # running in the nix environment.
-              ${config.local-remote-execution.installationScript}
+              ${config.lre.installationScript}
 
               # Generate nativelink.bazelrc which gives Bazel invocations access
               # to NativeLink's read-only cache.
@@ -492,17 +500,5 @@
             '';
         };
       };
-    }
-    // {
-      flakeModule = {
-        default = ./flake-module.nix;
-        darwin = ./tools/darwin/flake-module.nix;
-        local-remote-execution = ./local-remote-execution/flake-module.nix;
-        nixos = ./tools/nixos/flake-module.nix;
-      };
-      overlays = {
-        lre = import ./local-remote-execution/overlays/default.nix {inherit nix2container;};
-        tools = import ./tools/public/default.nix {inherit nix2container;};
-      };
     };
 }

flake.nix

@@ -69,7 +69,7 @@ devShells.default = pkgs.mkShell {
   shellHook = ''
     # Generate lre.bazelrc which configures LRE toolchains when running
     # in the nix environment.
-    ${config.local-remote-execution.installationScript}
+    ${config.lre.installationScript}
   '';
 }
 ```
@@ -101,12 +101,12 @@ build --extra_toolchains=@local-remote-execution//generated-cc/config:cc-toolcha
 
 In the snippet above you can see a warning that no local toolchain is
 configured. LRE needs to know the remote toolchain configuration to make it
-available locally. The `local-remote-execution` settings take an `Env` input and
+available locally. The `lre` settings take an `Env` input and
 an optional `prefix` input to configure the generated `lre.bazelrc`:
 
 ```nix
 # This is a top-level field, next to `packages` and `apps`, and `devShells`
-local-remote-execution.settings = {
+lre.settings = {
   # In this example we import the lre-cc environment from nativelink and make it
   # available locally.
   inherit (lre-cc.meta) Env;
@@ -270,7 +270,7 @@ invoke a build against the cluster:
 CACHE=$(kubectl get gtw cache -o=jsonpath='{.status.addresses[0].value}')
 SCHEDULER=$(kubectl get gtw scheduler -o=jsonpath='{.status.addresses[0].value}')
 
-# Note: If you omit setting a `prefix` the `local-remote-execution.settings` you
+# Note: If you omit setting a `prefix` the `lre.settings` you
 #       can omit `--config=lre` here as LRE will be enabled by default.
 bazel build \
     --config=lre \
@@ -300,7 +300,7 @@ bazel clean
 
 CACHE=$(kubectl get gtw cache -o=jsonpath='{.status.addresses[0].value}')
 
-# Note: If you omit setting a `prefix` the `local-remote-execution.settings` you
+# Note: If you omit setting a `prefix` the `lre.settings` you
 #       can omit `--config=lre` here as LRE will be enabled by default.
 bazel build \
     --config=lre \

local-remote-execution/README.md

@@ -11,10 +11,10 @@
         pkgs,
         ...
       }: let
-        cfg = config.local-remote-execution;
+        cfg = config.lre;
       in {
         options = {
-          local-remote-execution = {
+          lre = {
             pkgs = lib.mkOption {
               type = lib.types.uniq (lib.types.lazyAttrsOf (lib.types.raw or lib.types.unspecified));
               description = lib.mdDoc ''

local-remote-execution/flake-module.nix

@@ -41,7 +41,7 @@
   # devShells.default = pkgs.mkShell {
   #   shellHook = ''
   #   # Generate the `lre.bazelrc` config file.
-  #   ${config.local-remote-execution.installationScript}
+  #   ${config.lre.installationScript}
   #   '';
   # };
   # ```
@@ -103,7 +103,7 @@
     then ["#" "# WARNING: No environment set. LRE will not work locally."]
     else ["#"] ++ (map (x: "# " + x) (lib.lists.unique config.Env));
 
-  # If the `local-remote-execution.settings.prefix` is set to a nonempty string,
+  # If the `lre.settings.prefix` is set to a nonempty string,
   # prefix the Bazel build commands with that string. This will disable LRE
   # by default and require adding `--config=<prefix>` to Bazel invocations.
   maybePrefixedConfig =