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

Author: ocharles

build.nix

@@ -43,8 +43,18 @@ in rec {
             "ghc8107" = "3.4.1";
           }.${compiler-nix-name} or "latest";
       };
-    } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.4" < 0) {
-      stack = tool compiler-nix-name "stack" { version = "2.9.3"; inherit evalPackages; };
+    } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.6" < 0) {
+      stack =
+        tool compiler-nix-name "stack" {
+          cabalProjectLocal = ''
+            constraints: optparse-applicative <0.18
+          '';
+          version =
+            if __compareVersions haskell.compiler.${compiler-nix-name}.version "9.2" < 0
+              then "2.9.3"
+              else "2.11.1";
+          inherit evalPackages;
+        };
     } // pkgs.lib.optionalAttrs (__compareVersions haskell.compiler.${compiler-nix-name}.version "9.6" < 0) {
       hls-latest = tool compiler-nix-name "haskell-language-server" {
         inherit evalPackages;

ci.nix

@@ -14,6 +14,7 @@
   nixpkgsVersions = {
     "R2205" = "nixpkgs-2205";
     "R2211" = "nixpkgs-2211";
+    "R2305" = "nixpkgs-2305";
     "unstable" = "nixpkgs-unstable";
   };
   haskellNix = compat { inherit checkMaterialization system; };
@@ -50,39 +51,45 @@
       nixpkgs.lib.optionalAttrs (nixpkgsName == "R2211") {
         ghc8107 = false;
         ghc902 = false;
-        ghc927 = false;
+        ghc928 = false;
         ghc945 = false;
+      } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2305") {
+        ghc8107 = false;
+        ghc902 = false;
+        ghc928 = false;
+        ghc945 = false;
+        ghc962 = false;
       } // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
         ghc884 = false;
         ghc8107 = true;
         ghc902 = false;
-        ghc927 = true;
+        ghc928 = true;
         ghc945 = true;
-        ghc961 = true;
+        ghc962 = true;
       }));
   crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
     # We need to use the actual nixpkgs version we're working with here, since the values
     # 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 ["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"])
+      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc962"])
+       || (system == "aarch64-linux" && __elem compiler-nix-name ["ghc8107" "ghc962"])
+       || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc962"])
+       || (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc962"])
        )) {
     inherit (lib.systems.examples) ghcjs;
   } // lib.optionalAttrs (nixpkgsName == "unstable"
-      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc945" "ghc961"])
+      && ((system == "x86_64-linux"  && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc927" "ghc928" "ghc945" "ghc962"])
        || (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
     inherit (lib.systems.examples) mingwW64;
-  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926" "ghc927" "ghc945" "ghc961"]) {
+  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926" "ghc927" "ghc928" "ghc945" "ghc962"]) {
     # Musl cross only works on linux
     # aarch64 cross only works on linux
     inherit (lib.systems.examples) musl64 aarch64-multiplatform;
-  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927"]) {
+  } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928"]) {
     # TODO fix this for the compilers we build with hadrian (ghc >=9.4)
     inherit (lib.systems.examples) aarch64-multiplatform-musl;
-  } // lib.optionalAttrs (system == "aarch64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc944" "ghc961"]) {
+  } // lib.optionalAttrs (system == "aarch64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc927" "ghc928" "ghc945" "ghc962"]) {
     inherit (lib.systems.examples) aarch64-multiplatform-musl;
   };
   isDisabled = d: d.meta.disabled or false;

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;
   };

docs/tutorials/development/default.nix

@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
     src = ./.;
   };
   # Specify the GHC version to use.
-  compiler-nix-name = "ghc927"; # Not required for `stack.yaml` based projects.
+  compiler-nix-name = "ghc92"; # Not required for `stack.yaml` based projects.
 }

docs/tutorials/getting-started-flakes/flake.nix

@@ -12,7 +12,7 @@
           helloProject =
             final.haskell-nix.project' {
               src = ./.;
-              compiler-nix-name = "ghc927";
+              compiler-nix-name = "ghc92";
               # This is used by `nix develop .` to open a shell for use with
               # `cabal`, `hlint` and `haskell-language-server`
               shell.tools = {

docs/tutorials/getting-started/default.nix

@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
     src = ./.;
   };
   # Specify the GHC version to use.
-  compiler-nix-name = "ghc927"; # Not required for `stack.yaml` based projects.
+  compiler-nix-name = "ghc92"; # Not required for `stack.yaml` based projects.
 }

flake.lock

@@ -8,6 +8,7 @@
     nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
     nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; };
     nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; };
+    nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
     flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; };
@@ -64,8 +65,8 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, flake-utils, ... }@inputs:
-    let compiler = "ghc927";
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, nixpkgs-2305, flake-utils, ... }@inputs:
+    let compiler = "ghc928";
       config = import ./config.nix;
 
       traceNames = prefix: builtins.mapAttrs (n: v:
@@ -124,6 +125,8 @@
               (nixpkgsArgs // { localSystem = { inherit system; }; });
             pkgs-2211 = import nixpkgs-2211
               (nixpkgsArgs // { localSystem = { inherit system; }; });
+            pkgs-2305 = import nixpkgs-2305
+              (nixpkgsArgs // { localSystem = { inherit system; }; });
             pkgs-unstable = import nixpkgs-unstable
               (nixpkgsArgs // { localSystem = { inherit system; }; });
             hix = import ./hix/default.nix { inherit pkgs; };

flake.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   # name = "project-name";
-  compiler-nix-name = "ghc8107"; # Version of GHC to use
+  compiler-nix-name = "ghc92"; # Version of GHC to use
 
   # Cross compilation support:
   # crossPlatforms = p: pkgs.lib.optionals pkgs.stdenv.hostPlatform.isx86_64 ([

hix/init/nix/hix.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.