doc: use new file-embed to fix ghci cwd dependence

See https://github.com/snoyberg/file-embed/issues/18

hledger/Hledger/Cli/DocFiles.hs

@@ -31,48 +31,47 @@ import Hledger.Utils (first3, second3, third3)
 
 type Topic = String
 
--- XXX assumes cwd is the hledger package directory, for now ghci must be run from there
 docFiles :: IsString a => [(Topic, (a, a, a))]
 docFiles = [
    ("cli",
-    ($(embedStringFile $ "../hledger/doc/hledger.1")
+    ($(makeRelativeToProject "doc/hledger.1" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger/doc/hledger.1.txt")
+    ,$(makeRelativeToProject "doc/hledger.1.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger/doc/hledger.1.info")
+    ,$(makeRelativeToProject "doc/hledger.1.info" >>= embedStringFile)
     ))
   ,("ui",
-    ($(embedStringFile $ "../hledger-ui/doc/hledger-ui.1")
+    ($(makeRelativeToProject "../hledger-ui/doc/hledger-ui.1" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-ui/doc/hledger-ui.1.txt")
+    ,$(makeRelativeToProject "../hledger-ui/doc/hledger-ui.1.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-ui/doc/hledger-ui.1.info")
+    ,$(makeRelativeToProject "../hledger-ui/doc/hledger-ui.1.info" >>= embedStringFile)
     ))
   ,("web",
-    ($(embedStringFile $ "../hledger-web/doc/hledger-web.1")
+    ($(makeRelativeToProject "../hledger-web/doc/hledger-web.1" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-web/doc/hledger-web.1.txt")
+    ,$(makeRelativeToProject "../hledger-web/doc/hledger-web.1.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-web/doc/hledger-web.1.info")
+    ,$(makeRelativeToProject "../hledger-web/doc/hledger-web.1.info" >>= embedStringFile)
     ))
   ,("api",
-    ($(embedStringFile $ "../hledger-api/doc/hledger-api.1")
+    ($(makeRelativeToProject "../hledger-api/doc/hledger-api.1" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-api/doc/hledger-api.1.txt")
+    ,$(makeRelativeToProject "../hledger-api/doc/hledger-api.1.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-api/doc/hledger-api.1.info")
+    ,$(makeRelativeToProject "../hledger-api/doc/hledger-api.1.info" >>= embedStringFile)
     ))
   ,("journal",
-    ($(embedStringFile $ "../hledger-lib/doc/hledger_journal.5")
+    ($(makeRelativeToProject "../hledger-lib/doc/hledger_journal.5" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_journal.5.txt")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_journal.5.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_journal.5.info")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_journal.5.info" >>= embedStringFile)
     ))
   ,("csv",
-    ($(embedStringFile $ "../hledger-lib/doc/hledger_csv.5")
+    ($(makeRelativeToProject "../hledger-lib/doc/hledger_csv.5" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_csv.5.txt")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_csv.5.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_csv.5.info")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_csv.5.info" >>= embedStringFile)
     ))
   ,("timeclock",
-    ($(embedStringFile $ "../hledger-lib/doc/hledger_timeclock.5")
+    ($(makeRelativeToProject "../hledger-lib/doc/hledger_timeclock.5" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_timeclock.5.txt")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_timeclock.5.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_timeclock.5.info")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_timeclock.5.info" >>= embedStringFile)
     ))
   ,("timedot",
-    ($(embedStringFile $ "../hledger-lib/doc/hledger_timedot.5")
+    ($(makeRelativeToProject "../hledger-lib/doc/hledger_timedot.5" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_timedot.5.txt")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_timedot.5.txt" >>= embedStringFile)
-    ,$(embedStringFile $ "../hledger-lib/doc/hledger_timedot.5.info")
+    ,$(makeRelativeToProject "../hledger-lib/doc/hledger_timedot.5.info" >>= embedStringFile)
     ))
   ]
 

hledger/future-package.yaml

@@ -74,7 +74,7 @@ dependencies:
   - cmdargs >= 0.10 && < 0.11
   - csv
   - directory
-  - file-embed
+  - file-embed >= 0.0.10 && < 0.1
   - filepath
   - haskeline >= 0.6 && <= 0.8
   - HUnit

hledger/hledger.cabal

@@ -71,7 +71,7 @@ library
     , cmdargs >= 0.10 && < 0.11
     , csv
     , directory
-    , file-embed
+    , file-embed >= 0.0.10 && < 0.1
     , filepath
     , haskeline >= 0.6 && <= 0.8
     , HUnit
@@ -152,7 +152,7 @@ executable hledger
     , cmdargs >= 0.10 && < 0.11
     , csv
     , directory
-    , file-embed
+    , file-embed >= 0.0.10 && < 0.1
     , filepath
     , haskeline >= 0.6 && <= 0.8
     , HUnit
@@ -208,7 +208,7 @@ test-suite test
     , cmdargs >= 0.10 && < 0.11
     , csv
     , directory
-    , file-embed
+    , file-embed >= 0.0.10 && < 0.1
     , filepath
     , haskeline >= 0.6 && <= 0.8
     , HUnit
@@ -267,7 +267,7 @@ benchmark bench
                     temporary,
                     timeit,
                     process,
-                    file-embed,
+                    file-embed >= 0.0.10 && < 0.1,
                     filepath,
                     directory
 

stack.yaml

@@ -1,5 +1,8 @@
 # docs: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
 
+# this or a newer snapshot is suggested (hledger-api/servant/aeson requires > lts-5)
+resolver: nightly-2016-04-01
+
 packages:
 - hledger-lib
 - hledger
@@ -7,13 +10,11 @@ packages:
 - hledger-web
 - hledger-api
 
+extra-deps:
+- file-embed-0.0.10
+
 #flags:
 
-# this or a newer snapshot is suggested (hledger-api/servant/aeson requires > lts-5)
-resolver: nightly-2016-04-01
-
-#extra-deps:
-
 # ghc-options:
 #   rtsopts:
 #     all