Update haskell.nix and use nixpkgs-2505

Author: hamishmack

.github/workflows/hello.yml

@@ -18,7 +18,6 @@ jobs:
           #- aarch64-darwin
           #- aarch64-linux
         compiler-nix-name:
-          - ghc810
           - ghc96
           - ghc98
           - ghc910
@@ -35,9 +34,6 @@ jobs:
           - false
           - true
         exclude:
-          # Just cross compiling javascript with ghc 9.6 and above
-          - compiler-nix-name: ghc810
-            target-platform: "-js"
           # Windows cross compilation only works on x86_64 right now.
           - platform: aarch64-darwin
             target-platform: "-windows"

.github/workflows/lints.yml

@@ -42,7 +42,7 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
       - run: |
           nix profile install github:Kha/nixprof
-          nixprof record nix develop .#ghc8107 --accept-flake-config
+          nixprof record nix develop .#ghc96 --accept-flake-config
           nixprof report -p
           nixprof report -a
           nixprof report -s

flake.lock

@@ -2,7 +2,7 @@
     description = "Minimal devshell flake for haskell";
 
     inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
-    inputs.nixpkgs.follows = "haskellNix/nixpkgs-2411";
+    inputs.nixpkgs.follows = "haskellNix/nixpkgs-2505";
     inputs.flake-utils.url = "github:numtide/flake-utils";
     inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";
     inputs.cabal.url = "github:stable-haskell/cabal";
@@ -91,7 +91,6 @@
              # Map the compiler-nix-name to a final compiler-nix-name the way haskell.nix
              # projects do (that way we can use short names)
              let compilers = pkgs: pkgs.lib.genAttrs [
-                      "ghc810"
                       "ghc96"
                       "ghc98"
                       "ghc910"
@@ -257,9 +256,9 @@
             })) devShells)
           // (pkgs.lib.mapAttrs' (name: drv:
             pkgs.lib.nameValuePair "${name}-plans" drv.plans) devShells);
-        packages.cabalProjectLocal.static        = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template;
-        packages.cabalProjectLocal.cross-js      = (import ./quirks.nix { pkgs = js-pkgs;                    }).template;
-        packages.cabalProjectLocal.cross-windows = (import ./quirks.nix { pkgs = windows-pkgs;               }).template;
+        packages.cabalProjectLocal-static        = (import ./quirks.nix { pkgs = static-pkgs; static = true; }).template;
+        packages.cabalProjectLocal-cross-js      = (import ./quirks.nix { pkgs = js-pkgs;                    }).template;
+        packages.cabalProjectLocal-cross-windows = (import ./quirks.nix { pkgs = windows-pkgs;               }).template;
        });
      # we use flake-outputs here to inject a required job that aggregates all required jobs.
      in flake-outputs // {

flake.nix

@@ -15,7 +15,7 @@ let
              f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
              26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
              7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-          --sha256: sha256-+hzciiQqWb5oOzQ2JZ2lzJGfGuwA3ZigeWgAQ8Dz+kk=
+          --sha256: sha256-NZy6Y5Lea+nOKpYkY9gO+XAZdAm0oKIAGIN8QICO9Co=
 
         if impl(ghc < 9.13)
           active-repositories: hackage.haskell.org
@@ -37,15 +37,15 @@ compiler-nix-name: tool: {
       # Use the github source of HLS that is tested with haskell.nix CI
       src = { "ghc8107" = pkgs.haskell-nix.sources."hls-2.2";
               "ghc902"  = pkgs.haskell-nix.sources."hls-2.4";
-            }.${compiler-nix-name} or pkgs.haskell-nix.sources."hls-2.10";
+            }.${compiler-nix-name} or pkgs.haskell-nix.sources."hls-2.11";
       # `tool` normally ignores the `cabal.project` (if there is one in the hackage source).
       # We need to use the github one (since it has settings to make hls build).
       cabalProject = __readFile (src + "/cabal.project");
       configureArgs = "--disable-benchmarks --disable-tests";
   };
   happy = { version = "1.20.1.1"; inherit cabalProjectLocal; };
   alex = { version = "3.2.7.3"; inherit cabalProjectLocal; };
-  cabal = {
+  cabal = rec {
     src = self.inputs.cabal;
     # We use the cabal.boostrap.project file, as we don't
     # want an of the cabal complexities they have. The
@@ -54,10 +54,10 @@ compiler-nix-name: tool: {
     #
     #    cabal = { src = { outPath = self.inputs.cabal; filterPath = { path, ... }: path; }; }
     #
-    cabalProjectFileName = "cabal.bootstrap.project";
-    cabalProjectLocal = ''
-      index-state: hackage.haskell.org 2025-03-17T00:00:00Z
-    '';
+    cabalProject = __replaceStrings
+      ["import: project-cabal/constraints.config"]
+      [(__readFile (src + "/project-cabal/constraints.config"))]
+      (__readFile (src + "/cabal.bootstrap.project"));
   };
   hlint = {
     cabalProjectLocal = ''