Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub

Author: ocharles

build.nix

@@ -46,12 +46,9 @@ in rec {
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.6" < 0) {
       stack =
         tool compiler-nix-name "stack" {
-          cabalProjectLocal = ''
-            constraints: optparse-applicative <0.18
-          '';
           version =
             if __compareVersions haskell.compiler.${compiler-nix-name}.version "9.2" < 0
-              then "2.9.3"
+              then "2.9.3.1"
               else "2.11.1";
           inherit evalPackages;
         };

builder/comp-builder.nix

@@ -172,7 +172,7 @@ let
     ) ++ [ "$(cat $configFiles/configure-flags)"
     ] ++ commonConfigureFlags);
 
-  commonConfigureFlags = ([
+  commonConfigureFlags = [
       # GHC
       "--with-ghc=${ghc.targetPrefix}ghc"
       "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
@@ -209,7 +209,7 @@ let
       ++ lib.optional (enableLibraryProfiling || enableProfiling) "--profiling-detail=${profilingDetail}"
       ++ lib.optional stdenv.hostPlatform.isLinux (enableFeature enableDeadCodeElimination "split-sections")
       ++ lib.optionals haskellLib.isCrossHost (
-        map (arg: "--hsc2hs-option=" + arg) (["--cross-compile"] ++ lib.optionals (stdenv.hostPlatform.isWindows) ["--via-asm"])
+        map (arg: "--hsc2hs-option=" + arg) (["--cross-compile"] ++ lib.optionals stdenv.hostPlatform.isWindows ["--via-asm"])
         ++ lib.optional (package.buildType == "Configure") "--configure-option=--host=${
            # Older ghcjs patched config.sub to support "js-unknown-ghcjs" (not "javascript-unknown-ghcjs")
            if stdenv.hostPlatform.isGhcjs && builtins.compareVersions defaults.ghc.version "9" < 0
@@ -223,23 +223,22 @@ let
       ++ lib.optionals useLLVM [
         "--ghc-option=-fPIC" "--gcc-option=-fPIC"
         ]
-      ++ map (o: ''--ghc${lib.optionalString (stdenv.hostPlatform.isGhcjs) "js"}-options="${o}"'') ghcOptions
+      ++ 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"
-    );
+        "--ghc-options=-j1";
 
   # the build-tools version might be depending on the version of the package, similarly to patches
   executableToolDepends =
     (lib.concatMap (c: if c.isHaskell or false
       then builtins.attrValues (c.components.exes or {})
       else [c])
-      (builtins.filter (x: !(isNull x)
+      (builtins.filter (x: x != null
         # We always exclude hsc2hs from build-tools because it is unecessary as it is provided by ghc
         # and hsc2hs from ghc is first in PATH so the one from build-tools is never used.
         && x.identifier.name or "" != "hsc2hs")
@@ -348,7 +347,11 @@ let
     inherit dontPatchELF dontStrip;
 
     passthru = {
-      inherit (package) identifier;
+      identifier = package.identifier // {
+        component-id = "${package.identifier.name}:${componentId.ctype}:${componentId.cname}";
+        component-name = componentId.cname;
+        component-type = componentId.ctype;
+      };
       config = component;
       srcSubDir = cleanSrc.subDir;
       srcSubDirPath = cleanSrc.root + cleanSrc.subDir;
@@ -394,7 +397,7 @@ let
       # These only need to be propagated for library components (otherwise they
       # will be in `buildInputs`)
       ++ lib.optionals (haskellLib.isLibrary componentId) configFiles.libDeps # libDeps is already deduplicated
-      ++ lib.optionals (stdenv.hostPlatform.isWindows)
+      ++ lib.optionals stdenv.hostPlatform.isWindows
         (haskellLib.uniqueWithName (lib.flatten component.libs)));
 
     buildInputs = haskellLib.checkUnique "${ghc.targetPrefix}${fullName} buildInputs" (
@@ -415,7 +418,7 @@ let
 
     prePatch =
       # emcc is very slow if it cannot cache stuff in $HOME
-      (lib.optionalString (stdenv.hostPlatform.isGhcjs) ''
+      (lib.optionalString stdenv.hostPlatform.isGhcjs ''
       export HOME=$(mktemp -d)
       '') +
       (lib.optionalString (!canCleanSource) ''

flake.lock

@@ -13,7 +13,7 @@
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
     flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; };
     "hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
-    "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.0"; flake = false; };
+    "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; };
     hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";
@@ -73,7 +73,7 @@
       traceNames = prefix: builtins.mapAttrs (n: v:
         if builtins.isAttrs v
           then if v ? type && v.type == "derivation"
-            then __trace (prefix + n) v
+            then builtins.trace (prefix + n) v
             else traceNames (prefix + n + ".") v
           else v);
 
@@ -103,7 +103,7 @@
             # flake outputs so that we can incorporate the args passed
             # to the compat layer (e.g. sourcesOverride).
             overlays = [ allOverlays.combined ]
-              ++ (if checkMaterialization == true then
+              ++ (if checkMaterialization then
                 [
                   (final: prev: {
                     haskell-nix = prev.haskell-nix // {
@@ -161,7 +161,7 @@
       # Exposed so that buildkite can check that `allow-import-from-derivation=false` works for core of haskell.nix
       roots = legacyPackagesUnstable.haskell-nix.roots compiler;
 
-      packages = ((self.internal.compat { inherit system; }).hix).apps;
+      packages = (self.internal.compat { inherit system; }).hix.apps;
 
       allJobs =
         let
@@ -180,15 +180,14 @@
                 let nixpkgsJobs = allJobs.${nixpkgsVer};
                 in lib.concatMap (compiler-nix-name:
                   let ghcJobs = nixpkgsJobs.${compiler-nix-name};
-                  in (
-                    builtins.map (crossPlatform: {
+                  in builtins.map (crossPlatform: {
                       name = "required-${nixpkgsVer}-${compiler-nix-name}-${crossPlatform}";
                       value = legacyPackages.releaseTools.aggregate {
                         name = "haskell.nix-${nixpkgsVer}-${compiler-nix-name}-${crossPlatform}";
                         meta.description = "All ${nixpkgsVer} ${compiler-nix-name} ${crossPlatform} jobs";
-                        constituents = lib.collect (d: lib.isDerivation d) ghcJobs.${crossPlatform};
+                        constituents = lib.collect lib.isDerivation ghcJobs.${crossPlatform};
                       };
-                   }) (names ghcJobs))
+                   }) (names ghcJobs)
                 ) (names nixpkgsJobs)
               ) (names allJobs));
 

flake.nix

@@ -90,7 +90,7 @@ let
             echo "Updating $FLAKE/flake.nix and deleting old $FLAKE/flake.lock"
             rm $FLAKE/flake.lock
           else
-            echo "Updating $FLAKE/flake.nix" 
+            echo "Updating $FLAKE/flake.nix"
           fi
           cp $HIX_FLAKE $FLAKE/flake.nix
           chmod +w $FLAKE/flake.nix

hix/default.nix

@@ -30,11 +30,8 @@ let
             then []
             else [{ inherit name; value = commandArgs.${name}; }]
     ) (builtins.attrNames commandArgs));
-  defaultArgs = {
-    nixpkgsPin = "nixpkgs-unstable";
-  };
   importDefaults = src:
-    if src == null || !(__pathExists src)
+    if src == null || !(builtins.pathExists src)
       then {}
       else import src;
   userDefaults = importDefaults (commandArgs.userDefaults or null);
@@ -64,7 +61,7 @@ let
             commandArgs'
             ({config, ...}: {
               src =
-                if __pathExists (toString (src.origSrcSubDir or src) + "/.git")
+                if builtins.pathExists (toString (src.origSrcSubDir or src) + "/.git")
                   then config.evalPackages.haskell-nix.haskellLib.cleanGit {
                     inherit src name;
                   }
@@ -73,5 +70,5 @@ let
           ];
       })
     ];
-  }).config) project shell;
+  }).config) project;
 in project

hix/project/default.nix

@@ -1,14 +1,4 @@
 { pkgs, runCommand, cacert, index-state-hashes, haskellLib }@defaults:
-let readIfExists = src: fileName:
-      # Using origSrcSubDir bypasses any cleanSourceWith.
-      # `lookForCabalProject` allows us to avoid looking in source from hackage
-      # for cabal.project files.  It is set in `modules/hackage-project.nix`.
-      let origSrcDir = src.origSrcSubDir or src;
-      in
-        if (src.lookForCabalProject or true) && builtins.elem ((__readDir origSrcDir)."${fileName}" or "") ["regular" "symlink"]
-          then __readFile (origSrcDir + "/${fileName}")
-          else null;
-in
 { name          ? src.name or null # optional name for better error messages
 , src
 , materialized-dir ? ../materialized
@@ -19,9 +9,9 @@ in
 , materialized  ? null # Location of a materialized copy of the nix files
 , checkMaterialization ? null # If true the nix files will be generated used to check plan-sha256 and material
 , cabalProjectFileName ? "cabal.project"
-, cabalProject         ? readIfExists src cabalProjectFileName
-, cabalProjectLocal    ? readIfExists src "${cabalProjectFileName}.local"
-, cabalProjectFreeze   ? readIfExists src "${cabalProjectFileName}.freeze"
+, cabalProject         ? null
+, cabalProjectLocal    ? null
+, cabalProjectFreeze   ? null
 , caller               ? "callCabalProjectToNix" # Name of the calling function for better warning messages
 , compilerSelection    ? p: p.haskell-nix.compiler
 , ghc           ? null # Deprecated in favour of `compiler-nix-name`