From 5cf7344ed6894f80716555324a32785c0ba01b61 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 22:05:39 +0200 Subject: [PATCH 01/14] Changed old-os-string flag to os-string Also moved Stack configurations to own directory. --- os-string-aeson.cabal | 58 +++++------------- stack.ghc-9.2+old.yaml.lock | 61 ------------------- stack.ghc-9.2.yaml.lock | 33 ---------- stack.ghc-9.4+old.yaml.lock | 54 ---------------- stack.ghc-9.4.yaml.lock | 19 ------ stack.ghc-9.6+old.yaml.lock | 61 ------------------- stack.ghc-9.6.yaml.lock | 19 ------ stack.yaml | 2 +- stack.yaml.lock | 27 +++++++- .../stack.ghc-9.2+os-string.yaml | 2 +- .../stack.ghc-9.2.yaml | 4 -- .../stack.ghc-9.4+os-string.yaml | 3 +- .../stack.ghc-9.4.yaml | 4 -- .../stack.ghc-9.6+os-string.yaml | 2 +- .../stack.ghc-9.6.yaml | 4 -- stack/test-stack.sh | 14 +++++ 16 files changed, 61 insertions(+), 306 deletions(-) delete mode 100644 stack.ghc-9.2+old.yaml.lock delete mode 100644 stack.ghc-9.2.yaml.lock delete mode 100644 stack.ghc-9.4+old.yaml.lock delete mode 100644 stack.ghc-9.4.yaml.lock delete mode 100644 stack.ghc-9.6+old.yaml.lock delete mode 100644 stack.ghc-9.6.yaml.lock mode change 120000 => 100644 stack.yaml.lock rename stack.ghc-9.2.yaml => stack/stack.ghc-9.2+os-string.yaml (93%) rename stack.ghc-9.2+old.yaml => stack/stack.ghc-9.2.yaml (93%) rename stack.ghc-9.4.yaml => stack/stack.ghc-9.4+os-string.yaml (56%) rename stack.ghc-9.4+old.yaml => stack/stack.ghc-9.4.yaml (92%) rename stack.ghc-9.6.yaml => stack/stack.ghc-9.6+os-string.yaml (85%) rename stack.ghc-9.6+old.yaml => stack/stack.ghc-9.6.yaml (87%) create mode 100755 stack/test-stack.sh diff --git a/os-string-aeson.cabal b/os-string-aeson.cabal index 069137a..149ab24 100644 --- a/os-string-aeson.cabal +++ b/os-string-aeson.cabal @@ -30,7 +30,7 @@ extra-doc-files: tested-with: ghc ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.6 || ==9.8.2 || ==9.10.1 -flag old-os-string +flag os-string description: Use an older version of the os-string library. manual: False default: False @@ -51,6 +51,17 @@ common language default-language: Haskell2010 +common os-string-compat + if flag(os-string) + build-depends: + os-string >=2.0.0 && <2.1 + else + build-depends: + filepath >=1.4.100.0 && <1.6, + os-string <2, + + ghc-options: -Wno-deprecations + common rts ghc-options: -threaded @@ -59,6 +70,7 @@ common rts library import: language + import: os-string-compat hs-source-dirs: src/ build-depends: base, @@ -74,19 +86,9 @@ library System.OsString.Aeson.Posix System.OsString.Aeson.Windows - -- Only needed for doctests - if flag(old-os-string) - build-depends: - filepath >=1.4.100.0 && <1.5, - os-string <2, - - ghc-options: -Wno-deprecations - else - build-depends: - os-string >=2.0.0 && <2.1 - library os-string-aeson-internal import: language + import: os-string-compat visibility: public hs-source-dirs: os-string-aeson-internal/ build-depends: @@ -105,18 +107,9 @@ library os-string-aeson-internal System.OsString.Aeson.Internal.Types System.OsString.Aeson.Internal.Windows - if flag(old-os-string) - build-depends: - filepath >=1.4.100.0 && <1.5, - os-string <2, - - ghc-options: -Wno-deprecations - else - build-depends: - os-string >=2.0.0 && <2.1 - test-suite examples import: language + import: os-string-compat import: rts type: exitcode-stdio-1.0 hs-source-dirs: examples @@ -135,18 +128,9 @@ test-suite examples HKD2 Utils - if flag(old-os-string) - build-depends: - filepath >=1.4.100.0 && <1.5, - os-string <2, - - ghc-options: -Wno-deprecations - else - build-depends: - os-string >=2.0.0 && <2.1 - test-suite test import: language + import: os-string-compat import: rts type: exitcode-stdio-1.0 hs-source-dirs: test @@ -170,16 +154,6 @@ test-suite test Units.Posix Units.Windows - if flag(old-os-string) - build-depends: - filepath >=1.4.100.0 && <1.5, - os-string <2, - - ghc-options: -Wno-deprecations - else - build-depends: - os-string >=2.0.0 && <2.1 - source-repository head type: git location: https://github.com/mmhat/os-string-aeson diff --git a/stack.ghc-9.2+old.yaml.lock b/stack.ghc-9.2+old.yaml.lock deleted file mode 100644 index 9cb7333..0000000 --- a/stack.ghc-9.2+old.yaml.lock +++ /dev/null @@ -1,61 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -- completed: - hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 - pantry-tree: - sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e - size: 3519 - original: - hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 -- completed: - hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 - pantry-tree: - sha256: 2420f7addc917bf41970a8980f52abe431b1a0fb711b00795effbb289c8ea76c - size: 3998 - original: - hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 -- completed: - hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 - pantry-tree: - sha256: 75321cadad8a67becb5fc36bdd974a6db3746dcbe0235bf9ec0f0baaad7b4a23 - size: 207 - original: - hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 -- completed: - hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 - pantry-tree: - sha256: 14d1e9a5ec731766e43c7eb9c2dc59a7da48d98d43374d9d83e725d8891c6173 - size: 1789 - original: - hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 -- completed: - hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 - pantry-tree: - sha256: 25f3b6dd211e30f9e0ef5047bb9f30df7a9296cf1043873e31558196dfe78676 - size: 7514 - original: - hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 -- completed: - hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 - pantry-tree: - sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 - size: 5821 - original: - hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 -snapshots: -- completed: - sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 - size: 650475 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: lts-20.26 diff --git a/stack.ghc-9.2.yaml.lock b/stack.ghc-9.2.yaml.lock deleted file mode 100644 index 0943081..0000000 --- a/stack.ghc-9.2.yaml.lock +++ /dev/null @@ -1,33 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -- completed: - hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 - pantry-tree: - sha256: 4743363ed98362a8541108a2e7febb7ba32acd337d29dbff4472fafbe246589c - size: 2218 - original: - hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 -- completed: - hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 - pantry-tree: - sha256: 25f3b6dd211e30f9e0ef5047bb9f30df7a9296cf1043873e31558196dfe78676 - size: 7514 - original: - hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 -snapshots: -- completed: - sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 - size: 650475 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml - original: lts-20.26 diff --git a/stack.ghc-9.4+old.yaml.lock b/stack.ghc-9.4+old.yaml.lock deleted file mode 100644 index fe870df..0000000 --- a/stack.ghc-9.4+old.yaml.lock +++ /dev/null @@ -1,54 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -- completed: - hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 - pantry-tree: - sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e - size: 3519 - original: - hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 -- completed: - hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 - pantry-tree: - sha256: 2420f7addc917bf41970a8980f52abe431b1a0fb711b00795effbb289c8ea76c - size: 3998 - original: - hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 -- completed: - hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 - pantry-tree: - sha256: 75321cadad8a67becb5fc36bdd974a6db3746dcbe0235bf9ec0f0baaad7b4a23 - size: 207 - original: - hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 -- completed: - hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 - pantry-tree: - sha256: 14d1e9a5ec731766e43c7eb9c2dc59a7da48d98d43374d9d83e725d8891c6173 - size: 1789 - original: - hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 -- completed: - hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 - pantry-tree: - sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 - size: 5821 - original: - hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 -snapshots: -- completed: - sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd - size: 640086 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml - original: lts-21.25 diff --git a/stack.ghc-9.4.yaml.lock b/stack.ghc-9.4.yaml.lock deleted file mode 100644 index 707d2a6..0000000 --- a/stack.ghc-9.4.yaml.lock +++ /dev/null @@ -1,19 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -snapshots: -- completed: - sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd - size: 640086 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml - original: lts-21.25 diff --git a/stack.ghc-9.6+old.yaml.lock b/stack.ghc-9.6+old.yaml.lock deleted file mode 100644 index 2f1e0d5..0000000 --- a/stack.ghc-9.6+old.yaml.lock +++ /dev/null @@ -1,61 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: data-fix-0.3.2@sha256:cd7d6ff8b68aca3b51d8116870fc8ccdbc557989562cd3d5c941e4f0b7bc5af1,1734 - pantry-tree: - sha256: 39ea2bb3ace2b61bf72e7df77948f7fccc67c70d12a11e35dd20744eec5dd0bf - size: 262 - original: - hackage: data-fix-0.3.2 -- completed: - hackage: hashable-1.4.3.0@sha256:f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194,4718 - pantry-tree: - sha256: abef0611d6a717ba351317bdb603ef536659e7767a49ba81b2dbe20994065c7d - size: 1248 - original: - hackage: hashable-1.4.3.0 -- completed: - hackage: semialign-1.3@sha256:7be9ef5ca1d6b052991f68c053aab68b9d1ab3b1938c9557ac84c97937815223,2888 - pantry-tree: - sha256: e5daa7e0023dabb1b21a04bf084364b94e45e81b380e950b90f51294a1990b87 - size: 537 - original: - hackage: semialign-1.3 -- completed: - hackage: text-short-0.1.5@sha256:9c73c9c9182ca69ee92ce3758f515b1c078cd167d882ccc8c46f92f68c65e190,3216 - pantry-tree: - sha256: d3dcfee9029cd3624a788a0e65f0dea588ae0446a8a75a27d6b6164b8ee0fd57 - size: 727 - original: - hackage: text-short-0.1.5 -- completed: - hackage: these-1.2@sha256:011e22f6891ca028f87c04ea48796696c92d593313a9c699f7ff4f9ffd7aec6e,2882 - pantry-tree: - sha256: 37483703ce7326c07608b06f2f741fb0f708cb06bd10ec57d87108d068046b05 - size: 351 - original: - hackage: these-1.2 -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -- completed: - hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 - pantry-tree: - sha256: 75321cadad8a67becb5fc36bdd974a6db3746dcbe0235bf9ec0f0baaad7b4a23 - size: 207 - original: - hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 -snapshots: -- completed: - sha256: acaab6ca693211938d1542abcb1c83a2f298b9f6b571854a9d38febe39b6408e - size: 719577 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/31.yaml - original: lts-22.31 diff --git a/stack.ghc-9.6.yaml.lock b/stack.ghc-9.6.yaml.lock deleted file mode 100644 index 25e2bdc..0000000 --- a/stack.ghc-9.6.yaml.lock +++ /dev/null @@ -1,19 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -snapshots: -- completed: - sha256: acaab6ca693211938d1542abcb1c83a2f298b9f6b571854a9d38febe39b6408e - size: 719577 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/31.yaml - original: lts-22.31 diff --git a/stack.yaml b/stack.yaml index 84c8558..f45a555 120000 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -stack.ghc-9.6.yaml \ No newline at end of file +stack/stack.ghc-9.4+os-string.yaml \ No newline at end of file diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 120000 index 06be9ba..0000000 --- a/stack.yaml.lock +++ /dev/null @@ -1 +0,0 @@ -stack.ghc-9.6.yaml.lock \ No newline at end of file diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..4f3b0a1 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,26 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 + pantry-tree: + sha256: 4743363ed98362a8541108a2e7febb7ba32acd337d29dbff4472fafbe246589c + size: 2218 + original: + hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 +snapshots: +- completed: + sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd + size: 640086 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml + original: lts-21.25 diff --git a/stack.ghc-9.2.yaml b/stack/stack.ghc-9.2+os-string.yaml similarity index 93% rename from stack.ghc-9.2.yaml rename to stack/stack.ghc-9.2+os-string.yaml index 0bb8b24..a7c6a0f 100644 --- a/stack.ghc-9.2.yaml +++ b/stack/stack.ghc-9.2+os-string.yaml @@ -7,4 +7,4 @@ extra-deps: flags: os-string-aeson: - old-os-string: false + os-string: true diff --git a/stack.ghc-9.2+old.yaml b/stack/stack.ghc-9.2.yaml similarity index 93% rename from stack.ghc-9.2+old.yaml rename to stack/stack.ghc-9.2.yaml index af21c38..723fdd8 100644 --- a/stack.ghc-9.2+old.yaml +++ b/stack/stack.ghc-9.2.yaml @@ -9,9 +9,5 @@ extra-deps: - text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 - unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 -flags: - os-string-aeson: - old-os-string: true - ghc-options: os-string-aeson: -Wno-deprecations diff --git a/stack.ghc-9.4.yaml b/stack/stack.ghc-9.4+os-string.yaml similarity index 56% rename from stack.ghc-9.4.yaml rename to stack/stack.ghc-9.4+os-string.yaml index c159253..85ed5d8 100644 --- a/stack.ghc-9.4.yaml +++ b/stack/stack.ghc-9.4+os-string.yaml @@ -2,7 +2,8 @@ resolver: lts-21.25 extra-deps: - base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + - os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 flags: os-string-aeson: - old-os-string: false + os-string: true diff --git a/stack.ghc-9.4+old.yaml b/stack/stack.ghc-9.4.yaml similarity index 92% rename from stack.ghc-9.4+old.yaml rename to stack/stack.ghc-9.4.yaml index 467f237..56940d0 100644 --- a/stack.ghc-9.4+old.yaml +++ b/stack/stack.ghc-9.4.yaml @@ -8,9 +8,5 @@ extra-deps: - process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 - unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 -flags: - os-string-aeson: - old-os-string: true - ghc-options: os-string-aeson: -Wno-deprecations diff --git a/stack.ghc-9.6.yaml b/stack/stack.ghc-9.6+os-string.yaml similarity index 85% rename from stack.ghc-9.6.yaml rename to stack/stack.ghc-9.6+os-string.yaml index 5ca4c58..8888631 100644 --- a/stack.ghc-9.6.yaml +++ b/stack/stack.ghc-9.6+os-string.yaml @@ -5,4 +5,4 @@ extra-deps: flags: os-string-aeson: - old-os-string: false + os-string: true diff --git a/stack.ghc-9.6+old.yaml b/stack/stack.ghc-9.6.yaml similarity index 87% rename from stack.ghc-9.6+old.yaml rename to stack/stack.ghc-9.6.yaml index 1bd468e..9b14938 100644 --- a/stack.ghc-9.6+old.yaml +++ b/stack/stack.ghc-9.6.yaml @@ -9,9 +9,5 @@ extra-deps: - base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 -flags: - os-string-aeson: - old-os-string: true - ghc-options: os-string-aeson: -Wno-deprecations diff --git a/stack/test-stack.sh b/stack/test-stack.sh new file mode 100755 index 0000000..d65623a --- /dev/null +++ b/stack/test-stack.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e + +for version in '9.2' '9.4' '9.6'; do + for flag in '+os-string' ''; do + stack_yaml="stack/stack.ghc-${version}${flag}.yaml" + echo "### TESTING ${stack_yaml}" + rm -rf .stack-work stack.yaml stack.yaml.lock + ln -s "${stack_yaml}" stack.yaml + ln -s "${stack_yaml}.lock" stack.yaml.lock + stack test --pedantic + done +done From 0139252fca83e58b4d3d43f4352ca1b46c5e11b0 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:15:10 +0200 Subject: [PATCH 02/14] Added workflow for linters --- .github/workflows/linters.yml | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/linters.yml diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml new file mode 100644 index 0000000..1fd86ed --- /dev/null +++ b/.github/workflows/linters.yml @@ -0,0 +1,51 @@ +name: Run linters + +on: + pull_request: {} + push: + branches: + - "main" + +jobs: + cabal-gild: + runs-on: ubuntu-latest + steps: + - name: 'Set up cabal-gild' + uses: tfausak/cabal-gild-setup-action@v2 + + - name: 'Checkout the repository' + uses: actions/checkout@v4 + + - name: 'Check package' + run: cabal-gild --mode check --input os-string-aeson.cabal + + fourmolu: + runs-on: ubuntu-latest + steps: + - name: 'Checkout the repository' + uses: actions/checkout@v4 + + - name: 'Check that the source code is formatted' + uses: fourmolu/fourmolu-action@v10 + with: + pattern: | + src/**/*.hs + os-string-aeson-internal/**/*.hs + examples/**/*.hs + test/**/*.hs + + hlint: + runs-on: ubuntu-latest + steps: + - name: 'Checkout the repository' + uses: actions/checkout@v4 + + - name: 'Set up HLint' + uses: haskell-actions/hlint-setup@v2 + + - name: 'Run HLint' + uses: haskell-actions/hlint-run@v2 + with: + path: '["src", "os-string-aeson-internal", "examples", "test"]' + fail-on: warning + From 0ad0fc0aedb6c4bffa869796713ae997252c15dc Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:15:57 +0200 Subject: [PATCH 03/14] Started to move doctest installation to own workflow --- .github/workflows/doctest.action.yml | 35 ++++++++++++++++++++++++++++ .github/workflows/main.yml | 8 +++++++ 2 files changed, 43 insertions(+) create mode 100644 .github/workflows/doctest.action.yml diff --git a/.github/workflows/doctest.action.yml b/.github/workflows/doctest.action.yml new file mode 100644 index 0000000..90d85f7 --- /dev/null +++ b/.github/workflows/doctest.action.yml @@ -0,0 +1,35 @@ +name: "Run doctest on a Cabal package" + +on: + workflow_call: + inputs: + ghc: + description: 'Which GHC version to use for doctest' + type: string + required: true + version: + description: 'Which version of doctest to use' + type: string + required: false + default: 'latest' + +jobs: + run: + name: 'Run doctest on a Cabal package' + runs-on: 'ubuntu-latest' + steps: + - name: "Check for cached executable" + id: cache + uses: actions/github-script@v7 + with: + result-encoding: string + script: | + const tc = require('@actions/tool-cache'); + return null; + + - name: "Setup Haskell environment" + id: setup + uses: haskell-actions/setup@v2.7 + with: + ghc-version: "${{ inputs.ghc }}" + cabal-update: true diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92b5483..853dd7e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,14 @@ jobs: ghc-version: "${{ matrix.ghc }}" cabal-update: true + - name: "Install doctest" + uses: ./.github/workflows/doctest.action.yml + with: + ghc: ${{ steps.setup.outputs.ghc-version }} + + - name: 'STOP HERE' + run: exit 1 + - name: "Configure the build" run: | cabal configure --enable-tests --enable-benchmarks --disable-documentation From 6cb6aa91d2ef9faa4e1c57003a68a6909dd1162d Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:25:40 +0200 Subject: [PATCH 04/14] Added doctest/action.yml --- .github/workflows/doctest.action.yml | 35 -------------------- .github/workflows/doctest/action.yml | 48 ++++++++++++++++++++++++++++ .github/workflows/main.yml | 2 +- 3 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 .github/workflows/doctest.action.yml create mode 100644 .github/workflows/doctest/action.yml diff --git a/.github/workflows/doctest.action.yml b/.github/workflows/doctest.action.yml deleted file mode 100644 index 90d85f7..0000000 --- a/.github/workflows/doctest.action.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: "Run doctest on a Cabal package" - -on: - workflow_call: - inputs: - ghc: - description: 'Which GHC version to use for doctest' - type: string - required: true - version: - description: 'Which version of doctest to use' - type: string - required: false - default: 'latest' - -jobs: - run: - name: 'Run doctest on a Cabal package' - runs-on: 'ubuntu-latest' - steps: - - name: "Check for cached executable" - id: cache - uses: actions/github-script@v7 - with: - result-encoding: string - script: | - const tc = require('@actions/tool-cache'); - return null; - - - name: "Setup Haskell environment" - id: setup - uses: haskell-actions/setup@v2.7 - with: - ghc-version: "${{ inputs.ghc }}" - cabal-update: true diff --git a/.github/workflows/doctest/action.yml b/.github/workflows/doctest/action.yml new file mode 100644 index 0000000..ab3cbd0 --- /dev/null +++ b/.github/workflows/doctest/action.yml @@ -0,0 +1,48 @@ +name: "Run doctest on a Cabal package" + +inputs: + ghc: + description: 'Which GHC version to use for doctest' + type: string + required: true + version: + description: 'Which version of doctest to use' + type: string + required: false + default: 'latest' + +outputs: + path: + description: "The path to the doctest executable" + value: ${{ steps.result.outputs.result }} + +runs: + using: "composite" + steps: + - name: "Check for cached executable" + id: cache + uses: actions/github-script@v7 + with: + result-encoding: string + script: | + const tc = require('@actions/tool-cache'); + return null; + + - name: "Setup Haskell environment" + id: setup + uses: haskell-actions/setup@v2.7 + with: + ghc-version: "${{ inputs.ghc }}" + cabal-update: true + + - name: "Result" + id: result + uses: actions/github-script@v7 + with: + result-encoding: string + script: | + if (${{ step.cache.outputs.result }}) { + return ${{ step.cache.outputs.result }}; + } else { + return null; + } diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 853dd7e..40bfb57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: cabal-update: true - name: "Install doctest" - uses: ./.github/workflows/doctest.action.yml + uses: ./.github/workflows/doctest with: ghc: ${{ steps.setup.outputs.ghc-version }} From 62f17c746b244040f930b1980f35ea90d03bf4f2 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:27:32 +0200 Subject: [PATCH 05/14] step -> steps --- .github/workflows/doctest/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doctest/action.yml b/.github/workflows/doctest/action.yml index ab3cbd0..f660c8a 100644 --- a/.github/workflows/doctest/action.yml +++ b/.github/workflows/doctest/action.yml @@ -41,7 +41,7 @@ runs: with: result-encoding: string script: | - if (${{ step.cache.outputs.result }}) { + if (${{ steps.cache.outputs.result }}) { return ${{ step.cache.outputs.result }}; } else { return null; From c2869030134fe754ac1d321c480408729577c11e Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:28:55 +0200 Subject: [PATCH 06/14] step -> steps --- .github/workflows/doctest/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doctest/action.yml b/.github/workflows/doctest/action.yml index f660c8a..7e686b5 100644 --- a/.github/workflows/doctest/action.yml +++ b/.github/workflows/doctest/action.yml @@ -42,7 +42,7 @@ runs: result-encoding: string script: | if (${{ steps.cache.outputs.result }}) { - return ${{ step.cache.outputs.result }}; + return ${{ steps.cache.outputs.result }}; } else { return null; } From 8c4e78e0fbe68c0faa5f78df832e14cfa36e1432 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:54:38 +0200 Subject: [PATCH 07/14] Added doctest install step --- .github/workflows/main.yml | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40bfb57..32cdc89 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,9 +40,36 @@ jobs: cabal-update: true - name: "Install doctest" - uses: ./.github/workflows/doctest - with: - ghc: ${{ steps.setup.outputs.ghc-version }} + shell: bash + run: | + if [[ "${RUNNER_TEMP}" == '' ]]; then + echo 'Expected $RUNNER_TEMP to be defined' + exit 1 + fi + + if [[ "${RUNNER_TOOL_CACHE}" == '' ]]; then + echo 'Expected $RUNNER_TOOL_CACHE to be defined' + exit 1 + fi + + doctest="doctest-${{ steps.setup.outputs.ghc-version }}" + if [[ "${{ runner.os }}" == 'Windows' ]]; then + doctest="${doctest}.exe" + fi + result="${RUNNER_TOOL_CACHE}/${doctest}" + + if [[ ! -x "${result}" ]]; then + tmpdir="$(mktemp -d "${RUNNER_TEMP}/doctest.XXXX")" + cabal install --ignore-project --installdir "${tmpdir}" doctest:exe:doctest + installed='doctest' + if [[ "${{ runner.os }}" == 'Windows' ]]; then + installed="${installed}.exe" + fi + cp "${installed}" "${result}" + fi + "${result}" --version + + echo "path=${result}" >> "${GITHUB_OUTPUT}" - name: 'STOP HERE' run: exit 1 From 592176291618cddefe8e7745f846f7027f7ce60a Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Sun, 11 Aug 2024 23:59:27 +0200 Subject: [PATCH 08/14] Could not download doctest:exe:doctest --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32cdc89..e7e9785 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: if [[ ! -x "${result}" ]]; then tmpdir="$(mktemp -d "${RUNNER_TEMP}/doctest.XXXX")" - cabal install --ignore-project --installdir "${tmpdir}" doctest:exe:doctest + cabal install --ignore-project --installdir "${tmpdir}" doctest installed='doctest' if [[ "${{ runner.os }}" == 'Windows' ]]; then installed="${installed}.exe" From e1e65706b40aa5c0905658453ec273349a061265 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Mon, 12 Aug 2024 00:05:01 +0200 Subject: [PATCH 09/14] Fixed path to temporarily installed doctest --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7e9785..bb22f92 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,8 +60,8 @@ jobs: if [[ ! -x "${result}" ]]; then tmpdir="$(mktemp -d "${RUNNER_TEMP}/doctest.XXXX")" - cabal install --ignore-project --installdir "${tmpdir}" doctest - installed='doctest' + cabal install --ignore-project --installdir "${tmpdir}" --install-method copy doctest + installed="${tmpdir}/doctest" if [[ "${{ runner.os }}" == 'Windows' ]]; then installed="${installed}.exe" fi From 43bf7f909656e8fc09007620d87cd93afb83e69e Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Mon, 12 Aug 2024 00:10:15 +0200 Subject: [PATCH 10/14] Use doctest from install-doctest step --- .github/workflows/main.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb22f92..6e20471 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,6 +40,7 @@ jobs: cabal-update: true - name: "Install doctest" + id: install-doctest shell: bash run: | if [[ "${RUNNER_TEMP}" == '' ]]; then @@ -71,9 +72,6 @@ jobs: echo "path=${result}" >> "${GITHUB_OUTPUT}" - - name: 'STOP HERE' - run: exit 1 - - name: "Configure the build" run: | cabal configure --enable-tests --enable-benchmarks --disable-documentation @@ -113,16 +111,13 @@ jobs: - name: "Run doctests" shell: bash run: | - if [[ "${{ runner.os }}" == 'Windows' ]] - then - doctest="$HOME/.local/bin/doctest.exe" - else - doctest="$HOME/.local/bin/doctest" - fi - cabal install --ignore-project --installdir "$HOME/.local/bin" doctest - "${doctest}" --version - cabal repl --with-compiler "${doctest}" 'os-string-aeson:lib:os-string-aeson-internal' - cabal repl --with-compiler "${doctest}" 'os-string-aeson:lib:os-string-aeson' + targets=( + 'os-string-aeson:lib:os-string-aeson-internal' + 'os-string-aeson:lib:os-string-aeson' + ) + for target in "${targets[@]}"; do + cabal repl --with-compiler "${{ steps.install-doctest.outputs.path }}" "${target}" + done - name: "Check cabal file" run: cabal check From 7a21b500fadd8b453a0903b7ce1be5e96f850d6b Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Mon, 12 Aug 2024 00:19:42 +0200 Subject: [PATCH 11/14] Also install dependencies without documentation --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e20471..3ca03cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -91,7 +91,9 @@ jobs: - name: "Install dependencies" # If we had an exact cache hit, the dependencies will be up to date. if: steps.cache.outputs.cache-hit != 'true' - run: cabal build all --only-dependencies --enable-documentation + run: | + cabal build all --only-dependencies + cabal build all --only-dependencies --enable-documentation - name: "Save cached dependencies" # Cache dependencies already here, so that we do not have to rebuild them should the subsequent steps fail. From c017d318a8d612e5299a736790c7bdd3bcb9115e Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Mon, 12 Aug 2024 00:30:40 +0200 Subject: [PATCH 12/14] Removed doctest dependencies from Cabal file --- .github/workflows/main.yml | 2 +- os-string-aeson.cabal | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ca03cd..d111dce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,7 +118,7 @@ jobs: 'os-string-aeson:lib:os-string-aeson' ) for target in "${targets[@]}"; do - cabal repl --with-compiler "${{ steps.install-doctest.outputs.path }}" "${target}" + cabal repl --with-compiler "${{ steps.install-doctest.outputs.path }}" --build-depends aeson "${target}" done - name: "Check cabal file" diff --git a/os-string-aeson.cabal b/os-string-aeson.cabal index 149ab24..759ffdb 100644 --- a/os-string-aeson.cabal +++ b/os-string-aeson.cabal @@ -76,10 +76,6 @@ library base, os-string-aeson-internal, - -- Dependencies for doctests - build-depends: - aeson - -- cabal-gild: discover ./src/ --exclude=Setup.hs --exclude=**/Include.hs exposed-modules: System.OsString.Aeson From 7a46ce79f225f7b1f8fc1d9527e56972ed54d3e6 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Mon, 12 Aug 2024 00:56:15 +0200 Subject: [PATCH 13/14] Updated Mergify config --- .mergify.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index e92aba5..1238dd8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,6 +4,8 @@ queue_rules: # See https://docs.mergify.io/conditions/#validating-all-status-checks - 'check-success~=.* on ubuntu-latest' - 'check-success~=.* on windows-latest' + merge_method: squash + pull_request_rules: - name: 'Automatically merge pull requests' conditions: @@ -13,9 +15,9 @@ pull_request_rules: actions: queue: name: default - method: squash + - name: 'Delete head branch after merge' conditions: - - merged + - 'merged' actions: delete_head_branch: {} From 8945b0d9df814910fc5aed3b9ce1b1487a81ae54 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Mon, 12 Aug 2024 04:20:33 +0200 Subject: [PATCH 14/14] Require filepath even though we have os-string >2 --- os-string-aeson.cabal | 5 +- stack.yaml | 2 +- stack.yaml.lock | 27 +--------- stack/stack.ghc-9.2+os-string.yaml | 9 ++++ stack/stack.ghc-9.2+os-string.yaml.lock | 68 +++++++++++++++++++++++++ stack/stack.ghc-9.2.yaml.lock | 61 ++++++++++++++++++++++ stack/stack.ghc-9.4+os-string.yaml | 9 ++++ stack/stack.ghc-9.4+os-string.yaml.lock | 61 ++++++++++++++++++++++ stack/stack.ghc-9.4.yaml.lock | 54 ++++++++++++++++++++ stack/stack.ghc-9.6+os-string.yaml | 8 +++ stack/stack.ghc-9.6+os-string.yaml.lock | 47 +++++++++++++++++ stack/stack.ghc-9.6.yaml.lock | 61 ++++++++++++++++++++++ stack/test-stack.sh | 10 ++-- 13 files changed, 391 insertions(+), 31 deletions(-) mode change 100644 => 120000 stack.yaml.lock create mode 100644 stack/stack.ghc-9.2+os-string.yaml.lock create mode 100644 stack/stack.ghc-9.2.yaml.lock create mode 100644 stack/stack.ghc-9.4+os-string.yaml.lock create mode 100644 stack/stack.ghc-9.4.yaml.lock create mode 100644 stack/stack.ghc-9.6+os-string.yaml.lock create mode 100644 stack/stack.ghc-9.6.yaml.lock diff --git a/os-string-aeson.cabal b/os-string-aeson.cabal index 759ffdb..b116a3a 100644 --- a/os-string-aeson.cabal +++ b/os-string-aeson.cabal @@ -53,8 +53,11 @@ common language common os-string-compat if flag(os-string) + -- We don't actually need filepath, but we want to make sure that it is not + -- <1.5 if it brought into scope by some tool (Looking at you, doctest). build-depends: - os-string >=2.0.0 && <2.1 + filepath >=1.5, + os-string >=2.0.0 && <2.1, else build-depends: filepath >=1.4.100.0 && <1.6, diff --git a/stack.yaml b/stack.yaml index f45a555..4572b94 120000 --- a/stack.yaml +++ b/stack.yaml @@ -1 +1 @@ -stack/stack.ghc-9.4+os-string.yaml \ No newline at end of file +stack/stack.ghc-9.6.yaml \ No newline at end of file diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index 4f3b0a1..0000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,26 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 - pantry-tree: - sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 - size: 2229 - original: - hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 -- completed: - hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 - pantry-tree: - sha256: 4743363ed98362a8541108a2e7febb7ba32acd337d29dbff4472fafbe246589c - size: 2218 - original: - hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 -snapshots: -- completed: - sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd - size: 640086 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml - original: lts-21.25 diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 120000 index 0000000..b3d91aa --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1 @@ +stack/stack.ghc-9.6.yaml.lock \ No newline at end of file diff --git a/stack/stack.ghc-9.2+os-string.yaml b/stack/stack.ghc-9.2+os-string.yaml index a7c6a0f..d125405 100644 --- a/stack/stack.ghc-9.2+os-string.yaml +++ b/stack/stack.ghc-9.2+os-string.yaml @@ -1,10 +1,19 @@ resolver: lts-20.26 extra-deps: + - hashable-1.4.7.0 - base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + - directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + - filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 - os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 + - process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 - text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 + - unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 flags: + directory: + os-string: true os-string-aeson: os-string: true + unix: + os-string: true diff --git a/stack/stack.ghc-9.2+os-string.yaml.lock b/stack/stack.ghc-9.2+os-string.yaml.lock new file mode 100644 index 0000000..5f47605 --- /dev/null +++ b/stack/stack.ghc-9.2+os-string.yaml.lock @@ -0,0 +1,68 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: hashable-1.4.7.0@sha256:573f3ab242f75465a0d67ce9d84202650a1606575e6dbd6d31ffcf4767a9a379,6629 + pantry-tree: + sha256: 9ec168505c52fa389b7447a1251b302e32537adeecac88c2aa72beed53beb3bd + size: 1578 + original: + hackage: hashable-1.4.7.0 +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + pantry-tree: + sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e + size: 3519 + original: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 +- completed: + hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 + pantry-tree: + sha256: a5feb33f17ff131a5bba009abae35761594d62ba6873b2f70992a48db160c9b7 + size: 2274 + original: + hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 +- completed: + hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 + pantry-tree: + sha256: 4743363ed98362a8541108a2e7febb7ba32acd337d29dbff4472fafbe246589c + size: 2218 + original: + hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 +- completed: + hackage: process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 + pantry-tree: + sha256: 20d200008cf22d2f0402f900e0f26df17e355947689784852a10c28f03fbbca0 + size: 1790 + original: + hackage: process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 +- completed: + hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 + pantry-tree: + sha256: 25f3b6dd211e30f9e0ef5047bb9f30df7a9296cf1043873e31558196dfe78676 + size: 7514 + original: + hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 +- completed: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 + pantry-tree: + sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 + size: 5821 + original: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 +snapshots: +- completed: + sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 + size: 650475 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml + original: lts-20.26 diff --git a/stack/stack.ghc-9.2.yaml.lock b/stack/stack.ghc-9.2.yaml.lock new file mode 100644 index 0000000..9cb7333 --- /dev/null +++ b/stack/stack.ghc-9.2.yaml.lock @@ -0,0 +1,61 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + pantry-tree: + sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e + size: 3519 + original: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 +- completed: + hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 + pantry-tree: + sha256: 2420f7addc917bf41970a8980f52abe431b1a0fb711b00795effbb289c8ea76c + size: 3998 + original: + hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 +- completed: + hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 + pantry-tree: + sha256: 75321cadad8a67becb5fc36bdd974a6db3746dcbe0235bf9ec0f0baaad7b4a23 + size: 207 + original: + hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 +- completed: + hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 + pantry-tree: + sha256: 14d1e9a5ec731766e43c7eb9c2dc59a7da48d98d43374d9d83e725d8891c6173 + size: 1789 + original: + hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 +- completed: + hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 + pantry-tree: + sha256: 25f3b6dd211e30f9e0ef5047bb9f30df7a9296cf1043873e31558196dfe78676 + size: 7514 + original: + hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 +- completed: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 + pantry-tree: + sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 + size: 5821 + original: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 +snapshots: +- completed: + sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 + size: 650475 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml + original: lts-20.26 diff --git a/stack/stack.ghc-9.4+os-string.yaml b/stack/stack.ghc-9.4+os-string.yaml index 85ed5d8..fa0a8c1 100644 --- a/stack/stack.ghc-9.4+os-string.yaml +++ b/stack/stack.ghc-9.4+os-string.yaml @@ -1,9 +1,18 @@ resolver: lts-21.25 extra-deps: + - hashable-1.4.7.0 - base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + - directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + - filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 - os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 + - process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 + - unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 flags: + directory: + os-string: true os-string-aeson: os-string: true + unix: + os-string: true diff --git a/stack/stack.ghc-9.4+os-string.yaml.lock b/stack/stack.ghc-9.4+os-string.yaml.lock new file mode 100644 index 0000000..fca4663 --- /dev/null +++ b/stack/stack.ghc-9.4+os-string.yaml.lock @@ -0,0 +1,61 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: hashable-1.4.7.0@sha256:573f3ab242f75465a0d67ce9d84202650a1606575e6dbd6d31ffcf4767a9a379,6629 + pantry-tree: + sha256: 9ec168505c52fa389b7447a1251b302e32537adeecac88c2aa72beed53beb3bd + size: 1578 + original: + hackage: hashable-1.4.7.0 +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + pantry-tree: + sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e + size: 3519 + original: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 +- completed: + hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 + pantry-tree: + sha256: a5feb33f17ff131a5bba009abae35761594d62ba6873b2f70992a48db160c9b7 + size: 2274 + original: + hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 +- completed: + hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 + pantry-tree: + sha256: 4743363ed98362a8541108a2e7febb7ba32acd337d29dbff4472fafbe246589c + size: 2218 + original: + hackage: os-string-2.0.6@sha256:7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030,3259 +- completed: + hackage: process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 + pantry-tree: + sha256: 20d200008cf22d2f0402f900e0f26df17e355947689784852a10c28f03fbbca0 + size: 1790 + original: + hackage: process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 +- completed: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 + pantry-tree: + sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 + size: 5821 + original: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 +snapshots: +- completed: + sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd + size: 640086 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml + original: lts-21.25 diff --git a/stack/stack.ghc-9.4.yaml.lock b/stack/stack.ghc-9.4.yaml.lock new file mode 100644 index 0000000..fe870df --- /dev/null +++ b/stack/stack.ghc-9.4.yaml.lock @@ -0,0 +1,54 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + pantry-tree: + sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e + size: 3519 + original: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 +- completed: + hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 + pantry-tree: + sha256: 2420f7addc917bf41970a8980f52abe431b1a0fb711b00795effbb289c8ea76c + size: 3998 + original: + hackage: filepath-1.4.300.2@sha256:345cbb1afe414a09e47737e4d14cbd51891a734e67c0ef3d77a1439518bb81e8,5900 +- completed: + hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 + pantry-tree: + sha256: 75321cadad8a67becb5fc36bdd974a6db3746dcbe0235bf9ec0f0baaad7b4a23 + size: 207 + original: + hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 +- completed: + hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 + pantry-tree: + sha256: 14d1e9a5ec731766e43c7eb9c2dc59a7da48d98d43374d9d83e725d8891c6173 + size: 1789 + original: + hackage: process-1.6.20.0@sha256:2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03,2790 +- completed: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 + pantry-tree: + sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 + size: 5821 + original: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 +snapshots: +- completed: + sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd + size: 640086 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml + original: lts-21.25 diff --git a/stack/stack.ghc-9.6+os-string.yaml b/stack/stack.ghc-9.6+os-string.yaml index 8888631..6d093fe 100644 --- a/stack/stack.ghc-9.6+os-string.yaml +++ b/stack/stack.ghc-9.6+os-string.yaml @@ -2,7 +2,15 @@ resolver: lts-22.31 extra-deps: - base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + - directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + - filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 + - process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 + - unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 flags: + directory: + os-string: true os-string-aeson: os-string: true + unix: + os-string: true diff --git a/stack/stack.ghc-9.6+os-string.yaml.lock b/stack/stack.ghc-9.6+os-string.yaml.lock new file mode 100644 index 0000000..19d1cd0 --- /dev/null +++ b/stack/stack.ghc-9.6+os-string.yaml.lock @@ -0,0 +1,47 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 + pantry-tree: + sha256: d11130a0ca9e7c8720ed1ceef4e2f0d9be4b446e67e7d15d634763a5c952877e + size: 3519 + original: + hackage: directory-1.3.8.5@sha256:fbeec9ec346e5272167f63dcb86af513b457a7b9fc36dc818e4c7b81608d612b,3166 +- completed: + hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 + pantry-tree: + sha256: a5feb33f17ff131a5bba009abae35761594d62ba6873b2f70992a48db160c9b7 + size: 2274 + original: + hackage: filepath-1.5.3.0@sha256:0c64bc9a4f5946c86a8f0527bf40c8ba51e2c02d36eea0e20ea558c8d94166e8,4945 +- completed: + hackage: process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 + pantry-tree: + sha256: 20d200008cf22d2f0402f900e0f26df17e355947689784852a10c28f03fbbca0 + size: 1790 + original: + hackage: process-1.6.21.0@sha256:685bc68759da31b5f152092fe664e1644e84f6dc0ae7a6c143e8564a1d6dafe8,2644 +- completed: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 + pantry-tree: + sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5 + size: 5821 + original: + hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 +snapshots: +- completed: + sha256: acaab6ca693211938d1542abcb1c83a2f298b9f6b571854a9d38febe39b6408e + size: 719577 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/31.yaml + original: lts-22.31 diff --git a/stack/stack.ghc-9.6.yaml.lock b/stack/stack.ghc-9.6.yaml.lock new file mode 100644 index 0000000..2f1e0d5 --- /dev/null +++ b/stack/stack.ghc-9.6.yaml.lock @@ -0,0 +1,61 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: data-fix-0.3.2@sha256:cd7d6ff8b68aca3b51d8116870fc8ccdbc557989562cd3d5c941e4f0b7bc5af1,1734 + pantry-tree: + sha256: 39ea2bb3ace2b61bf72e7df77948f7fccc67c70d12a11e35dd20744eec5dd0bf + size: 262 + original: + hackage: data-fix-0.3.2 +- completed: + hackage: hashable-1.4.3.0@sha256:f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194,4718 + pantry-tree: + sha256: abef0611d6a717ba351317bdb603ef536659e7767a49ba81b2dbe20994065c7d + size: 1248 + original: + hackage: hashable-1.4.3.0 +- completed: + hackage: semialign-1.3@sha256:7be9ef5ca1d6b052991f68c053aab68b9d1ab3b1938c9557ac84c97937815223,2888 + pantry-tree: + sha256: e5daa7e0023dabb1b21a04bf084364b94e45e81b380e950b90f51294a1990b87 + size: 537 + original: + hackage: semialign-1.3 +- completed: + hackage: text-short-0.1.5@sha256:9c73c9c9182ca69ee92ce3758f515b1c078cd167d882ccc8c46f92f68c65e190,3216 + pantry-tree: + sha256: d3dcfee9029cd3624a788a0e65f0dea588ae0446a8a75a27d6b6164b8ee0fd57 + size: 727 + original: + hackage: text-short-0.1.5 +- completed: + hackage: these-1.2@sha256:011e22f6891ca028f87c04ea48796696c92d593313a9c699f7ff4f9ffd7aec6e,2882 + pantry-tree: + sha256: 37483703ce7326c07608b06f2f741fb0f708cb06bd10ec57d87108d068046b05 + size: 351 + original: + hackage: these-1.2 +- completed: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 + pantry-tree: + sha256: 62150ae24db8e07f966679024406de4cdfe13556c9afce807f4f24d7ec03d0b5 + size: 2229 + original: + hackage: base64-1.0@sha256:ab8084608505f30d6cf7dd790271f927fd8a00956c5e7f5546f5cf56b298022c,2991 +- completed: + hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 + pantry-tree: + sha256: 75321cadad8a67becb5fc36bdd974a6db3746dcbe0235bf9ec0f0baaad7b4a23 + size: 207 + original: + hackage: os-string-1.0.0@sha256:f1582da15c52761681da87d98c854a0db54049f34d59f74cfec4cc56ad8fbc05,1852 +snapshots: +- completed: + sha256: acaab6ca693211938d1542abcb1c83a2f298b9f6b571854a9d38febe39b6408e + size: 719577 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/31.yaml + original: lts-22.31 diff --git a/stack/test-stack.sh b/stack/test-stack.sh index d65623a..6e595ea 100755 --- a/stack/test-stack.sh +++ b/stack/test-stack.sh @@ -1,14 +1,18 @@ #!/usr/bin/env bash -set -e +set -eu for version in '9.2' '9.4' '9.6'; do for flag in '+os-string' ''; do stack_yaml="stack/stack.ghc-${version}${flag}.yaml" echo "### TESTING ${stack_yaml}" rm -rf .stack-work stack.yaml stack.yaml.lock - ln -s "${stack_yaml}" stack.yaml - ln -s "${stack_yaml}.lock" stack.yaml.lock + cp "${stack_yaml}" stack.yaml stack test --pedantic + cp stack.yaml.lock "${stack_yaml}.lock" done done + +rm -rf .stack-work stack.yaml stack.yaml.lock +ln -s "${stack_yaml}" stack.yaml +ln -s "${stack_yaml}.lock" stack.yaml.lock