Skip to content

OpenCV 4 only, GHC 9.2 support #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

OpenCV 4 only, GHC 9.2 support #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca44d16
OpenCV 4 compatibility and default. OpenCV 3 compat likely broken now
nh2 Sep 6, 2023
20a195c
Drop `opencv4` Cabal flag since it's now the only choice
nh2 Sep 6, 2023
0174f21
Compatibility with Stackage lts-20.26 (GHC 9.2).
nh2 Sep 6, 2023
6ce76b0
opencv-extra: Make Aruco compile on OpenCV >= 4.7
nh2 Sep 7, 2023
6c0c068
nix: Use nixos-23.05, remove remnants of opencv3 support
nh2 Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ nixpkgs ? import ./nixpkgs.nix, enableOpencv4 ? false
{ nixpkgs ? import ./nixpkgs.nix
, system ? builtins.currentSystem
}:
import nixpkgs {
inherit system;
overlays = [ (import ./overlay.nix enableOpencv4) ];
overlays = [ (import ./overlay.nix) ];
}
4 changes: 2 additions & 2 deletions doc/ExampleExtractor.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import qualified "bytestring" Data.ByteString as B
import qualified "bytestring" Data.ByteString.Lazy as BL
import "template-haskell" Language.Haskell.TH
import "template-haskell" Language.Haskell.TH.Syntax
import "this" Language.Haskell.Meta.Syntax.Translate ( toDecs )
import "haskell-src-meta" Language.Haskell.Meta.Syntax.Translate ( toDecs )

#if !MIN_VERSION_base(4,11,0)
import "base" Data.Monoid
Expand Down Expand Up @@ -269,7 +269,7 @@ mkRenderExampleImages renderTargets = [d|
where
doRender :: Exp
doRender =
DoE $ do
DoE Nothing $ do
rt <- renderTargets
let sym = VarE $ rtSymbolName rt
fp = LitE $ StringL $ "examples/" <> rtDestination rt
Expand Down
Loading