From 1083844f78319db815eed3e7f8f688c7c2c847b2 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 12:03:44 -0400 Subject: [PATCH 1/7] chore: Remove support for ghc-8.10 --- flake.nix | 51 ++++++++------------------------------------------- 1 file changed, 8 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index 09118b85b..4eddc6acf 100644 --- a/flake.nix +++ b/flake.nix @@ -76,23 +76,6 @@ schema = ./schema; }) - (final: prev: { - # HLint 3.2.x requires GHC >= 8.10 && < 9.0 - hlint = final.haskell-nix.tool "ghc8107" "hlint" { - version = "3.2.7"; - }; - - # Fourmolu 0.10.x requires GHC >= 9.0 && < 9.6 - fourmolu = final.haskell-nix.tool "ghc928" "fourmolu" { - version = "0.10.1.0"; - }; - - # Weeder 2.2.0 requires GHC >= 8.10 && < 9.0 - weeder = final.haskell-nix.tool "ghc8107" "weeder" { - version = "2.2.0"; - }; - }) - (final: prev: { postgresql = prev.postgresql.overrideAttrs (_: final.lib.optionalAttrs (final.stdenv.hostPlatform.isMusl) { @@ -156,25 +139,20 @@ project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, pkgs, ... }: rec { src = ./.; name = "cardano-db-sync"; - compiler-nix-name = - if system == "x86_64-linux" - then lib.mkDefault "ghc810" - else lib.mkDefault "ghc96"; + compiler-nix-name = lib.mkDefault "ghc96"; flake.variants = let compilers = if (system == "x86_64-linux") then - ["ghc96" "ghc98" "ghc910"] + [ "ghc98" "ghc910" ] else - ["ghc98"]; + [ "ghc98" ]; in lib.genAttrs compilers (c: { compiler-nix-name = c; }); crossPlatforms = p: lib.optional (system == "x86_64-linux") p.musl64 ++ - lib.optional - (system == "x86_64-linux" && config.compiler-nix-name == "ghc966") - p.aarch64-multiplatform-musl; + lib.optional (system == "x86_64-linux") p.aarch64-multiplatform-musl; inputMap = { "https://chap.intersectmbo.org/" = inputs.CHaP; @@ -182,12 +160,11 @@ shell.tools = { cabal = "latest"; + hlint = "latest"; + fourmolu = "latest"; + weeder = "latest"; haskell-language-server = { - src = - if config.compiler-nix-name == "ghc8107" then - nixpkgs.haskell-nix.sources."hls-1.10" - else - nixpkgs.haskell-nix.sources."hls-2.9"; + src = nixpkgs.haskell-nix.sources."hls-2.9"; }; }; # Now we use pkgsBuildBuild, to make sure that even in the cross @@ -195,18 +172,6 @@ # for the target. shell.buildInputs = with nixpkgs.pkgsBuildBuild; [ gitAndTools.git - hlint - ] ++ lib.optionals (config.compiler-nix-name == "ghc8107") [ - # Weeder requires the GHC version to match HIE files - weeder - ] ++ lib.optionals (system != "aarch64-darwin") [ - # TODO: Fourmolu 0.10 is currently failing to build with aarch64-darwin - # - # Linking dist/build/fourmolu/fourmolu ... - # ld: line 269: 2352 Segmentation fault ... - # clang-11: error: linker command failed with exit code 139 (use -v to see invocation) - # `cc' failed in phase `Linker'. (Exit code: 139) - fourmolu ]; shell.withHoogle = true; shell.crossPlatforms = _: []; From 8b976a85d1c520e4893b6491745ddb249d11632d Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 12:08:16 -0400 Subject: [PATCH 2/7] build(ci): Remove ghc 8.10 Add 9.10 --- .github/workflows/haskell.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 9326ae064..90c23a12f 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -19,8 +19,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - # TODO: Add ghc910 when input-output-hk/devx is fixed - compiler-nix-name: [ghc810, ghc96, ghc98] + compiler-nix-name: [ghc96, ghc98, ghc910] include: # We want a single job, because macOS runners are scarce. - os: macos-latest From 1e15f8deeb392d04431d4bbb623078f44d0627be Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 13:03:59 -0400 Subject: [PATCH 3/7] build(nix): Fix static checks --- flake.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/flake.nix b/flake.nix index 4eddc6acf..96f9855fb 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,15 @@ schema = ./schema; }) + (final: prev: { + fourmolu = final.haskell-nix.tool "ghc96" "fourmolu" { + version = "latest"; + }; + + hlint = final.haskell-nix.tool "ghc96" "hlint" { + }; + }) + (final: prev: { postgresql = prev.postgresql.overrideAttrs (_: final.lib.optionalAttrs (final.stdenv.hostPlatform.isMusl) { From ccd8e0e2b257c57436d12cd0381c47728d92edb7 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 14:20:43 -0400 Subject: [PATCH 4/7] build(nix): Fix weeder --- flake.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 96f9855fb..73d5d21b6 100644 --- a/flake.nix +++ b/flake.nix @@ -169,18 +169,19 @@ shell.tools = { cabal = "latest"; - hlint = "latest"; fourmolu = "latest"; - weeder = "latest"; haskell-language-server = { src = nixpkgs.haskell-nix.sources."hls-2.9"; }; + } // lib.optionalAttrs (config.compiler-nix-name == "ghc966") { + weeder = "latest"; }; # Now we use pkgsBuildBuild, to make sure that even in the cross # compilation setting, we don't run into issues where we pick tools # for the target. shell.buildInputs = with nixpkgs.pkgsBuildBuild; [ gitAndTools.git + hlint ]; shell.withHoogle = true; shell.crossPlatforms = _: []; From 3c67b35cc60fbe2bf7a5af427cfb40389ec75083 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 14:42:47 -0400 Subject: [PATCH 5/7] build(nix): Remove aarch64-musl for ghc-9.8,9.10 --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 73d5d21b6..1d3e2303c 100644 --- a/flake.nix +++ b/flake.nix @@ -161,7 +161,9 @@ crossPlatforms = p: lib.optional (system == "x86_64-linux") p.musl64 ++ - lib.optional (system == "x86_64-linux") p.aarch64-multiplatform-musl; + lib.optional + (system == "x86_64-linux" && config.compiler-nix-name == "ghc966") + p.aarch64-multiplatform-musl; inputMap = { "https://chap.intersectmbo.org/" = inputs.CHaP; From 2cbd7f28bbc6b5702a76f1f47fe7b6f92c2db5c2 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 15:09:40 -0400 Subject: [PATCH 6/7] build(nix): Remove some ghc-8.10 hacks --- flake.nix | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index 1d3e2303c..87bd98380 100644 --- a/flake.nix +++ b/flake.nix @@ -183,7 +183,6 @@ # for the target. shell.buildInputs = with nixpkgs.pkgsBuildBuild; [ gitAndTools.git - hlint ]; shell.withHoogle = true; shell.crossPlatforms = _: []; @@ -211,32 +210,13 @@ }) - ({ lib, config, ... }: - # Disable haddock on 8.x - lib.mkIf (lib.versionOlder config.compiler.version "9") { - packages.cardano-ledger-alonzo.doHaddock = false; - packages.cardano-ledger-allegra.doHaddock = false; - packages.cardano-ledger-api.doHaddock = false; - packages.cardano-ledger-babbage.doHaddock = false; - packages.cardano-ledger-conway.doHaddock = false; - packages.cardano-ledger-shelley.doHaddock = false; - packages.cardano-protocol-tpraos.doHaddock = false; - packages.fs-api.doHaddock = false; - packages.ouroboros-network-framework.doHaddock = false; - packages.ouroboros-consensus-cardano.doHaddock = false; - packages.ouroboros-consensus.doHaddock = false; - packages.cardano-ledger-core.doHaddock = false; - packages.plutus-ledger-api.doHaddock = false; - packages.wai-extra.doHaddock = false; - }) - ({ lib, pkgs, config, ... }: - lib.mkIf (lib.versionAtLeast config.compiler.version "9.4") { - # lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries - # to call out to all kinds of silly tools that GHC doesn't really provide. - # For this reason, we try to get away without re-installing lib:ghc for now. - reinstallableLibGhc = false; - }) + ({ lib, pkgs, config, ... }: { + # lib:ghc is a bit annoying in that it comes with it's own build-type:Custom, and then tries + # to call out to all kinds of silly tools that GHC doesn't really provide. + # For this reason, we try to get away without re-installing lib:ghc for now. + reinstallableLibGhc = false; + }) ({ pkgs, ... }: # Database tests From dcb18450bcee57134fa12b58cc49f4b3d78baf1a Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Fri, 9 May 2025 16:55:13 -0400 Subject: [PATCH 7/7] build(nix): nix flake update --- cabal.project | 4 +- flake.lock | 300 ++++++++++++++++---------------------------------- flake.nix | 2 +- 3 files changed, 99 insertions(+), 207 deletions(-) diff --git a/cabal.project b/cabal.project index e897f7a98..678ba7101 100644 --- a/cabal.project +++ b/cabal.project @@ -10,8 +10,8 @@ repository cardano-haskell-packages d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee index-state: - , hackage.haskell.org 2024-10-10T00:52:24Z - , cardano-haskell-packages 2024-11-26T16:00:26Z + , hackage.haskell.org 2025-05-08T22:29:22Z + , cardano-haskell-packages 2025-04-29T20:52:57Z packages: cardano-db diff --git a/flake.lock b/flake.lock index a8d647c65..2bd5e5b46 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1732742574, - "narHash": "sha256-XUhDWQeChjNPcYluz8sCbs5vW+3jEYysxEhpKdFXbt0=", + "lastModified": 1745960978, + "narHash": "sha256-SKYYwYUYPEuHhVFu+82ExAYkaJ1oZ9MIgRZ2U+MVpe4=", "owner": "IntersectMBO", "repo": "cardano-haskell-packages", - "rev": "375a4694472aa362b7abba0e8b7f3de787e90c91", + "rev": "b8e34520941dd8631c22c7bf2f1cd68533104fe0", "type": "github" }, "original": { @@ -36,16 +36,16 @@ "blst": { "flake": false, "locked": { - "lastModified": 1691598027, - "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", + "lastModified": 1739372843, + "narHash": "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=", "owner": "supranational", "repo": "blst", - "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", + "rev": "8c7db7fe8d2ce6e76dc398ebd4d475c0ec564355", "type": "github" }, "original": { "owner": "supranational", - "ref": "v0.3.11", + "ref": "v0.3.14", "repo": "blst", "type": "github" } @@ -168,14 +168,31 @@ "type": "github" } }, + "hackage-for-stackage": { + "flake": false, + "locked": { + "lastModified": 1746750361, + "narHash": "sha256-U63OLr9ECT4rx1kSWpV6UMVQeEzCD3TbBFU84cABU7g=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "535df5fbe747407601112a99b8cd37c7620fd0ce", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "for-stackage", + "repo": "hackage.nix", + "type": "github" + } + }, "hackageNix": { "flake": false, "locked": { - "lastModified": 1729470551, - "narHash": "sha256-AKBK4jgOjIz5DxIsIKFZR0mf30qc4Dv+Dm/DVRjdjD8=", + "lastModified": 1746750371, + "narHash": "sha256-RjeQ3ITyLy8EUQkQQww2TYgYeFpNGfekYx86+RJEDmY=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "ee5b803d828db6efac3ef7e7e072c855287dc298", + "rev": "fb0bf47ca325226cf115d467f23fd2ef03339861", "type": "github" }, "original": { @@ -196,8 +213,11 @@ "hackage": [ "hackageNix" ], + "hackage-for-stackage": "hackage-for-stackage", + "hls": "hls", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.10": "hls-2.10", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -207,30 +227,25 @@ "hls-2.8": "hls-2.8", "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", - "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ "haskellNix", "nixpkgs-unstable" ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405", + "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1729471867, - "narHash": "sha256-xMxD8YQGGcbrZGHJws32UvtWJxfhzAO7yzPs5TjiOPY=", + "lastModified": 1746775653, + "narHash": "sha256-tMrLzQS9X0Tkj9DvQV23RI+UMH33oB0Gj/eQQ3XMrWc=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "03c3581d2e0c91f7c2690115b487961ad62099a6", + "rev": "5cc54670fb06177c69558bdce32db28ea535dda1", "type": "github" }, "original": { @@ -239,6 +254,22 @@ "type": "github" } }, + "hls": { + "flake": false, + "locked": { + "lastModified": 1741604408, + "narHash": "sha256-tuq3+Ip70yu89GswZ7DSINBpwRprnWnl6xDYnS4GOsc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "682d6894c94087da5e566771f25311c47e145359", + "type": "github" + }, + "original": { + "owner": "haskell", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-1.10": { "flake": false, "locked": { @@ -273,6 +304,23 @@ "type": "github" } }, + "hls-2.10": { + "flake": false, + "locked": { + "lastModified": 1743069404, + "narHash": "sha256-q4kDFyJDDeoGqfEtrZRx4iqMVEC2MOzCToWsFY+TOzY=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "2318c61db3a01e03700bd4b05665662929b7fe8b", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -395,11 +443,11 @@ "hls-2.9": { "flake": false, "locked": { - "lastModified": 1720003792, - "narHash": "sha256-qnDx8Pk0UxtoPr7BimEsAZh9g2WuTuMB/kGqnmdryKs=", + "lastModified": 1719993701, + "narHash": "sha256-wy348++MiMm/xwtI9M3vVpqj2qfGgnDcZIGXw8sF1sA=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "0c1817cb2babef0765e4e72dd297c013e8e3d12b", + "rev": "90319a7e62ab93ab65a95f8f2bcf537e34dae76a", "type": "github" }, "original": { @@ -425,29 +473,6 @@ "type": "github" } }, - "hydra": { - "inputs": { - "nix": "nix", - "nixpkgs": [ - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", - "owner": "NixOS", - "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, "iohkNix": { "inputs": { "blst": "blst", @@ -458,11 +483,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1730297014, - "narHash": "sha256-n3f1iAmltKnorHWx7FrdbGIF/FmEG8SsZshS16vnpz0=", + "lastModified": 1745582862, + "narHash": "sha256-dMoJ6yHcRvUcB66nofzfAtmVxnDg8oPW3wiVtimXT/o=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "d407eedd4995e88d08e83ef75844a8a9c2e29b36", + "rev": "5c16fdfc45deda7a4ccf964b6dfa1c3cab72f1f7", "type": "github" }, "original": { @@ -474,11 +499,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1717479972, - "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", + "lastModified": 1742121966, + "narHash": "sha256-x4bg4OoKAPnayom0nWc0BmlxgRMMHk6lEPvbiyFBq1s=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "2ed34002247213fc435d0062350b91bab920626e", + "rev": "e9dc86ed6ad71f0368c16672081c8f26406c3a7e", "type": "github" }, "original": { @@ -488,139 +513,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2003": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2205": { - "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2211": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2305": { "locked": { "lastModified": 1705033721, @@ -655,11 +547,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1735564410, + "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", "type": "github" }, "original": { @@ -669,29 +561,29 @@ "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-2411": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1739151041, + "narHash": "sha256-uNszcul7y++oBiyYXjHEDw/AHeLNp8B6pyWOB+RLA/4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "94792ab2a6beaec81424445bf917ca2556fbeade", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-24.11-darwin", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726583932, - "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", + "lastModified": 1737110817, + "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "658e7223191d2598641d50ee4e898126768fe847", + "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", "type": "github" }, "original": { @@ -703,11 +595,11 @@ }, "nixpkgsUpstream": { "locked": { - "lastModified": 1737942377, - "narHash": "sha256-8Eo/jRAgT3CbAloyqOj6uPN1EqBvLI/Tv2g+RxHjkhU=", + "lastModified": 1746576598, + "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88a55dffa4d44d294c74c298daf75824dc0aafb5", + "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", "type": "github" }, "original": { @@ -786,11 +678,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1729039017, - "narHash": "sha256-fGExfgG+7UNSOV8YfOrWPpOHWrCjA02gQkeSBhaAzjQ=", + "lastModified": 1746749572, + "narHash": "sha256-0jUwKXRwaOuzVkmaz1zajXmVic948PsUtWLvN4Be6R0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "df1d8f0960407551fea7af7af75a9c2f9e18de97", + "rev": "4029bb170a515bb908251a8ca5be0b03b2cce72a", "type": "github" }, "original": { @@ -819,11 +711,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 87bd98380..439d8310b 100644 --- a/flake.nix +++ b/flake.nix @@ -173,7 +173,7 @@ cabal = "latest"; fourmolu = "latest"; haskell-language-server = { - src = nixpkgs.haskell-nix.sources."hls-2.9"; + src = nixpkgs.haskell-nix.sources."hls-2.10"; }; } // lib.optionalAttrs (config.compiler-nix-name == "ghc966") { weeder = "latest";