Merge branch 'avieth/shell-inputs' of https://github.com/avieth/haskell.nix

Author: shlevy

builder/shell-for.nix

@@ -92,8 +92,18 @@ let
   # We need to remove any inputs which are selected components (see above).
   # `buildInputs`, `propagatedBuildInputs`, and `executableToolDepends` contain component
   # derivations, not packages, so we use `removeSelectedInputs`).
-  systemInputs = removeSelectedInputs (lib.concatMap
-    (c: c.buildInputs ++ c.propagatedBuildInputs) selectedComponents);
+  #
+  # Also, we take care to keep duplicates out of the list, otherwise we may see
+  # "Argument list too long" errors from bash when entering a shell.
+  #
+  # Version of `lib.unique` that should be fast if the name attributes are unique
+  uniqueWithName = list:
+    lib.concatMap lib.unique (
+      builtins.attrValues (
+        builtins.groupBy (x: if __typeOf x == "set" then x.name or "noname" else "notset") list));
+  allSystemInputs = lib.concatMap (c: c.buildInputs ++ c.propagatedBuildInputs) selectedComponents;
+  systemInputs = removeSelectedInputs (uniqueWithName allSystemInputs);
+
   nativeBuildInputs = removeSelectedInputs
     (lib.concatMap (c: c.executableToolDepends) selectedComponents);