From patchwork Wed May 7 05:59:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 42367 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 98C9327BC4B; Wed, 7 May 2025 07:00:54 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 8877727BC4A for ; Wed, 7 May 2025 07:00:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCXp7-0004TX-Uv; Wed, 07 May 2025 02:00:06 -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 1uCXp5-0004RO-Ju for guix-patches@gnu.org; Wed, 07 May 2025 02:00:03 -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 1uCXp5-0005r9-9F for guix-patches@gnu.org; Wed, 07 May 2025 02:00:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=vNwhUhYg0XIOhtZHA1vjE/dRKo1FEtkbgiw+oFs8hC8=; b=LsiMQctxfftFdfJ5LoWZ91pyA4LGosSwvjRaonBrwoidhn9IpKz1/odtBrfH7ZSf6zJ7D2h+9aRujdQ5N5LPuHwTnZc9xIHWvlip7Rm2f4+AqmLLdfB9NW2IIdB7KJ843c7nmD9LfXI/rdwq+pAuwWMNSUpZgdEYrFg/fQPt8KYy8VFO/d8T4nQvkEb1GjAgKzrf9Lr9OW+hmaPnqe6t2D0ZdApmYXVnEGK2CJD4R80aLRL0oJjyRkpvwAWRHwyCRBxtKknH0X7exyE8QSstT9hsYmUmqY6hpAzmadWL4PCqrrHKq9uhFy0p59vNmlhlz/3nZnbxUiQ3xX52AAmbPw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCXp4-000505-VX; Wed, 07 May 2025 02:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78294] [PATCH 1/4] gnu: stb: Use modern package style. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 07 May 2025 06:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78294@debbugs.gnu.org Cc: aurtzy , aurtzy X-Debbugs-Original-Xcc: aurtzy Received: via spool by 78294-submit@debbugs.gnu.org id=B78294.174659759819153 (code B ref 78294); Wed, 07 May 2025 06:00:02 +0000 Received: (at 78294) by debbugs.gnu.org; 7 May 2025 05:59:58 +0000 Received: from localhost ([127.0.0.1]:38918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCXoz-0004yl-Os for submit@debbugs.gnu.org; Wed, 07 May 2025 01:59:58 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:55651) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uCXow-0004yG-AH for 78294@debbugs.gnu.org; Wed, 07 May 2025 01:59:55 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7c53b9d66fdso985695085a.3 for <78294@debbugs.gnu.org>; Tue, 06 May 2025 22:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746597588; x=1747202388; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vNwhUhYg0XIOhtZHA1vjE/dRKo1FEtkbgiw+oFs8hC8=; b=CS4niHXupdOe8JAPtGuE8ULJIGC2PjpwgUYnQ0sC05PANiVXKR2mx+d6wsXFS9PyO8 FHuYdWbQdQ8zkFom6GiLBeixdTSlT0z7onRVY6iZuIKWEk23pO66Bd2PSRi8ZoRH09Tv XCGFKnoSILPnmW/6UGlAZg6jXfWX5d1Vvy0DnKfIJXPv9gE303Hpanxeh6eD5vKYf34n LxCHeaTexxSvBvui07yOV9uWXKOch4F6pQ6fL7C5lZcTJNQ2/r1ytYwGG972xQHYdik8 6/slX2VfWgbUNKrl9QQAE8qKSpbJ7YPDMTZg3GCFwrZN4xKdPc7j4LJf7pDQQNVFLCxJ CNdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746597588; x=1747202388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vNwhUhYg0XIOhtZHA1vjE/dRKo1FEtkbgiw+oFs8hC8=; b=wN046FsBa61fZAG52fjMR/DyVZphEM5Ae20TJhtzyaLI0kqX03qD7puAQMf6Wr5JQM E1dELsvNRxJkpCO2WwybhPYrpyNzRjcRPqftrsbdmbbHet+Z0BwUEdGgrwHnISVSVaSo LxQAirs/bYCzKhLmewMSAxqQ/QCerXcfksnjojZaVUeWKvQhgNubCZvtdjqKp1n3AAzV zX4rc8vPk9m65o1I2HTewR/EbWyla/+X13przHvUmJ5M85IFau8E42LTeIigfMugI3eV x/wVTZ7ckXyjMXujkNv3+0e7ykD07ncgU95SXDjT2TekLRhKwo2W0CPfXLBvyu4H5Fi2 B/PQ== X-Gm-Message-State: AOJu0YzGwG9T+Yy0eAesAm69sSfDjdZnNlAgpOtnlv+lHveBbF1KLHb+ pWz/MepLyQBXR97lCO5EBY3ZuIzq3W7nScEEHCaQfgE729zFqPk1YKhVcg== X-Gm-Gg: ASbGncsxSlKxuV+Xb5jOScL9BCfFGnqNSQgm9tSNP8eewiWnDOR7Wg+Pw3KEpErSCop uvlPuA0+1YkTk6r3vpEqqT1ctbVhqEEEinS9OpZbiS9yTKQ224I00IjLemtyLRF5V/1XSDfJSpU 3x6CZ1gUwfYyv+yc38b99OcAGyXaPPPB1PaLVKhqvzyr/SgPUYoMCBKksBh+yAfXEAsnv6rRRTp v/3mWMALOBrf5QQsBcU17UZ9RQbsLIdOun/49uD8TEwkcojut6d9itzMn/C0AZ3wSHG8hy+szOw BTBbX7vaqSiaVN9izX52XCITh8Gtm8pXzKM= X-Google-Smtp-Source: AGHT+IE7fvXUggkLUS4VVSxncz2QP0j/DV3KmkhuF7exlbLtaptPnpebbSi6WEIXZFt0P5AWZesP7g== X-Received: by 2002:a05:6214:763:b0:6f5:3e38:6127 with SMTP id 6a1803df08f44-6f542afe161mr32274736d6.42.1746597587512; Tue, 06 May 2025 22:59:47 -0700 (PDT) Received: from localhost.localdomain ([2600:4808:a053:1800::7c1b]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f542623f1esm9795636d6.8.2025.05.06.22.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 22:59:47 -0700 (PDT) From: aurtzy Date: Wed, 7 May 2025 01:59:08 -0400 Message-ID: <6a6970133aa16ca64f7a98823ca62c9c596a3d50.1746593989.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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/stb.scm (stb)[arguments]<#:phases>: Use G-Expressions. (make-stb-header-package): Likewise. Change-Id: I836ad872e20444dcfb30480bd420cb63e4bb313f --- gnu/packages/stb.scm | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 90c9fff8cf..64375e7480 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2025 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages stb) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu) @@ -44,25 +46,27 @@ (define stb (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:modules ((ice-9 ftw) + (list + #:modules `((ice-9 ftw) (ice-9 regex) (srfi srfi-26) ,@%default-gnu-modules) - #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'check - (lambda _ - #f ; (invoke "make" "-C" "tests" "CC=gcc") - )) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (files (make-regexp "\\.(c|h|md)$"))) - (for-each (lambda (file) - (install-file file out)) - (scandir "." (cut regexp-exec files <>))) - #t)))))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'check + (lambda _ + #f ; (invoke "make" "-C" "tests" "CC=gcc") + )) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (files (make-regexp "\\.(c|h|md)$"))) + (for-each (lambda (file) + (install-file file out)) + (scandir "." (cut regexp-exec files <>))) + #t)))))) (synopsis "Single file libraries for C/C++") (description "This package contains a variety of small independent libraries for @@ -79,15 +83,17 @@ (define (make-stb-header-package name version description) (inputs (list stb)) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((stb (assoc-ref %build-inputs "stb")) - (lib (string-join (string-split ,name #\-) "_")) - (out (assoc-ref %outputs "out"))) - (install-file (string-append stb "/" lib ".h") - (string-append out "/include")) - #t)))) + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let ((stb #$(this-package-input "stb")) + (lib (string-join (string-split #$name #\-) "_")) + (out #$output)) + (install-file (string-append stb "/" lib ".h") + (string-append out "/include")) + #t)))) (description description))) ;; TODO: These descriptions are not translatable! They should be