From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:60730) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOC3j-0007gU-7x for guix-patches@gnu.org; Fri, 25 Oct 2019 22:44:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iOC3f-0003q6-8p for guix-patches@gnu.org; Fri, 25 Oct 2019 22:44:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iOC3e-0003py-LQ for guix-patches@gnu.org; Fri, 25 Oct 2019 22:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iOC3e-0004hg-HH for guix-patches@gnu.org; Fri, 25 Oct 2019 22:44:02 -0400 Subject: [bug#37717] [PATCH 0/3] gnu: Add kmonad. Resent-Message-ID: References: <4551b258-a4e3-49f8-9c22-5840edbbd3a7@www.fastmail.com> <87lfthyjpj.fsf@devup.no> From: Alex Griffin Message-ID: <4ba7596b-5f84-f3ab-e15a-7a99011ad4c1@ajgrf.com> Date: Fri, 25 Oct 2019 21:43:13 -0500 MIME-Version: 1.0 In-Reply-To: <87lfthyjpj.fsf@devup.no> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="jLefpTZjKLMj8ZN23plEnEWNzXKrbCVFW" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke , 37717@debbugs.gnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --jLefpTZjKLMj8ZN23plEnEWNzXKrbCVFW Content-Type: multipart/mixed; boundary="SGnmCbgbqldNWU1IQylvHMxCxLiHvNP9H"; protected-headers="v1" From: Alex Griffin To: Marius Bakke , 37717@debbugs.gnu.org Message-ID: <4ba7596b-5f84-f3ab-e15a-7a99011ad4c1@ajgrf.com> Subject: Re: [bug#37717] [PATCH 0/3] gnu: Add kmonad. References: <4551b258-a4e3-49f8-9c22-5840edbbd3a7@www.fastmail.com> <87lfthyjpj.fsf@devup.no> In-Reply-To: <87lfthyjpj.fsf@devup.no> --SGnmCbgbqldNWU1IQylvHMxCxLiHvNP9H Content-Type: multipart/mixed; boundary="------------1304C277A46FD133F210DF8D" Content-Language: en-US This is a multi-part message in MIME format. --------------1304C277A46FD133F210DF8D Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/18/19 1:47 PM, Marius Bakke wrote: > I sent some feedback on the individual patches. Can you create an > account on Savannah if you haven't already? Then you can push the next= > version yourself. :-) >=20 > Please also send a reply to this message signed by the same GPG key tha= t > you will use to sign commits, and make sure to upload it to Savannah. Thanks! I've attached updated patches with the suggested changes, created a Savannah account, and this email should be signed with my GPG k= ey. Kmonad 0.3 was released last week, but I don't think it can be updated in Guix until we move to a newer Stackage. > Should this not be provided by 'ghc-primitive'? Perhaps it is > expecting a different version? =46rom what I can gather, there were a few commits upstream to add suppor= t for primitive 0.7 without breaking 0.6, but they forgot to make the same change in the test suite. https://github.com/jberryman/unagi-chan/commit/b4af3f2b0d76de701ec8ca4a17= ab88f776fe80a9 --=20 Alex Griffin --------------1304C277A46FD133F210DF8D Content-Type: text/x-patch; name="0001-gnu-Add-ghc-atomic-primops.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-ghc-atomic-primops.patch" =46rom f21859ffccd201e9229e38cdc0be1e7bd4be0cd4 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 12 Oct 2019 13:34:43 -0500 Subject: [PATCH 1/3] gnu: Add ghc-atomic-primops. * gnu/packages/haskell-xyz.scm (ghc-atomic-primops): New variable. --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2977398880..e134641de4 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -21,6 +21,7 @@ ;;; Copyright =C2=A9 2019 Jacob MacDonald ;;; Copyright =C2=A9 2019 John Soo ;;; Copyright =C2=A9 2019 Kyle Meyer +;;; Copyright =C2=A9 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -381,6 +382,28 @@ over threads in Haskell, in which @code{Async a} is = a concurrent thread that will eventually deliver a value of type @code{a}.") (license license:bsd-3))) =20 +(define-public ghc-atomic-primops + (package + (name "ghc-atomic-primops") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/atomic-p= rimops" + "/atomic-primops-" version ".tar.gz")) + (sha256 + (base32 + "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37")))) + (build-system haskell-build-system) + (inputs `(("ghc-primitive" ,ghc-primitive))) + (home-page "https://github.com/rrnewton/haskell-lockfree/wiki") + (synopsis "Safe approach to CAS and other atomic ops") + (description + "GHC 7.4 introduced a new @code{casMutVar} PrimOp which is difficul= t to +use safely, because pointer equality is a highly unstable property in Ha= skell. +This library provides a safer method based on the concept of @code{Ticke= t}s.") + (license license:bsd-3))) + (define-public ghc-atomic-write (package (name "ghc-atomic-write") --=20 2.23.0 --------------1304C277A46FD133F210DF8D Content-Type: text/x-patch; name="0002-gnu-Add-ghc-unagi-chan.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-Add-ghc-unagi-chan.patch" =46rom 1f5fa2c80e1e8e2ae2bfa430f7feefad159fbd40 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 12 Oct 2019 13:45:35 -0500 Subject: [PATCH 2/3] gnu: Add ghc-unagi-chan. * gnu/packages/haskell-xyz.scm (ghc-unagi-chan): New variable. --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e134641de4..2b7fb68bb8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10628,6 +10628,37 @@ processes. It wraps around the @code{process} l= ibrary, and intends to improve upon it.") (license license:expat))) =20 +(define-public ghc-unagi-chan + (package + (name "ghc-unagi-chan") + (version "0.4.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/unagi-ch= an" + "/unagi-chan-" version ".tar.gz")) + (sha256 + (base32 + "1lnl5n4jnjmm4chp461glcwkrrw63rjz3fvprwxcy3lkpbkrqvgn")))) + (build-system haskell-build-system) + (inputs + `(("ghc-atomic-primops" ,ghc-atomic-primops) + ("ghc-primitive" ,ghc-primitive))) + (arguments + `(#:tests? #f ; FIXME: Tests can't find Data.Primitive.Addr + #:cabal-revision + ("1" + "09pqi867wskwgc5lpn197f895mbn1174ydgllvcppcsmrz2b6yr6"))) + (home-page "http://hackage.haskell.org/package/unagi-chan") + (synopsis "Fast concurrent queues with a Chan-like API, and more") + (description + "This library provides implementations of concurrent FIFO queues (f= or +both general boxed and primitive unboxed values) that are fast, perform = well +under contention, and offer a Chan-like interface. The library may be o= f +limited usefulness outside of x86 architectures where the fetch-and-add +instruction is not available.") + (license license:bsd-3))) + (define-public ghc-unbounded-delays (package (name "ghc-unbounded-delays") --=20 2.23.0 --------------1304C277A46FD133F210DF8D Content-Type: text/x-patch; name="0003-gnu-Add-kmonad.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-Add-kmonad.patch" =46rom 03602a5602a701554e82383b7032f2d6d02b8e19 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 12 Oct 2019 13:55:49 -0500 Subject: [PATCH 3/3] gnu: Add kmonad. * gnu/packages/haskell-apps.scm (kmonad): New variable. --- gnu/packages/haskell-apps.scm | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.sc= m index c5e1cd6c64..a349c7445d 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2015 Paul van der Walt ;;; Copyright =C2=A9 2019 Kyle Meyer ;;; Copyright =C2=A9 2015 John Soo +;;; Copyright =C2=A9 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -496,6 +497,64 @@ with CSS and mouseover annotations, XHTML 1.0 with i= nline CSS styling, LaTeX, and mIRC chat codes.") (license license:bsd-3))) =20 +(define-public kmonad + (package + (name "kmonad") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/david-janssen/kmonad.git") + (commit "06d7b8c709efa695be35df9bde91275cbb2ba099"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rjr4h5yq63x3kad6yn4p8v26389sd9dgr5n2w73s1chafapzwwd"))= )) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'haddock) ; Haddock fails to generate docs + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules (string-append out "/lib/udev/rules.d"))) + (mkdir-p rules) + (call-with-output-file (string-append rules "/70-kmonad.r= ules") + (lambda (port) + (display + (string-append + "KERNEL=3D=3D\"uinput\", MODE=3D\"0660\", " + "GROUP=3D\"input\", OPTIONS+=3D\"static_node=3Duinp= ut\"\n") + port))) + #t))) + (add-after 'install-udev-rules 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/kmonad-" ,versio= n))) + (install-file "README.md" doc) + (copy-recursively "doc" doc) + (copy-recursively "example" (string-append doc "/example"= )) + #t)))))) + (inputs + `(("ghc-cereal" ,ghc-cereal) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens" ,ghc-lens) + ("ghc-megaparsec" ,ghc-megaparsec-7) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-unagi-chan" ,ghc-unagi-chan) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (home-page "https://github.com/david-janssen/kmonad") + (synopsis "Advanced keyboard manager") + (description "KMonad is a keyboard remapping utility that supports +advanced functionality, such as custom keymap layers and modifiers, macr= os, +and conditional mappings that send a different keycode when tapped or he= ld. +By operating at a lower level than most similar tools, it supports X11, +Wayland, and Linux console environments alike.") + (license license:expat))) + (define-public raincat (package (name "raincat") --=20 2.23.0 --------------1304C277A46FD133F210DF8D-- --SGnmCbgbqldNWU1IQylvHMxCxLiHvNP9H-- --jLefpTZjKLMj8ZN23plEnEWNzXKrbCVFW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEKjk//2j073o9KRKvb1EgoCL7stUFAl2zssJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDJB MzkzRkZGNjhGNEVGN0EzRDI5MTJBRjZGNTEyMEEwMjJGQkIyRDUACgkQb1EgoCL7 stUNig/9EDmm4yORkdTn2eF2PE3a1uH40otl0E+d8friBuAGJyCQ6259GcqfNcD4 zWc8OoqPOUHP4cvSpe0hqr9mHPQV758/Ej6ppKUs3FqPF5xFd3JyZmQ9vcimgDqz Jcw04Hu6kLJC2evAUi+JXu3ClIBsGn5wMUVG9+3xphJIBDtJuGZFhiZ/1htCVxb+ u/WotSy58WIsKW1BhIBA9NUTP4+I5Sdv9aCvDS9iVxxs88fnL+ocxAzlGiidceHh KEJMA1F1y0Ovmhm/JFuufeoLgbuz9isVsL6gvofukFIpVStlYuywfyp8i/pO+SKk rUgvDL2Q7EensDwOOWN5jJMQGrTVnBfIT+Hf3GrF9Mc0PwyTKuy8SA/7mqSlPZei letbLxPQLEhcdlY9c8CwXcoQwUWZ1/futX05EtEUjPgw/Qn8O7Flj6NP4O2vKVcg zn+RVa1RIb8F3y3XVEs1V0XimLbCSF1PLJqbtmgFj2iEVcev3oZvYOM8Fq8Dk+/J zChO9MpQqyWpS8S4cCnBC2hL53h/ThwvVU4eEj7nzjO6IXo2lyH/ShyaCvigq+xV vPrxdjcwoMpbzXD8RTO8xNmEswfL3Kc3izecmg+CO5wtthxtSgTVBvxvfUPXisOm zQvo1i3muW1P60sw6N91XT4g2KZ+fpCGcZAHRYaJIvuYAPPn1TQ= =VzVY -----END PGP SIGNATURE----- --jLefpTZjKLMj8ZN23plEnEWNzXKrbCVFW--