Skip to content

[RFC] haskell build recipe updates #6955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
liontiger23 wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[RFC] haskell build recipe updates #6955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1af9679
ghcup: Update build recipe
liontiger23 Oct 25, 2025
53c38c8
pandoc: Update build recipe
liontiger23 Oct 25, 2025
7dafdc7
pandoc-crossref: Update build recipe
liontiger23 Oct 25, 2025
ac038c9
sv2v: Update build recipe
liontiger23 Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions packages/g/ghcup/files/0001-Brick-version-fix.patch
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions packages/g/ghcup/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name : ghcup
version : 0.1.50.2
release : 2
Expand All @@ -19,10 +19,14 @@
- libffi-devel
- ncurses-devel
setup : |
%patch -p1 -i $pkgfiles/0001-Brick-version-fix.patch
%cabal_configure -f+tar -f+tui --enable-tests
%cabal_configure -f+tar -f+tui --enable-tests \
--constraint='brick >=2.5 && <2.8'
cabal install hspec-discover
Copy link
Contributor Author

@liontiger23 liontiger23 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be %cabal_install_build_tool hspec-discover

cp "$HOME/.cabal/bin/hspec-discover" /usr/bin/hspec-discover
build : |
cabal build %JOBS%
%haskell_build -j1
install : |
mkdir -p $installdir/usr/bin
cabal install --installdir=$installdir/usr/bin --install-method=copy exe:ghcup
%haskell_install exe:ghcup
rm -rf $installdir/%libdir%
Copy link
Contributor Author

@liontiger23 liontiger23 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can also bundle this rm -rf somewhere into %haskell_install_exe or something like that?

check : |
%haskell_check
3 changes: 2 additions & 1 deletion packages/g/ghcup/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<PISI>
<Source>
<Name>ghcup</Name>
Expand All @@ -21,6 +21,7 @@
<PartOf>programming.haskell</PartOf>
<Files>
<Path fileType="executable">/usr/bin/ghcup</Path>
<Path fileType="doc">/usr/share/doc/ghcup/LICENSE</Path>
</Files>
</Package>
<History>
Expand All @@ -32,4 +33,4 @@
<Email>liontiger23@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
5 changes: 2 additions & 3 deletions packages/p/pandoc-crossref/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name : pandoc-crossref
version : 0.3.20
release : 8
source :
- https://github.com/lierdakil/pandoc-crossref/archive/refs/tags/v0.3.20.tar.gz : 935d66e4b52323aba625b2bfa90abfea774816ccf4feb959e8271beac6d9b453
- https://hackage.haskell.org/package/pandoc-crossref-0.3.20/pandoc-crossref-0.3.20.tar.gz : ca8f548209cb5c7a0e0634f187ddee9ead134843acd404b1f7486d4f5babcf81
homepage : https://lierdakil.github.io/pandoc-crossref/
license : GPL-2.0-only
component : office
Expand All @@ -16,8 +16,7 @@
- pandoc
networking : true
setup : |
rm $workdir/cabal.project.freeze
%cabal_configure --enable-tests
%cabal_configure --constraint="crypton-x509-store == 1.6.11" --enable-tests
Copy link
Contributor Author

@liontiger23 liontiger23 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here %cabal_configure works because --constraint contains only version specification

build : |
%haskell_build
install : |
Expand Down
2 changes: 1 addition & 1 deletion packages/p/pandoc-crossref/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<PISI>
<Source>
<Name>pandoc-crossref</Name>
Expand Down Expand Up @@ -33,4 +33,4 @@
<Email>liontiger23@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
52 changes: 0 additions & 52 deletions packages/p/pandoc/files/0001-upstream-test-fix-before-3.8.1.patch
View file
Open in desktop

This file was deleted.

22 changes: 12 additions & 10 deletions packages/p/pandoc/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name : pandoc
version : 3.7.0.2
release : 11
source :
- https://github.com/jgm/pandoc/archive/refs/tags/3.7.0.2.tar.gz : a098c1dc8051844e3992f8396c6c947dccbc57b6ca3df2f2c47b9f7fa9f11246
- https://hackage.haskell.org/package/pandoc-cli-3.7.0.2/pandoc-cli-3.7.0.2.tar.gz : ff4dcab86cfa5291ba11a14d14fef49ddf494c549bdd01b6752ed6a8043c3d3d
homepage : https://pandoc.org
license : BSD-3-Clause
component : office
Expand All @@ -14,16 +14,18 @@
- haskell-cabal-install
networking : true
setup : |
%patch -p1 -i $pkgfiles/0001-upstream-test-fix-before-3.8.1.patch
export CABAL_DIR="$HOME/.cabal"
export GHCV=$(ghc --numeric-version)
cabal update
cabal configure -O2 %JOBS% \
--disable-executable-dynamic \
--ghc-options="-H512m %JOBS%" \
-f embed_data_files
cabal build %JOBS% --only-dependencies --disable-tests -O2 --ghc-options="-H128m %JOBS%" \
Copy link
Contributor Author

@liontiger23 liontiger23 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be

%cabal_build_dependencies --constraint="crypton-x509-store == 1.6.11" \
                          --constraint="pandoc +embed_data_files"
%haskell_configure_exe

--constraint="crypton-x509-store == 1.6.11" \
--constraint="pandoc +embed_data_files"
%haskell_configure --disable-executable-dynamic \
--package-db=$HOME/.cabal/store/ghc-$GHCV/package.db
build : |
cabal build pandoc-cli
%haskell_build
install : |
mkdir -p $installdir/usr/bin
cabal install --installdir=$installdir/usr/bin --install-method=copy pandoc-cli
%haskell_install
rm -rf $installdir/{%libdir%,usr/share/pandoc}
check : |
cabal test
%haskell_check
3 changes: 2 additions & 1 deletion packages/p/pandoc/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<PISI>
<Source>
<Name>pandoc</Name>
Expand All @@ -21,6 +21,7 @@
<PartOf>office</PartOf>
<Files>
<Path fileType="executable">/usr/bin/pandoc</Path>
<Path fileType="doc">/usr/share/doc/pandoc/COPYING.md</Path>
</Files>
</Package>
<History>
Expand All @@ -32,4 +33,4 @@
<Email>liontiger23@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
11 changes: 7 additions & 4 deletions packages/s/sv2v/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name : sv2v
version : 0.0.13
release : 2
Expand All @@ -14,10 +14,13 @@
- ghc
- haskell-cabal-install
setup : |
export CABAL_DIR="$HOME/.cabal"
cabal update
cabal configure -O2 %JOBS% --disable-executable-dynamic
cabal install alex happy
Copy link
Contributor Author

@liontiger23 liontiger23 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be %cabal_install_build_tool alex happy

cp "$HOME/.cabal/bin/alex" "$HOME/.cabal/bin/happy" /usr/bin
%cabal_configure
build : |
cabal build exe:sv2v
%haskell_build
install : |
mkdir -p $installdir/usr/bin
cabal install exe:sv2v --installdir=$installdir/usr/bin --install-method=copy
%haskell_install exe:sv2v
rm -rf $installdir/%libdir%
4 changes: 3 additions & 1 deletion packages/s/sv2v/pspec_x86_64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<PISI>
<Source>
<Name>sv2v</Name>
Expand All @@ -21,6 +21,8 @@
<PartOf>programming.tools</PartOf>
<Files>
<Path fileType="executable">/usr/bin/sv2v</Path>
<Path fileType="doc">/usr/share/doc/sv2v/LICENSE</Path>
<Path fileType="doc">/usr/share/doc/sv2v/NOTICE</Path>
</Files>
</Package>
<History>
Expand All @@ -32,4 +34,4 @@
<Email>liontiger23@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
Loading