From: nadevko <nadevko@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: klfc-1.5.7
Date: Mon, 02 May 2022 18:18:00 +0200 [thread overview]
Message-ID: <20220502161800.7vm42u8mNoZYrIC1_r3JZJN91N15RP77HM1DrYqHKKE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36939@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 654 bytes --]
There is an updated pull request by nadevko against master on the void-packages repository
https://github.com/nadevko/void-packages master
https://github.com/void-linux/void-packages/pull/36939
New package: klfc-1.5.7
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-gnulibc
A patch file from https://github.com/void-linux/void-packages/pull/36939.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-36939.patch --]
[-- Type: text/x-diff, Size: 5674 bytes --]
From ff4fcde2eccca0b488aac7a4d912883f711bbdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nade=C5=ADka?= <nadevko@riseup.net>
Date: Sun, 1 May 2022 18:34:24 +0300
Subject: [PATCH] New package: klfc-1.5.7
---
.../klfc/patches/0001-Fix-some-warnings.patch | 32 ++++++++++++++
...0002-Fix-compilation-with-GHC-9.0-40.patch | 44 +++++++++++++++++++
.../patches/0003-More-fixes-for-GHC-9.0.patch | 25 +++++++++++
srcpkgs/klfc/template | 23 ++++++++++
4 files changed, 124 insertions(+)
create mode 100644 srcpkgs/klfc/patches/0001-Fix-some-warnings.patch
create mode 100644 srcpkgs/klfc/patches/0002-Fix-compilation-with-GHC-9.0-40.patch
create mode 100644 srcpkgs/klfc/patches/0003-More-fixes-for-GHC-9.0.patch
create mode 100644 srcpkgs/klfc/template
diff --git a/srcpkgs/klfc/patches/0001-Fix-some-warnings.patch b/srcpkgs/klfc/patches/0001-Fix-some-warnings.patch
new file mode 100644
index 000000000000..9d405dbf92c8
--- /dev/null
+++ b/srcpkgs/klfc/patches/0001-Fix-some-warnings.patch
@@ -0,0 +1,32 @@
+From 725bf5bf6c7177c538bcd6bab73a8ce1bd179c42 Mon Sep 17 00:00:00 2001
+From: Aldo Gunsing <dev@aldogunsing.nl>
+Date: Thu, 16 Dec 2021 22:38:03 +0100
+Subject: [PATCH 1/6] Fix some warnings
+
+---
+ src/KlcParse.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/KlcParse.hs b/src/KlcParse.hs
+index 7cc76ac..de90301 100644
+--- a/src/KlcParse.hs
++++ b/src/KlcParse.hs
+@@ -196,13 +196,13 @@ keyName = do
+ descriptions ∷ (Parser m, MonadFail m) ⇒ m ()
+ descriptions = do
+ ["DESCRIPTIONS"] ← readLine
+- many (some hexDigitChar *> spacing *> endLine)
++ void $ many (some hexDigitChar *> spacing *> endLine)
+ pure ()
+
+ languageNames ∷ (Parser m, MonadFail m) ⇒ m ()
+ languageNames = do
+ ["LANGUAGENAMES"] ← readLine
+- many (some hexDigitChar *> spacing *> endLine)
++ void $ many (some hexDigitChar *> spacing *> endLine)
+ pure ()
+
+ endKbd ∷ (Parser m, MonadFail m) ⇒ m ()
+--
+2.36.0
+
diff --git a/srcpkgs/klfc/patches/0002-Fix-compilation-with-GHC-9.0-40.patch b/srcpkgs/klfc/patches/0002-Fix-compilation-with-GHC-9.0-40.patch
new file mode 100644
index 000000000000..c4743120f49e
--- /dev/null
+++ b/srcpkgs/klfc/patches/0002-Fix-compilation-with-GHC-9.0-40.patch
@@ -0,0 +1,44 @@
+From fee9bdeb76cc1f9e9e36b91764aff665c9164164 Mon Sep 17 00:00:00 2001
+From: Aldo Gunsing <dev@aldogunsing.nl>
+Date: Thu, 16 Dec 2021 22:38:09 +0100
+Subject: [PATCH 2/6] Fix compilation with GHC 9.0 (#40)
+
+See https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.0#simplified-subsumption
+for the required eta-expansion in lensWithDefault'
+
+Hiding singleton from BasePrelude gives a warning for previous GHC versions,
+but this is a minor issue
+---
+ src/Util.hs | 2 +-
+ src/WithPlus.hs | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Util.hs b/src/Util.hs
+index 0dc0884..dc096db 100644
+--- a/src/Util.hs
++++ b/src/Util.hs
+@@ -80,7 +80,7 @@ lensWithDefault guess setter getter f x =
+ (\y → setter (Just y) x) <$> f (fromMaybe (guess x) (getter x))
+
+ lensWithDefault' ∷ α → (Maybe α → σ → σ) → (σ → Maybe α) → Lens' σ α
+-lensWithDefault' = lensWithDefault ∘ const
++lensWithDefault' x = lensWithDefault (const x)
+
+ (!?) ∷ [α] → Int → Maybe α
+ (!?) xs i =
+diff --git a/src/WithPlus.hs b/src/WithPlus.hs
+index 1a46faf..558591d 100644
+--- a/src/WithPlus.hs
++++ b/src/WithPlus.hs
+@@ -9,7 +9,7 @@ module WithPlus
+ , parseString
+ ) where
+
+-import BasePrelude hiding (toList, fromList)
++import BasePrelude hiding (toList, fromList, singleton)
+ import Prelude.Unicode
+ import Data.Monoid.Unicode ((∅))
+ import Util (HumanReadable, split)
+--
+2.36.0
+
diff --git a/srcpkgs/klfc/patches/0003-More-fixes-for-GHC-9.0.patch b/srcpkgs/klfc/patches/0003-More-fixes-for-GHC-9.0.patch
new file mode 100644
index 000000000000..e7a3d29979ff
--- /dev/null
+++ b/srcpkgs/klfc/patches/0003-More-fixes-for-GHC-9.0.patch
@@ -0,0 +1,25 @@
+From ad4a431513470f8386dd7a8c28aeef35187193fe Mon Sep 17 00:00:00 2001
+From: Aldo Gunsing <dev@aldogunsing.nl>
+Date: Fri, 17 Dec 2021 00:11:58 +0100
+Subject: [PATCH 3/6] More fixes for GHC 9.0
+
+---
+ src/Layout/Modifier.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Layout/Modifier.hs b/src/Layout/Modifier.hs
+index 1fe456e..0d5e44c 100644
+--- a/src/Layout/Modifier.hs
++++ b/src/Layout/Modifier.hs
+@@ -22,7 +22,7 @@ module Layout.Modifier
+ , activatedBy
+ ) where
+
+-import BasePrelude hiding (Alt, Control, empty, fromList)
++import BasePrelude hiding (Alt, Control, empty, fromList, singleton)
+ import Prelude.Unicode hiding ((∈))
+ import Data.Foldable.Unicode ((∈))
+ import Data.Monoid.Unicode ((∅), (⊕))
+--
+2.36.0
+
diff --git a/srcpkgs/klfc/template b/srcpkgs/klfc/template
new file mode 100644
index 000000000000..87a37e49b244
--- /dev/null
+++ b/srcpkgs/klfc/template
@@ -0,0 +1,23 @@
+# Template file for 'klfc'
+pkgname=klfc
+version=1.5.7
+revision=1
+build_style=haskell-stack
+stackage=nightly-2021-10-07
+short_desc='Keyboard layout files creator'
+maintainer='Nadeŭka <nadevko@riseup.net>'
+license=GPL-3.0-or-later
+homepage=https://github.com/39aldo39/klfc
+distfiles=https://github.com/39aldo39/klfc/archive/refs/tags/v$version.tar.gz
+checksum=5a052c6f59917e99593e507e460e37b6633a388a43ef9ed0401b297c723c1eba
+python_version=3
+nopie_files=/usr/bin/klfc
+nocross="Cannot yet cross compile with Haskell"
+
+pre_install() {
+ vdoc README.md
+ vlicense LICENSE.txt
+ for i in doc/* examples; do
+ vcopy "$i" usr/share/doc/$pkgname
+ done
+}
next prev parent reply other threads:[~2022-05-02 16:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-01 16:31 [PR PATCH] " nadevko
2022-05-01 16:32 ` [PR PATCH] [Updated] " nadevko
2022-05-01 16:34 ` nadevko
2022-05-01 16:44 ` [PR REVIEW] " classabbyamp
2022-05-01 16:52 ` [PR PATCH] [Updated] " nadevko
2022-05-01 16:55 ` [PR REVIEW] " nadevko
2022-05-02 7:40 ` [PR PATCH] [Updated] " nadevko
2022-05-02 16:18 ` nadevko [this message]
2022-05-02 17:39 ` nadevko
2022-05-08 12:07 ` [PR PATCH] [Closed]: " nadevko
2022-05-08 12:28 [PR PATCH] " nadevko
2022-05-19 12:55 ` [PR PATCH] [Updated] " nadevko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220502161800.7vm42u8mNoZYrIC1_r3JZJN91N15RP77HM1DrYqHKKE@z \
--to=nadevko@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).