Merge remote-tracking branch 'origin/master' into hkm/combined-derivations

Author: hamishmack

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;
@@ -90,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);
 
@@ -104,14 +116,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 +157,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 [];

flake.lock

@@ -121,6 +121,7 @@ in
      ole32 = null; rpcrt4 = null;
      winmm = null; userenv = null;
      kernel32 = null; ws2_32 = null;
+     opengl32 = null; glu32 = null;
      # this should be bundled with gcc.
      # if it's not we have more severe
      # issues anyway.

lib/system-nixpkgs-map.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 = {};
+    };
   };
 }

modules/shell.nix

@@ -0,0 +1,10 @@
+allow-import-from-derivation = true
+allowed-users = *
+builders-use-substitutes = true
+experimental-features = nix-command flakes
+keep-derivations = true
+keep-outputs = true
+max-jobs = auto
+substituters = https://cache.iog.io https://cache.nixos.org https://cache.ngi0.nixos.org/ https://cache.nixos.org/
+system-features = nixos-test benchmark big-parallel kvm
+trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo=

test/nix.conf

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p bash jq nix gnused
+#! nix-shell -i "bash -x" -p bash jq nix gnused
 
 set -euo pipefail
 
@@ -10,7 +10,7 @@ NIX_BUILD_ARGS="${NIX_BUILD_ARGS:-}"
 cd $(dirname $0)
 
 if [ "$#" != "1" ]; then
-  echo "Please pass a compiler-nix-name to use.  For example: ./test/test.sh ghc884"
+  echo "Please pass a compiler-nix-name to use.  For example: ./test/tests.sh ghc884"
   exit 1
 fi
 
@@ -20,6 +20,17 @@ printf "*** Cleaning package build directories..." >& 2
 rm -rvf */cabal.project.local */.ghc.environment* */dist */dist-newstyle */.stack-work
 echo >& 2
 
+# This was needed is first place to make hix template / flake devShell examples
+# not require interactive user confirmation. Because the IOG nix cache settings
+# are defined in the `nixConfig` flake attribute.
+if [ ! -z ${CI+x} ]; then
+  printf "*** Set custom nix.conf for CI ..." >& 2
+  export XDG_CONFIG_HOME=$HOME/.config
+  mkdir -p $XDG_CONFIG_HOME/nix
+  cp ./nix.conf $XDG_CONFIG_HOME/nix
+  echo >& 2
+fi
+
 printf "*** Running the nix-build tests...\n" >& 2
 nix build $NIX_BUILD_ARGS \
    -I . -I .. \