Update streamly 0.11

.gitignore

@@ -0,0 +1 @@
+dist-newstyle

.packcheck.ignore

@@ -1,4 +1,5 @@
 .github/workflows/build.yml
+.gitignore
 .packcheck.ignore
 Benchmarks/ListT.hs
 Benchmarks/ListTransformer.hs
@@ -7,5 +8,7 @@ Benchmarks/SimpleConduit.hs
 appveyor.yml
 cabal.project.user
 cabal.project.Werror
-default.nix
-stack.yaml
+flake.lock
+flake.nix
+packages.nix
+sources.nix

Changelog.md

@@ -1,3 +1,7 @@
+## 0.4.1
+
+* Support streamly-core-0.3.0 and streamly-0.11.0
+
 ## 0.4.0
 
 * Add different streaming libraries under individual flags

README.md

@@ -8,7 +8,7 @@
 This package provides micro-benchmarks to measure and compare the
 performance of various streaming implementations in Haskell.
 
-We have taken due to care to make sure that we are
+We have taken due care to make sure that we are
 benchmarking correctly and fairly. See [the notes on correct
 benchmarking](docs/benchmarking-notes.md).
 

appveyor.yml

@@ -1,8 +1,12 @@
-# packcheck-0.4.2
+# packcheck-0.7.1
 # You can use any of the options supported by packcheck as environment
 # variables here.  See https://github.com/composewell/packcheck for all
 # options and their explanation.
 
+#branches:
+#  only:
+#    - master
+
 environment:
     # ------------------------------------------------------------------------
     # Global options, you can use these per build as well
@@ -11,42 +15,34 @@ environment:
     # ------------------------------------------------------------------------
     # Common options
     # ------------------------------------------------------------------------
-    # GHC_OPTIONS: "-Werror"
     CABAL_REINIT_CONFIG: "y"
     LC_ALL: "C.UTF-8"
 
+    # ------------------------------------------------------------------------
+    # How to build
+    # ------------------------------------------------------------------------
+    #
+    GHCUP_VERSION: "0.1.50.2"
+    GHCVER: "9.10.3"
+    #CABALVER: "3.10.3.0"
+
     # ------------------------------------------------------------------------
     # What to build
     # ------------------------------------------------------------------------
     # DISABLE_TEST: "y"
     # DISABLE_BENCH: "y"
     # DISABLE_DOCS: "y"
-    DISABLE_SDIST_BUILD: "y"
     # DISABLE_DIST_CHECKS: "y"
-
-    # ------------------------------------------------------------------------
-    # stack options
-    # ------------------------------------------------------------------------
-    # Note requiring a specific version of stack using STACKVER may fail due to
-    # github API limit while checking and upgrading/downgrading to the specific
-    # version.
-    #STACKVER: "1.6.5"
-    STACK_UPGRADE: "y"
-    RESOLVER: "lts-21.25"
-    STACK_ROOT: "c:\\sr"
+    # DISABLE_SDIST_BUILD: "y"
+    # Note: these require the "diff" utility.
+    # DISABLE_SDIST_GIT_CHECK: "y"
+    DISABLE_SDIST_PROJECT_CHECK: "y"
 
     # ------------------------------------------------------------------------
     # cabal options
     # ------------------------------------------------------------------------
     CABAL_CHECK_RELAX: "y"
-    CABAL_NO_SANDBOX: "y"
-    CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com"
-
-    # ------------------------------------------------------------------------
-    # Where to find the required tools
-    # ------------------------------------------------------------------------
-    PATH: "%PATH%;%APPDATA%\\local\\bin"
-    LOCAL_BIN: "%APPDATA%\\local\\bin"
+    #CABAL_PROJECT: "cabal.project"
 
     # ------------------------------------------------------------------------
     # Location of packcheck.sh (the shell script invoked to perform CI tests ).
@@ -59,31 +55,33 @@ environment:
     # If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
     # then it is automatically pulled from this URL.
     PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-    PACKCHECK_GITHUB_COMMIT: "79fb4437009a7ebdada33d0493c27ee30160ec3f"
+    PACKCHECK_GITHUB_COMMIT: "3d3c94bf48f18a99271d509c1f1702d15824b1f0"
 
     # Override the temp directory to avoid sed escaping issues
     # See https://github.com/haskell/cabal/issues/5386
     TMP: "c:\\tmp"
 
+# Bump the -> version to clear the cache
+# packcheck uses "%APPDATA%\\local" to install tools like hlint etc.
+# cabal may use "%APPDATA%\\cabal" or "c:\\cabal"
+# ghcup may use "%APPDATA%\\ghcup" or "c:\\ghcup"
 cache:
-  - "%STACK_ROOT%"
-  - "%LOCAL_BIN%"
+  - "%APPDATA%\\local\\bin -> v1"
   - "%APPDATA%\\cabal"
-  - "%APPDATA%\\ghc"
-# - "%LOCALAPPDATA%\\Programs\\stack"
+  - "%LOCALAPPDATA%\\cabal"
+  - "C:\\ghcup"
+  - "C:\\cabal"
 
+# Folder where the repository is cloned.
 clone_folder: "c:\\pkg"
 build: off
 
 before_test:
-- if not exist %PACKCHECK_LOCAL_PATH% curl -sSkL -o%PACKCHECK_LOCAL_PATH% %PACKCHECK_GITHUB_URL%/%PACKCHECK_GITHUB_COMMIT%/packcheck.sh
-- if not exist %LOCAL_BIN% mkdir %LOCAL_BIN%
-- where stack.exe || curl -sSkL -ostack.zip http://www.stackage.org/stack/windows-x86_64 && 7z x stack.zip stack.exe && move stack.exe %LOCAL_BIN%
-- if defined STACKVER (stack upgrade --binary-only --binary-version %STACKVER%) else (stack upgrade --binary-only || ver > nul)
-- stack --version
+- if not exist %PACKCHECK_LOCAL_PATH% curl --fail -sSL -o%PACKCHECK_LOCAL_PATH% %PACKCHECK_GITHUB_URL%/%PACKCHECK_GITHUB_COMMIT%/packcheck.sh
 
 test_script:
-- stack setup > nul
 - for /f "usebackq tokens=*" %%i in (`where 7z.exe`) do set PATH7Z=%%i\..
 - for /f "usebackq tokens=*" %%i in (`where git.exe`) do set PATHGIT=%%i\..
-- chcp 65001 && stack exec bash -- -c "chmod +x %PACKCHECK_LOCAL_PATH%; %PACKCHECK_LOCAL_PATH% stack PATH=/usr/bin:\"%PATH7Z%\":\"%PATHGIT%\""
+- for /f "usebackq tokens=*" %%i in (`where curl.exe`) do set PATHCURL=%%i\..
+- chcp 65001
+- bash %PACKCHECK_LOCAL_PATH% cabal PATH="/usr/bin:%PATH7Z%:%PATHGIT%:%PATHCURL%"

bench-runner/cabal.project.user

@@ -1,35 +1,35 @@
 packages: .
 
-source-repository-package
-  type: git
-  location: https://github.com/composewell/streamly.git
-  tag: 9a039b89c6b81300b2bd9c8765bf4bfa18e7c83c
-
-source-repository-package
-  type: git
-  location: https://github.com/composewell/streamly.git
-  tag: 9a039b89c6b81300b2bd9c8765bf4bfa18e7c83c
-  subdir: core
-
-source-repository-package
-  type: git
-  location: https://github.com/composewell/streamly-process.git
-  tag: c1ce40ebe84973d0c54dd27fb17e337bf9ca4a46
-
-source-repository-package
-  type: git
-  location: https://github.com/composewell/streamly-shell.git
-  tag: 070ff21fda7aab8ca45b08b330746299a91eb981
+package bench-report
+  flags: +no-charts
 
 source-repository-package
   type: git
   location: https://github.com/composewell/streamly-coreutils.git
-  tag: 051ef37a5fa399f039d0530e8d642fd79ec6aec2
+  tag: fa180060c7510c89d2767980ca6f7ec7011d04b9
 
 source-repository-package
   type: git
   location: https://github.com/composewell/bench-report.git
-  tag: a9bbaecb19eda832edf32ae274fef48895facf0b
+  tag: 4dad3ea916a950524bcfd5097fc6f0f63e645987
 
-package bench-report
-  flags: +no-charts
+-- source-repository-package
+--   type: git
+--   location: https://github.com/composewell/streamly.git
+--   tag: 9a039b89c6b81300b2bd9c8765bf4bfa18e7c83c
+-- 
+-- source-repository-package
+--   type: git
+--   location: https://github.com/composewell/streamly.git
+--   tag: 9a039b89c6b81300b2bd9c8765bf4bfa18e7c83c
+--   subdir: core
+-- 
+-- source-repository-package
+--   type: git
+--   location: https://github.com/composewell/streamly-process.git
+--   tag: c1ce40ebe84973d0c54dd27fb17e337bf9ca4a46
+-- 
+-- source-repository-package
+--   type: git
+--   location: https://github.com/composewell/streamly-shell.git
+--   tag: 070ff21fda7aab8ca45b08b330746299a91eb981