From patchwork Sat Jun 22 22:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Leung X-Patchwork-Id: 14369 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BCC1D17138; Sat, 22 Jun 2019 23:51:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 09DC517136 for ; Sat, 22 Jun 2019 23:51:09 +0100 (BST) Received: from localhost ([::1]:42632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heoqi-0006cv-Gf for patchwork@mira.cbaines.net; Sat, 22 Jun 2019 18:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34814) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heoqe-0006ch-NJ for guix-patches@gnu.org; Sat, 22 Jun 2019 18:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heoqc-00025p-BC for guix-patches@gnu.org; Sat, 22 Jun 2019 18:51:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heoqb-00024C-TV for guix-patches@gnu.org; Sat, 22 Jun 2019 18:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heoqb-0001Kb-OY for guix-patches@gnu.org; Sat, 22 Jun 2019 18:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36326] [PATCH] Add Haskell packages. References: In-Reply-To: Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jun 2019 22:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36326 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36326@debbugs.gnu.org Received: via spool by 36326-submit@debbugs.gnu.org id=B36326.15612438055047 (code B ref 36326); Sat, 22 Jun 2019 22:51:01 +0000 Received: (at 36326) by debbugs.gnu.org; 22 Jun 2019 22:50:05 +0000 Received: from localhost ([127.0.0.1]:52665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heopg-0001JK-Qu for submit@debbugs.gnu.org; Sat, 22 Jun 2019 18:50:05 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:40688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heope-0001Ik-Sy for 36326@debbugs.gnu.org; Sat, 22 Jun 2019 18:50:04 -0400 Received: by mail-qt1-f173.google.com with SMTP id a15so10729726qtn.7 for <36326@debbugs.gnu.org>; Sat, 22 Jun 2019 15:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=JIxEmcDXHTR+Ljmefl9uof+Oe1Vq+7eDVclBjRXwOgM=; b=jsN4Li/er3sVd2ggdDcUlcTV57w6kQMIW76akFh9n3txjI1Okw3DqWrPdNuSi9jFmV O6iqfA/t4r2m/QPeAzv7EQ1xoN7ljyfTqqGbDO9ij2EeDKqgP+YH6K63KzK93Zalaw2k YfaC6KQLTn+6IeJwyFvj5UWOBzqPZafSQRqAaZtzy6nfVSS7dLs+zAfAXBsBZ4NIFjag P2ZUuvOetooCwf9OZlXOzGRQ0PJmiRNr5oc37b5Myqf6QMnUZOCX1pJkaFq1mZHiO39u erUWr91CG0Zd0Kmu8mLWGQtlhAJ3Zw6Vmm5G1DWADsEYmOwzpGeBr3NGibjTSGgYDO1I d6ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=JIxEmcDXHTR+Ljmefl9uof+Oe1Vq+7eDVclBjRXwOgM=; b=L3uw5ozsQZmS7v+XxaNHqJ6TkFJbUoE0A1QE+z/cqL6tT+Pn3ra0rimtF3UiHTU+gt 45hrit3QfG5AjCA+C9XZBzmrW/K5KU1BxhjW3aAIB7zEymjTIniK59QcCPLx51iJd0Zi MPZlMo5vcDeVlg4DheWxj1A8tNHHlAzE+ESvjsTm7gLX7xL+2Jxx/TAwSHS3LR0kzugo Gzve0ikVghIJfaPQL/yBezjGFIYyL1ynA4toGe46kD9efVLQLvL2xXxRlcXpAPv2FKev LyWtgMmEBZGxaoQXdAg3RuiL9fcSY+wXY4CjAku0ePRSFt4dvuc6or6uQs2mAd/6D4/6 jmvw== X-Gm-Message-State: APjAAAXwjfGvVYdU85aqescacgkOWWu8J6FaotZ+U6kvafI0eJc0hoD8 3aQ/zXHAtOoRw6VDuVxPp+o5n2sl/e+GNaDdTUmlPjzb X-Google-Smtp-Source: APXvYqzEhI+v5YxgMydvC66d4Wos0yvsFNXLwD/5TF3nitI8O5WeBVP02aO/DrraHUZTCsNQOxL80lvBenyEXy2iuDk= X-Received: by 2002:aed:3e1d:: with SMTP id l29mr110164305qtf.175.1561243797109; Sat, 22 Jun 2019 15:49:57 -0700 (PDT) MIME-Version: 1.0 From: Brian Leung Date: Sun, 23 Jun 2019 00:49:20 +0200 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, OK, I've linted and added another package. Please ignore my last email. From 92a6919a4d447b4451161a7ae5026466313056d0 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 22 Jun 2019 23:47:32 +0200 Subject: [PATCH 8/8] gnu: Add ghc-hindent. * gnu/packages/haskell.scm (ghc-hindent): New variable. --- gnu/packages/haskell.scm | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3730d89946..fc2f38e99a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages elf) + #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -11696,6 +11697,64 @@ recursive scanning and copying of directories, working with temporary files/directories, and more.") (license license:bsd-3))) +(define-public ghc-hindent + (package + (name "ghc-hindent") + (version "5.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hindent/hindent-" + version + ".tar.gz")) + (sha256 + (base32 + "0wkfik7mvqskk23kyh7ybgnlh3j9j1ym7d3ncahsbli9w654b7xg")))) + (build-system haskell-build-system) + (arguments + `(#:modules ((guix build haskell-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%haskell-build-system-modules + (guix build emacs-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'emacs-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (elisp-file "elisp/hindent.el") + (dest (string-append + out "/share/emacs/site-lisp/guix.d/hindent-" ,version)) + (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))) + (make-file-writable elisp-file) + (emacs-substitute-variables elisp-file + ("hindent-process-path" + (string-append out "/bin/hindent"))) + (install-file elisp-file dest) + (emacs-generate-autoloads "hindent" dest))))))) + (inputs + `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-monad-loops" ,ghc-monad-loops) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-yaml" ,ghc-yaml) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-path" ,ghc-path) + ("ghc-path-io" ,ghc-path-io) + ("ghc-optparse-applicative" ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-diff" ,ghc-diff) + ("emacs" ,emacs-minimal))) + (home-page + "https://github.com/commercialhaskell/hindent") + (synopsis "Extensible Haskell pretty printer") + (description + "This package provides automatic formatting for Haskell files. Both a +library and an executable.") + (license license:bsd-3))) + (define-public ghc-descriptive (package (name "ghc-descriptive") -- 2.22.0