Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
phadej committed Aug 19, 2024
1 parent 47db1fa commit 9d6d9e4
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ jobs:
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-pkgconfig" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-pgconfig" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-configure" >> cabal.project
cat cabal.project
- name: sdist
run: |
Expand All @@ -192,23 +192,23 @@ jobs:
echo "PKGDIR_postgresql_libpq=${PKGDIR_postgresql_libpq}" >> "$GITHUB_ENV"
PKGDIR_postgresql_libpq_pkgconfig="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-pkgconfig-[0-9.]*')"
echo "PKGDIR_postgresql_libpq_pkgconfig=${PKGDIR_postgresql_libpq_pkgconfig}" >> "$GITHUB_ENV"
PKGDIR_postgresql_libpq_pgconfig="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-pgconfig-[0-9.]*')"
echo "PKGDIR_postgresql_libpq_pgconfig=${PKGDIR_postgresql_libpq_pgconfig}" >> "$GITHUB_ENV"
PKGDIR_postgresql_libpq_configure="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-configure-[0-9.]*')"
echo "PKGDIR_postgresql_libpq_configure=${PKGDIR_postgresql_libpq_configure}" >> "$GITHUB_ENV"
rm -f cabal.project cabal.project.local
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_postgresql_libpq}" >> cabal.project
echo "packages: ${PKGDIR_postgresql_libpq_pkgconfig}" >> cabal.project
echo "packages: ${PKGDIR_postgresql_libpq_pgconfig}" >> cabal.project
echo "packages: ${PKGDIR_postgresql_libpq_configure}" >> cabal.project
echo "package postgresql-libpq" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo "package postgresql-libpq-pkgconfig" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo "package postgresql-libpq-pgconfig" >> cabal.project
echo "package postgresql-libpq-configure" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(postgresql-libpq|postgresql-libpq-pgconfig|postgresql-libpq-pkgconfig)$/; }' >> cabal.project.local
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(postgresql-libpq|postgresql-libpq-configure|postgresql-libpq-pkgconfig)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
${CABAL} -vnormal check
cd ${PKGDIR_postgresql_libpq_pkgconfig} || false
${CABAL} -vnormal check
cd ${PKGDIR_postgresql_libpq_pgconfig} || false
cd ${PKGDIR_postgresql_libpq_configure} || false
${CABAL} -vnormal check
- name: haddock
run: |
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
packages: .
packages: postgresql-libpq-pkgconfig
packages: postgresql-libpq-pgconfig
packages: postgresql-libpq-configure
2 changes: 1 addition & 1 deletion cabal.project.macos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
packages: .
packages: postgresql-libpq-pgconfig
packages: postgresql-libpq-configure

constraints: unix installed

Expand Down
2 changes: 1 addition & 1 deletion cabal.project.win
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
packages: .
packages: postgresql-libpq-pgconfig
packages: postgresql-libpq-configure

constraints: Win32 installed

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
postgresql-libpq-pgconfig.buildinfo
postgresql-libpq-configure.buildinfo
config.log
config.status
aclocal.m4
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 2.4
name: postgresql-libpq-pgconfig
name: postgresql-libpq-configure
version: 0.10
synopsis: low-level binding to libpq: pg_config based provider
synopsis: low-level binding to libpq: configure based provider
description:
This is a binding to libpq: the C application
programmer's interface to PostgreSQL. libpq is a
Expand Down Expand Up @@ -42,4 +42,4 @@ library
source-repository head
type: git
location: https://github.com/haskellari/postgresql-libpq
subdir: postgresql-libpq-pgconfig
subdir: postgresql-libpq-configure
2 changes: 1 addition & 1 deletion postgresql-libpq.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ library
build-depends: postgresql-libpq-pkgconfig ^>=0.10

else
build-depends: postgresql-libpq-pgconfig ^>=0.10
build-depends: postgresql-libpq-configure ^>=0.10

build-tool-depends: hsc2hs:hsc2hs >=0.68.5

Expand Down

0 comments on commit 9d6d9e4

Please sign in to comment.