Merge remote-tracking branch 'origin/master' into rela-aarch64-none

compiler/ghc/default.nix

@@ -242,7 +242,7 @@ let
           then ../../materialized/ghc8107/hadrian-ghc94
         else ../../materialized/ghc8107/hadrian-ghc96;
       modules = [{
-        # Apply the patches in a way that does not require using somethin
+        # Apply the patches in a way that does not require using something
         # like `srcOnly`. The problem with `pkgs.srcOnly` was that it had to run
         # on a platform at eval time.
         packages.hadrian.prePatch = ''
@@ -260,7 +260,13 @@ let
       cabalProjectLocal = null;
       cabalProjectFreeze = null;
       src = haskell-nix.haskellLib.cleanSourceWith {
-        inherit src;
+        src = {
+          outPath = buildPackages.srcOnly {
+            name = "hadrian";
+            inherit src;
+          };
+          filterPath = { path, ... }: path;
+        };
         subDir = "hadrian";
       };
     };
@@ -274,7 +280,8 @@ let
           + lib.optionalString (!enableShared) "+no_dynamic_ghc"
           + lib.optionalString useLLVM "+llvm"
           + lib.optionalString enableDWARF "+debug_info"
-          + lib.optionalString targetPlatform.isGhcjs "+native_bignum+no_profiled_libs"
+          + lib.optionalString (enableNativeBignum || targetPlatform.isGhcjs) "+native_bignum"
+          + lib.optionalString targetPlatform.isGhcjs "+no_profiled_libs"
       } --docs=no-sphinx -j --verbose"
       # This is needed to prevent $GCC from emitting out of line atomics.
       # Those would then result in __aarch64_ldadd1_sync and others being referenced, which
@@ -317,7 +324,7 @@ let
     # Same goes for strip.
     strip =
       # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-      if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+      if stdenv.targetPlatform.isAarch64
       then targetCC.bintools
       else targetCC.bintools.bintools;
   };

lib/cabal-project-parser.nix

@@ -84,8 +84,8 @@ let
     url = repo.location;
     "${refOrRev}" = repo.tag;
     sha256 = repo."--sha256" or (
-      if sha256map != null
-        then sha256map."${repo.location}"."${repo.tag}"
+      if sha256map != null && sha256map ? ${repo.location}
+        then sha256map.${repo.location}.${repo.tag}
         else null);
     subdirs = if repo ? subdir
       then pkgs.lib.filter (x: x != "") (pkgs.lib.splitString " " repo.subdir)
@@ -136,7 +136,7 @@ let
       attrs = parseBlockLines x.fst;
       sha256 = attrs."--sha256" or (
         if sha256map != null
-          then sha256map."${attrs.url}"
+          then sha256map.${attrs.url} or null
           else null);
     in rec {
       # This is `some-name` from the `repository some-name` line in the `cabal.project` file.

lib/stack-cache-generator.nix

@@ -82,8 +82,10 @@ concatMap (dep:
         let
             is-private = private dep.url;
             sha256 =
-              if dep.sha256 != null then dep.sha256
-              else if sha256map != null then sha256map."${dep.url}"."${dep.rev}"
+              if dep.sha256 != null
+                then dep.sha256
+              else if sha256map != null && sha256map ? ${dep.url}
+                then sha256map.${dep.url}.${dep.rev}
               else null;
             branch = lookupBranch {
               location = dep.url;