Fix #1587: the option shell.buildInputs does not exist ... (#1598)

Author: yvan-sraka

Diff for: builder/shell-for.nix

@@ -78,10 +78,12 @@ let
     ++ lib.optionals packageSetupDeps (map (p: p.setup.config)
          (lib.filter (p: p.buildType != "Simple") selectedPackages));
 
-  name = if lib.length selectedPackages == 1
+  identifierName = if lib.length selectedPackages == 1
     then "ghc-shell-for-${(lib.head selectedPackages).identifier.name}"
     else "ghc-shell-for-packages";
 
+  name = if (mkDrvArgs.name or null) == null then identifierName else mkDrvArgs.name;
+
   # We need to remove any dependencies which would bring in selected components (see above).
   packageInputs = removeSelectedInputs (lib.concatMap (cfg: cfg.depends) selectedConfigs)
     ++ additionalPackages;
@@ -104,14 +106,14 @@ let
     doExactConfig = false;
   };
   configFiles = makeConfigFiles {
-    fullName = args.name or name;
-    identifier.name = name;
+    fullName = name;
+    identifier.name = identifierName;
     inherit component enableDWARF;
     chooseDrv = p: if withHaddock && p ? haddock then p.haddock else p;
   };
   ghcEnv = ghcForComponent {
     inherit configFiles;
-    componentName = name;
+    componentName = identifierName;
     postInstall = lib.optionalString withHoogle' ''
       ln -s ${hoogleIndex}/bin/hoogle $out/bin
     '';
@@ -145,7 +147,7 @@ let
   mkDrvArgs = builtins.removeAttrs args ["packages" "components" "additional" "withHoogle" "tools"];
 in
   mkShell (mkDrvArgs // {
-    name = mkDrvArgs.name or name;
+    inherit name;
 
     buildInputs = systemInputs
       ++ mkDrvArgs.buildInputs or [];

Diff for: modules/shell.nix

@@ -1,6 +1,10 @@
 { projectConfig }:
 { lib, config, pkgs, haskellLib, ... }: {
   options = {
+    name = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+    };
     packages = lib.mkOption {
       type = lib.types.unspecified;
       default = ps: builtins.attrValues (haskellLib.selectLocalPackages ps);
@@ -41,5 +45,29 @@
       type = lib.types.unspecified;
       default = projectConfig.crossPlatforms;
     };
+
+    # mkShell args
+    inputsFrom = lib.mkOption {
+      type = lib.types.listOf lib.types.unspecified;
+      default = [];
+    };
+    shellHook = lib.mkOption {
+      type = lib.types.str;
+      default = "";
+    };
+
+    # mkDerivation args
+    buildInputs = lib.mkOption {
+      type = lib.types.listOf lib.types.unspecified;
+      default = [];
+    };
+    nativeBuildInputs = lib.mkOption {
+      type = lib.types.listOf lib.types.unspecified;
+      default = [];
+    };
+    passthru = lib.mkOption {
+      type = lib.types.attrsOf lib.types.unspecified;
+      default = {};
+    };
   };
 }