update to 3.4.1; refresh to cabal-rpm-2.1.0 with SPDX migration

This commit is contained in:
Jens Petersen 2023-01-23 02:00:52 +08:00
parent 5b2e725300
commit 0db0bce146
4 changed files with 241 additions and 15 deletions

3
.gitignore vendored
View File

@ -39,3 +39,6 @@ hlint-1.7.3.tar.gz
/hlint-3.2.7.tar.gz
/ghc-lib-parser-ex-8.10.0.19.tar.gz
/hlint-3.2.8.tar.gz
/hlint-3.4.1.tar.gz
/ghc-lib-parser-ex-9.2.0.4.tar.gz
/deriving-aeson-0.2.9.tar.gz

186
hlint-3.4.1.cabal Normal file
View File

@ -0,0 +1,186 @@
cabal-version: 1.18
build-type: Simple
name: hlint
version: 3.4.1
x-revision: 1
license: BSD3
license-file: LICENSE
category: Development
author: Neil Mitchell <ndmitchell@gmail.com>
maintainer: Neil Mitchell <ndmitchell@gmail.com>
copyright: Neil Mitchell 2006-2022
synopsis: Source code suggestions
description:
HLint gives suggestions on how to improve your source code.
homepage: https://github.com/ndmitchell/hlint#readme
bug-reports: https://github.com/ndmitchell/hlint/issues
data-dir: data
data-files:
hlint.yaml
default.yaml
Test.hs
report_template.html
hs-lint.el
hlint.1
hlint.ghci
HLint_QuickCheck.hs
HLint_TypeCheck.hs
extra-source-files:
.hlint.yaml
data/*.hs
data/*.yaml
tests/*.test
-- These are needed because of haskell/cabal#7862
data/default.yaml
data/hlint.yaml
data/report_template.html
extra-doc-files:
README.md
CHANGES.txt
tested-with: GHC==9.0, GHC==8.10, GHC==8.8
source-repository head
type: git
location: https://github.com/ndmitchell/hlint.git
flag threaded
default: True
manual: True
description: Build with support for multithreaded execution
flag gpl
default: True
manual: True
description: Use GPL libraries, specifically hscolour
flag ghc-lib
default: False
manual: True
description: Force dependency on ghc-lib-parser even if GHC API in the ghc package is supported
flag hsyaml
default: False
manual: True
description: Use HsYAML instead of yaml
library
default-language: Haskell2010
build-depends:
base == 4.*, process, filepath, directory, containers,
unordered-containers, vector, text, bytestring,
transformers,
file-embed,
utf8-string,
data-default >= 0.3,
cpphs >= 1.20.1,
cmdargs >= 0.10,
uniplate >= 1.5,
ansi-terminal >= 0.8.1,
extra >= 1.7.3,
refact >= 0.3,
aeson >= 1.3,
deriving-aeson >= 0.2,
filepattern >= 0.1.1
if !flag(ghc-lib) && impl(ghc >= 9.2.2) && impl(ghc < 9.3.0)
build-depends:
ghc == 9.2.*,
ghc-boot-th,
ghc-boot
else
build-depends:
ghc-lib-parser == 9.2.*
build-depends:
ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.2
if flag(gpl)
build-depends: hscolour >= 1.21
else
cpp-options: -DGPL_SCARES_ME
if flag(hsyaml)
build-depends:
HsYAML >= 0.2,
HsYAML-aeson >= 0.2
cpp-options: -DHS_YAML
else
build-depends: yaml >= 0.5.0
hs-source-dirs: src
exposed-modules:
Language.Haskell.HLint
other-modules:
Paths_hlint
Apply
CmdLine
Extension
Fixity
HLint
HsColour
Idea
Report
Util
Parallel
Refact
Timing
CC
EmbedData
Summary
Config.Compute
Config.Haskell
Config.Read
Config.Type
Config.Yaml
GHC.All
GHC.Util
GHC.Util.ApiAnnotation
GHC.Util.View
GHC.Util.Brackets
GHC.Util.DynFlags
GHC.Util.FreeVars
GHC.Util.HsDecl
GHC.Util.HsExpr
GHC.Util.SrcLoc
GHC.Util.Scope
GHC.Util.Unify
Hint.All
Hint.Bracket
Hint.Comment
Hint.Duplicate
Hint.Export
Hint.Extensions
Hint.Fixities
Hint.Import
Hint.Lambda
Hint.List
Hint.ListRec
Hint.Match
Hint.Monad
Hint.Naming
Hint.NewType
Hint.Pattern
Hint.Pragma
Hint.Restrict
Hint.Smell
Hint.Type
Hint.Unsafe
Hint.NumLiteral
Test.All
Test.Annotations
Test.InputOutput
Test.Util
ghc-options: -Wunused-binds -Wunused-imports -Worphans
executable hlint
default-language: Haskell2010
build-depends: base, hlint
main-is: src/Main.hs
-- See https://github.com/ndmitchell/hlint/pull/1169 for benchmarks
-- that indicate -A32 is a good idea
ghc-options: -rtsopts -with-rtsopts=-A32m
if flag(threaded)
ghc-options: -threaded

View File

@ -1,31 +1,62 @@
# generated by cabal-rpm-2.0.9 --subpackage
# generated by cabal-rpm-2.1.0 --subpackage
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name hlint
%global pkgver %{pkg_name}-%{version}
%global ghclibparserex ghc-lib-parser-ex-8.10.0.19
%global subpkgs %{ghclibparserex}
%global ghclibparserex ghc-lib-parser-ex-9.2.0.4
%global derivingaeson deriving-aeson-0.2.9
%global subpkgs %{ghclibparserex} %{derivingaeson}
Name: %{pkg_name}
Version: 3.2.8
Version: 3.4.1
# can only be reset when all subpkgs bumped
Release: 5%{?dist}
Release: 1%{?dist}
Summary: Haskell source code suggestions
License: BSD
License: BSD-3-Clause
Url: https://hackage.haskell.org/package/%{name}
# Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{ghclibparserex}/%{ghclibparserex}.tar.gz
Source2: https://hackage.haskell.org/package/%{derivingaeson}/%{derivingaeson}.tar.gz
Source3: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal
# End cabal-rpm sources
# ghc-lib-parser build fails on s390x
# https://bugzilla.redhat.com/show_bug.cgi?id=1806109
ExcludeArch: s390x
#ExcludeArch: s390x
# Begin cabal-rpm deps:
BuildRequires: dos2unix
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-ansi-terminal-devel
BuildRequires: ghc-base-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cmdargs-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cpphs-devel
BuildRequires: ghc-data-default-devel
#BuildRequires: ghc-deriving-aeson-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-extra-devel
BuildRequires: ghc-file-embed-devel
BuildRequires: ghc-filepath-devel
BuildRequires: ghc-filepattern-devel
BuildRequires: ghc-ghc-lib-parser-devel
#BuildRequires: ghc-ghc-lib-parser-ex-devel
BuildRequires: ghc-hscolour-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-refact-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-uniplate-devel
BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-utf8-string-devel
BuildRequires: ghc-vector-devel
BuildRequires: ghc-yaml-devel
%if %{with ghc_prof}
BuildRequires: ghc-aeson-prof
BuildRequires: ghc-ansi-terminal-prof
BuildRequires: ghc-base-prof
@ -34,14 +65,13 @@ BuildRequires: ghc-cmdargs-prof
BuildRequires: ghc-containers-prof
BuildRequires: ghc-cpphs-prof
BuildRequires: ghc-data-default-prof
#BuildRequires: ghc-deriving-aeson-prof
BuildRequires: ghc-directory-prof
BuildRequires: ghc-extra-prof
BuildRequires: ghc-file-embed-prof
BuildRequires: ghc-filepath-prof
BuildRequires: ghc-filepattern-prof
BuildRequires: ghc-ghc-prof
BuildRequires: ghc-ghc-boot-prof
BuildRequires: ghc-ghc-boot-th-prof
BuildRequires: ghc-ghc-lib-parser-prof
#BuildRequires: ghc-ghc-lib-parser-ex-prof
BuildRequires: ghc-hscolour-prof
BuildRequires: ghc-process-prof
@ -53,6 +83,7 @@ BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-utf8-string-prof
BuildRequires: ghc-vector-prof
BuildRequires: ghc-yaml-prof
%endif
Requires: %{name}-common = %{version}-%{release}
# End cabal-rpm deps
@ -114,7 +145,8 @@ This package provides the Haskell %{name} profiling library.
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{ghclibparserex}
%ghc_lib_subpackage -l BSD-3-Clause %{ghclibparserex}
%ghc_lib_subpackage -l BSD-3-Clause %{derivingaeson}
%endif
%global version %{main_version}
@ -122,7 +154,8 @@ This package provides the Haskell %{name} profiling library.
%prep
# Begin cabal-rpm setup:
%setup -q -a1
%setup -q -a1 -a2
dos2unix -k -n %{SOURCE3} %{name}.cabal
# End cabal-rpm setup
@ -141,7 +174,6 @@ This package provides the Haskell %{name} profiling library.
# Begin cabal-rpm install
%ghc_libs_install %{subpkgs}
%ghc_lib_install
%ghc_fix_rpath %{pkgver}
mv %{buildroot}%{_ghcdocdir}{,-common}
# End cabal-rpm install
@ -182,6 +214,10 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man
%changelog
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 3.4.1-6
- https://hackage.haskell.org/package/hlint-3.4.1/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1,2 +1,3 @@
SHA512 (ghc-lib-parser-ex-8.10.0.19.tar.gz) = a286a0874191e7e10484279e9a70e1dc1add602ee6180718e7936f9ac0714ad0997a0398d1879ae0b1d1864f5976c26eb05d8db621343885630e37739e6cc17f
SHA512 (hlint-3.2.8.tar.gz) = 6a9b8cbb94d50c848904a2c60eea1ec2b8f66b9827baab74f3f9d964cf50f092bceb52fcce22b685b907166d2aa52bb7557f2b0aa968446b284484f21d111430
SHA512 (hlint-3.4.1.tar.gz) = 6c41235c9c36588d2760af84a251b078ebc31762e8ad91c817a500c787866d34a0eae92298ebad7ed57ac9df678018c52cce990e767ea64ffebc3a6ff68b51d1
SHA512 (ghc-lib-parser-ex-9.2.0.4.tar.gz) = 7d33a712eacf7f959c0adc0f72890ffc2c3298e1eb8cb6c82571804ba15a0d8cbb80a1b54f5a3bd9c434e2918149a35ccecc4f444ff8b227ea89db034dbeedbe
SHA512 (deriving-aeson-0.2.9.tar.gz) = d5112d03e8e117001a88acfed3dde85ba7c8323fbc27169215a6656787caad20faf63563558ac6ef6b8412d2fea38530ed2dcb701e7f3d952cf8ad261b49293a