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

Author: ocharles

changelog.md

@@ -1,6 +1,28 @@
 This file contains a summary of changes to Haskell.nix and `nix-tools`
 that will impact users.
 
+## Mar 27, 2023
+
+Haskell.nix will no longer parse the `cabal.project` file to
+determine the `index-state`. This decision was made due to
+the function's inability to handle more than one `index-state`
+or a qualified `index-state` as the first `index-state`
+field in the file.
+
+As a result, there will be some drawbacks:
+
+* There will no longer be a warning in the trace output
+  if an index state is not found.
+
+* Even if the `index-state:` in the `cabal.project` has not changed,
+  the plan will be recomputed when hackage.nix is bumped. However, this
+  is not expected to be a problem since plan recomputations are typically
+  quick.
+
+* `project.index-state` cannot be used to obtain the found `index-state`.
+  However, the parse function is still available if required
+  (haskell-nix.haskellLib.parseIndexState).  
+
 ## Jul 27, 2022
 * Removed reliance on `builtins.currentSystem`.  It was used it to provide
   `pkgs.evalPackages` via an overlay that it used to run derivations

ci.nix

@@ -65,8 +65,11 @@
     # of 'lib.systems.examples' are not understood between all versions
     let lib = nixpkgs.lib;
     in lib.optionalAttrs (nixpkgsName == "unstable"
-      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107" "ghc961"])
-       || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961"]))) {
+      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc961"])
+       || (system == "aarch64-linux" && __elem compiler-nix-name ["ghc8107" "ghc961"])
+       || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961"])
+       || (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961"])
+       )) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (nixpkgsName == "unstable"
       && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc944" "ghc961"])

compiler/ghc/default.nix

@@ -684,6 +684,10 @@ stdenv.mkDerivation (rec {
     ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:terminfo
   '' + lib.optionalString (installStage1 && !haskell-nix.haskellLib.isCrossTarget) ''
     ${hadrian}/bin/hadrian ${hadrianArgs} stage2:exe:iserv
+    # I don't seem to be able to build _build/stage1/lib/bin/ghc-iserv-prof
+    # by asking hadrian for this. The issue is likely that the profiling way
+    # is probably missing from hadrian m(
+    ${hadrian}/bin/hadrian ${hadrianArgs} _build/stage1/lib/bin/ghc-iserv-prof
     pushd _build/stage1/bin
     for exe in *; do
       mv $exe ${targetPrefix}$exe

flake.lock

@@ -19,7 +19,8 @@
             hixProject =
               final.haskell-nix.hix.project {
                 src = ./.;
-                evalSystem = "EVAL_SYSTEM";
+                # uncomment with your current system for `nix flake show` to work:
+                #evalSystem = "EVAL_SYSTEM";
               };
           })
         ];

hix/init/flake.nix

@@ -151,46 +151,29 @@ in let
     }
   '';
 
-  cabalProjectIndexState = pkgs.haskell-nix.haskellLib.parseIndexState rawCabalProject;
-
-  index-state-found =
+  index-state-max =
     if index-state != null
     then index-state
-    else if cabalProjectIndexState != null
-    then cabalProjectIndexState
-    else
-      let latest-index-state = pkgs.lib.last (builtins.attrNames index-state-hashes);
-      in builtins.trace ("No index state specified" + (if name == null then "" else " for " + name) + ", using the latest index state that we know about (${latest-index-state})!") latest-index-state;
-
-  index-state-pinned = index-state != null || cabalProjectIndexState != null;
+    else pkgs.lib.last (builtins.attrNames index-state-hashes);
 
   pkgconfPkgs = import ./pkgconf-nixpkgs-map.nix pkgs;
 
-in
-  assert (if index-state-found == null
-    then throw "No index state passed and none found in ${cabalProjectFileName}" else true);
-
-  assert (if index-sha256 == null && !(pkgs.lib.hasSuffix "Z" index-state-found)
-    then throw "Index state found was ${index-state-found} and no `index-sha256` was provided. "
-      "The index hash lookup code requires zulu time zone (ends in a Z)" else true);
-
-let
   # If a hash was not specified find a suitable cached index state to
   # use that will contain all the packages we need.  By using the
   # first one after the desired index-state we can avoid recalculating
   # when new index-state-hashes are added.
   # See https://github.com/input-output-hk/haskell.nix/issues/672
   cached-index-state = if index-sha256 != null
-    then index-state-found
+    then index-state-max
     else
       let
         suitable-index-states =
           builtins.filter
-            (s: s >= index-state-found) # This compare is why we need zulu time
+            (s: s >= index-state-max) # This compare is why we need zulu time
             (builtins.attrNames index-state-hashes);
       in
         if builtins.length suitable-index-states == 0
-          then index-state-found
+          then index-state-max
           else pkgs.lib.head suitable-index-states;
 
   # Lookup hash for the index state we found
@@ -200,7 +183,7 @@ let
 
 in
   assert (if index-sha256-found == null
-    then throw "Unknown index-state ${index-state-found}, the latest index-state I know about is ${pkgs.lib.last (builtins.attrNames index-state-hashes)}. You may need to update to a newer hackage.nix." else true);
+    then throw "Unknown index-state ${index-state-max}, the latest index-state I know about is ${pkgs.lib.last (builtins.attrNames index-state-hashes)}. You may need to update to a newer hackage.nix." else true);
 
 let
   # Deal with source-repository-packages in a way that will work in
@@ -392,11 +375,6 @@ let
     sha256 = plan-sha256;
     sha256Arg = "plan-sha256";
     this = "project.plan-nix" + (if name != null then " for ${name}" else "");
-    # Before pinning stuff down we need an index state to use
-    reasonNotSafe =
-      if !index-state-pinned
-        then "index-state is not pinned by an argument or the cabal project file"
-        else null;
   } // pkgs.lib.optionalAttrs (checkMaterialization != null) {
     inherit checkMaterialization;
   }) (evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
@@ -470,12 +448,11 @@ let
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
     export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt
 
-    echo "Using index-state ${index-state-found}"
     CABAL_DIR=${
       # This creates `.cabal` directory that is as it would have
       # been at the time `cached-index-state`.  We may include
-      # some packages that will be excluded by `index-state-found`
-      # which is used by cabal (cached-index-state >= index-state-found).
+      # some packages that will be excluded by `index-state-max`
+      # which is used by cabal (cached-index-state >= index-state-max).
       dotCabal {
         inherit cabal-install nix-tools extra-hackage-tarballs;
         extra-hackage-repos = fixedProject.repos;
@@ -485,7 +462,7 @@ let
     } make-install-plan ${
           # Setting the desired `index-state` here in case it is not
           # in the cabal.project file. This will further restrict the
-          # packages used by the solver (cached-index-state >= index-state-found).
+          # packages used by the solver (cached-index-state >= index-state-max).
           pkgs.lib.optionalString (index-state != null) "--index-state=${index-state}"
         } \
         -w ${
@@ -548,7 +525,6 @@ let
   '');
 in {
   projectNix = plan-nix;
-  index-state = index-state-found;
-  inherit src;
+  inherit index-state-max src;
   inherit (fixedProject) sourceRepos extra-hackages;
 }

lib/call-cabal-project-to-nix.nix

@@ -17,7 +17,6 @@
             hixProject =
               final.haskell-nix.hix.project {
                 src = ./.;
-                evalSystem = "x86_64-darwin";
                 compiler-nix-name = __head compilers;
               };
           })

nix-tools/flake.nix

@@ -35,7 +35,7 @@ final: prev: { haskell-nix = prev.haskell-nix // { hix = {
           then {}
           else import src;
       projectDefaults = importDefaults (toString (src.origSrcSubDir or src) + "/nix/hix.nix");
-    in final.haskell-nix.project [
+    in final.haskell-nix.project' [
             (import ../modules/hix-project.nix)
             projectDefaults
             commandArgs'

overlays/hix.nix

@@ -25,7 +25,11 @@ in recurseIntoAttrs {
       touch $out
     '';
 
-    meta.platforms = platforms.all;
+    meta = rec {
+      platforms = lib.platforms.all;
+      broken = stdenv.hostPlatform.isGhcjs && __elem compiler-nix-name ["ghc961"];
+      disabled = broken;
+    };
 
     passthru = {
       # Attributes used for debugging with nix repl

test/buildable/default.nix

@@ -55,7 +55,11 @@ in recurseIntoAttrs {
       touch $out
     '';
 
-    meta.platforms = platforms.all;
+    meta = rec {
+      platforms = lib.platforms.all;
+      broken = stdenv.hostPlatform.isGhcjs && __elem compiler-nix-name ["ghc961"];
+      disabled = broken;
+    };
 
     passthru = {
       # Used for debugging with nix repl