From patchwork Fri Jun 24 17:56:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 40305 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 248FC27BBEA; Fri, 24 Jun 2022 18:58:03 +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=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 895B827BBE9 for ; Fri, 24 Jun 2022 18:58:02 +0100 (BST) Received: from localhost ([::1]:58626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4nZ9-0005FS-Kt for patchwork@mira.cbaines.net; Fri, 24 Jun 2022 13:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4nYE-0005ES-8m for guix-patches@gnu.org; Fri, 24 Jun 2022 13:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4nYD-0005fM-Rn for guix-patches@gnu.org; Fri, 24 Jun 2022 13:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4nYD-0005ME-Na for guix-patches@gnu.org; Fri, 24 Jun 2022 13:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55999] [PATCH v3 1/3] gnu: packages: Replace rdmd with d-tools. References: In-Reply-To: Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jun 2022 17:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55999@debbugs.gnu.org Cc: "\(" Received: via spool by 55999-submit@debbugs.gnu.org id=B55999.165609340220539 (code B ref 55999); Fri, 24 Jun 2022 17:57:01 +0000 Received: (at 55999) by debbugs.gnu.org; 24 Jun 2022 17:56:42 +0000 Received: from localhost ([127.0.0.1]:43455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4nXt-0005LD-Hf for submit@debbugs.gnu.org; Fri, 24 Jun 2022 13:56:41 -0400 Received: from knopi.disroot.org ([178.21.23.139]:53612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4nXr-0005Kx-Rj for 55999@debbugs.gnu.org; Fri, 24 Jun 2022 13:56:41 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7DBBF45922; Fri, 24 Jun 2022 19:56:38 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KUNzZG5jCEUi; Fri, 24 Jun 2022 19:56:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1656093396; bh=JeBTX65k0fDAdE5VLARjHF1lWV6DwF7nLNUGm+BpUFw=; h=From:To:Cc:Subject:Date; b=PTB8xbHWZL3n9u2MNzEgOhHdehRxDFynFi0rJS8w3m8Pi/5xqTDqVy/c7jz8tWng0 sPqOzpy4Z8iaY0vfxEKO4HZgcNqzbUbr41NPMJ0PKygC5lq7aXwrHLECzxSQXl/QaY xjU10aXr0wihG6w30eP8UPMQzAKkhm+VBcA+vZ1j4FIRmINSwN7Kz1dzGvxXkFwbqG OLQuByDRqMC9tdael65X6CpNGJHTWrNuX4SqHu7NwikN96Vqs8txjA/VwN9HQAYQUi SnrF6hBJrwKElbxZVCXLZMqj2xztLdlMgJXNR6QQ/2Z9PLaMydBXjXil0BSgicCMwz 7v+51XPYms81Q== Date: Fri, 24 Jun 2022 18:56:26 +0100 Message-Id: <20220624175628.7877-1-paren@disroot.org> 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" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dlang.scm (rdmd): Remove variable. * gnu/packages/dlang.scm (d-tools): New variable. This fixes the build of rdmd and updates it to the latest version, along with running rdmd_test.d, building dustmite along with rdmd, and renaming the package to d-tools to reflect that change. --- gnu/packages/dlang.scm | 75 +++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 403fcbbd6b..7010994d2c 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages dlang) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) #:use-module ((guix build utils) #:hide (delete which)) @@ -48,42 +50,55 @@ (define-module (gnu packages dlang) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) -(define-public rdmd +(define-public d-tools (package - (name "rdmd") - (version "2.077.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dlang/tools/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (name "d-tools") + (version "2.100.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlang/tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0c8w373rv6iz3xfid94w40ncv2lr2ncxi662qsr4lda4aghczmq7")))) + (base32 "1jbn0hyskv4ykcckw0iganpyrm0bq2lggswspw21r4hgnxkmjbyw")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) ; There is no Makefile, so there's no 'make check'. - (replace - 'build - (lambda _ - (invoke "ldc2" "rdmd.d"))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "rdmd" bin))))))) + (list #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (mkdir-p "bin") + (setenv "CC" #$(cc-for-target)) + (setenv "LD" #$(ld-for-target)) + (invoke "ldc2" "rdmd.d" "--of" "bin/rdmd") + (apply invoke "ldc2" "--of=bin/dustmite" + (find-files "DustMite" ".*\\.d")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "bin/rdmd" "rdmd_test.d" "bin/rdmd" + "--rdmd-default-compiler" "ldmd2")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/man"))) + (copy-recursively "bin" bin) + (copy-recursively "man" man))))))) (native-inputs - (list ldc)) - (home-page "https://github.com/D-Programming-Language/tools/") - (synopsis "Specialized equivalent to 'make' for the D language") + (list ldc + (module-ref (resolve-interface + '(gnu packages commencement)) + 'ld-gold-wrapper))) + (home-page "https://github.com/dlang/tools") + (synopsis "Useful D-related tools") (description - "rdmd is a companion to the dmd compiler that simplifies the typical -edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like -make and other tools, rdmd uses the relative dates of the files involved to -minimize the amount of work necessary. Unlike make, rdmd tracks dependencies -and freshness without requiring additional information from the user.") + "@code{d-tools} provides two useful tools for the D language: @code{rdmd}, +which runs D source files as scripts, and @code{dustmite}, which reduces D code +to a minimal test case.") (license license:boost1.0))) ;;; The 0.17.6 version is the last release to support being bootstrapped