From d669f8a52827aff387f41810aaad0df910c892e0 Mon Sep 17 00:00:00 2001 From: Daniel Brice Date: Thu, 4 Jan 2024 11:23:54 -0800 Subject: [PATCH] get rid of custom depends --- .github/workflows/haskell-ci.yml | 11 +++-------- cabal.project | 13 +++---------- package.yaml | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 95d9779..ddd58a9 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -144,18 +144,13 @@ jobs: rm -f cabal.project cabal.project.local touch cabal.project touch cabal.project.local + echo "packages: ${PKGDIR_string_variants}" >> cabal.project echo "package string-variants" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project - echo "source-repository-package" >> cabal.project - echo " type: git" >> cabal.project - echo " location: https://github.com/nikita-volkov/refined" >> cabal.project - echo " tag: 11296288b5e2f2b391ee721b50af3cfe7beaa790" >> cabal.project - echo "source-repository-package" >> cabal.project - echo " type: git" >> cabal.project - echo " location: https://github.com/TOTBWF/refinery" >> cabal.project - echo " tag: e9dbb5fd990ff040c2496c7cf527c45550eb189b" >> cabal.project echo "tests: True" >> cabal.project + echo "allow-newer:" >> cabal.project + echo " refined:aeson" >> cabal.project $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(string-variants)$/; }' >> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index 3138e27..514478e 100644 --- a/cabal.project +++ b/cabal.project @@ -1,15 +1,8 @@ -- HI! for pants reasons, if you add anything load bearing in here, you have to -- add it to `generate cabal.project` in `.github/workflows/haskell-ci.yml` -source-repository-package - type: git - location: https://github.com/nikita-volkov/refined - tag: 11296288b5e2f2b391ee721b50af3cfe7beaa790 - -source-repository-package - type: git - location: https://github.com/TOTBWF/refinery - tag: e9dbb5fd990ff040c2496c7cf527c45550eb189b - packages: . tests: True + +allow-newer: + refined:aeson diff --git a/package.yaml b/package.yaml index c7fc7f5..ee7a463 100644 --- a/package.yaml +++ b/package.yaml @@ -11,7 +11,7 @@ extra-source-files: license: MIT -tested-with: ==9.4.8 || ==9.6.3 +tested-with: ==9.2.8 || ==9.4.8 || ==9.6.3 # FIXME(jadel): maybe instances should be in a separate package but whatever dependencies: - aeson >= 2.0.0.0