From 9c0a65d019641e9e05a056d1017cd08d99213de9 Mon Sep 17 00:00:00 2001 From: Marco Perone Date: Wed, 8 Mar 2023 11:49:34 +0100 Subject: [PATCH] try building doctests on examples --- cabal.project | 2 ++ doctest/Main.hs | 4 ++-- nix/haskell-source.nix | 1 + package.yaml | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 cabal.project diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..1fc63b8 --- /dev/null +++ b/cabal.project @@ -0,0 +1,2 @@ +packages: *.cabal +write-ghc-environment-files: always diff --git a/doctest/Main.hs b/doctest/Main.hs index 4e0d539..5d32360 100644 --- a/doctest/Main.hs +++ b/doctest/Main.hs @@ -9,7 +9,7 @@ main = do args <- getArgs cremPackage <- findCabalPackage "crem" cremLib <- extractCabalLibrary cremPackage - -- cremExamplesLib <- extractSpecificCabalLibrary (Just "crem-examples") cremPackage + cremExamplesLib <- extractSpecificCabalLibrary (Just "crem-examples") cremPackage let - wholeCremLib = mergeLibraries [cremLib {-, cremExamplesLib-}] + wholeCremLib = mergeLibraries [cremLib, cremExamplesLib] mainFromLibrary wholeCremLib args diff --git a/nix/haskell-source.nix b/nix/haskell-source.nix index 4a0fe0a..2d1bc86 100644 --- a/nix/haskell-source.nix +++ b/nix/haskell-source.nix @@ -6,4 +6,5 @@ "src" "spec" "package.yaml" + "cabal.project" ] diff --git a/package.yaml b/package.yaml index fbbf1b7..095a012 100644 --- a/package.yaml +++ b/package.yaml @@ -146,6 +146,7 @@ tests: - -Wno-unused-packages dependencies: - crem + - crem-examples - doctest-parallel when: - condition: false