Merge pull request #45 from input-output-hk/coot/io-sim-1.3

io-sim-1.3.0.0

Author: coot

.github/workflows/haskell.yml

@@ -11,76 +11,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.8", "9.4.7", "9.6.3"]
+        ghc: ["8.10", "9.2", "9.4", "9.6"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     env:
       CABAL_VERSION: "3.10.1.0"
 
     defaults:
       run:
-        shell: ${{ matrix.os == 'windows-latest' && 'msys2 {0}' || 'bash' }}
+        shell: "bash"
 
     steps:
-    - name: "WIN: Setup MSYS2 and libraries"
-      if: runner.os == 'Windows'
-      uses: msys2/setup-msys2@v2
-      with:
-        update: true
-        install: >-
-          base-devel
-          autoconf-wrapper
-          autoconf
-          automake
-          libtool
-          make
-          git
-          mingw-w64-x86_64-jq
-
     - name: Set cache version
       run: echo "CACHE_VERSION=pu4Aevoo" >> $GITHUB_ENV
 
-    - name: "LINUX: Setup Haskell"
-      uses: haskell/actions/setup@v1
-      if: runner.os != 'Windows'
+    - name: "Setup Haskell"
+      uses: haskell-actions/setup@v2
       id: setup-haskell
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ env.CABAL_VERSION }}
 
-    - name: "WIN: Setup Haskell"
-      id: win-setup-haskell
-      if: runner.os == 'Windows'
-      run: |
-        # see https://gitlab.haskell.org/haskell/ghcup-hs/-/blob/master/scripts/bootstrap/bootstrap-haskell
-        curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
-          BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
-          BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=1 \
-          BOOTSTRAP_HASKELL_ADJUST_BASHRC=1 \
-          BOOTSTRAP_HASKELL_GHC_VERSION="${{ matrix.ghc }}" \
-          BOOTSTRAP_HASKELL_CABAL_VERSION="${{ env.CABAL_VERSION }}" \
-          sh
-
-        # MSYS2 doesn't inherit $GITHUB_PATH so this is needed
-        cat <(echo "source /c/ghcup/env") ~/.bashrc > ~/.bashrc.new
-        mv ~/.bashrc.new ~/.bashrc
-
-        source ~/.bashrc
-
-        # There is an issue with crt libraries, fixed by prepending the ghc
-        # mingw32 libraries directory to every other library directory.
-        echo "# Original cabal config extra-lib-dirs"
-        grep extra-lib-dirs /c/cabal/config
-
-        sed -i 's/C:\\msys64\\mingw64\\lib/C:\\ghcup\\ghc\\8.10.7\\mingw\\x86_64-w64-mingw32\\lib, C:\\msys64\\mingw64\\lib/g' /c/cabal/config
-
-        echo "# Modified cabal config extra-lib-dirs"
-        grep extra-lib-dirs /c/cabal/config
-
-        ghc --version
-        cabal --version
-        echo "cabal-store=$(dirname $(cabal --help | tail -1 | tr -d ' '))\\store" >> $GITHUB_OUTPUT
-
     - uses: actions/checkout@v3
 
     - name: "Configure cabal.project.local"
@@ -140,7 +91,7 @@ jobs:
         sudo apt-get -y install fd-find
 
     - name: "Setup Haskell"
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       id: setup-haskell
       with:
         ghc-version: 9.2.5
@@ -150,12 +101,6 @@ jobs:
       run: |
         echo "$HOME/.cabal/bin" >> $GITHUB_PATH
 
-    - uses: actions/cache@v3
-      name: "Cache cabal store"
-      with:
-        path: ${{ steps.setup-haskell.outputs.cabal-store }}
-        key: cache-dependencies-${{ env.CACHE_VERSION }}
-
     - uses: actions/cache@v3
       name: "Cache `stylish-haskell`"
       with:

cabal.project

@@ -11,7 +11,7 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2023-05-04T00:55:55Z
+    hackage.haskell.org 2023-11-08T09:44:54Z
   , cardano-haskell-packages 2023-05-16T03:39:10Z
 
 

typed-protocols-cborg/typed-protocols-cborg.cabal

@@ -19,7 +19,7 @@ library
   exposed-modules:   Network.TypedProtocol.Codec.CBOR
 
   build-depends:     base            >=4.12  && <4.20,
-                     bytestring      >=0.10  && <0.12,
+                     bytestring      >=0.10  && <0.13,
                      cborg           >=0.2.1 && <0.3,
 
                      io-classes,

typed-protocols/typed-protocols.cabal

@@ -32,7 +32,7 @@ library
                    , TypeOperators
                    , BangPatterns
   build-depends:     base,
-                     io-classes >= 1.0 && < 1.3
+                     io-classes >= 1.0 && < 1.4
 
   hs-source-dirs:    src
   default-language:  Haskell2010