forked from pool/ghc-language-docker
osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-language-docker revision:5, using keep-link
OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-language-docker?expand=0&rev=5
This commit is contained in:
parent
8e9f11fc5b
commit
96e9d2c589
35
fix-build-with-ghc-9.8.x.patch
Normal file
35
fix-build-with-ghc-9.8.x.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 7b1b018826810b99f9f697904001b1c13d9e1b04 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Simons <simons@cryp.to>
|
||||||
|
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,
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 29 14:51:53 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||||
|
|
||||||
|
- 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 <psimons@suse.com>
|
Thu Mar 30 17:07:21 UTC 2023 - Peter Simons <psimons@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ghc-language-docker
|
# spec file for package ghc-language-docker
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -26,6 +26,7 @@ Summary: Dockerfile parser, pretty-printer and embedded DSL
|
|||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
URL: https://hackage.haskell.org/package/%{pkg_name}
|
URL: https://hackage.haskell.org/package/%{pkg_name}
|
||||||
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
|
||||||
|
Patch1: https://github.com/hadolint/language-docker/pull/94.patch#/fix-build-with-ghc-9.8.x.patch
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
BuildRequires: ghc-base-devel
|
BuildRequires: ghc-base-devel
|
||||||
BuildRequires: ghc-base-prof
|
BuildRequires: ghc-base-prof
|
||||||
@ -95,7 +96,7 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
|
|||||||
This package provides the Haskell %{pkg_name} profiling library.
|
This package provides the Haskell %{pkg_name} profiling library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{pkg_name}-%{version}
|
%autosetup -n %{pkg_name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ghc_lib_build
|
%ghc_lib_build
|
||||||
|
Loading…
Reference in New Issue
Block a user