Upgrade to new Stackage snapshot (digital-asset#941)

I also started an Upgrading.md document. I’ll add the documentation for upgrading nixpkgs in a separate PR.
TuranDev · May 6, 2019 · 66541f1 · 66541f1
1 parent 1a069ad
commit 66541f1
Show file tree

Hide file tree

Showing 6 changed files with 836 additions and 742 deletions.
diff --git a/Upgrading.md b/Upgrading.md
@@ -0,0 +1,34 @@
+# How to upgrade packages in this repo
+
+## Stackage
+
+To update the Stackage snapshot you need to clone the hazel repository into a
+separate directory:
+
+```
+$ git clone https://github.com/tweag/rules_haskell.git
+```
+
+Change into the hazel directory.
+
+```
+$ cd rules_haskell/hazel
+```
+
+Then execute the following command to update to the specified Stackage
+snapshot, where `$PROJECT` points to the root of this repository:
+(Requires `stack`)
+
+```
+$ Stackage.hs lts-12.4 "$PROJECT/hazel/packages.bzl"
+```
+
+On NixOS you may need to modify `Stackage.hs` to append the following flag to
+the list of `stack` intrepreter flags: `--nix-packages zlib`.
+
+This will take a while.
+
+
+## Nixpkgs
+
+TODO
diff --git a/WORKSPACE b/WORKSPACE
@@ -454,11 +454,7 @@ hazel_repositories(
                 "c8905268b7e3b4cf624a40245bf11b35274a6dd836a5d4d531b5760075645303",
                 patches = ["@ai_formation_hazel//third_party/haskell:network.patch"],
             ) +
-            hazel_hackage("unix-time", "0.4.5", "fe7805c62ad682589567afeee265e6e230170c3941cdce479a2318d1c5088faf") +
             hazel_hackage("zip-archive", "0.3.3", "988adee77c806e0b497929b24d5526ea68bd3297427da0d0b30b99c094efc84d") +
-            hazel_hackage("js-dgtable", "0.5.2", "e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac") +
-            hazel_hackage("shake", "0.17.8", "ade4162f7540f044f0446981120800076712d1f98d30c5b5344c0f7828ec49a2") +
-            hazel_hackage("filepattern", "0.1.1", "f7fc5bdcfef0d43a793a3c64e7c0fd3b1d35eea97a37f0e69d6612ab255c9b4b") +
             hazel_hackage("terminal-progress-bar", "0.4.0.1", "c5a9720fcbcd9d83f9551e431ee3975c61d7da6432aa687aef0c0e04e59ae277") +
             hazel_hackage("rope-utf16-splay", "0.2.0.0", "83d1961bf55355da49a6b55d6f58d02483eff1f8e6df53f4dccdab1ac49e101d") +
             hazel_hackage("unix-compat", "0.5.1", "a39d0c79dd906763770b80ba5b6c5cb710e954f894350e9917de0d73f3a19c52") +

diff --git a/daml-assistant/daml-helper/src/DamlHelper.hs b/daml-assistant/daml-helper/src/DamlHelper.hs
@@ -24,7 +24,7 @@ import Control.Concurrent
 import Control.Concurrent.Async
 import Control.Exception.Safe
 import Control.Monad
-import Control.Monad.Extra
+import Control.Monad.Extra hiding (fromMaybeM)
 import Control.Monad.Loops (untilJust)
 import Data.Aeson
 import Data.Aeson.Text

diff --git a/daml-assistant/src/DAML/Assistant/Util.hs b/daml-assistant/src/DAML/Assistant/Util.hs
@@ -12,7 +12,7 @@ import DAML.Project.Util
 import System.FilePath
 import Control.Exception.Safe
 import Control.Applicative
-import Control.Monad.Extra
+import Control.Monad.Extra hiding (fromMaybeM)
 import Network.HTTP.Client
 import Network.TLS
 

diff --git a/hazel/README.md b/hazel/README.md
@@ -3,30 +3,4 @@
 The file `packages.bzl` in this directory lists all packages available in the
 chosen Stackage snapshot.
 
-## Update the Stackage snapshot
-
-To update the Stackage snapshot you need to clone the hazel repository into a
-separate directory:
-
-```
-$ git clone https://github.com/FormationAI/hazel.git
-```
-
-Change into the hazel repository root directory.
-
-```
-$ cd hazel
-```
-
-Then execute the following command to update to the specified Stackage
-snapshot, where `$PROJECT` points to the root of this repository:
-(Requires `stack`)
-
-```
-$ Stackage.hs lts-12.4 "$PROJECT/hazel/packages.bzl"
-```
-
-On NixOS you may need to modify `Stackage.hs` to append the following flag to
-the list of `stack` intrepreter flags: `--nix-packages zlib`.
-
-This will take a while.
+See [Upgrading.md](../Upgrading.md) for how to upgrade to a new Stackage snapshot.