From 2b4626217105e45a971c63d6d8d66539a03b58ac Mon Sep 17 00:00:00 2001 From: Teo Camarasu Date: Thu, 19 Dec 2024 15:14:01 +0000 Subject: [PATCH] Support GHC-9.12 --- cabal.project | 8 +- ..._151415_teofilcamarasu_support_ghc_9_12.md | 3 + flake.lock | 94 ++++++++++++++----- flake.nix | 2 +- rel8.cabal | 8 +- 5 files changed, 88 insertions(+), 27 deletions(-) create mode 100644 changelog.d/20241219_151415_teofilcamarasu_support_ghc_9_12.md diff --git a/cabal.project b/cabal.project index 9ea02062..9c5314c1 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,9 @@ packages: . -constraints: ansi-wl-pprint < 1.0.0 + +source-repository-package + type: git + location: https://github.com/jfischoff/tmp-postgres + tag: 7f2467a6d6d5f6db7eed59919a6773fe006cf22b + allow-newer: base16:base, base16:deepseq, base16:text +allow-newer: *:base, *:template-haskell, *:ghc-prim diff --git a/changelog.d/20241219_151415_teofilcamarasu_support_ghc_9_12.md b/changelog.d/20241219_151415_teofilcamarasu_support_ghc_9_12.md new file mode 100644 index 00000000..52add6be --- /dev/null +++ b/changelog.d/20241219_151415_teofilcamarasu_support_ghc_9_12.md @@ -0,0 +1,3 @@ +### Added + +- Support GHC-9.12 diff --git a/flake.lock b/flake.lock index b9f80e71..f7e614fd 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1746663969, - "narHash": "sha256-SnVSxxxX+J1hVI7sFh3nBUPEI5ql8ieNwE9xFm4uizk=", + "lastModified": 1755735907, + "narHash": "sha256-8fOqP45pBWQVFW4tBGgWw1vJmRRBSrQX1TOkCIRZUlw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "cc4e4c0d1b0c76dad98de5eaf1e9065516caf6dc", + "rev": "6313548135c7dc5daea2ae1ed1d0dd1afa3d485e", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "hackage-for-stackage": { "flake": false, "locked": { - "lastModified": 1746663959, - "narHash": "sha256-sv0/0CmiQWHqsWlcwhSNlnux8YPMJx2Y3FxAalvB54s=", + "lastModified": 1755735896, + "narHash": "sha256-X4HTWcv6vgx6EncLyyJJdaNTkL8F8P69HAMaEgZLYhg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a4f96c31bebc5cbee31b7ea079bc7ffeb5d35957", + "rev": "54203507c2141dfea4463ba5c4015f11f2c2a503", "type": "github" }, "original": { @@ -168,6 +168,22 @@ "type": "github" } }, + "hackage-internal": { + "flake": false, + "locked": { + "lastModified": 1750307553, + "narHash": "sha256-iiafNoeLHwlSLQTyvy8nPe2t6g5AV4PPcpMeH/2/DLs=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "f7867baa8817fab296528f4a4ec39d1c7c4da4f3", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, "haskellNix": { "inputs": { "HTTP": "HTTP", @@ -179,10 +195,12 @@ "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", "hackage-for-stackage": "hackage-for-stackage", + "hackage-internal": "hackage-internal", "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.2": "hls-2.2", "hls-2.3": "hls-2.3", "hls-2.4": "hls-2.4", @@ -201,16 +219,17 @@ "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-2411": "nixpkgs-2411", + "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1746665528, - "narHash": "sha256-Pztdz0tTbCvnsq9vgbFTiFtXuQ6NCdUXDJCaRq1l9bE=", + "lastModified": 1755737525, + "narHash": "sha256-BVHCMhwjwl+uxDUgQOQu3EoGRwcDYLuJ/6DNTgWDSys=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "f98f6bf207d8344c0b043ae4ccbac8a9f887f3a4", + "rev": "a808cbd430a74c00a0e5959d384e1a11e2ea1e2a", "type": "github" }, "original": { @@ -286,6 +305,23 @@ "type": "github" } }, + "hls-2.11": { + "flake": false, + "locked": { + "lastModified": 1747306193, + "narHash": "sha256-/MmtpF8+FyQlwfKHqHK05BdsxC9LHV70d/FiMM7pzBM=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "46ef4523ea4949f47f6d2752476239f1c6d806fe", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.11.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -441,11 +477,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1742121966, - "narHash": "sha256-x4bg4OoKAPnayom0nWc0BmlxgRMMHk6lEPvbiyFBq1s=", + "lastModified": 1755040634, + "narHash": "sha256-8W7uHpAIG8HhO3ig5OGHqvwduoye6q6dlrea1IrP2eI=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "e9dc86ed6ad71f0368c16672081c8f26406c3a7e", + "rev": "1383d199a2c64f522979005d112b4fbdee38dd92", "type": "github" }, "original": { @@ -505,11 +541,11 @@ }, "nixpkgs-2411": { "locked": { - "lastModified": 1739151041, - "narHash": "sha256-uNszcul7y++oBiyYXjHEDw/AHeLNp8B6pyWOB+RLA/4=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94792ab2a6beaec81424445bf917ca2556fbeade", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { @@ -519,13 +555,29 @@ "type": "github" } }, + "nixpkgs-2505": { + "locked": { + "lastModified": 1748852332, + "narHash": "sha256-r/wVJWmLYEqvrJKnL48r90Wn9HWX9SHFt6s4LhuTh7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a8167f3cc2f991dd4d0055746df53dae5fd0c953", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-25.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737110817, - "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { @@ -565,11 +617,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1746663191, - "narHash": "sha256-s1Yln2DNZp1aJyNuCQm3/vvW8W6wgDWG5L5L5HOx3j8=", + "lastModified": 1755735102, + "narHash": "sha256-/oZzMO5tdwz0V3uLRI5N9BrMEQc6/MFOpDfHRMRehEI=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "b9b32646970b0f8ea5e399ff948aaa9d212aca91", + "rev": "999a41c7e94d417cd507977e1050a18f3a7a2424", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5af46be2..419fd713 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ }; rel8 = pkgs.haskell-nix.project { - compiler-nix-name = "ghc982"; + compiler-nix-name = "ghc9121"; cabalProjectLocal = builtins.readFile ./cabal.project.haskell-nix; diff --git a/rel8.cabal b/rel8.cabal index 6aa8de77..2703f99f 100644 --- a/rel8.cabal +++ b/rel8.cabal @@ -21,9 +21,9 @@ library build-depends: aeson , attoparsec - , base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19 || ^>= 4.20 + , base >= 4.16 && < 4.22 , base16 >= 1.0 - , base-compat ^>= 0.11 || ^>= 0.12 || ^>= 0.13 || ^>= 0.14 + , base-compat >= 0.11 && < 0.15 , bifunctors , bytestring , case-insensitive @@ -258,7 +258,7 @@ test-suite tests , containers , hasql , hasql-transaction - , hedgehog ^>= 1.0 || ^>= 1.1 || ^>= 1.2 || ^>= 1.3 || ^>= 1.4 || ^>= 1.5 + , hedgehog >= 1.0 && < 1.6 , mmorph , iproute , rel8 @@ -268,7 +268,7 @@ test-suite tests , text , these , time - , tmp-postgres ^>=1.34.1.0 + , tmp-postgres >=1.34 && <1.36 , transformers , uuid , vector