From patchwork Tue Nov 19 21:39:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Pflug X-Patchwork-Id: 70598 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 4867627BBE9; Tue, 19 Nov 2024 21:40:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 4BFAA27BBE2 for ; Tue, 19 Nov 2024 21:40:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDVxC-00029m-1F; Tue, 19 Nov 2024 16:40:10 -0500 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 1tDVx6-000298-Kk for guix-patches@gnu.org; Tue, 19 Nov 2024 16:40:04 -0500 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 1tDVx6-0005jU-Bq for guix-patches@gnu.org; Tue, 19 Nov 2024 16:40:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=goMLcv0HnTng1iF4KXnRb2bQHMYICCG5G3FqFc/cMZA=; b=HIbAUX9jXkty+WbW+pDZX0gztZvO63vHytTK09HgB/mGNy1QFIvPte06C0V90VsKMdLWFqtjoUAACIzvdzDekg9GAcl+kNRbWqPRDR0aXo/KnzPofUEs1IOQbGI9fxzEDD4+hi7mS79xe+e6h1pdFcIh1VfsaWFPoN9s6SEexqX0eEXuISRCCVv7RgkOZVWT9tPebkLqfaWJF5LqBA9kk2XcX6wHKNty/0dmDUxSvZiBOGV14e1sxio07Bggaji6hXJjYyP4DMvFkEkKheGM6yhpuFGjxTqQUeDL8TJpih3hdukN2voFJGbAqkU6usZ0Mn5pnYHws1yafdM+OtGn3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDVx4-00039H-DP; Tue, 19 Nov 2024 16:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74441] [PATCH] gnu: picolisp: Update to 24.9. Resent-From: David Pflug Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74441 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74441@debbugs.gnu.org Cc: David Pflug , Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by submit@debbugs.gnu.org id=B.173205237912063 (code B ref -1); Tue, 19 Nov 2024 21:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2024 21:39:39 +0000 Received: from localhost ([127.0.0.1]:44325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDVwg-00038S-E7 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 16:39:39 -0500 Received: from lists.gnu.org ([209.51.188.17]:37218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDVwe-00038J-EY for submit@debbugs.gnu.org; Tue, 19 Nov 2024 16:39:37 -0500 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 1tDVwc-00027T-M8 for guix-patches@gnu.org; Tue, 19 Nov 2024 16:39:34 -0500 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDVwZ-00053K-VT for guix-patches@gnu.org; Tue, 19 Nov 2024 16:39:34 -0500 Received: by mail-qv1-xf2a.google.com with SMTP id 6a1803df08f44-6d4035f2d18so9237136d6.1 for ; Tue, 19 Nov 2024 13:39:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tpflug-com.20230601.gappssmtp.com; s=20230601; t=1732052370; x=1732657170; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=goMLcv0HnTng1iF4KXnRb2bQHMYICCG5G3FqFc/cMZA=; b=GAxlili8J6n4/OYLH6x7h1ekpxMGgbUG4ZtZFyc04KLTIxr7AGVKQDs9/83J8ebtJC 9U2RZnUeWrvO9ibtcvnx7OQw98bxKcjQo5JI8cEeVjyBit9SMh/jxr945hOOfUSikBOe C8aPccde5VSJGlr+AzdAGkYR22UjIj9Js7w0zkqSInobnYku0Tou13WgKQTMHCFahU/f 1+TuM/XE5RfC4YeHbOTimyj6p/n3iAJXQ0/NTORF5Ilf+dGMCQKiYd28VR4wBKUVQeKl tdcwVjaPAmpfpCBKNGN+gGxCxed2N4gBOXUdYT4BFVO8WeZUp1b2qvKB+gQ110e7yFyG wTkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732052370; x=1732657170; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=goMLcv0HnTng1iF4KXnRb2bQHMYICCG5G3FqFc/cMZA=; b=Qu1D6OcPh5dYaHs2T9dCJ+6GNGCD1kJrhrJYUNktQyMY1pUgy45HsbbNnwPHRLYIhj dv+VqJnWIooa/y3w+iG8P3n1VcQp3+wzXp43LZbhazdfQJzTh8kzPPiByVrom6W2gz1C I8NOBFRMIXVgdgaw4RgMJoSH/v9dAPqPnqzxZFUfe0AKtdm8xsHeL4qsApn4HiaggO0M mrYLl23ACAkv0quZxMk/dwl2UxUG9eUPpQ3z4HabdCqwylXt9eQTdVp2vmM0l9BwPWm7 eRZTVULw/zZTVCcSigdMGYf00epTlZ3Iv7DPdVHmN3GqY01BVytfz5WQSzP/K9qeETrz Mr3Q== X-Gm-Message-State: AOJu0YyfHwrQJU7/0mz/EHXG3lnO8sazyMFvMNDGyYpA7IacKguf5VWK kz/eZia6nts6L/oL9nsIvdDHSBdd1DbaR/TiUq6eBM84wT4ylB1jj74Us9ZhxuOWs/ac3YXDSnN 2 X-Google-Smtp-Source: AGHT+IF4RE+linLGmueojmyABElwO17PdzejIi2tefgIKRAo6tYAaVx/mve61Z/94y2Lbk5s0cmJrw== X-Received: by 2002:a05:6214:1bca:b0:6d4:b1e:5418 with SMTP id 6a1803df08f44-6d437852ecfmr7586416d6.33.1732052369907; Tue, 19 Nov 2024 13:39:29 -0800 (PST) Received: from tamar.hsd1.vt.comcast.net ([2601:19e:8580:c390:ea1f:c0a3:90b3:c6ff]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d4380b6390sm1148196d6.5.2024.11.19.13.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2024 13:39:29 -0800 (PST) From: David Pflug Date: Tue, 19 Nov 2024 16:39:15 -0500 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2a; envelope-from=david@tpflug.com; helo=mail-qv1-xf2a.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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/lisp.scm (picolisp): Update to 24.9. Upstream has retired Java version and 32bit support. Change-Id: I6bb3604ed9d48ef5a4b372d8dbc6dd3917295b5f --- gnu/packages/lisp.scm | 207 +++++++++++++----------------------------- 1 file changed, 63 insertions(+), 144 deletions(-) base-commit: 304a6deaeb42c24488d909641aeb72ddcf2b6a02 diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6c16d8ab71..ea38fd81de 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1028,163 +1028,82 @@ (define-public lush2 (home-page "https://lush.sourceforge.net/") (license license:lgpl2.1+))) -(define picolisp32 +(define-public picolisp (package - (name "picolisp32") - (version "19.12") + (name "picolisp") + (version "24.9") (source (origin (method url-fetch) (uri (string-append "https://software-lab.de/picoLisp-" version ".tgz")) (sha256 - (base32 "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j")) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete the pre-compiled jar file. - (delete-file "ersatz/picolisp.jar") - #t)))) + (base32 "1bsp14vjzvlav813mxzgigcdrmsxhrrhlhdzfdvdq6havacm0cwf")) + (modules '((guix build utils))))) (build-system gnu-build-system) - (inputs - `(("libxcrypt" ,libxcrypt) - ("openssl" ,openssl))) + (inputs (list clang readline libffi openssl pkg-config)) (arguments - `(#:system ,(match (%current-system) - ((or "armhf-linux" "aarch64-linux") - "armhf-linux") - (_ - "i686-linux")) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (shebang-line (string-append - "#!" out "/bin/picolisp " - out "/lib/picolisp/lib.l"))) - (substitute* '("bin/pil" - "bin/pilIndent" - "bin/pilPretty" - "bin/psh" - "bin/replica" - "bin/vip" - "bin/watchdog" - "games/xchess" - "misc/bigtest" - "misc/calc" - "misc/chat" - "misc/mailing" - "src/mkVers") - (("#\\!bin/picolisp lib.l") - shebang-line) - (("#\\!\\.\\./bin/picolisp \\.\\./lib.l") - shebang-line) - (("#\\!/usr/bin/picolisp /usr/lib/picolisp/lib.l") - shebang-line))) - #t)) - (add-after 'fix-paths 'make-build-reproducible - (lambda _ - (substitute* "src64/lib/asm.l" - (("\\(prinl \"/\\* \" \\(datSym \\(date\\)\\) \" \\*/\\)") - "")) - #t)) - (add-after 'make-build-reproducible 'fix-permissions - (lambda _ - (for-each make-file-writable - '("doc/family.tgz" - "doc/family64.tgz" - "lib/map" - "src64/tags")) - #t)) - (replace 'build - (lambda _ - (invoke "make" "-C" "src" "picolisp" "tools" "gate"))) - (add-before 'check 'set-home-for-tests - (lambda _ - (setenv "HOME" "/tmp") - #t)) - (replace 'check - (lambda _ - (invoke "./pil" "test/lib.l" "-bye" "+"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man (string-append out "/share/man")) - (picolisp (string-append out "/lib/picolisp"))) - (copy-recursively "man" man) - (copy-recursively "." picolisp) - (for-each (lambda (name) - (let ((path (string-append picolisp "/" name))) - (delete-file-recursively path))) - '("CHANGES" "COPYING" "CREDITS" "cygwin" - "INSTALL" "man" "pil" "README" "src" "src64" - "test")) - (mkdir-p bin) - (symlink (string-append picolisp "/bin/picolisp") - (string-append bin "/picolisp")) - (symlink (string-append picolisp "/bin/pil") - (string-append bin "/pil"))) - #t))))) + '(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (picolisp-shebang (string-append "#!" out + "/bin/picolisp " out + "/lib/picolisp/lib.l")) + (pil-shebang (string-append "#!" out "/bin/pil"))) + (substitute* '("bin/pil" "bin/psh" "bin/pty" "bin/vip" + "bin/watchdog") + (("#\\!bin/picolisp lib.l") + picolisp-shebang) + (("#\\!\\.\\./bin/picolisp \\.\\./lib.l") + picolisp-shebang) + (("#\\!/usr/bin/picolisp /usr/lib/picolisp/lib.l") + picolisp-shebang) + (("#\\!/usr/bin/pil") + pil-shebang))) #t)) + (replace 'build + (lambda _ + (invoke "make" "-C" "src"))) + (add-before 'check 'set-home-for-tests + (lambda _ + (setenv "HOME" "/tmp") #t)) + (replace 'check + (lambda _ + (invoke "./pil" "test/lib.l" "-bye" "+"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc")) + (man (string-append out "/share/man")) + (picolisp (string-append out "/lib/picolisp"))) + (copy-recursively "man" man) + (copy-recursively "doc" doc) + (copy-recursively "." picolisp) + (for-each (lambda (name) + (let ((path (string-append picolisp "/" + name))) + (delete-file-recursively path))) + '("doc" "COPYING" + "INSTALL" + "man" + "pil" + "README" + "src" + "test")) + (mkdir-p bin) + (for-each (lambda (name) + (symlink name + (string-append bin "/" + (basename name)))) + (find-files (string-append picolisp "/bin"))))))))) (synopsis "Interpreter for the PicoLisp programming language") (description "PicoLisp is a programming language, or really a programming system, including a built-in database engine and a GUI system.") (home-page "https://picolisp.com/wiki/?home") - (license license:expat))) - -(define-public picolisp - (match (%current-system) - ((or "aarch64-linux" "x86_64-linux") - (package - ;; Use the 32-bit picolisp to generate the assembly files required by - ;; the 64-bit picolisp. - (inherit picolisp32) - (name "picolisp") - (native-inputs - (list picolisp32 which)) - (arguments - (substitute-keyword-arguments (package-arguments picolisp32) - ((#:system _ "") (%current-system)) - ((#:phases phases) - `(modify-phases ,phases - (delete 'fix-paths) - (add-before 'build 'fix-paths - ;; This must run after the other shebang-patching phases, - ;; or they will override our changes. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((picolisp32 (assoc-ref inputs "picolisp32")) - (out (assoc-ref outputs "out")) - (shebang-line (string-append - "#!" out "/bin/picolisp " - out "/lib/picolisp/lib.l"))) - (substitute* '("bin/pil" - "bin/pilIndent" - "bin/pilPretty" - "bin/psh" - "bin/replica" - "bin/vip" - "bin/watchdog" - "games/xchess" - "misc/bigtest" - "misc/calc" - "misc/chat" - "misc/mailing" - "src/mkVers") - (("#\\!.*picolisp32.*/bin/picolisp .*lib\\.l") - shebang-line)) - (substitute* "src64/mkAsm" - (("/usr/bin/") - (string-append picolisp32 "/bin/")))) - #t)) - (replace 'build - (lambda _ - (invoke "make" "-C" "src" "tools" "gate") - (invoke "make" "-C" "src64" "CC=gcc" "picolisp"))))))))) - (_ - (package - (inherit picolisp32) - (name "picolisp"))))) + (license license:expat) + (supported-systems '("aarch64-linux" "x86_64-linux")))) (define-public roswell (package