Compare commits
No commits in common. "factory" and "factory" have entirely different histories.
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,11 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 24 18:33:18 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||
|
||||
- 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 <psimons@suse.com>
|
||||
|
||||
|
@ -20,12 +20,13 @@
|
||||
%global pkgver %{pkg_name}-%{version}
|
||||
%bcond_with tests
|
||||
Name: ghc-%{pkg_name}
|
||||
Version: 13.0.0
|
||||
Version: 11.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
|
||||
Patch1: https://github.com/hadolint/language-docker/pull/94.patch#/fix-build-with-ghc-9.8.x.patch
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-base-devel
|
||||
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.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pkg_name}-%{version}
|
||||
%autosetup -n %{pkg_name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%ghc_lib_build
|
||||
|
3
language-docker-11.0.0.tar.gz
Normal file
3
language-docker-11.0.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:88a46005dfaf0adbe04651e3d1248857d9872829e50a3aa2aef01d7ccd8a0ac9
|
||||
size 40695
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:086e733bea476f4be4caaee8f6fa7f661e089a9a0b4ff654ea0141b59087dc9b
|
||||
size 42269
|
Loading…
Reference in New Issue
Block a user