WIP

Author: andreabedini

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

@@ -1,4 +1,12 @@
-{ pkgs, runCommand, cacert, index-state-hashes, haskellLib }:
+{ pkgs
+, cacert
+, index-state-hashes
+, haskell-nix
+}:
+
+let inherit (haskell-nix) haskellLib; 
+in
+
 { name          ? src.name or null # optional name for better error messages
 , src
 , materialized-dir ? ../materialized
@@ -65,7 +73,7 @@
 , ...
 }@args:
 let
-  inherit (evalPackages.haskell-nix) materialize dotCabal;
+  inherit (evalPackages.haskell-nix) dummy-ghc-pkg-dump materialize dotCabal;
 
   # These defaults are here rather than in modules/cabal-project.nix to make them
   # lazy enough to avoid infinite recursion issues.
@@ -102,6 +110,7 @@ in let
   ghc = if ghc' ? latestVersion
     then __trace "WARNING: ${ghc'.version} is out of date, consider using upgrading to ${ghc'.latestVersion}." ghc'
     else ghc';
+
   subDir' = src.origSubDir or "";
   subDir = pkgs.lib.strings.removePrefix "/" subDir';
 
@@ -295,8 +304,6 @@ let
 
   fixedProject = replaceSourceRepos rawCabalProject;
 
-  ghcSrc = (ghc.raw-src or ghc.buildGHC.raw-src) evalPackages;
-
   platformString = p: with p.parsed; "${cpu.name}-${vendor.name}-${kernel.name}";
 
   # Dummy `ghc` that uses the captured output
@@ -366,11 +373,6 @@ let
     '';
   };
 
-  dummy-ghc-pkg-dump = evalPackages.callPackage ./dummy-ghc-pkg-dump {
-    ghc-src = (ghc.raw-src or ghc.buildGHC.raw-src) evalPackages;
-    ghc-version = ghc.version;
-  };
-  
   # Dummy `ghc-pkg` that uses the captured output
   dummy-ghc-pkg = evalPackages.writeTextFile {
     name = "dummy-pkg-" + ghc.name;
@@ -388,7 +390,12 @@ let
           ;;
       ''}
         'dump --global -v0')
-          cat ${dummy-ghc-pkg-dump}
+          cat ${
+            dummy-ghc-pkg-dump {
+              ghc-src = (ghc.raw-src or ghc.buildGHC.raw-src) evalPackages;
+              ghc-version = ghc.version;
+            }
+          }
           ;;
         *)
           echo "Unknown argument '$*'. " >&2

lib/dummy-ghc-pkg-dump/configure.ac

@@ -1,23 +1,63 @@
 {
   autoconf,
-  cabal2json,
   coreutils,
   findutils,
-  ghc-src,
-  ghc-version,
+  haskell-nix,
   jq,
   lib,
   runCommand,
   stdenv,
+  writeText,
 }:
 
+let
+  inherit (haskell-nix.nix-tools-unchecked.exes) cabal2json;
+in
+
+{ ghc-src, ghc-version }:
+
 let
   ghc-m4-src = builtins.path {
     filter = path: type: lib.hasPrefix "${ghc-src}/m4" path;
     path = ghc-src;
     name = "ghc-src-m4";
   };
 
+  configure-ac = writeText "configure.ac" ''
+    m4_include([fp_check_prog.m4])
+    m4_include([fp_prog_find.m4])
+    m4_include([fp_prog_sort.m4])
+    m4_include([fp_setup_project_version.m4])
+
+    AC_INIT([The Glorious Glasgow Haskell Compilation System],
+            [${ghc-version}],
+    		[glasgow-haskell-bugs@haskell.org],
+    		[ghc])
+
+    # Set this to YES for a released version, otherwise NO
+    : ''${RELEASE=NO}
+
+    dnl ** Make sure we do not have a bogus source directory
+    AC_CONFIG_SRCDIR(ghc/Main.hs)
+
+    dnl ----------------------------------------------------------
+    dnl ** Find unixy sort and find commands,
+    dnl ** which are needed by FP_SETUP_PROJECT_VERSION
+
+    FP_PROG_FIND
+    FP_PROG_SORT
+
+    dnl ----------------------------------------------------------
+    pushd ''${srcdir}
+    FP_SETUP_PROJECT_VERSION
+    popd
+
+    dnl ** Output code to perform substitutions
+    AC_CONFIG_FILES
+
+    AC_OUTPUT
+  '';
+
   configure =
     runCommand "dummy-ghc-configure"
       {
@@ -28,15 +68,9 @@ let
         ];
       }
       ''
-        set -euo pipefail
-        autoconf --warnings all --include "${ghc-m4-src}/m4" --output=$out ${./configure.ac}
+        autoconf --warnings all --include "${ghc-m4-src}/m4" --output=$out ${configure-ac}
       '';
 
-  # cabal2json = builtins.fetchClosure {
-  #   fromStore = "https://cache.zw3rk.com";
-  #   fromPath = /nix/store/q1kqwvqmwqcqaq82gaf951mq39v4sc91-Cabal-syntax-json-exe-cabal2json-0.1.0.0;
-  # };
-
   cabal2json-flags =
     with stdenv.targetPlatform;
     lib.cli.toGNUCommandLineShell { } {
@@ -60,16 +94,16 @@ let
         cd $out
 
         # Run configure script (only for the project version)
-        ${configure} --srcdir=${ghc-src} PACKAGE_VERSION=${ghc-version}
+        ${configure} --srcdir=${ghc-src}
 
         # Copy the cabal.in files
         pushd ${ghc-src}
         cp --no-preserve all --parents */*.cabal */*.cabal.in libraries/*/*.cabal libraries/*/*.cabal.in "$out"
         popd
 
         # Substitute config variables in the cabal files
-        FILES=( **/*.cabal.in )
-        ./config.status $(printf -- '--file %s ' "''${FILES[@]%.in}")
+        CABAL_IN=( **/*.cabal.in )
+        ./config.status $(printf -- '--file %s ' "''${CABAL_IN[@]%.in}")
 
         # Convert to json
         for f in **/*.cabal; do

lib/dummy-ghc-pkg-dump/default.nix

@@ -167,7 +167,11 @@ final: prev: {
             };
 
         # Package sets for all stackage snapshots.
-        snapshots = import ../snapshots.nix { inherit (final) lib ghc-boot-packages; inherit mkPkgSet stackage excludeBootPackages; };
+        snapshots = import ../snapshots.nix {
+          inherit (final) lib ghc-boot-packages;
+          inherit mkPkgSet stackage excludeBootPackages;
+        };
+
         # Pick a recent LTS snapshot to be our "default" package set.
         haskellPackages =
             if final.stdenv.targetPlatform.isAarch64 && final.stdenv.buildPlatform.isAarch64
@@ -595,19 +599,12 @@ final: prev: {
 
             };
 
-        dummy-ghc-pkg-dump = final.callPackage ../lib/dummy-ghc-pkg-dump {
-          # FIXME: just for testing
-          ghc-version = final.ghc.version;
-          ghc-src = final.ghc.src;
-        };
+        dummy-ghc-pkg-dump = final.callPackage ../lib/dummy-ghc-pkg-dump { };
 
         # Takes a haskell src directory runs cabal new-configure and plan-to-nix.
         # Resulting nix files are added to nix-plan subdirectory.
-        callCabalProjectToNix = import ../lib/call-cabal-project-to-nix.nix {
+        callCabalProjectToNix = final.buildPackages.callPackage ../lib/call-cabal-project-to-nix.nix {
             index-state-hashes = import indexStateHashesPath;
-            inherit (final.buildPackages.haskell-nix) haskellLib;
-            pkgs = final.buildPackages.pkgs;
-            inherit (final.buildPackages.pkgs) cacert;
         };
 
         # Loads a plan and filters the package directories using cleanSourceWith