From unknown Fri Jun 13 11:32:55 2025 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/ninja.scm (samurai): New variable. Change-Id: I5be4fd7e5100adfd24370a1ce8d7377a6b45df3b --- gnu/packages/ninja.scm | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) 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 + base-commit: cf84898b4baea91f9f1139bf8af1529e2d63a45a -- 2.49.0 From unknown Fri Jun 13 11:32:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78560] [PATCH 2/4] gnu: Add samu-as-ninja-wrapper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: code@greghogan.com, guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 06:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Greg Hogan Received: via spool by 78560-submit@debbugs.gnu.org id=B78560.174798232410971 (code B ref 78560); Fri, 23 May 2025 06:39:02 +0000 Received: (at 78560) by debbugs.gnu.org; 23 May 2025 06:38:44 +0000 Received: from localhost ([127.0.0.1]:44240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIM3F-0002qf-O4 for submit@debbugs.gnu.org; Fri, 23 May 2025 02:38:44 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:53633) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uIM3C-0002pv-Gd for 78560@debbugs.gnu.org; Fri, 23 May 2025 02:38:39 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-af5085f7861so5646656a12.3 for <78560@debbugs.gnu.org>; Thu, 22 May 2025 23:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747982311; x=1748587111; 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=zUM1+ZOUMvdtx6HynFdS3XMrYNB8F87gvW3gwURu/aM=; b=J+UYtNcXYPE++qQCHMiBysW5b6DbszdOu5dgGBXY65X+74PXC21nsAUkmBek8RU3In vkHOZa47asCGtYCb6ZgdY/lPxqbcUYU0yTn4EQy12v7TQfoJ64e5cqNqtvkvs9eqQsHO gd+hPqI8GvzlsLFJfK/xcsy2obAqhlS4j8T27h0clnbImXpY1x2lllmnDK6FoKhpU0yP 7Yp+j76VktXed3vIVWAVp/LGuyRzOsPO5FT/Jy8mckpWGEkE3x2+hJGF6OoODGIhyap4 Z9HoWzIRBINhxVHv+Gjfy5Ph/NuE/bX6cagMMo5hqsMnnU4u4wjpH7q6tQ2JCLHESge8 iUiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747982311; x=1748587111; 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=zUM1+ZOUMvdtx6HynFdS3XMrYNB8F87gvW3gwURu/aM=; b=NCLav9T0eg7M0jOk6Qn1T6nxkEWfZ4GtV0D6hpDOneGH7/6C5dmWVdl84yv2s3hk58 lgCaCknzrILjSMb5sS9pKN6VAMBHnOLp4ffciGZ0abWwhp2GEepIhNP5+C7W1bXWyiq4 JBLCsj/Q8t/tl3/6AH3jNG/ExldLolbuezrvSmzrQ7ZP+d/SIPQ1SgY44wUfJo4CHt0F UjO9XWYOMPNJdc6ZmHA9nwOtqXj8ZCwTv8fVd1N7hEZ/JVVs/xDlTpdoNi/L4d62YWcq xcwjM8F2nX3gGE3bIAahLLH9QRfe4WqEy1u/sglmXzrrviuOls2Mt3GFcRRRiQ1UkEHW Owuw== X-Gm-Message-State: AOJu0YysGOJwMy9AFSw6FCyc7isxPV7Toz9mwtTAx/tQnbfcY9m5iA5N YYiYXfo+HmtNyW76cMCn+SVuSANn1pmo7h+gIt9jGmXmLHTEyDN4UBbBJCs65w== X-Gm-Gg: ASbGncttqZkqwQvOabNgOuDGp5clFC7ecjGkudDQwBbrryy2c5mJARvk8/c7jo4F+ld /U6z8xwh2AjebVSG5eN1k02iJOsjca6ndMHB8W8y3QzA7a193cEGbC+DzJ4QOK/yyI1MkHwv1hi rKvkNZV+dHY3nD9Vz7WkPi0WxX6Uu5MFNZCfxzmmIxOcFIGnXEWa0TyUTdUcmLh40xCJKxaTbQ+ dA7XQX3tuu5yiWsnqUCuY+8t3WO4nFb5zHUKUbOQrlbnrpVIDwieUi2ZMgWuSOxstpdPS9G/5+u 0IYSafdRVOZou+onE03K0EIbuAC8rSI8S6esd/Izq8eSY84nPY6C8lIut+/PdJwskpmLX6Y= X-Google-Smtp-Source: AGHT+IFjfGaBlVgsN5cgb73AKsDuxAf0jwO/y2140i+/1gzJgQk7oQHci6Ifk1UajM5FAcPmObDIMw== X-Received: by 2002:a17:903:b8f:b0:215:8d49:e2a7 with SMTP id d9443c01a7336-231de37f1d8mr353394715ad.50.1747982311492; Thu, 22 May 2025 23:38:31 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebae71sm117621275ad.190.2025.05.22.23.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 23:38:30 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 23 May 2025 15:38:25 +0900 Message-ID: <1a614b25df667a96dcb24b7605a8731d59669e28.1747982042.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> References: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/ninja.scm (samu-as-ninja-wrapper): New variable. Change-Id: I8227fc23ebb2bf9cdc9a6729be9f00ff10b196ca --- gnu/packages/ninja.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 7b517b9837..398c4be10f 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -27,6 +27,7 @@ (define-module (gnu packages ninja) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -116,3 +117,21 @@ (define-public samurai (license (list asl2.0 ;for the most part expat)))) ;htab.h, htab.c and tree.c +(define-public samu-as-ninja-wrapper + (package/inherit samurai + (name "samu-as-ninja-wrapper") + (build-system trivial-build-system) + (arguments + (list #:builder + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (let ((bindir (string-append #$output "/bin")) + (samu (string-append #$(this-package-input "samurai") + "/bin/samu"))) + (mkdir-p bindir) + (symlink samu (string-append bindir "/ninja"))))))) + (inputs (list samurai)) + (description "This package provides the @command{ninja} command, +implemented as a symbolic link to the @command{samu} command of @code{samurai} +package."))) -- 2.49.0 From unknown Fri Jun 13 11:32:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78560] [PATCH 4/4] gnu: Add muon-as-meson-wrapper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 06:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78560@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 78560-submit@debbugs.gnu.org id=B78560.174798232810994 (code B ref 78560); Fri, 23 May 2025 06:39:02 +0000 Received: (at 78560) by debbugs.gnu.org; 23 May 2025 06:38:48 +0000 Received: from localhost ([127.0.0.1]:44243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIM3M-0002rF-8B for submit@debbugs.gnu.org; Fri, 23 May 2025 02:38:48 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:43301) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uIM3F-0002qB-IZ for 78560@debbugs.gnu.org; Fri, 23 May 2025 02:38:43 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22e331215dbso4440255ad.1 for <78560@debbugs.gnu.org>; Thu, 22 May 2025 23:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747982315; x=1748587115; 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=ICSgmsK5YHbJ44oGXDNupLHIEon6owh6P+GeXcJV7RM=; b=Osqf0LmBDs7wpipvZAW9DiDnYzuA99V16d1k7e2hgJulAWl/2XhjLHQaIUTVwmGZQY P///wlHozKb59XvQVEjXZ+31UB3c8TBpbmVoq1qccTOeVJfhbRYyF3hV9b9Kb+LItxyO ngvkhFkRScXrkqswhKvBTlVMUhRwd5JSPRqTmPu0ISUAtQc4Xb/W6zVGDdZ/4V4b2sNE kxeP7VK8sO0WxED9Qhfo0lUDc1sjq/LNtlJtaXbnZQW3r5pZMIblpI9J2dvdi7F6LfRo o/K3blYI2lCk6Vmx39ZKc9Y55B7j4Bl7pvWgxszv/RdFHGl6qaIMq1Z5lLcdmDsYOU+c kbuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747982315; x=1748587115; 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=ICSgmsK5YHbJ44oGXDNupLHIEon6owh6P+GeXcJV7RM=; b=H+CmduOzyzJpqpqOQpBpPK4PGgUpwBQJH9cNyq3k1nb95/M5fArO+fSGdHOYQuvJwC y1NcvWfsYPwqgqtEyHM9U50b2jyu+0AOhr0pfaozwKiRozAwUCzCqr/1LGU/eU7xrpax DM8hxLlIGUkwgh7FW5WnJwwR0Gv+Di1+3u1WEKCm+qLxb2LyOfNcue2aIr/MnGJjAgqg e3Kje3b5YPY+oMS2Dm1jRxCUI4G44ugmzClzV5gZAl7UPcbwclw4YaAqLk+QOZyg2Fpb NfRYc8INNtZCFhLXfezLj5BnwDWZzGqdnbFTJGXB2/3lusjS/fhQbfW0wRMhrDNPGXBR sXZA== X-Gm-Message-State: AOJu0YxMvDoIfghehGeWLIVTzGQuhiMbXY2T4TZ5cyM6tQAS9yAFrmL6 HPyTk45zrCnXodQcdV8u5+muh+t1OXx3R1ojz1MdsdB8jigi94Ydilg+auFQKA== X-Gm-Gg: ASbGncvTti1sW2Xg0bFYKVJZzzMIK7TKaPymBspjkHdllLFHh3uy8pDEX44PiFHT3u2 lW4eONxW5PdYTpa56M77Zq44qkgAjrcAcNpIXo/dlvlYzYpJOpWPO4h4T8FC1GOOf2Qb7Ym2JVc ipv7pGcRarK39SkJfXXsiF2iT4z7AZnYhyBkHVrYVXorFtZjy8g/RcSPGj20fEOPQqInmcp+PWT Q7Ixynf8AYr1PfJWz5ZXsjMKWprNeaQLOI6wKA65092D4tGvQL4Ulzt91iVZ0lvoP4xY0pSeiOX ueu9ugMYgGZ7TZyZ4kNee4zHC3+ZCH9xIvCMlAUoClGZlf8OkZCFmnCT3HzBE6QjT3FVhqU= X-Google-Smtp-Source: AGHT+IEk9g04z8pzoUgagTB324VStGZWOncJl84eU6ja02ob1jypZlr1WG5TNTf8Etqkshko/lsIgg== X-Received: by 2002:a17:902:cec5:b0:215:6c5f:d142 with SMTP id d9443c01a7336-233f06a1335mr29170415ad.20.1747982314926; Thu, 22 May 2025 23:38:34 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebae71sm117621275ad.190.2025.05.22.23.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 23:38:34 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 23 May 2025 15:38:27 +0900 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> References: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/build-tools.scm (muon-as-meson-wrapper): New variable. Change-Id: I13d9a71e0be896e47115379415b88f0969e207a5 --- gnu/packages/build-tools.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 58bad94ff8..f008656a8b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -43,6 +43,7 @@ (define-module (gnu packages build-tools) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system guile) + #:use-module (guix build-system trivial) #:use-module (guix modules) #:use-module (gnu packages) #:use-module (gnu packages adns) @@ -416,6 +417,25 @@ (define-public muon with minimal dependencies.") (license license:gpl3))) ;for the combined work +(define-public muon-as-meson-wrapper + (package/inherit muon + (name "muon-as-meson-wrapper") + (build-system trivial-build-system) + (arguments + (list #:builder + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (let ((bindir (string-append #$output "/bin")) + (samu (string-append #$(this-package-input "muon") + "/bin/muon"))) + (mkdir-p bindir) + (symlink samu (string-append bindir "/meson"))))))) + (inputs (list muon)) + (description "This package provides the @command{meson} command, +implemented as a symbolic link to the @command{muon} command of @code{muon} +package."))) + (define-public premake4 (package (name "premake") -- 2.49.0 From unknown Fri Jun 13 11:32:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78560] [PATCH 3/4] gnu: Add muon. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 06:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78560@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 78560-submit@debbugs.gnu.org id=B78560.174798233311009 (code B ref 78560); Fri, 23 May 2025 06:39:03 +0000 Received: (at 78560) by debbugs.gnu.org; 23 May 2025 06:38:53 +0000 Received: from localhost ([127.0.0.1]:44245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIM3M-0002rH-Nr for submit@debbugs.gnu.org; Fri, 23 May 2025 02:38:53 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:55397) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uIM3D-0002q4-Vg for 78560@debbugs.gnu.org; Fri, 23 May 2025 02:38:44 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-7fd35b301bdso9580030a12.2 for <78560@debbugs.gnu.org>; Thu, 22 May 2025 23:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747982313; x=1748587113; 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=VFNyj3SvtGCC9VlOqZzKvlAnzsrQlXR9skyexXO6T6o=; b=RWnbCcMC9qQTrZp04/z5UGCE31+8RsYlmYE0ZaBBGeJdlXsBwTOnH8xzjAt8KNvp6H ohcWdEG/2HzZaTV+1InaeB6mHkEavBVOcFN+j9dT6SsT2IPc1lc13L1jO7ffBfH8aZjG Ad232Z+Q4e37ZLRuIhYusgPALHISAsRndYYRKy36jEaEdsHi3odQE2XIt2/PXmoy7cxa or6TAwpom2pFZLwuIlhBy6ULa6BbALv8F6ahmqTdoaqjA53JMhHhzHzPuxjApfRyUq0L Fo7uGrq9zs31jj+50+MorcHOJW3lK2C2c0eZDJ+IEpEO3u0oOXGq7jMbtOH3O+I54Qf8 LM7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747982313; x=1748587113; 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=VFNyj3SvtGCC9VlOqZzKvlAnzsrQlXR9skyexXO6T6o=; b=HtEmNWaP35xQO5vSN6vmXpvHykx0kmuA92qlS3nL+vT9/nDN2zp8D+MIpRh/MsRpyu 9kPpbUfp5uDVJAPYCzpeySGBdUM2N15k27DTnRfMJhqOH78ji8nG40p6G5212lQkMU87 7pCDa2PUgU260BZNuK9qcZYA3RfI2l+jg53mOqBdOq7BaSJ/G+ECrJX7i5Z3A8vhDrl7 A5cDS0rpsS/O3e9ARM8KEPGyk+motTmsbbIJ9H27T/NSNsbwS2jAHWnTRz7K+A5tNeWa 49tsqU3/xA+CtJgEmpjzMwsb19/FQefa7r/m/7y+J4agGTSADiZJss41OuTMsoRmCad7 S/Qg== X-Gm-Message-State: AOJu0Yz+K2LSjM+Td2Zk9ShVRFkogvw0D7u3ANzwrs9qTUFtGaRbMUYl o0ZUhrQekmGFWTG7kEAIk5QALnOpwaCuObqE7+vRz+Wzoc31/fCvQWZxpkmtHw== X-Gm-Gg: ASbGncvavihBGcFoHF0spRNZSj1uTohtE+eC927dxHaSaNYaAtgj7RVcEwZA1f8DaKr v9rxzYx9LNmKvcduQzmxHe45iVvd8bpCvg7z86CtfEnqfS1PBc9rm1rb9kfB/7lgC2QO+Rof0Rt yZhqPuF0fK7uW6JYkq/7BNAsVnDPoQbMQXy5zZmhQN9BmMVb7XrM0+kP8OqYmr81GXBuIaJY4Mg Ltm+rauAPBXCfU8p7lBGayr5lgLHohhUPfaLrQnNIuNjcV5LtqGIdtR4FXA3rfQEL9ZSJPDQVzH nDo4ewEUJa7IUpEqC3GQES/rEei5pD03WXgOgKbdhdsWPW49A/tNwReC3u+2HABxIVK8+vKLIps C3dzADg== X-Google-Smtp-Source: AGHT+IHWFE5SVYxLMuZf72jR99LRgooBv+MQnPZad87m+/ZguX+6h7wXkQEqo/GfhVMgBWpoP7vEBQ== X-Received: by 2002:a17:902:c951:b0:21f:617a:f1b2 with SMTP id d9443c01a7336-231de3bb36amr389694025ad.46.1747982313204; Thu, 22 May 2025 23:38:33 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-231d4ebae71sm117621275ad.190.2025.05.22.23.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 23:38:32 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 23 May 2025 15:38:26 +0900 Message-ID: <0a7b42055ca5720318aaa841170ad70d7d2b84c6.1747982042.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> References: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/build-tools.scm (muon): New variable. Change-Id: I482fdbf5196ec6b23232b85febfa34ffb43fe912 --- gnu/packages/build-tools.scm | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 1335989bb2..58bad94ff8 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -374,6 +374,48 @@ (define-public meson-python (description "Meson-python is a PEP 517 build backend for Meson projects.") (license license:expat))) +(define-public muon + (package + (name "muon") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muon-build/muon") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "137rrsp5r31pv5sdccfcnaic0sbd9j88qqy8d1mqvvrdmyl74dy5")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;to avoid extra dependencies + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (setenv "CC" "gcc") + (setenv "CFLAGS" "-DBOOTSTRAP_NO_SAMU") + (invoke "sh" "bootstrap.sh" "build"))) + (replace 'configure + (lambda _ + (invoke "build/muon-bootstrap" "setup" "-Dprefix=/" + "build"))) + (replace 'build + (lambda _ + (invoke "samu" "-C" "build"))) + (replace 'install + (lambda _ + (setenv "DESTDIR" #$output) + (invoke "build/muon" "-C" "build" "install")))))) + (native-inputs (list samurai)) + (inputs (list pkgconf)) + (home-page "https://muon.build/") + (synopsis "Meson build system alternative implementation in C99") + (description "Muon is an implementation of the meson build system in c99 +with minimal dependencies.") + (license license:gpl3))) ;for the combined work + (define-public premake4 (package (name "premake") -- 2.49.0 From unknown Fri Jun 13 11:32:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Maxim Cournoyer Subject: bug#78560: closed (Re: [bug#78560] [PATCH 3/4] gnu: Add muon.) Message-ID: References: <87zff0kuvw.fsf@gmail.com> <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> X-Gnu-PR-Message: they-closed 78560 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78560@debbugs.gnu.org Date: Mon, 26 May 2025 01:46:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1748223963-6988-1" This is a multi-part message in MIME format... ------------=_1748223963-6988-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78560: [PATCH 1/4] gnu: Add samurai. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 78560@debbugs.gnu.org. --=20 78560: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78560 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1748223963-6988-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78560-done) by debbugs.gnu.org; 26 May 2025 01:45:28 +0000 Received: from localhost ([127.0.0.1]:51206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJMu8-0001nM-6C for submit@debbugs.gnu.org; Sun, 25 May 2025 21:45:28 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:47520) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uJMty-0001hN-97 for 78560-done@debbugs.gnu.org; Sun, 25 May 2025 21:45:24 -0400 Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-b1a1930a922so890395a12.3 for <78560-done@debbugs.gnu.org>; Sun, 25 May 2025 18:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748223911; x=1748828711; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=C9s+343WPNYIAdGr4tGLjMx2HSxIeRND7eTn9WpyqAk=; b=fPMUMCC83sfrMXDWXA9IAPvm/ad6cKyX4/aprwttxm0ClJpLCmXGQnXd/nCEE7dEEV iIeSj8VV0MnLd97j0rA/nCUZrq/iOELaqEMee1Hz0nU3yFXGoukZ/abn+RT4AShAxoI8 1IZyTtTkf5a/ss1q1K0Q1qIvZDAfbdeHS2pjVrGBljDpX6qcCVQIrL1Om7Y69KuqmZs+ amfVjpufn05glRqqPRGh0kiMOnUkiOFBQPSX6o/OgvY1Evyab2OG0B7NSJUcaVeBQutD ogQ1uqvrCUZkd99a9ybgquYmaO61OayWIlFu8LzQiosrlpqsFRxExYPvH3zY7ERHofkB tIzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748223911; x=1748828711; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=C9s+343WPNYIAdGr4tGLjMx2HSxIeRND7eTn9WpyqAk=; b=EppNZs3+K6zEjvkdEztfh/vMK/khTcHFE0U/Gc2FcfJy/m5OgABcXNDZodI+slLuRc GfllOLq6y3VHPx3HlJRyy4gS4Iw0U78esKNsdN9rxjcQA5IS7OjpRfGeTrnsBzNEV4Ry ZZBFbisr2L4zRRK8r6lK9yGmrDXymOv3DGZmdC8oQdLWmuC8nPDfr3/hZIqJcCHoVpH6 O4gibxM0vU2JebVsppVzQnyn7x10eACv9Cl9JkUhP3BhuFQOu9OjINpWDs50vFs4GZvJ VdqXUKSIXAmPMPJotJD5pCcvqjwM2BpOfhiqey+AGbLYWN5NXA+vHkc8nANfWbLUr4FW FDqQ== X-Gm-Message-State: AOJu0Ywu32MY76i5WplDmBuCymx+B7sW/eUqviEM4T6jIT79iDQ0j+/O sFui6Qakk+LbeH1o4kaMmHUp3xoaQJycFbNbY50+dzOlZLGoMYxAQ7d8hU4JtQ== X-Gm-Gg: ASbGncvuOeMTOCMXskL1jgMeuMQBqXRgJvJd9Zahy06GPHNlr4S9EEA5ONwB+X6DQZw VCaVP3QX/OAZrRHqjYMjSVMMl2cNIvBYRUmLK5BRnvo+N/0AyFXkpzV9NzOTCOaEASyuZhR/bQp L/BJ0hnshXGiND2h/rytWgXyf3dh3vuO5EbL8qJEOM4L9HyEeG2dhpqG0TlUvyXWZOTAy4JLZOe WPK9JDxJLFJMFXDHnb8NC/ZDC3vWBTmCwLYKzIpBgszzMaN46vXa8H4ju5OcWMfg5hG1O3p+DPO TFp6ua5IWiqH8inq4uPbAZd/UKjIkA2tEpishdfDkt7jWqNbCg== X-Google-Smtp-Source: AGHT+IFVVg8KG9BsYrF3t4t4IW2BYMY6ZsvvwPVEWM0rxojz4w/FnPuNpf5NlZrqLeVDsv0bsFysTw== X-Received: by 2002:a05:6a21:600c:b0:1f5:619a:7f4c with SMTP id adf61e73a8af0-2188c329374mr13592288637.29.1748223911032; Sun, 25 May 2025 18:45:11 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf8db5csm16100978a12.34.2025.05.25.18.45.09 for <78560-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 May 2025 18:45:10 -0700 (PDT) From: Maxim Cournoyer To: 78560-done@debbugs.gnu.org Subject: Re: [bug#78560] [PATCH 3/4] gnu: Add muon. In-Reply-To: <0a7b42055ca5720318aaa841170ad70d7d2b84c6.1747982042.git.maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Fri, 23 May 2025 15:38:26 +0900") References: <2b817f37192054dfc3d63d39ce96f8b1f686764b.1747982042.git.maxim.cournoyer@gmail.com> <0a7b42055ca5720318aaa841170ad70d7d2b84c6.1747982042.git.maxim.cournoyer@gmail.com> Date: Mon, 26 May 2025 10:45:07 +0900 Message-ID: <87zff0kuvw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78560-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, I've recreated this series for review on Codeberg. There have been a few fixes since I had shared that series here, for cross-building muon for example and also in the meson-build-system to be able to use it as a replacement to #:meson. See: https://codeberg.org/guix/guix/pulls/35. -- Thanks, Maxim ------------=_1748223963-6988-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH 1/4] gnu: Add samurai. 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 X-Debbugs-Cc: Greg Hogan Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/ninja.scm (samurai): New variable. Change-Id: I5be4fd7e5100adfd24370a1ce8d7377a6b45df3b --- gnu/packages/ninja.scm | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) 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 + base-commit: cf84898b4baea91f9f1139bf8af1529e2d63a45a -- 2.49.0 ------------=_1748223963-6988-1--