From 5ff02e404147db50fe9493f44762b177c91d7dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Wed, 10 May 2023 12:11:40 +0200 Subject: [PATCH 1/3] Allow GHCs 9.4 on CI --- flake.nix | 4 ++++ monad-bayes.cabal | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d7ec9863..9d1931c2 100644 --- a/flake.nix +++ b/flake.nix @@ -76,10 +76,14 @@ name = "monad-bayes"; root = src; cabal2nixOptions = "--benchmark -fdev"; + overrides = self: super: { + string-qq = pkgs.haskell.lib.dontCheck super.string-qq; + }; }; ghcs = [ # Always keep this up to date with the tested-with section in monad-bayes.cabal! "ghc902" "ghc927" + "ghc945" ]; buildForVersion = ghcVersion: (builtins.getAttr ghcVersion pkgs.haskell.packages).developPackage opts; in lib.attrsets.genAttrs ghcs buildForVersion; diff --git a/monad-bayes.cabal b/monad-bayes.cabal index 8cdb4213..e74b1fe9 100644 --- a/monad-bayes.cabal +++ b/monad-bayes.cabal @@ -7,7 +7,7 @@ copyright: 2015-2020 Adam Scibior maintainer: dominic.steinitz@tweag.io author: Adam Scibior stability: experimental -tested-with: GHC ==9.0.2 || ==9.2.7 +tested-with: GHC ==9.0.2 || ==9.2.7 || ==9.4.5 homepage: http://github.com/tweag/monad-bayes#readme bug-reports: https://github.com/tweag/monad-bayes/issues synopsis: A library for probabilistic programming. From cdb88994d0bcc7cc5b8196ee7d89c1473ab51f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 11 May 2023 17:37:19 +0200 Subject: [PATCH 2/3] Add maintainer comment --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9d1931c2..dcb02439 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ name = "monad-bayes"; root = src; cabal2nixOptions = "--benchmark -fdev"; - overrides = self: super: { + overrides = self: super: { # Please periodically check whether some of these overrides can be removed string-qq = pkgs.haskell.lib.dontCheck super.string-qq; }; }; From 71ce7c636a1284244bf73b3c280dcf4d50aa475a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 11 May 2023 18:21:09 +0200 Subject: [PATCH 3/3] Refactor overrides --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index dcb02439..f9ff6f46 100644 --- a/flake.nix +++ b/flake.nix @@ -76,8 +76,8 @@ name = "monad-bayes"; root = src; cabal2nixOptions = "--benchmark -fdev"; - overrides = self: super: { # Please periodically check whether some of these overrides can be removed - string-qq = pkgs.haskell.lib.dontCheck super.string-qq; + overrides = self: super: with pkgs.haskell.lib; { # Please check after flake.lock updates whether some of these overrides can be removed + string-qq = dontCheck super.string-qq; }; }; ghcs = [ # Always keep this up to date with the tested-with section in monad-bayes.cabal!