Update nixpkgs pin; update GHC to 9.4.8

Author: sd234678

.hlint.yaml

@@ -21,7 +21,6 @@
     - "-XDeriveGeneric"
     - "-XGeneralizedNewtypeDeriving"
     - "-XLambdaCase"
-    - "-XNoCPP"
     - "-XOverloadedStrings"
     - "-XRecordWildCards"
     - "-XScopedTypeVariables"
@@ -2740,16 +2739,6 @@
     name: "Use 'getSum' from Relude"
     note: "'getSum' is already exported from Relude"
     rhs: getSum
-- warn:
-    lhs: Data.Semigroup.Option
-    name: "Use 'Option' from Relude"
-    note: "'Option' is already exported from Relude"
-    rhs: Option
-- warn:
-    lhs: Data.Semigroup.getOption
-    name: "Use 'getOption' from Relude"
-    note: "'getOption' is already exported from Relude"
-    rhs: getOption
 - warn:
     lhs: Data.Semigroup.Semigroup
     name: "Use 'Semigroup' from Relude"

.last-exported-commit

@@ -1 +1 @@
-Last exported commit from parent repo: 9737839d92e3d170e213434fec8533a7f1375ea3
+Last exported commit from parent repo: a1a2bdf77db95b7be1cfb417fbef33008e7dde63

cabal.project

@@ -1,7 +1,2 @@
 packages: 
   .
-source-repository-package
-    type: git
-    location: https://github.com/nmattia/niv.git 
-    tag: 5830a4dd348d77e39a0f3c4c762ff2663b602d4c
-    post-checkout-command: hpack && exit 1

flake.lock

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           nix-bootstrap
-version:        1.5.5.0
+version:        1.5.5.1
 author:         gchquser
 maintainer:     [email protected]
 copyright:      Crown Copyright
@@ -107,30 +107,30 @@ library
       StrictData
   ghc-options: -Wall -Wcpp-undef -Widentities -Wincomplete-patterns -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wmissing-export-lists -Wmissing-import-lists -Wmissing-signatures -Wpartial-fields -Wredundant-constraints
   build-depends:
-      aeson ==2.0.3.0
+      aeson ==2.1.2.1
     , aeson-pretty ==0.8.9
-    , base ==4.15.1.0
+    , base ==4.17.2.1
     , blaze-html ==0.9.1.2
-    , dhall ==1.40.2
-    , directory ==1.3.6.2
-    , exceptions ==0.10.4
-    , extra ==1.7.10
-    , filepath ==1.4.2.1
-    , lens ==5.0.1
-    , megaparsec ==9.2.1
+    , dhall ==1.42.1
+    , directory ==1.3.7.1
+    , exceptions ==0.10.5
+    , extra ==1.7.14
+    , filepath ==1.4.2.2
+    , lens ==5.2.3
+    , megaparsec ==9.3.1
     , mtl ==2.2.2
     , parser-combinators ==1.3.0
-    , process ==1.6.13.2
+    , process ==1.6.18.0
     , raw-strings-qq ==1.1
     , regex-compat ==0.95.2.1
-    , relude ==1.0.0.1
-    , silently ==1.2.5.2
-    , singletons ==3.0.1
-    , template-haskell ==2.17.0.0
+    , relude ==1.2.1.0
+    , silently ==1.2.5.3
+    , singletons ==3.0.2
+    , template-haskell ==2.19.0.0
     , terminal ==0.2.0.0
-    , th-abstraction ==0.4.4.0
-    , tomland ==1.3.3.1
-    , yaml ==0.11.8.0
+    , th-abstraction ==0.4.5.0
+    , tomland ==1.3.3.2
+    , yaml ==0.11.11.2
   mixins:
       base hiding (Prelude)
   if flag(prod)
@@ -156,9 +156,9 @@ executable app
       StrictData
   ghc-options: -Wall -Wcpp-undef -Widentities -Wincomplete-patterns -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wmissing-export-lists -Wmissing-import-lists -Wmissing-signatures -Wpartial-fields -Wredundant-constraints -O2 -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      base ==4.15.1.0
+      base ==4.17.2.1
     , nix-bootstrap
-    , relude ==1.0.0.1
+    , relude ==1.2.1.0
   mixins:
       base hiding (Prelude)
   if flag(prod)
@@ -231,17 +231,17 @@ test-suite nix-bootstrap-test
       StrictData
   ghc-options: -Wall -Wcpp-undef -Widentities -Wincomplete-patterns -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wmissing-export-lists -Wmissing-import-lists -Wmissing-signatures -Wpartial-fields -Wredundant-constraints
   build-tool-depends:
-      hspec-discover:hspec-discover ==2.8.5
+      hspec-discover:hspec-discover ==2.10.10
   build-depends:
-      QuickCheck ==2.14.2
-    , base ==4.15.1.0
-    , dhall ==1.40.2
-    , hspec ==2.8.5
+      QuickCheck ==2.14.3
+    , base ==4.17.2.1
+    , dhall ==1.42.1
+    , hspec ==2.10.10
     , hspec-expectations-pretty-diff ==0.7.2.6
     , nix-bootstrap
     , raw-strings-qq ==1.1
-    , relude ==1.0.0.1
-    , tomland ==1.3.3.1
+    , relude ==1.2.1.0
+    , tomland ==1.3.3.2
   mixins:
       base hiding (Prelude)
   if flag(prod)

nix-bootstrap.cabal

@@ -13,7 +13,7 @@
 # limitations under the License.
 {nixpkgs}: let
   # haskell package set
-  baseHaskellPackages = nixpkgs.haskell.packages.ghc902;
+  baseHaskellPackages = nixpkgs.haskell.packages.ghc948;
 
   # dev tools
   haskellEnv = baseHaskellPackages.ghcWithPackages (
@@ -23,15 +23,10 @@
         haskell-language-server
       ]
   );
-  setUpHaskellLanguageServer = nixpkgs.writeShellScriptBin "setUpHaskellLanguageServer" ''
-    sed=${nixpkgs.gnused}/bin/sed
-    ${builtins.readFile ../scripts/set-up-haskell-language-server.sh}
-  '';
 in {
   inherit baseHaskellPackages;
   haskellDevTools = [
     haskellEnv
-    setUpHaskellLanguageServer
     # cabal uses wget but doesn't package it. This ensures a compatible version is used,
     # as devcontainers otherwise package the busybox version by default, which accepts
     # different arguments.

nix/haskell-env.nix

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 name: nix-bootstrap
-version: 1.5.5.0
+version: 1.5.5.1
 author: gchquser
 maintainer: [email protected]
 copyright: Crown Copyright
@@ -28,10 +28,10 @@ default-extensions:
   - StrictData
 dependencies:
   - name: base
-    version: "== 4.15.1.0"
+    version: "== 4.17.2.1"
     mixin:
       - hiding (Prelude)
-  - relude == 1.0.0.1
+  - relude == 1.2.1.0
 flags:
   prod:
     default: false
@@ -58,28 +58,28 @@ when:
 library:
   source-dirs: src
   dependencies:
-    - aeson == 2.0.3.0
+    - aeson == 2.1.2.1
     - aeson-pretty == 0.8.9
     - blaze-html == 0.9.1.2
-    - directory == 1.3.6.2
-    - dhall == 1.40.2
-    - exceptions == 0.10.4
-    - extra == 1.7.10
-    - filepath == 1.4.2.1
-    - lens == 5.0.1
-    - megaparsec == 9.2.1
+    - directory == 1.3.7.1
+    - dhall == 1.42.1
+    - exceptions == 0.10.5
+    - extra == 1.7.14
+    - filepath == 1.4.2.2
+    - lens == 5.2.3
+    - megaparsec == 9.3.1
     - mtl == 2.2.2
     - parser-combinators == 1.3.0
-    - process == 1.6.13.2
+    - process == 1.6.18.0
     - raw-strings-qq == 1.1
     - regex-compat == 0.95.2.1
-    - silently == 1.2.5.2
-    - singletons == 3.0.1
-    - template-haskell == 2.17.0.0
+    - silently == 1.2.5.3
+    - singletons == 3.0.2
+    - template-haskell == 2.19.0.0
     - terminal == 0.2.0.0
-    - th-abstraction == 0.4.4.0
-    - tomland == 1.3.3.1
-    - yaml == 0.11.8.0
+    - th-abstraction == 0.4.5.0
+    - tomland == 1.3.3.2
+    - yaml == 0.11.11.2
 executables:
   app:
     main: Main.hs
@@ -96,12 +96,12 @@ tests:
     main: Spec.hs
     source-dirs: test
     dependencies:
-      - dhall == 1.40.2
-      - hspec == 2.8.5
+      - dhall == 1.42.1
+      - hspec == 2.10.10
       - hspec-expectations-pretty-diff == 0.7.2.6
       - nix-bootstrap
-      - QuickCheck == 2.14.2
+      - QuickCheck == 2.14.3
       - raw-strings-qq == 1.1
-      - tomland == 1.3.3.1
+      - tomland == 1.3.3.2
     build-tools:
-      - hspec-discover == 2.8.5
+      - hspec-discover == 2.10.10

package.yaml

@@ -28,7 +28,7 @@ import Bootstrap.Error
 import Bootstrap.Monad (MonadBootstrap)
 import Bootstrap.Terminal (promptYesNo, withAttribute, withAttributes)
 import Control.Exception (IOException)
-import Control.Monad.Catch (MonadCatch, catchAll, try)
+import Control.Monad.Catch (catchAll, try)
 import Data.Char (toLower)
 import Data.Tree (Tree (Node, rootLabel, subForest))
 import Language.Haskell.TH (Quote)
@@ -61,9 +61,9 @@ getOverwriteStatus :: MonadIO m => FilePath -> Text -> m OverwriteStatus
 getOverwriteStatus path newContents = liftIO do
   doesFileExist path >>= \case
     True ->
-      readFileText path `catchAll` const (pure "") >>= \oldContents ->
+      readFileBS path `catchAll` const (pure "") >>= \oldContents ->
         pure $
-          if oldContents == newContents
+          if oldContents == encodeUtf8 newContents
             then NoContentChange
             else WillOverwrite
     False -> pure NothingToOverwrite
@@ -190,7 +190,7 @@ bootstrap BuildPlan {..} =
         r2 <- bootstrapFile (second contents f)
         pure (r1, r2)
 
-createParentDir :: (MonadCatch m, MonadIO m) => FilePath -> ExceptT Text m ()
+createParentDir :: MonadIO m => FilePath -> ExceptT Text m ()
 createParentDir path =
   let dir = takeDirectory path
    in ExceptT $
@@ -201,7 +201,7 @@ createParentDir path =
           )
           <$> liftIO (try $ createDirectoryIfMissing True dir)
 
-bootstrapFile :: (MonadCatch m, MonadIO m) => (FilePath, Text) -> ExceptT Text m ()
+bootstrapFile :: MonadIO m => (FilePath, Text) -> ExceptT Text m ()
 bootstrapFile (path, contents) =
   ExceptT $
     first

scripts/set-up-haskell-language-server.sh

@@ -29,5 +29,5 @@ type MonadBootstrap m =
     Quote m
   )
 
-instance (Monad (TerminalT m a), MonadIO (TerminalT m a)) => Quote (TerminalT m a) where
+instance (Monad a, MonadIO (TerminalT m a)) => Quote (TerminalT m a) where
   newName = liftIO . newName