diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 398160f..af7e769 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -201,7 +201,6 @@ jobs: echo "packages: $GITHUB_WORKSPACE/source/universe-instances-extended" >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/universe-reverse-instances" >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/universe-some" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/universe-dependent-sum" >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/universe" >> cabal.project cat cabal.project - name: sdist @@ -222,8 +221,6 @@ jobs: echo "PKGDIR_universe_reverse_instances=${PKGDIR_universe_reverse_instances}" >> "$GITHUB_ENV" PKGDIR_universe_some="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/universe-some-[0-9.]*')" echo "PKGDIR_universe_some=${PKGDIR_universe_some}" >> "$GITHUB_ENV" - PKGDIR_universe_dependent_sum="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/universe-dependent-sum-[0-9.]*')" - echo "PKGDIR_universe_dependent_sum=${PKGDIR_universe_dependent_sum}" >> "$GITHUB_ENV" PKGDIR_universe="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/universe-[0-9.]*')" echo "PKGDIR_universe=${PKGDIR_universe}" >> "$GITHUB_ENV" rm -f cabal.project cabal.project.local @@ -233,7 +230,6 @@ jobs: echo "packages: ${PKGDIR_universe_instances_extended}" >> cabal.project echo "packages: ${PKGDIR_universe_reverse_instances}" >> cabal.project echo "packages: ${PKGDIR_universe_some}" >> cabal.project - echo "packages: ${PKGDIR_universe_dependent_sum}" >> cabal.project echo "packages: ${PKGDIR_universe}" >> cabal.project echo "package universe-base" >> cabal.project echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project @@ -243,8 +239,6 @@ jobs: echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe-some" >> cabal.project echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project - echo "package universe-dependent-sum" >> cabal.project - echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package universe" >> cabal.project echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-base" >> cabal.project ; fi @@ -255,8 +249,6 @@ jobs: if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-some" >> cabal.project ; fi if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi - if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe-dependent-sum" >> cabal.project ; fi - if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package universe" >> cabal.project ; fi if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-base" >> cabal.project ; fi @@ -267,13 +259,11 @@ jobs: if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-some" >> cabal.project ; fi if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe-dependent-sum" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package universe" >> cabal.project ; fi if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(universe|universe-base|universe-instances-extended|universe-reverse-instances|universe-some)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -313,8 +303,6 @@ jobs: ${CABAL} -vnormal check cd ${PKGDIR_universe_some} || false ${CABAL} -vnormal check - cd ${PKGDIR_universe_dependent_sum} || false - ${CABAL} -vnormal check cd ${PKGDIR_universe} || false ${CABAL} -vnormal check - name: haddock diff --git a/cabal.project b/cabal.project index d031051..7f82622 100644 --- a/cabal.project +++ b/cabal.project @@ -3,5 +3,4 @@ packages: universe-instances-extended/ universe-reverse-instances/ universe-some/ - universe-dependent-sum/ universe/ diff --git a/universe-dependent-sum/LICENSE b/universe-dependent-sum/LICENSE deleted file mode 120000 index ea5b606..0000000 --- a/universe-dependent-sum/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/universe-dependent-sum/cabal.project b/universe-dependent-sum/cabal.project deleted file mode 100644 index 46f46b9..0000000 --- a/universe-dependent-sum/cabal.project +++ /dev/null @@ -1,4 +0,0 @@ --- this project file allows to test this package in isolation -packages: . -packages: ../universe-base -packages: ../universe-some diff --git a/universe-dependent-sum/changelog b/universe-dependent-sum/changelog deleted file mode 100644 index 6613a3b..0000000 --- a/universe-dependent-sum/changelog +++ /dev/null @@ -1,9 +0,0 @@ -1.3.1 -* Depend on universe-some >=1.2.2 && <1.3 -* Support GHC-9.6.5..9.10.1 - -1.3 -* DEPRECATED, use universe-some -* Data.Universe.DependentSum re-exports Data.Universe.Some -* Don't depend on dependent-sum, you should use dependent-sum >=0.7, which uses -some package diff --git a/universe-dependent-sum/src/Data/Universe/DependentSum.hs b/universe-dependent-sum/src/Data/Universe/DependentSum.hs deleted file mode 100644 index 252074d..0000000 --- a/universe-dependent-sum/src/Data/Universe/DependentSum.hs +++ /dev/null @@ -1,5 +0,0 @@ --- | This module re-exports "Data.Universe.Some" from @universe-some@ package. -module Data.Universe.DependentSum -{-# DEPRECATED "Use universe-some package directly" #-} -() where -import Data.Universe.Some () diff --git a/universe-dependent-sum/universe-dependent-sum.cabal b/universe-dependent-sum/universe-dependent-sum.cabal deleted file mode 100644 index 1553473..0000000 --- a/universe-dependent-sum/universe-dependent-sum.cabal +++ /dev/null @@ -1,57 +0,0 @@ -cabal-version: 2.2 -name: universe-dependent-sum -version: 1.3.1 -x-revision: 2 -synopsis: Universe instances for types from dependent-sum -description: - A class for finite and recursively enumerable types and some helper functions for enumerating them - defined in @universe-base@ package: - . - @ - class Universe a where universe :: [a] - class Universe a => Finite a where universeF :: [a]; universeF = universe - @ - . - This package adds - . - @ - class UniverseSome f where universeSome :: [Some f] - class UniverseSome f => FiniteSome f where universeFSome :: [Some f]; universeFSome = universe - @ - . - classes. - -homepage: https://github.com/dmwit/universe -license: BSD-3-Clause -license-file: LICENSE -author: Daniel Wagner -maintainer: me@dmwit.com -copyright: Daniel Wagner 2014 -category: Data -build-type: Simple -extra-source-files: changelog -tested-with: - GHC ==8.6.5 - || ==8.8.4 - || ==8.10.7 - || ==9.0.2 - || ==9.2.8 - || ==9.4.8 - || ==9.6.6 - || ==9.8.4 - || ==9.10.1 - || ==9.12.4 - || ==9.14.1 - -source-repository head - type: git - location: https://github.com/dmwit/universe - subdir: universe-dependent-sum - -library - default-language: Haskell2010 - hs-source-dirs: src - exposed-modules: Data.Universe.DependentSum - build-depends: - base >=4.12 && <4.23 - , universe-some >=1.2.2 && <1.3