[Git][haskell-team/DHG_packages][master] hadrian: Initial release

Ilias Tsitsimpis (@iliastsi) gitlab at salsa.debian.org
Sat Sep 30 18:27:40 BST 2023



Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
6216f310 by Ilias Tsitsimpis at 2023-09-30T18:31:40+03:00
hadrian: Initial release

- - - - -


12 changed files:

- + p/haskell-hadrian/debian/changelog
- + p/haskell-hadrian/debian/compat
- + p/haskell-hadrian/debian/control
- + p/haskell-hadrian/debian/copyright
- + p/haskell-hadrian/debian/hadrian.install
- + p/haskell-hadrian/debian/patches/hadrian-haddock-opts
- + p/haskell-hadrian/debian/patches/hadrian-iserv
- + p/haskell-hadrian/debian/patches/series
- + p/haskell-hadrian/debian/rules
- + p/haskell-hadrian/debian/source/format
- + p/haskell-hadrian/debian/uscan-repack.sh
- + p/haskell-hadrian/debian/watch


Changes:

=====================================
p/haskell-hadrian/debian/changelog
=====================================
@@ -0,0 +1,5 @@
+haskell-hadrian (9.4.7-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sat, 30 Sep 2023 18:13:35 +0300


=====================================
p/haskell-hadrian/debian/compat
=====================================
@@ -0,0 +1 @@
+10


=====================================
p/haskell-hadrian/debian/control
=====================================
@@ -0,0 +1,39 @@
+Source: haskell-hadrian
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Ilias Tsitsimpis <iliastsi at debian.org>,
+Priority: optional
+Section: haskell
+Rules-Requires-Root: no
+Build-Depends: debhelper (>= 10),
+ haskell-devscripts (>= 0.13),
+ cdbs,
+ ghc (>= 9.4),
+ libghc-extra-dev (>= 1.4.7),
+ libghc-shake-dev (>= 0.18.3),
+ libghc-shake-dev (<< 0.20),
+ libghc-unordered-containers-dev (>= 0.2.1),
+ libghc-unordered-containers-dev (<< 0.3),
+Standards-Version: 4.6.2
+Homepage: https://www.haskell.org/ghc/
+Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-hadrian
+Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-hadrian]
+X-Description: build system for GHC
+ Hadrian is a modular, statically-typed, extensible build system for GHC,
+ introduced in the paper Non-recursive Make Considered Harmful. It consists of
+ a Haskell executable implemented using the shake library, and is used to
+ configure and build GHC.
+
+Package: hadrian
+Architecture: any
+Depends: ${haskell:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends: ${haskell:Recommends},
+Suggests: ${haskell:Suggests},
+Conflicts: ${haskell:Conflicts},
+Provides: ${haskell:Provides},
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}


=====================================
p/haskell-hadrian/debian/copyright
=====================================
@@ -0,0 +1,35 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: hadrian
+Upstream-Contact: Andrey Mokhov <andrey.mokhov at gmail.com>
+Source: https://haskell.org/ghc/
+
+Files: *
+Copyright: Andrey Mokhov 2014-2017
+License: Expat
+
+Files: debian/*
+Copyright: held by the contributors mentioned in debian/changelog
+License: Expat
+
+License: Expat
+ MIT License
+ .
+ Copyright (c) 2014-2017 Andrey Mokhov
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.


=====================================
p/haskell-hadrian/debian/hadrian.install
=====================================
@@ -0,0 +1 @@
+dist-ghc/build/hadrian/hadrian usr/bin


=====================================
p/haskell-hadrian/debian/patches/hadrian-haddock-opts
=====================================
@@ -0,0 +1,26 @@
+Description: Pass 'mathjax' to Haddock
+ Hadrian currently doesn't allow us to modify Haddock options, so
+ patch Hadrian to manually pass the 'mathjax' option.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/23625
+
+Index: b/src/Settings/Builders/Haddock.hs
+===================================================================
+--- a/src/Settings/Builders/Haddock.hs
++++ b/src/Settings/Builders/Haddock.hs
+@@ -32,6 +32,7 @@ haddockBuilderArgs = mconcat
+             , arg "-o", arg $ takeDirectory output
+             , arg "-t", arg "Haskell Hierarchical Libraries"
+             , arg "-p", arg "libraries/prologue.txt"
++            , arg "--mathjax=file:///usr/share/javascript/mathjax/MathJax.js"
+             , pure [ "--read-interface="
+                      ++ (takeFileName . takeDirectory) haddock
+                      ++ "," ++ haddock | haddock <- inputs ] ]
+@@ -60,6 +61,7 @@ haddockBuilderArgs = mconcat
+             , arg "--hyperlinked-source"
+             , arg "--hoogle"
+             , arg "--quickjump"
++            , arg "--mathjax=file:///usr/share/javascript/mathjax/MathJax.js"
+             , arg $ "--title=" ++ pkgName pkg ++ "-" ++ version
+                     ++ ": " ++ synopsis
+             , arg $ "--prologue=" ++ takeDirectory output -/- "haddock-prologue.txt"


=====================================
p/haskell-hadrian/debian/patches/hadrian-iserv
=====================================
@@ -0,0 +1,18 @@
+Description: Fix installation patch for iserv/unlit
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22557
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22697
+
+Index: b/src/Packages.hs
+===================================================================
+--- a/src/Packages.hs
++++ b/src/Packages.hs
+@@ -192,7 +192,7 @@ programPath context at Context {..} = do
+     -- See: https://github.com/snowleopard/hadrian/issues/570
+     -- Likewise for @iserv@ and @unlit at .
+     name <- programName context
+-    path <- if package `elem` [iserv, touchy, unlit]
++    path <- if package `elem` [touchy, unlit]
+               then stageLibPath stage <&> (-/- "bin")
+               else stageBinPath stage
+     return $ path -/- name <.> exe


=====================================
p/haskell-hadrian/debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+hadrian-haddock-opts
+hadrian-iserv


=====================================
p/haskell-hadrian/debian/rules
=====================================
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+# Tests require having the full GHC source code
+DEB_ENABLE_TESTS = no
+DEB_SETUP_GHC_CONFIGURE_ARGS += -f-selftest -f-threaded
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/hlibrary.mk
+
+build/hadrian:: build-ghc-stamp


=====================================
p/haskell-hadrian/debian/source/format
=====================================
@@ -0,0 +1 @@
+3.0 (quilt)


=====================================
p/haskell-hadrian/debian/uscan-repack.sh
=====================================
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+VERSION=$2
+
+TMPDIR=$(mktemp -d -p ../ -t haskell-hadrian-repack.XXXXX)
+echo Using temporary directory ${TMPDIR}
+
+echo Unpack tarball
+tar -xf ../haskell-hadrian_${VERSION}.orig.tar.xz -C ${TMPDIR}
+
+echo Repack only the hadrian directory
+tar -cJf ../haskell-hadrian_${VERSION}.orig.tar.xz -C ${TMPDIR}/ghc-${VERSION} hadrian
+
+echo Remove temporary directory
+rm -rf ${TMPDIR}


=====================================
p/haskell-hadrian/debian/watch
=====================================
@@ -0,0 +1,5 @@
+version=4
+opts="pgpmode=none,dirversionmangle=s/-rc/~rc/" \
+https://downloads.haskell.org/~ghc/(\d[\d.rc-]*)/ghc-(\d[\d.]*)-src.tar.(?:bz2|xz|gz) \
+debian debian/uscan-repack.sh
+



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/6216f3104dac5df21d5ea5989c36444aa9e4cd89

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/6216f3104dac5df21d5ea5989c36444aa9e4cd89
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20230930/edd12017/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list