From patchwork Tue Jul 9 14:33:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 66049 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 85E1C27BBEA; Tue, 9 Jul 2024 15:34:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8ED3D27BBE2 for ; Tue, 9 Jul 2024 15:34:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRBuq-0005VW-4B; Tue, 09 Jul 2024 10:34:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRBum-0005N1-VC for guix-patches@gnu.org; Tue, 09 Jul 2024 10:33:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sRBum-0004GV-Ht for guix-patches@gnu.org; Tue, 09 Jul 2024 10:33:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRBur-0001w8-Mq for guix-patches@gnu.org; Tue, 09 Jul 2024 10:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72001] [PATCH v2] gnu: Add icon. References: <87v81fjxj9.fsf@antr.me> In-Reply-To: <87v81fjxj9.fsf@antr.me> Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jul 2024 14:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72001@debbugs.gnu.org Cc: sharlatanus@gmail.com Received: via spool by 72001-submit@debbugs.gnu.org id=B72001.17205356037345 (code B ref 72001); Tue, 09 Jul 2024 14:34:01 +0000 Received: (at 72001) by debbugs.gnu.org; 9 Jul 2024 14:33:23 +0000 Received: from localhost ([127.0.0.1]:53880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRBuE-0001uO-Cu for submit@debbugs.gnu.org; Tue, 09 Jul 2024 10:33:22 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:48294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRBuB-0001u2-8Y for 72001@debbugs.gnu.org; Tue, 09 Jul 2024 10:33:21 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4WJNkn1CjXz9sbL; Tue, 9 Jul 2024 16:33:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antr.me; s=MBO0001; t=1720535585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jizr/aKHdfJkAT6cJ7BU5eh+6rrP4jNeVWbxwAQLU5g=; b=agFUNe5An24a13u8HBAqJfsNs+Iphs/xoq0Th+n0Ug3tiUGqy+cGeu14/nLd24gB+Qft0H xS1Ab/zBgs/EEXJR+Ga6e8HQgRL0bcbxf8p6TLoa98xuqAm/M1a92z1NM+T62FmkFoFEv6 YT6HszkiySlxtROr5O/FIulEHA+FBPbQL4RGzTEfjer0hasc3wbJpxjBSqhW+e55Fbprwy vZ0Cbsh38fPVWi5iXir8uVeXD2gmYih0ZWtPbwcJM98OAb3rrkISnj17IQq2/UcrIdR23C 3QF8N+F4Niv6NX0ERjfKPHrZTmAreZYdvAbtYvtrAmp2tPmSm2PiW4T1qfyEPQ== From: Antero Mejr Date: Tue, 09 Jul 2024 14:33:00 +0000 Message-ID: <87zfqqprdv.fsf@antr.me> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/esolangs.scm (icon): New variable. Change-Id: Ibd61e5431a2a57b89b94391be87a9ca36a40c58b --- Changes in v2: - use #:test-target instead of replacing test phase. - patch Makefile more to avoid phase modifications. - use #:make-flags argument. - organize output directory hierachy correctly. Oleg: bash-minimal is required at runtime because icon does an unusual thing where it embeds code into a shell script. Also please merge the mailmap patch sent earlier along with this one. Thanks. gnu/packages/esolangs.scm | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) base-commit: 13f0f52314244f08eb9fdd626d907c0c3976e06a prerequisite-patch-id: f51bc060af7f806eb590f28f45d1f06c26b02812 diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 0651dda1b0..f89bc875b9 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Hendursaga ;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2022 jgart +;;; Copyright © 2024 Antero Mejr ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,16 +23,19 @@ (define-module (gnu packages esolangs) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) #:use-module (gnu packages readline) + #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) @@ -156,3 +160,56 @@ (define-public shakespeare-spl If you want to assign a character, let's say Juliet, a positive value, you put her and another character on the stage and let that character praise Juliet.") (license license:gpl2+))) + +(define-public icon + (package + (name "icon") + (version "9.5.24a") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gtownsend/icon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0im1ikjyg14qvn4d31lpkhynaspws25m6whhb5xqwscq7xh4dy4p")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list "name=linux" (string-append "dest=" #$output)) + #:parallel-build? #f ;non-deterministic errors + #:test-target "Test" + #:phases #~(modify-phases %standard-phases + (add-before 'configure 'patch + (lambda _ + (substitute* "Makefile" + (("Install:") "install:") + (("mkdir \\$D$") "") + (("mkdir \\$D/bin") "mkdir -p $D/bin") + (("\\$D/doc") "$D/share/doc/icon") + (("cp README \\$D") + "cp README $D/share/doc/icon")) + (substitute* "tests/general/Test-opts" + (("/usr/bin/env icon") + "../../bin/icon")) + (substitute* '("ipl/progs/shar.icn" + "ipl/progs/ipatch.icn" + "src/icont/link.c") + (("/bin/sh") + (string-append + #$(this-package-input "bash-minimal") + "/bin/bash"))))) + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "X-Configure" + make-flags)))))) + (inputs (list bash-minimal libx11 libxpm libxt libxaw)) + (home-page "https://www2.cs.arizona.edu/icon/") + (synopsis "String-processing programming language") + (description + "Icon is a high-level programming language with facilities for processing +strings and structures, expressions that may produce sequences of results, +goal-directed evaluation that automatically searches for a successful result, +and string scanning that allows operations on strings to be formulated at a +conceptual level. Icon also provides high-level graphics facilities.") + (license license:public-domain)))