From patchwork Thu Apr 30 16:37:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Becze X-Patchwork-Id: 21774 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 139FD27BBE4; Thu, 30 Apr 2020 17:51:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id CCB0227BBE1 for ; Thu, 30 Apr 2020 17:51:23 +0100 (BST) Received: from localhost ([::1]:45838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUCPD-0007cD-3P for patchwork@mira.cbaines.net; Thu, 30 Apr 2020 12:51:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52374) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUCM8-0002CC-0n for guix-patches@gnu.org; Thu, 30 Apr 2020 12:48:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUCLy-0002yD-8U for guix-patches@gnu.org; Thu, 30 Apr 2020 12:48:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUCLx-0002y7-QS for guix-patches@gnu.org; Thu, 30 Apr 2020 12:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUCLx-0004p3-NT for guix-patches@gnu.org; Thu, 30 Apr 2020 12:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40984] [PATCH 1/2] gnu: Add guile3.0-ncurses. Resent-From: Martin Becze Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Apr 2020 16:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40984@debbugs.gnu.org Cc: Martin Becze X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158826527218518 (code B ref -1); Thu, 30 Apr 2020 16:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2020 16:47:52 +0000 Received: from localhost ([127.0.0.1]:47559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUCLo-0004ob-C4 for submit@debbugs.gnu.org; Thu, 30 Apr 2020 12:47:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:37570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUCLn-0004oU-2a for submit@debbugs.gnu.org; Thu, 30 Apr 2020 12:47:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51932) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUCK6-0007tT-TB for guix-patches@gnu.org; Thu, 30 Apr 2020 12:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUCCf-0005bM-Gw for guix-patches@gnu.org; Thu, 30 Apr 2020 12:41:06 -0400 Received: from mx1.riseup.net ([198.252.153.129]:33960) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUCCe-0005ap-Tk for guix-patches@gnu.org; Thu, 30 Apr 2020 12:38:25 -0400 Received: from bell.riseup.net (unknown [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 49Cgzz0lgGzFfSQ for ; Thu, 30 Apr 2020 09:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1588264703; bh=jEJGLFWfkHB9AKNdIz8NKZ89tymXQFdKXfiN5XRdEoA=; h=From:To:Cc:Subject:Date:From; b=f4kYfcsib2NF0Hw5SXXoS5JZlXAsnupkVmB7w0rxujEdfAJpo9jFk8Wq8DGxy4YzI +HNVmf7bC/LkAI8oaah1hK7vz4gDjuM/PQWQAxlPqaNB1nW4e4AzPS9IH/cBPOwBgU AHoIRy1phK95uvtd2NtotDnWXSaYoUMEXgiGS1Fs= X-Riseup-User-ID: D308BB6B9701DAF28B1BA40CD67AD107569834292E65E850A5A9353C6C5B0D54 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 49Cgzy4PgkzJmq8; Thu, 30 Apr 2020 09:38:22 -0700 (PDT) From: Martin Becze Date: Thu, 30 Apr 2020 11:37:48 -0500 Message-Id: MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=mjbecze@riseup.net; helo=mx1.riseup.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 12:38:23 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/guile-xyz.scm (guile3.0-ncurses): new variable. --- gnu/packages/guile-xyz.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6ec1c4c2fc..37511e9bca 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019, 2020 Amar Singh ;;; Copyright © 2019 Timothy Sample -;;; Copyright © 2019 Martin Becze +;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw ;;; ;;; This file is part of GNU Guix. @@ -1858,6 +1858,33 @@ many readers as needed).") library.") (license license:lgpl3+))) +(define-public guile3.0-ncurses + (package + (inherit guile-ncurses) + (name "guile3.0-ncurses") + (version "3.0") + (inputs `(("ncurses" ,ncurses) + ("guile" ,guile-3.0))) + (arguments + '(#:configure-flags (list "--with-ncursesw" ; unicode support + "--with-gnu-filesystem-hierarchy") + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-libguile-ncurses-file-name + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "install" + "-c" "src/ncurses" + "-j" (number->string + (parallel-job-count))) + (let* ((out (assoc-ref outputs "out")) + (dir "src/ncurses") + (files (find-files dir ".scm"))) + (substitute* files + (("\"libguile-ncurses\"") + (format #f "\"~a/lib/guile/3.0/libguile-ncurses\"" + out))) + #t)))))))) + (define-public guile-ncurses/gpm (package (inherit guile-ncurses)