Run 'cabal update' only once

components/HaskellTools.dhall

@@ -11,7 +11,6 @@ let
       CF.run "build haskell tools"
       [ "mkdir -p ${outDir}/store"
       , "$CABAL user-config update"
-      , "$CABAL v2-update"
          -- We must override store-dir lest data files end up in
          -- /root/.cabal, which isn't accessible to the build user
       , ''

images/alpine.dhall

@@ -97,9 +97,9 @@ let
       # installDepsStep
       # fetchGhcStep (Ghc.Bindist.BindistSpec { version = ghcVersion, triple = "x86_64-alpine3.10-linux-integer-simple" })
       # Cabal.install (Cabal.Type.FromBindist "https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-x86_64-alpine-3.11.6-static-noofd.tar.xz")
+      # CF.run "update cabal index" [ "$CABAL update"]
       # HaskellTools.build
       # createUserStep
-      # CF.run "update cabal index" [ "$CABAL update"]
       # [ CF.Statement.Cmd ["bash"] ]
     },
     Image ::
@@ -111,9 +111,9 @@ let
       # installDepsStep
       # fetchGhcStep (Ghc.Bindist.BindistURL "https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.2/ghc-8.10.2-i386-alpine-linux.tar.xz")
       # Cabal.install (Cabal.Type.FromBindist "https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-i386-alpine-linux-musl.tar.gz")
+      # CF.run "update cabal index" [ "$CABAL update"]
       # HaskellTools.build
       # createUserStep
-      # CF.run "update cabal index" [ "$CABAL update"]
       # [ CF.Statement.Cmd ["bash"] ]
     }
   ]

images/centos.dhall

@@ -133,11 +133,11 @@ let
         # Cabal.install (Cabal.fromUpstreamBindist { version = "3.2.0.0", triple = "x86_64-unknown-linux" })
 
           -- install hscolour, alex, and happy
+        # CF.run "update cabal index" [ "$CABAL update"]
         # HaskellTools.build
 
         # nsswitchWorkaround
         # createUserStep
-        # CF.run "update cabal index" [ "$CABAL update"]
         # [ CF.Statement.Cmd ["bash"] ]
 
         in

images/debian.dhall

@@ -169,10 +169,10 @@ let
           # Cabal.install opts.cabalSource
 
             -- install hscolour, alex, and happy
+          # CF.run "update cabal index" [ "$CABAL update"]
           # HaskellTools.build
 
           # createUserStep
-          # CF.run "update cabal index" [ "$CABAL update"]
           # [ CF.Statement.Cmd ["bash"] ]
 
         in Image::{ name = opts.name, runnerTags = opts.runnerTags, image = image }

images/fedora.dhall

@@ -142,11 +142,11 @@ let
           # Cabal.install opts.cabalSource
 
             -- install hscolour, alex, and happy
+          # CF.run "update cabal index" [ "$CABAL update"]
           # HaskellTools.build
 
           # nsswitchWorkaround
           # createUserStep
-          # CF.run "update cabal index" [ "$CABAL update"]
           # [ CF.Statement.Cmd ["bash"] ]
 
         in Image::{ name = opts.name, runnerTags = opts.runnerTags, image = image }

[Ben Gamari]

@maerwald, this commit is actually breaking. Specifically, we must cabal update at least twice: once as root to build the bootstrap tools and again as the ghc user (which will be used by downstream GHC builds).