commit 238cc3def7050fb19612ec1d26fa58ead09b0753c5f4e722b385751a33050257 Author: Peter Simons Date: Tue Dec 10 11:25:54 2024 +0000 osc copypac from project:devel:languages:haskell:ghc-9.10.x package:ghc-language-docker revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-language-docker?expand=0&rev=7 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/fix-build-with-ghc-9.8.x.patch b/fix-build-with-ghc-9.8.x.patch new file mode 100644 index 0000000..b2ce0e6 --- /dev/null +++ b/fix-build-with-ghc-9.8.x.patch @@ -0,0 +1,35 @@ +From 7b1b018826810b99f9f697904001b1c13d9e1b04 Mon Sep 17 00:00:00 2001 +From: Peter Simons +Date: Thu, 29 Feb 2024 15:45:22 +0100 +Subject: [PATCH] Language.Docker: enable DuplicateRecordFields to fix build + error with ghc-9.8.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +src/Language/Docker.hs:26:5: error: [GHC-97219] + Duplicate record field ‘sourcePaths’ in export list: + ‘Language.Docker.Syntax.AddArgs(..)’ exports the field ‘Language.Docker.Syntax.sourcePaths’ + belonging to the constructor ‘Language.Docker.Syntax.AddArgs’ + imported qualified from ‘Language.Docker.Syntax’ at src/Language/Docker.hs:46:1-39 + (and originally defined at src/Language/Docker/Syntax.hs:193:9-19) + ‘Language.Docker.Syntax.CopyArgs(..)’ exports the field ‘Language.Docker.Syntax.sourcePaths’ + belonging to the constructor ‘Language.Docker.Syntax.CopyArgs’ + imported qualified from ‘Language.Docker.Syntax’ at src/Language/Docker.hs:46:1-39 + (and originally defined at src/Language/Docker/Syntax.hs:174:9-19) + +Fixes https://github.com/hadolint/language-docker/issues/93. +--- + src/Language/Docker.hs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Language/Docker.hs b/src/Language/Docker.hs +index 382118d..251ba38 100644 +--- a/src/Language/Docker.hs ++++ b/src/Language/Docker.hs +@@ -1,3 +1,5 @@ ++{-# LANGUAGE DuplicateRecordFields #-} ++ + module Language.Docker + ( Language.Docker.Syntax.Dockerfile, + diff --git a/ghc-language-docker.changes b/ghc-language-docker.changes new file mode 100644 index 0000000..c096cd2 --- /dev/null +++ b/ghc-language-docker.changes @@ -0,0 +1,24 @@ +------------------------------------------------------------------- +Wed Apr 24 18:33:18 UTC 2024 - Peter Simons + +- Update language-docker to version 13.0.0. + Upstream does not provide a change log file. + +- Remove obsolete "fix-build-with-ghc-9.8.x.patch". + +------------------------------------------------------------------- +Thu Feb 29 14:51:53 UTC 2024 - Peter Simons + +- Apply "fix-build-with-ghc-9.8.x.patch" to fix build errors with + ghc-9.8.x. + +------------------------------------------------------------------- +Thu Mar 30 17:07:21 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Mon Apr 4 14:27:58 UTC 2022 - Peter Simons + +- Add language-docker at version 11.0.0. + diff --git a/ghc-language-docker.spec b/ghc-language-docker.spec new file mode 100644 index 0000000..ced2486 --- /dev/null +++ b/ghc-language-docker.spec @@ -0,0 +1,126 @@ +# +# spec file for package ghc-language-docker +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global pkg_name language-docker +%global pkgver %{pkg_name}-%{version} +%bcond_with tests +Name: ghc-%{pkg_name} +Version: 13.0.0 +Release: 0 +Summary: Dockerfile parser, pretty-printer and embedded DSL +License: GPL-3.0-or-later +URL: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-default-class-devel +BuildRequires: ghc-data-default-class-prof +BuildRequires: ghc-data-default-devel +BuildRequires: ghc-data-default-prof +BuildRequires: ghc-megaparsec-devel +BuildRequires: ghc-megaparsec-prof +BuildRequires: ghc-prettyprinter-devel +BuildRequires: ghc-prettyprinter-prof +BuildRequires: ghc-rpm-macros +BuildRequires: ghc-split-devel +BuildRequires: ghc-split-prof +BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof +BuildRequires: ghc-time-devel +BuildRequires: ghc-time-prof +ExcludeArch: %{ix86} +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-HUnit-prof +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof +BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-megaparsec-devel +BuildRequires: ghc-hspec-megaparsec-prof +BuildRequires: ghc-hspec-prof +%endif + +%description +All functions for parsing and pretty-printing Dockerfiles are exported through +'Language.Docker'. For more fine-grained operations look for specific modules +that implement a certain functionality. See the + for the +source-code and examples. + +%package devel +Summary: Haskell %{pkg_name} library development files +Requires: %{name} = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} + +%description devel +This package provides the Haskell %{pkg_name} library development +files. + +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + +%prep +%autosetup -n %{pkg_name}-%{version} + +%build +%ghc_lib_build + +%install +%ghc_lib_install + +%check +%cabal_test + +%post devel +%ghc_pkg_recache + +%postun devel +%ghc_pkg_recache + +%files -f %{name}.files +%license LICENSE + +%files devel -f %{name}-devel.files +%doc README.md + +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + +%changelog diff --git a/language-docker-11.0.0.tar.gz b/language-docker-11.0.0.tar.gz new file mode 100644 index 0000000..26a7f0a --- /dev/null +++ b/language-docker-11.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88a46005dfaf0adbe04651e3d1248857d9872829e50a3aa2aef01d7ccd8a0ac9 +size 40695 diff --git a/language-docker-13.0.0.tar.gz b/language-docker-13.0.0.tar.gz new file mode 100644 index 0000000..10298c2 --- /dev/null +++ b/language-docker-13.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086e733bea476f4be4caaee8f6fa7f661e089a9a0b4ff654ea0141b59087dc9b +size 42269