working

Author: pranaysashank

builder/default.nix

@@ -68,7 +68,7 @@ let
         inherit evalPackages;
         version = "5.0.18.4";
         # index-state = pkgs.haskell-nix.internalHackageIndexState;
-        index-state = "2024-05-15T00:00:00Z";
+        index-state = "2024-05-14T23:56:58Z";
       }
     }:
     let

builder/make-config-files.nix

@@ -5,7 +5,7 @@
 let
   # Sort and remove duplicates from nonReinstallablePkgs.
   # That way changes to the order of nonReinstallablePkgs does not require rebuilds.
-  nonReinstallablePkgs' = let x = __attrNames (lib.genAttrs nonReinstallablePkgs (x: x)); in __trace x x;
+  nonReinstallablePkgs' = __attrNames (lib.genAttrs nonReinstallablePkgs (x: x));
 
   ghc = if enableDWARF then defaults.ghc.dwarf else defaults.ghc;
 
@@ -86,7 +86,7 @@ let
 
     unwrappedGhc=${ghc}
     ghcDeps=${ghc.cachedDeps
-      or (__trace "WARNING: ghc.cachedDeps not found" haskellLib.makeCompilerDeps ghc)}
+      or (haskellLib.makeCompilerDeps ghc).cachedDeps}
     ${ # Copy over the nonReinstallablePkgs from the global package db.
     ''
       for p in ${lib.concatStringsSep " " nonReinstallablePkgs'}; do
@@ -151,7 +151,6 @@ let
 
     for p in "''${pkgsHostTarget[@]}"; do
       if [ -e $p/envDep ]; then
-        echo "But not here"
         cat $p/envDep >> $configFiles/ghc-environment
       fi
       ${ lib.optionalString component.doExactConfig ''

builder/shell-for.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, mkShell, glibcLocales, pkgconfig, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib, buildPackages, evalPackages, compiler }:
+{ lib, stdenv, mkShell, glibcLocales, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib, buildPackages, evalPackages, compiler }:
 
 { # `packages` function selects packages that will be worked on in the shell itself.
   # These packages will not be built by `shellFor`, but their

flake.lock

@@ -2,27 +2,13 @@
   description = "Alternative Haskell Infrastructure for Nixpkgs";
 
   inputs = {
-    nixpkgs.follows = "nixpkgs-2405";
-    nixpkgs-2405 = { url = "github:NixOS/nixpkgs/release-24.05"; };
+    nixpkgs.follows = "nixpkgs-2411";
+    nixpkgs-2405 = { url = "github:NixOS/nixpkgs/release-24.11"; };
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
-    hydra.url = "hydra";
     hackage = {
       url = "github:kronor-io/hackage.nix/main";
       flake = false;
     };
-    stackage = {
-      url = "github:input-output-hk/stackage.nix";
-      flake = false;
-    };
-    nix-tools-static = {
-      url = "github:input-output-hk/haskell-nix-example/nix";
-      flake = false;
-    };
-    cabal-36 = {
-      url = "github:haskell/cabal/3.6";
-      flake = false;
-    };
-
     hackage-db = {
       url = "github:michaelpj/hackage-db/83f819cb08742d3c86a83b407d45c1f6c1c7e299";
       flake = false;

flake.nix

@@ -145,7 +145,7 @@ let
       repoContents = if inputMap ? ${attrs.url}
         # If there is an input use it to make `file:` url and create a suitable `.cabal/packages/${name}` directory
         then evalPackages.runCommand name ({
-          nativeBuildInputs = [ cabal-install ] ++ evalPackages.haskell-nix.cabal-issue-8352-workaround;
+          nativeBuildInputs = [ cabal-install ];
           preferLocalBuild = true;
         }) ''
             HOME=$(mktemp -d)
@@ -186,7 +186,7 @@ let
       # Output of hackage-to-nix
       hackage = import (
         evalPackages.runCommand ("hackage-to-nix-" + name) {
-          nativeBuildInputs = [ cabal-install evalPackages.curl nix-tools ];
+          nativeBuildInputs = [ cabal-install evalPackages.curl nix-tools.exes.hackage-to-nix ];
           LOCALE_ARCHIVE = pkgs.lib.optionalString (evalPackages.stdenv.buildPlatform.libc == "glibc") "${evalPackages.glibcLocales}/lib/locale/locale-archive";
           LANG = "en_US.UTF-8";
           preferLocalBuild = true;

lib/cabal-project-parser.nix

@@ -65,7 +65,7 @@
 , ...
 }@args:
 let
-  inherit (evalPackages.haskell-nix) materialize dotCabal;
+  inherit (evalPackages.haskell-nix) dotCabal;
 
   # These defaults are here rather than in modules/cabal-project.nix to make them
   # lazy enough to avoid infinite recursion issues.
@@ -74,7 +74,7 @@ let
   nix-tools = if args.nix-tools or null != null
     then args.nix-tools
     else evalPackages.haskell-nix.nix-tools;
-  cabal-install = nix-tools.exes.cabal;
+  cabal-install = pkgs.bootstrap-cabal-install;
   forName = pkgs.lib.optionalString (name != null) (" for " + name);
   nameAndSuffix = suffix: if name == null then suffix else name + "-" + suffix;
 
@@ -364,19 +364,12 @@ let
     '';
   };
 
-  plan-nix = materialize ({
-    inherit materialized;
-    sha256 = plan-sha256;
-    sha256Arg = "plan-sha256";
-    this = "project.plan-nix" + (if name != null then " for ${name}" else "");
-  } // pkgs.lib.optionalAttrs (checkMaterialization != null) {
-    inherit checkMaterialization;
-  }) (evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
+  plan-nix = evalPackages.runCommand (nameAndSuffix "plan-to-nix-pkgs") {
     nativeBuildInputs =
       # The things needed from nix-tools
       [ nix-tools.exes.make-install-plan
         nix-tools.exes.plan-to-nix
-        nix-tools.exes.cabal
+        pkgs.bootstrap-cabal-install
       ]
       ++ pkgs.lib.optional supportHpack nix-tools.exes.hpack
       ++ [dummy-ghc dummy-ghc-pkg evalPackages.rsync evalPackages.gitMinimal evalPackages.allPkgConfigWrapper ];
@@ -462,7 +455,6 @@ let
           # packages used by the solver (cached-index-state >= index-state-max).
           pkgs.lib.optionalString (index-state != null) "--index-state=${index-state}"
         } \
-        -v3 \
         -w ${
           # We are using `-w` rather than `--with-ghc` here to override
           # the `with-compiler:` in the `cabal.project` file.
@@ -523,7 +515,7 @@ let
 
     # move pkgs.nix to default.nix ensure we can just nix `import` the result.
     mv $out${subDir'}/pkgs.nix $out${subDir'}/default.nix
-  '');
+  '';
 in {
   projectNix = plan-nix;
   inherit index-state-max src;

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

@@ -22,20 +22,6 @@ let
   inherit (pkgs.haskell-nix) checkMaterialization;
   makeDummyGhcData = ghc: ghc // {
     dummy-ghc-data =
-      let
-        materialized = materialized-dir + "/dummy-ghc/${ghc.targetPrefix}${ghc.name}-${pkgs.stdenv.buildPlatform.system}"
-          + pkgs.lib.optionalString (builtins.compareVersions ghc.version "8.10" < 0 && ghc.targetPrefix == "" && builtins.compareVersions pkgs.lib.version "22.05" < 0) "-old";
-      in pkgs.haskell-nix.materialize ({
-        sha256 = null;
-        sha256Arg = "sha256";
-        materialized = if __pathExists materialized
-          then materialized
-          else __trace "WARNING: No materialized dummy-ghc-data.  mkdir ${toString materialized}"
-            null;
-        reasonNotSafe = null;
-      } // pkgs.lib.optionalAttrs (checkMaterialization != null) {
-        inherit checkMaterialization;
-      }) (
     runCommand ("dummy-data-" + ghc.name) {
       nativeBuildInputs = [ ghc ];
     } ''
@@ -69,7 +55,7 @@ let
         | tr '\r' '\n' \
         | sed -e '$ d' \
           > $out/ghc-pkg/dump-global
-    '');
+    '';
   } // pkgs.lib.optionalAttrs (ghc ? dwarf) {
     dwarf = makeDummyGhcData ghc.dwarf;
   } // pkgs.lib.optionalAttrs (ghc ? smallAddressSpace) {