From a785c51034695b73dc370094770dff1b159387ac Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Tue, 3 Jan 2023 13:02:24 +0100 Subject: [PATCH 1/4] Add comfort-glpk and glpk-headers --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e8867da7..277d483a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -502,6 +502,7 @@ packages: - comfort-array - comfort-array-shape - comfort-fftw + - comfort-glpk - concurrent-split - cutter - data-accessor @@ -594,6 +595,7 @@ packages: - hsshellscript < 0 # https://github.com/commercialhaskell/stackage/issues/6762 - hyper - storable-endian + - glpk-headers "Jeremy Barisch-Rooney @barischrooneyj": - threepenny-gui-flexbox From 8b95b2fe69d986730c53ff727d0fae6fda632851 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Tue, 3 Jan 2023 13:24:55 +0100 Subject: [PATCH 2/4] glpk-headers: disable tests some dependencies of tests are not contained in Stackage --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 277d483a..0c2fecab 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -8091,6 +8091,9 @@ skipped-tests: - captcha-2captcha - captcha-capmonster + # @thielema + - glpk-headers + # Uses Cabal's "library internal" stanza feature - s3-signer From b890245853698931a0b4c07b622d12d1090f7eb2 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Tue, 3 Jan 2023 13:31:32 +0100 Subject: [PATCH 3/4] Add derive-storable needed by glpk-headers --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0c2fecab..dcd9761d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -596,6 +596,7 @@ packages: - hyper - storable-endian - glpk-headers + - derive-storable "Jeremy Barisch-Rooney @barischrooneyj": - threepenny-gui-flexbox From df21c702b22e048edbb31999c5eeb3d0c7ed4a57 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Thu, 11 May 2023 22:44:38 +0200 Subject: [PATCH 4/4] Add linear-programming and Debian package libglpk-dev needed by comfort-glpk --- build-constraints.yaml | 1 + docker/02-apt-get-install.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dcd9761d..1d58aa6b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -528,6 +528,7 @@ packages: - jack - latex - lazyio + - linear-programming - markov-chain - midi - midi-alsa diff --git a/docker/02-apt-get-install.sh b/docker/02-apt-get-install.sh index c0b94164..9e327690 100755 --- a/docker/02-apt-get-install.sh +++ b/docker/02-apt-get-install.sh @@ -52,6 +52,7 @@ apt-get install -y \ libglew-dev \ libglfw3-dev \ libglib2.0-dev \ + libglpk-dev \ libglu1-mesa-dev \ libgmp3-dev \ libgnutls28-dev \