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

Author: gpampara

build.nix

@@ -56,10 +56,15 @@ in rec {
           inherit evalPackages;
         };
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.6" < 0) {
-      hls-latest = tool compiler-nix-name "haskell-language-server" {
+      "hls-110" = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;
         src = pkgs.haskell-nix.sources."hls-1.10";
       };
+    } // {
+      "hls-20" = tool compiler-nix-name "haskell-language-server" {
+        inherit evalPackages;
+        src = pkgs.haskell-nix.sources."hls-2.0";
+      };
     })
   );
 

builder/comp-builder.nix

@@ -362,7 +362,7 @@ let
       });
       profiled = self (drvArgs // { enableLibraryProfiling = true; });
       dwarf = self (drvArgs // { enableDWARF = true; });
-    } // lib.optionalAttrs (haskellLib.isLibrary componentId) ({
+    } // lib.optionalAttrs (haskellLib.isLibrary componentId || haskellLib.isTest componentId) ({
         inherit haddock;
         inherit (haddock) haddockDir; # This is null if `doHaddock = false`
       } // lib.optionalAttrs (haddock ? doc) {

builder/haddock-builder.nix

@@ -23,11 +23,11 @@
 
 let
   doHaddock' = doHaddock
-    && (haskellLib.isLibrary componentId)
+    && (haskellLib.isLibrary componentId || haskellLib.isTest componentId)
     && !haskellLib.isCrossHost;
 
-  # the target dir for haddock documentation
-  docdir = docoutput: docoutput + "/share/doc/" + componentId.cname;
+  # The target dir for haddock documentation
+  docdir = docoutput: docoutput + "/share/doc/" + package.identifier.name;
 
   packageCfgDir = configFiles.packageCfgDir;
 
@@ -111,6 +111,7 @@ let
       [[ -n $(find . -name "*.hs" -o -name "*.lhs") ]] && {
       $SETUP_HS haddock \
         "--html" \
+        ${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
         ${lib.optionalString doHoogle "--hoogle"} \
         ${lib.optionalString hyperlinkSource "--hyperlink-source"} \
         ${lib.optionalString quickjump "--quickjump"} \
@@ -129,7 +130,7 @@ let
            # Ensure that libraries are not pulled into the docs closure.
            # As an example, the prettified source code of a
            # Paths_package module will contain store paths of the library package.
-           for x in "$html/src/"*.html; do
+           for x in $(find "$html" -name "*.html"); do
              remove-references-to -t $out $x
              remove-references-to -t ${componentDrv} $x
            done

flake.lock

@@ -13,6 +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; };
     hydra.url = "hydra";
     hackage = {
       url = "github:input-output-hk/hackage.nix";

flake.nix

@@ -496,6 +496,9 @@ let
           --exclude '*' \
           $tmp/ $out/
 
+    # Make sure the subDir' exists even if it did not contain any cabal files
+    mkdir -p $out${subDir'}
+
     # make sure the path's in the plan.json are relative to $out instead of $tmp
     # this is necessary so that plan-to-nix relative path logic can work.
     substituteInPlace $tmp${subDir'}/dist-newstyle/cache/plan.json --replace "$tmp" "$out"

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

@@ -52,6 +52,8 @@ in
   bz2 = [ bzip2 ];
   util = [ utillinux ];
   magic = [ file ];
+  pgcommon = [ postgresql ];
+  pgport = [ postgresql] ;
   pq = [ postgresql ];
   libpq = [ postgresql ];
   iconv = [ libiconv ];

lib/system-nixpkgs-map.nix

@@ -83,18 +83,31 @@ in {
 
   # See https://github.com/input-output-hk/haskell.nix/issues/1455
   # This is a work around to make `ghcide` and `haskell-language-server` build with the unboxed tuple patch.
-  packages.ghcide.patches =
-    # Work out if we have applied the unboxed tupple patch in overlays/bootstrap.nix
-    pkgs.lib.optionals (__elem config.compiler.nix-name [
-      "ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc8105" "ghc8106" "ghc8107" "ghc810420210212"
-    ]) [
-      (fromUntil "1.7.0.0" "1.8.0.0" ../patches/ghcide-1.7-unboxed-tuple-fix-issue-1455.patch)
-      (fromUntil "1.8.0.0" "1.11.0.0" ../patches/ghcide-1.8-unboxed-tuple-fix-issue-1455.patch)
-    ]
-    # This is needed for a patch only applied to ghc810420210212
-    ++ pkgs.lib.optional (__elem config.compiler.nix-name [
-      "ghc810420210212"
-    ]) (from "1.7.0.0" ../patches/ghcide-1.7-plutus-ghc.patch);
+  packages.ghcide = pkgs.lib.mkIf (__elem config.compiler.nix-name [
+        # Work out if we have applied the unboxed tupple patch in overlays/bootstrap.nix
+        "ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc8105" "ghc8106" "ghc8107" "ghc810420210212"
+      ]) {
+    patches =
+       [
+        (fromUntil "1.7.0.0" "1.8.0.0" ../patches/ghcide-1.7-unboxed-tuple-fix-issue-1455.patch)
+        (fromUntil "1.8.0.0" "2.1.0.0" ../patches/ghcide-1.8-unboxed-tuple-fix-issue-1455.patch)
+      ]
+      # This is needed for a patch only applied to ghc810420210212
+      ++ pkgs.lib.optional (__elem config.compiler.nix-name [
+        "ghc810420210212"
+      ]) (from "1.7.0.0" ../patches/ghcide-1.7-plutus-ghc.patch);
+      flags = {
+        # This flag has enables an additional work around that normally
+        # is only enabled for ghc >=9.2.
+        ghc-patched-unboxed-bytecode = true;
+      };
+    };
+
+  # Fix for https://github.com/input-output-hk/haskell.nix/issues/1961
+  packages.haskell-language-server.components.exes.haskell-language-server = {
+    keepGhc = pkgs.stdenv.hostPlatform.isDarwin;
+    keepConfigFiles = pkgs.stdenv.hostPlatform.isDarwin;
+  };
 
   packages.language-c.patches = [
     # See https://github.com/visq/language-c/pull/89

modules/configuration-nix.nix

@@ -301,6 +301,15 @@ in {
       type = either path package;
       default = pkgs.fetchurl { url = "mirror://hackage/${config.name}.tar.gz"; inherit (config) sha256; };
       defaultText = "pkgs.fetchurl { url = \"mirror://hackage/\${config.name}.tar.gz\"; inherit (config) sha256; };";
+      # Make sure paths have a context so they will be included in the derivation
+      # inputs for the component derivations.  Without this sandbox builds fail
+      # cannot see the input and fail with the error:
+      #   do not know how to unpack source archive /nix/store/...
+      apply = v:
+        let storeDirMatch = __match "(${__storeDir}/[^/]+).*" v;
+        in if isString v && __getContext v == {} && storeDirMatch != null
+          then __appendContext v { ${__head storeDirMatch} = { path = true; }; }
+          else v;
     };
     package-description-override = mkOption {
       type = nullOr str;

modules/package.nix

@@ -0,0 +1,25 @@
+{ lib, cabalProject', tool, recurseIntoAttrs, testSrc, compiler-nix-name, evalPackages }:
+let
+  project = cabalProject' {
+    name = "cabal-project-nix-path";
+    inherit compiler-nix-name evalPackages;
+    src = testSrc "cabal-project-nix-path";
+    cabalProject = ''
+      packages: ${(tool compiler-nix-name "hello" { inherit evalPackages; }).project.args.src}
+    '';
+  };
+  # The same but with source in a subdir of the store path
+  projectSubDir = project.appendModule {
+    cabalProject = lib.mkForce ''
+      packages: ${evalPackages.runCommand "hello-src" {} "mkdir -p $out && cp -r ${(tool compiler-nix-name "hello" { inherit evalPackages; }).project.args.src} $out/subdir"}/subdir
+    '';
+  };
+
+in recurseIntoAttrs {
+  ifdInputs = {
+    inherit (project) plan-nix;
+  };
+
+  build = project.hsPkgs.hello.components.exes.hello;
+  buildSubDir = projectSubDir.hsPkgs.hello.components.exes.hello;
+}