From patchwork Fri May 23 06:34:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42876 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 9018027BC4C; Fri, 23 May 2025 07:35:18 +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 430D227BC49 for ; Fri, 23 May 2025 07:35:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uILzn-0007eC-IV; Fri, 23 May 2025 02:35:07 -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 1uILzj-0007dq-LX for guix-patches@gnu.org; Fri, 23 May 2025 02:35: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 1uILzj-00082M-8D for guix-patches@gnu.org; Fri, 23 May 2025 02:35: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:Date:From:To:Subject; bh=8wy3on6JlsUarFe602RDjggMXkpaEHB4icv0uAYyU+M=; b=g35rC3+5/zU9qbifKM5efgQ8vHzhasYH4XWHp7morybtChLOnutXHzD40Y5NMRSvaEjkJPMR8fQ4TwE1DgBHp7txQcW8P1R/fUnzGyOVe6TSGz2Br5ncZ3h+R5sZbr6BRQC82inYbDO34l4itwBPdGpGeTLdpxcnara8LwQFf8S+UPLSB3IOjO9BeMzuPZo1BnQ2cYmwt3Lxl0cdry7QrK4bqYWjje9Xm/lZg8pLBjHLR/QF6Nsbl1OYf59SGsBmGx0ij2rm0rsgbDbsITIvnFrx/d4Wv/uxrivQCmM6R1RsMayDTKoIL5xtxkX15EbAn07J2/M9ayzv9d2oR1domg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uILzi-0002X0-MC; Fri, 23 May 2025 02:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78560] [PATCH 1/4] gnu: Add samurai. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: code@greghogan.com, guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 06:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78560@debbugs.gnu.org Cc: Maxim Cournoyer , Greg Hogan X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Greg Hogan Received: via spool by submit@debbugs.gnu.org id=B.17479820789629 (code B ref -1); Fri, 23 May 2025 06:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2025 06:34:38 +0000 Received: from localhost ([127.0.0.1]:44209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uILzJ-0002VB-UD for submit@debbugs.gnu.org; Fri, 23 May 2025 02:34:38 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56414) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uILzD-0002UR-HH for submit@debbugs.gnu.org; Fri, 23 May 2025 02:34:35 -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 1uILz6-0007cH-Lt for guix-patches@gnu.org; Fri, 23 May 2025 02:34:25 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uILz4-00080s-QJ for guix-patches@gnu.org; Fri, 23 May 2025 02:34:24 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-7426c44e014so8474329b3a.3 for ; Thu, 22 May 2025 23:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747982060; x=1748586860; 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=8wy3on6JlsUarFe602RDjggMXkpaEHB4icv0uAYyU+M=; b=X5ZKENafwYO2FWOoJjqn4wemvd3td3MWpJ7UWOEqKIxJoiJtWlGWbY22qFN/G7WEBi cvEE05OaGcFjh5Q4btqfltme9pzIWYAklRluchmvf1LWyKXDdFZWW8iwZjCEQpawFBV/ gL2chLtTJfO6gtDzyQu54+84YzeuQgikJrFiJSlNOak8lRoeLsgtlIo2UVt1IP94UnHq wkdLqo+vq4Re2j9cpmIu1fRUgjUA821dafv0nFqgOJoQswbWBKfAHxJQMRzPC3CQH3FD AneaAUd5dtgDywPz8DWQq6zcmtLhQdQT42jqztLE+ciWWWNrz9IQdKclm3gkEGceZGzS i72Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747982060; x=1748586860; 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=8wy3on6JlsUarFe602RDjggMXkpaEHB4icv0uAYyU+M=; b=qUF0dPhmwv5but4Ajcu7M0stc6aQOyZX6KNkMP6nvlgt8dnIbHpDERshOqgsQR7Fm9 Qs9/nG8n5ko/p3o+TMn+38wEpSGgxU2DG7tLIldmkVsNL3+1bjBjkqGPWRKx2xioz6kw rC6aABhu+INDUKWlHFxvJDJI5MrANjvMBZsVbfqhBffEdn4bfkIFv0b3bp3GHPK0Fv3T PkPvLDAQ5mo0Wr1nSHD9EPPsduW9zfBfhcF3AVo1VoN5DylulCKln41txu4zqKt0nLZ8 AwlifZwsQFHwDRUDBxL4jLLQ7gdkrekIHXpZ9JVoQf3Ko2ZevSH6z0mfEPyX9VpKjqga EpJA== X-Gm-Message-State: AOJu0YxLFa1UTsu81goJMw4RgvFs38QcKPBy1/v7E3Tk/JFnMpcZ21A9 hNn8AySgE3Zo5hboRyQUIso9MEYWvbcjpK77HT7gldY6QzZ+HKcAGq9s86Tx3g== X-Gm-Gg: ASbGnctDxLPnE79QGun5Eh2Nv+UEcxCwSOCueRuMMjuoyTAk7PaA4moy9uwS0Rx6xgZ 2lmECLyJ68cF8cdyxQih1jaL7S9Acd57LCMnEK1egM7eQtWgvDXu6im+XorOi2z8kJsGsw6xHMS g8SIYyIhmXHmA0mvZ9OlV2P2QUjxJmiQk1DLXsuj+FUMZIcXhyM0huly5j2yDIQQ7CIw2ZktrLw 2qEo+dwXU97iXp1gCgQjJ+BIj1Y5NdHq2LxloI2BdqWBwTVnHdApjVpebukaHI9ymEvY7/deadD vpINQvgYu6tJ+LKXkF2bQOvPZDJJgqgMlWuHH7zgunh26JkgWp5akDUUzGnqjJGX8PbjG/A= X-Google-Smtp-Source: AGHT+IG6uRlj+EiXtU3EX11X0vIaGDG08lsBICRYTPumzof8j+d5iq9N93ysKHAkzwOFM7neiYCKiQ== X-Received: by 2002:a05:6a00:9455:b0:736:b101:aed3 with SMTP id d2e1a72fcca58-742a978730dmr35897912b3a.1.1747982059706; Thu, 22 May 2025 23:34:19 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0a45ccsm12114001a12.76.2025.05.22.23.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 23:34:19 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 23 May 2025 15:34:11 +0900 Message-ID: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pf1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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/ninja.scm (samurai): New variable. Change-Id: I5be4fd7e5100adfd24370a1ce8d7377a6b45df3b --- gnu/packages/ninja.scm | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) base-commit: cf84898b4baea91f9f1139bf8af1529e2d63a45a diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 42c9309b82..7b517b9837 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2025 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +22,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages ninja) - #:use-module ((guix licenses) #:select (asl2.0)) + #:use-module ((guix licenses) #:select (asl2.0 expat)) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages python)) (define-public ninja @@ -75,3 +79,40 @@ (define-public ninja files generated by a higher-level build system, and it is designed to run builds as fast as possible.") (license asl2.0))) + +(define-public samurai + (package + (name "samurai") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/michaelforney/samurai") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04iw18hgkm72yrl83a2xh1jc47w9rilpb95kwick0j37b4q3gxj4")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build.c" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) + (delete 'configure)))) + (inputs (list bash-minimal)) + (home-page "https://github.com/michaelforney/samurai") + (synopsis "Ninja-compatible build tool written in C") + (description "@code{samurai} is a ninja-compatible build tool written in +C99 with a focus on simplicity, speed, and portability. It is +feature-complete and supports most of the same options as ninja. This package +provides the command @command{samu}. For a @command{ninja} command +replacement, use the @code{samu-as-ninja-wrapper} package.") + (license (list asl2.0 ;for the most part + expat)))) ;htab.h, htab.c and tree.c +