diff options
Diffstat (limited to 'third_party/overlays')
-rw-r--r-- | third_party/overlays/haskell/default.nix | 12 | ||||
-rw-r--r-- | third_party/overlays/tvl.nix | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 16c250f82004..45681194acc6 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -20,18 +20,6 @@ let hashable = doJailbreak hsSuper.hashable; test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2; pandoc = doJailbreak hsSuper.pandoc; - - # can be removed if we have the following PR or equivalent - # https://github.com/NixOS/nixpkgs/pull/116931 - hedgehog-classes = overrideCabal hsSuper.hedgehog-classes (attrs: { - # remove version bound on semirings which is inside a - # conditional, so doJailbreak doesn't work - prePatch = '' - sed -i 's|semirings.*0.6|semirings|g' hedgehog-classes.cabal - ''; - }); - - hgeometry-combinatorial = dontCheck hsSuper.hgeometry-combinatorial; }; in { haskellPackages = super.haskellPackages.override { diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 01f7156ff19b..6c182df7d481 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -24,4 +24,8 @@ self: super: { clang-tools = (super.clang-tools.override { llvmPackages = self.llvmPackages_11; }); + + # Pick an older version of SBCL as the default, to avoid issues with + # warnings in newer SBCL. + sbcl = super.sbcl_2_0_8; } |