Merge remote-tracking branch 'upstream/master' into armando-1128-libm

Author: ramirez7

builder/comp-builder.nix

@@ -223,6 +223,14 @@ let
         "--ghc-option=-fPIC" "--gcc-option=-fPIC"
         ]
       ++ map (o: ''--ghc${lib.optionalString (stdenv.hostPlatform.isGhcjs) "js"}-options="${o}"'') ghcOptions
+      ++ lib.optional (
+        # GHC 9.2 cross compiler built with older versions of GHC seem to have problems
+        # with unique conters.  Perhaps because the name changed for the counters.
+        # TODO This work around to use `-j1` should be removed once we are able to build 9.2 with 9.2.
+        haskellLib.isCrossHost
+          && builtins.compareVersions defaults.ghc.version "9.2.1" >= 0
+          && builtins.compareVersions defaults.ghc.version "9.3" < 0)
+        "--ghc-options=-j1"
     );
 
   executableToolDepends =
@@ -236,6 +244,7 @@ let
   shellWrappers = ghcForComponent {
     componentName = fullName;
     inherit configFiles enableDWARF;
+    inherit (component) plugins;
   };
 
   # In order to let shell hooks make package-specific things like Hoogle databases
@@ -345,10 +354,14 @@ let
          frameworks # Frameworks will be needed at link time
       # Not sure why pkgconfig needs to be propagatedBuildInputs but
       # for gi-gtk-hs it seems to help.
-      ++ builtins.concatLists pkgconfig;
+      ++ builtins.concatLists pkgconfig
+      ++ lib.optionals (stdenv.hostPlatform.isWindows)
+        (lib.flatten component.libs
+        ++ map haskellLib.dependToLib component.depends);
 
-    buildInputs = component.libs
-      ++ map haskellLib.dependToLib component.depends;
+    buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows)
+      (lib.flatten component.libs
+      ++ map haskellLib.dependToLib component.depends);
 
     nativeBuildInputs =
       [shellWrappers buildPackages.removeReferencesTo]
@@ -481,22 +494,20 @@ let
         fi
       '')
       # In case `setup copy` did not create this
-      + (lib.optionalString enableSeparateDataOutput "mkdir -p $data")
+      + (lib.optionalString enableSeparateDataOutput ''
+         mkdir -p $data
+      '')
       + (lib.optionalString (stdenv.hostPlatform.isWindows && (haskellLib.mayHaveExecutable componentId)) (''
         echo "Symlink libffi and gmp .dlls ..."
         for p in ${lib.concatStringsSep " " [ libffi gmp ]}; do
           find "$p" -iname '*.dll' -exec ln -s {} $out/bin \;
         done
         ''
         # symlink all .dlls into the local directory.
-        # we ask ghc-pkg for *all* dynamic-library-dirs and then iterate over the unique set
-        # to symlink over dlls as needed.
         + ''
-        echo "Symlink library dependencies..."
-        for libdir in $(${stdenv.hostPlatform.config}-ghc-pkg field "*" dynamic-library-dirs --simple-output|xargs|sed 's/ /\n/g'|sort -u); do
-          if [ -d "$libdir" ]; then
-            find "$libdir" -iname '*.dll' -exec ln -s {} $out/bin \;
-          fi
+        for p in $pkgsHostTargetAsString; do
+          find "$p" -iname '*.dll' -exec ln -s {} $out/bin \;
+          find "$p" -iname '*.dll.a' -exec ln -s {} $out/bin \;
         done
       ''))
       + (lib.optionalString doCoverage ''

builder/ghc-for-component-wrapper.nix

@@ -13,6 +13,7 @@
 , configFiles    # The component's "config" derivation
 , postInstall ? ""
 , enableDWARF
+, plugins
 }:
 
 let
@@ -37,31 +38,70 @@ in runCommand "${componentName}-${ghc.name}-env" {
   ''
     . ${makeWrapper}/nix-support/setup-hook
 
-    # Start with a ghc...
+  ''
+  # Start with a ghc and remove all of the package directories
+  + ''
     mkdir -p $out/bin
     ${lndir}/bin/lndir -silent ${ghc} $out
-    # ... remove all of the package directories
     rm -rf ${libDir}/*/
-    # ... but retain the lib/ghc/bin directory. This contains `unlit' and friends.
+  ''
+  # ... but retain the lib/ghc/bin directory. This contains `unlit' and friends.
+  + ''
     ln -s ${ghc}/lib/${ghcCommand}-${ghc.version}/bin ${libDir}
-    # ... and the ghcjs shim's if they are available ...
+  ''
+  # ... and the ghcjs shim's if they are available ...
+  + ''
     if [ -d ${ghc}/lib/${ghcCommand}-${ghc.version}/shims ]; then
       ln -s ${ghc}/lib/${ghcCommand}-${ghc.version}/shims ${libDir}
     fi
-    # ... and node modules ...
+  ''
+  # ... and node modules ...
+  + ''
     if [ -d ${ghc}/lib/${ghcCommand}-${ghc.version}/ghcjs-node ]; then
       ln -s ${ghc}/lib/${ghcCommand}-${ghc.version}/ghcjs-node ${libDir}
     fi
-    # Replace the package database with the one from target package config.
+  ''
+  # Replace the package database with the one from target package config.
+  + ''
     ln -s ${configFiles}/${packageCfgDir} $out/${packageCfgDir}
 
-    # now the tricky bit. For GHCJS (to make plugins work), we need a special
-    # file called ghc_libdir. That points to the build ghc's lib.
-    echo "${ghc.buildGHC or ghc}/lib/${(ghc.buildGHC or ghc).name}" > "${libDir}/ghc_libdir"
+  ''
+  # Set the GHC_PLUGINS environment variable according to the plugins for the component.
+  # GHC will automatically load the relevant symbols from the given libraries and
+  # initialize them with the given arguments.
+  #
+  # GHC_PLUGINS is a `read`able [(FilePath,String,String,[String])], where the
+  # first component is a path to the shared library, the second is the package ID,
+  # the third is the module name, and the fourth is the plugin arguments.
+  + ''
+    GHC_PLUGINS="["
+    LIST_PREFIX=""
+    ${builtins.concatStringsSep "\n" (map (plugin: ''
+      id=$(${ghc}/bin/ghc-pkg --package-db ${plugin.library}/package.conf.d field ${plugin.library.package.identifier.name} id --simple-output)
+      lib_dir=$(${ghc}/bin/ghc-pkg --package-db ${plugin.library}/package.conf.d field ${plugin.library.package.identifier.name} dynamic-library-dirs --simple-output)
+      lib_base=$(${ghc}/bin/ghc-pkg --package-db ${plugin.library}/package.conf.d field ${plugin.library.package.identifier.name} hs-libraries --simple-output)
+      lib="$(echo ''${lib_dir}/lib''${lib_base}*)"
+      GHC_PLUGINS="''${GHC_PLUGINS}''${LIST_PREFIX}(\"''${lib}\",\"''${id}\",\"${plugin.moduleName}\",["
+      LIST_PREFIX=""
+      ${builtins.concatStringsSep "\n" (map (arg: ''
+        GHC_PLUGINS="''${GHC_PLUGINS}''${LIST_PREFIX}\"${arg}\""
+        LIST_PREFIX=","
+      '') plugin.args)}
+      GHC_PLUGINS="''${GHC_PLUGINS}])"
+      LIST_PREFIX=","
+    '') plugins)}
+    GHC_PLUGINS="''${GHC_PLUGINS}]"
 
-    # Wrap compiler executables with correct env variables.
-    # The NIX_ variables are used by the patched Paths_ghc module.
+  ''
+  # now the tricky bit. For GHCJS (to make plugins work), we need a special
+  # file called ghc_libdir. That points to the build ghc's lib.
+  + ''
+    echo "${ghc.buildGHC or ghc}/lib/${(ghc.buildGHC or ghc).name}" > "${libDir}/ghc_libdir"
 
+  ''
+  # Wrap compiler executables with correct env variables.
+  # The NIX_ variables are used by the patched Paths_ghc module.
+  + ''
     for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
       if [[ -x "${ghc}/bin/$prg" ]]; then
         rm -f $out/bin/$prg
@@ -70,6 +110,7 @@ in runCommand "${componentName}-${ghc.name}-env" {
           --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
           --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
           --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+          --set "GHC_PLUGINS"                  "$GHC_PLUGINS"               \
           --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
       fi
     done
@@ -82,21 +123,25 @@ in runCommand "${componentName}-${ghc.name}-env" {
           --set "NIX_${ghcCommandCaps}"        "$out/bin/${ghcCommand}"     \
           --set "NIX_${ghcCommandCaps}PKG"     "$out/bin/${ghcCommand}-pkg" \
           --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
+          --set "GHC_PLUGINS"                  "$GHC_PLUGINS"               \
           --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
       fi
     done
 
-    # Wrap haddock, if the base GHC provides it.
+  ''
+  # Wrap haddock, if the base GHC provides it.
+  + ''
     if [[ -x "${haddock}/bin/haddock" ]]; then
       rm -f $out/bin/haddock
       makeWrapper ${haddock}/bin/haddock $out/bin/haddock    \
         --add-flags '"-B$NIX_${ghcCommandCaps}_LIBDIR"'  \
         --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
     fi
 
-    # Point ghc-pkg to the package database of the component using the
-    # --global-package-db flag.
-
+  ''
+  # Point ghc-pkg to the package database of the component using the
+  # --global-package-db flag.
+  + ''
     for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do
       if [[ -x "${ghc}/bin/$prg" ]]; then
         rm -f $out/bin/$prg

builder/haddock-builder.nix

@@ -56,6 +56,7 @@ let
     componentName = fullName;
     configFiles = docsConfigFiles;
     inherit (componentDrv) enableDWARF;
+    inherit (component) plugins;
   };
 
   drv = stdenv.mkDerivation (commonAttrs // {

builder/make-config-files.nix

@@ -85,12 +85,12 @@ let
     ${target-pkg} init $out/${packageCfgDir}
 
     ${lib.concatStringsSep "\n" (lib.mapAttrsToList flagsAndConfig {
-      "extra-lib-dirs" = map (p: "${lib.getLib p}/lib") component.libs
+      "extra-lib-dirs" = map (p: "${lib.getLib p}/lib") (lib.flatten component.libs)
         # On windows also include `bin` directories that may contain DLLs
         ++ lib.optionals (stdenv.hostPlatform.isWindows)
           (map (p: "${lib.getBin p}/bin")
-               (component.libs ++ lib.concatLists component.pkgconfig));
-      "extra-include-dirs" = map (p: "${lib.getDev p}/include") component.libs;
+               (lib.flatten component.libs ++ lib.concatLists component.pkgconfig));
+      "extra-include-dirs" = map (p: "${lib.getDev p}/include") (lib.flatten component.libs);
       "extra-framework-dirs" = map (p: "${p}/Library/Frameworks") component.frameworks;
     })}
 

builder/shell-for.nix

@@ -113,6 +113,7 @@ let
       ln -s ${hoogleIndex}/bin/hoogle $out/bin
     '';
     inherit enableDWARF;
+    plugins = [];
   };
 
   hoogleIndex = let

ci.nix

@@ -41,7 +41,7 @@
       ghc902 = true;
       ghc921 = false;
       ghc922 = true;
-      ghc810420210212 = false;
+      ghc810420210212 = true;
     });
   systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (
     nixpkgs.lib.filter (v:
@@ -53,7 +53,12 @@
         # aarch64-darwin requires ghc 8.10.7 and does not work on older nixpkgs
         (v != "aarch64-darwin" || (
            !__elem compiler-nix-name ["ghc865" "ghc884" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901" "ghc921"]
-        && !__elem nixpkgsName ["R2105"]))) supportedSystems) (v: v);
+        && !__elem nixpkgsName ["R2105"]))
+      &&
+        # aarch64-linux requires ghc 8.8.4
+        (v != "aarch64-linux" || (
+           !__elem compiler-nix-name ["ghc865" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901" "ghc921"]
+        ))) supportedSystems) (v: v);
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name: system:
     # We need to use the actual nixpkgs version we're working with here, since the values
     # of 'lib.systems.examples' are not understood between all versions
@@ -63,10 +68,10 @@
        || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (system == "x86_64-linux" &&
-         nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) {
+         nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc810420210212" "ghc8107" "ghc902" "ghc922"])) {
     # Windows cross compilation is currently broken on macOS
     inherit (lib.systems.examples) mingwW64;
-  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && compiler-nix-name == "ghc8107") {
+  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922"]) {
     # Musl cross only works on linux
     # aarch64 cross only works on linux
     inherit (lib.systems.examples) musl64 aarch64-multiplatform;