Skip to content

Commit

Permalink
get rid of custom depends
Browse files Browse the repository at this point in the history
  • Loading branch information
friedbrice committed Jan 4, 2024
1 parent a6656a8 commit d669f8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 3 additions & 10 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d669f8a

Please sign in to comment.