changes for os x documentation and cabal file gen

Author: Gershom

hptool/os-extras/osx/bin/cabal.wrap

@@ -53,28 +53,43 @@ update_cabal_config() {
 --
 -- You may wish to bookmark that file
 
-
-remote-repo: hackage.haskell.org:http://hackage.haskell.org/packages/archive
-remote-repo-cache: ${user_haskell_dir}/repo-cache
+repository hackage.haskell.org
+  url: http://hackage.haskell.org/
+  -- secure: False
+  -- root-keys:
+  -- key-threshold:
+
+-- default-user-config:
+-- require-sandbox: False
+-- ignore-sandbox: False
+-- ignore-expiry: False
+-- http-transport:
+
+remote-repo-cache: ${cabal_dir}/packages
 -- local-repo:
 -- logs-dir:
 world-file: ${user_haskell_dir}/logs/world
 -- verbose: 1
 -- compiler: ghc
 -- with-compiler:
 -- with-hc-pkg:
--- scratchdir:
 -- program-prefix:
 -- program-suffix:
 -- library-vanilla: True
 library-profiling: True
 -- shared:
 -- executable-dynamic: False
--- executable-profiling: False
+-- profiling:
+-- executable-profiling:
+-- profiling-detail:
+-- library-profiling-detail:
 -- optimization: True
--- library-for-ghci: False
+-- debug-info: False
+-- library-for-ghci:
 -- split-objs: False
 -- executable-stripping: True
+-- library-stripping: True
+-- configure-option:
 -- user-install: True
 -- package-db:
 -- flags:
@@ -83,7 +98,10 @@ library-profiling: True
 extra-prog-path: ${user_haskell_dir}/bin
 -- tests: False
 -- library-coverage: False
+-- allow-newer: False
+-- exact-configuration: False
 -- benchmarks: False
+-- relocatable: False
 -- cabal-lib-version:
 -- constraint:
 -- preference:
@@ -103,10 +121,30 @@ root-cmd: sudo
 build-summary: ${user_haskell_dir}/logs/build.log
 -- build-log:
 remote-build-reporting: anonymous
+-- report-planning-failure: False
 -- one-shot: False
 jobs: \$ncpus
+-- offline: False
 -- username:
 -- password:
+-- password-command:
+-- builddir:
+
+haddock
+  -- keep-temp-files: False
+  -- hoogle: False
+  -- html: False
+  -- html-location:
+  -- for-hackage: False
+  -- executables: False
+  -- tests: False
+  -- benchmarks: False
+  -- all:
+  -- internal: False
+  -- css:
+  -- hyperlink-source: False
+  -- hscolour-css:
+  -- contents-location:
 
 install-dirs user
   prefix: ${user_haskell_dir}
@@ -262,4 +300,3 @@ if update_cabal_config ; then
 fi
 
 exec -a cabal /Library/Haskell/bin/cabal.real "$@"
-

hptool/os-extras/osx/doc/start.html.mu

@@ -105,11 +105,14 @@ p {
           <p>Documentation for the GHC API.</p>
         </li>
         <li>
-          <!-- <p><a href="ghc-doc/Cabal/index.html">Cabal</a></p> -->
           <p><a href="http://www.haskell.org/cabal/users-guide/">Cabal</a></p>
           <p>An infrastructure for building and distributing Haskell software.</p>
         </li>
         <li>
+          <p><a href="http://docs.haskellstack.org/">Stack</a></p>
+          <p>A cross-platform program for developing Haskell projects.</p>
+        </li>
+	<li>
           <p><a href="ghc-doc/haddock/index.html">Haddock</a></p>
           <p>A tool for automatically generating documentation from annotated Haskell source code.</p>
         </li>
@@ -139,6 +142,16 @@ p {
       <p><b>N.B.</b> Built executables will be symlink'd into <tt>~/Library/Haskell/bin</tt>, you probably want to add that to your <tt>$PATH</tt> by adding this line to your <tt>~/.bash_profile</tt>:
       <p class="paths">export PATH="$HOME/Library/Haskell/bin:$PATH"</p>
 
+      <p><b>N.B.</b> Built executables by the stack tool will be symlink'd into <tt>~/.local/bin</tt>, you probably want to add that to your <tt>$PATH</tt> by adding this line to your <tt>~/.bash_profile</tt>:
+      <p class="paths">export PATH="$HOME/.local/bin:$PATH"</p>
+
+      <p>In particular, when you upgrade to a new version of stack via
+      the "stack upgrade" command (and you should consider doing so if
+      the installed stack version is well behind the currently
+      released one), it will be installed into the above directory,
+      and will only be used if that directory is placed appropriately
+      in your path.</p>
+
       <div id="sidebar">
       <div class="module">
       <h2>Community</h2>
@@ -155,7 +168,7 @@ p {
       <div class="module">
       <h2>Development Resources</h2>
       <ul>
-        <li><a href="http://hackage.haskell.org/packages/hackage.html">Hackage libary database</a></li>
+        <li><a href="http://hackage.haskell.org/">Hackage libary database</a></li>
         <li><a href="http://haskell.org/hoogle/">Hoogle</a> and
             <a href="http://holumbus.fh-wedel.de/hayoo/">Hayoo</a> API search</li>
       </ul>