From 545d4e302a1f2f330f45a80e51d9dd0a9b076010 Mon Sep 17 00:00:00 2001 From: thomasjm Date: Sun, 11 Oct 2026 18:26:13 -0700 Subject: [PATCH] Pin nixpkgs and haskell.nix exactly, and build with GHC 9.12.4 --- flake.lock | 164 ++++++++++++++++++++++++++++++++++-------------- flake.nix | 8 +-- stack.yaml | 2 +- stack.yaml.lock | 8 +-- 4 files changed, 126 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index 68a669a..a12da6e 100644 --- a/flake.lock +++ b/flake.lock @@ -16,23 +16,6 @@ "type": "github" } }, - "cabal-32": { - "flake": false, - "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", - "owner": "haskell", - "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.2", - "repo": "cabal", - "type": "github" - } - }, "cabal-34": { "flake": false, "locked": { @@ -141,11 +124,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1763598401, - "narHash": "sha256-ob9BLrE7VWOvzYUZU3Ni6Kynst/eGRH2FAz1i16LGcA=", + "lastModified": 1791679392, + "narHash": "sha256-Gf5XePOzYD0XczOyQD11coOI+VV43l0uVRj7ZEn7Cxk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a9359105928d8c90ca9ec7a92a02a7aa9bfcfcab", + "rev": "32046d26f1f3ae59ae7c3e05eb1aba7e0d003045", "type": "github" }, "original": { @@ -157,11 +140,11 @@ "hackage-for-stackage": { "flake": false, "locked": { - "lastModified": 1763598390, - "narHash": "sha256-jk/tjpAfdkPl7qB7Zcb8Bq8pxLR5O0wkmBMtmoM90c0=", + "lastModified": 1791679369, + "narHash": "sha256-KRDo6T2jF7kY5XXYjkA5+HVncbvKHZndw2kK04NoLow=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "941003def37cb8915bbc33f20e73610e2bd6ecea", + "rev": "3220d7e13dfbef1a9a39a4c13e9400abb27c2e66", "type": "github" }, "original": { @@ -187,10 +170,25 @@ "type": "github" } }, + "hackage-overlay-repo-tool": { + "flake": false, + "locked": { + "lastModified": 1671663228, + "narHash": "sha256-GKeke8FT9w2u6J9aI4eN3mOV0BURHiytQAEir4/4M1Q=", + "owner": "bgamari", + "repo": "hackage-overlay-repo-tool", + "rev": "f60aa0d497961745a503ddea2adb0facb58376e8", + "type": "github" + }, + "original": { + "owner": "bgamari", + "repo": "hackage-overlay-repo-tool", + "type": "github" + } + }, "haskellNix": { "inputs": { "HTTP": "HTTP", - "cabal-32": "cabal-32", "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", @@ -198,11 +196,14 @@ "hackage": "hackage", "hackage-for-stackage": "hackage-for-stackage", "hackage-internal": "hackage-internal", + "hackage-overlay-repo-tool": "hackage-overlay-repo-tool", + "head-hackage": "head-hackage", "hls": "hls", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.10": "hls-2.10", "hls-2.11": "hls-2.11", + "hls-2.12": "hls-2.12", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -222,25 +223,45 @@ "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-2505": "nixpkgs-2505", + "nixpkgs-2511": "nixpkgs-2511", + "nixpkgs-2605": "nixpkgs-2605", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1763599931, - "narHash": "sha256-kuN9XY7ebniMxmZjUfG8EmJihnPptjCR24kin4BNIZI=", + "lastModified": 1791681788, + "narHash": "sha256-E9lGlzrcp9HcPo6fEllRAHPPbrBpUWIWYNaTKCWFcS0=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "9c5956641f45b6b02607e318485aad01c18e65b0", + "rev": "1dde0b46d3daa5bf0ff3ea6332d579a1943b4a0c", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "9c5956641f45b6b02607e318485aad01c18e65b0", + "rev": "1dde0b46d3daa5bf0ff3ea6332d579a1943b4a0c", "type": "github" } }, + "head-hackage": { + "flake": false, + "locked": { + "host": "gitlab.haskell.org", + "lastModified": 1780387533, + "narHash": "sha256-oifEa/JYg8ZLUtkbM8HVzKmqCcT9QxaDmG0ex2qT0Ng=", + "owner": "ghc", + "repo": "head.hackage", + "rev": "a50bec6c7722f774415bc0f0a0e64f6e2b8989b7", + "type": "gitlab" + }, + "original": { + "host": "gitlab.haskell.org", + "owner": "ghc", + "repo": "head.hackage", + "type": "gitlab" + } + }, "hls": { "flake": false, "locked": { @@ -325,6 +346,23 @@ "type": "github" } }, + "hls-2.12": { + "flake": false, + "locked": { + "lastModified": 1758709460, + "narHash": "sha256-xkI8MIIVEVARskfWbGAgP5sHG/lyeKnkm0LIOJ19X5w=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "7d983de4fa7ff54369f6dd31444bdb9869aec83e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.12.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -480,11 +518,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1755243078, - "narHash": "sha256-GLbl1YaohKdpzZVJFRdcI1O1oE3F3uBer4lFv3Yy0l8=", + "lastModified": 1786665587, + "narHash": "sha256-wyc/2cAic/m+xXVbjiJJe3XICe5yHUg1lGWoylFw/Dg=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "150605195cb7183a6fb7bed82f23fedf37c6f52a", + "rev": "6278b39451f6ddd81e1926389a99bfbcdb3f6c1c", "type": "github" }, "original": { @@ -511,17 +549,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767913362, - "narHash": "sha256-coWPipQc8rj3MfOl1JlEDNaMRen2wu7suttjDFQMbuQ=", + "lastModified": 1791765022, + "narHash": "sha256-ZGq3ptZzA+oO0N/Wi/F+GbuTijLkYExD01LvpNFAvr0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc404baae36fe1c24e481c4b7831cedc41ef5e08", + "rev": "7993f34ee47e28a3d607a525aadc6c94b73be728", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-25.11", "repo": "nixpkgs", + "rev": "7993f34ee47e28a3d607a525aadc6c94b73be728", "type": "github" } }, @@ -575,11 +613,11 @@ }, "nixpkgs-2411": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1751290243, + "narHash": "sha256-kNf+obkpJZWar7HZymXZbW+Rlk3HTEIMlpc6FCNz0Ds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "5ab036a8d97cb9476fbe81b09076e6e91d15e1b6", "type": "github" }, "original": { @@ -591,11 +629,11 @@ }, "nixpkgs-2505": { "locked": { - "lastModified": 1757716134, - "narHash": "sha256-OYoZLWvmCnCTCJQwaQlpK1IO5nkLnLLoUW8wwmPmrfU=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e85b5aa112a98805a016bbf6291e726debbc448a", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { @@ -605,13 +643,45 @@ "type": "github" } }, + "nixpkgs-2511": { + "locked": { + "lastModified": 1782904953, + "narHash": "sha256-ESJ4VgytmAt+98YLM8466luln4HyEZ9Q36b9+Bb4P5w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0921fdb3e13e40fe25fbc52b89661a9d6d32ac68", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-25.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2605": { + "locked": { + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "lastModified": 1784364478, + "narHash": "sha256-CdItYNdYUlm7NxqMVyQKqT2IxTwvapiPuRLWOyHTrbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "rev": "20535e48e12c86043b577b8518234ff5dbb26957", "type": "github" }, "original": { @@ -650,11 +720,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1763597599, - "narHash": "sha256-DXLOKxLE5gQLXIfi7hB3p1ozT2i3cjLfv1DcSzJuJNk=", + "lastModified": 1791678162, + "narHash": "sha256-nBxYGRCbcbmodrFeJfSgysaipQriNDO2KgIgvD/suRI=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "764f05b3fc01902659c26eb45825e633543f2692", + "rev": "3150f08172d4a75a26e675e6dc591e74ce7d5b42", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ed23368..e79f586 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,17 @@ { inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.haskellNix.url = "github:input-output-hk/haskell.nix/9c5956641f45b6b02607e318485aad01c18e65b0"; + inputs.haskellNix.url = "github:input-output-hk/haskell.nix/1dde0b46d3daa5bf0ff3ea6332d579a1943b4a0c"; inputs.gitignore = { url = "github:hercules-ci/gitignore.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-25.11"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/7993f34ee47e28a3d607a525aadc6c94b73be728"; inputs.linux-dynamic-bundler.url = "github:codedownio/linux-dynamic-bundler"; outputs = { self, flake-utils, gitignore, haskellNix, nixpkgs, linux-dynamic-bundler }: flake-utils.lib.eachSystem ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"] (system: let - compiler-nix-name = "ghc9122"; + compiler-nix-name = "ghc9124"; overlays = [ haskellNix.overlay @@ -110,7 +110,7 @@ NIX_PATH = "nixpkgs=${pkgs.path}"; buildInputs = with pkgs; [ stack - haskell.compiler.ghc9122 + haskell.compiler.ghc9124 pcre zlib diff --git a/stack.yaml b/stack.yaml index 53c854b..cf72afa 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2025-11-19 +resolver: nightly-2026-04-19 packages: - . diff --git a/stack.yaml.lock b/stack.yaml.lock index 9fd4a67..e742167 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -95,7 +95,7 @@ packages: git: https://github.com/codedownio/lsp-test-helpers.git snapshots: - completed: - sha256: 2dead96d1a0217c9c8f84bdb6c694bfc7542ccc5a09bbc8f648ebc1cdd9b6d2f - size: 705813 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/11/19.yaml - original: nightly-2025-11-19 + sha256: e532f0987cce63d549ae1ac942f7e52c91712c95c36447756a60e9279a68626d + size: 739226 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2026/4/19.yaml + original: nightly-2026-04-19