From patchwork Fri Jun 17 17:20:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 40095 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 556F627BBEA; Fri, 17 Jun 2022 18:21:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9792A27BBE9 for ; Fri, 17 Jun 2022 18:21:15 +0100 (BST) Received: from localhost ([::1]:38306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2Fek-0002UG-Nu for patchwork@mira.cbaines.net; Fri, 17 Jun 2022 13:21:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2FeZ-0002TF-9F for guix-patches@gnu.org; Fri, 17 Jun 2022 13:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2FeZ-0000F1-1Y for guix-patches@gnu.org; Fri, 17 Jun 2022 13:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2FeY-0003lm-V9 for guix-patches@gnu.org; Fri, 17 Jun 2022 13:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55999] [PATCH v2 1/2] 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, 17 Jun 2022 17:21:02 +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.165548643514419 (code B ref 55999); Fri, 17 Jun 2022 17:21:02 +0000 Received: (at 55999) by debbugs.gnu.org; 17 Jun 2022 17:20:35 +0000 Received: from localhost ([127.0.0.1]:46871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2Fe7-0003kT-62 for submit@debbugs.gnu.org; Fri, 17 Jun 2022 13:20:35 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2Fe5-0003kE-Hs for 55999@debbugs.gnu.org; Fri, 17 Jun 2022 13:20:34 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 060AE44099; Fri, 17 Jun 2022 19:20:32 +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 UTF8SMTP id B1xSmtsXctlk; Fri, 17 Jun 2022 19:20:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1655486430; bh=JeBTX65k0fDAdE5VLARjHF1lWV6DwF7nLNUGm+BpUFw=; h=From:To:Cc:Subject:Date; b=NVEQmz8XSDz264us80wRVxK87tOugU06j9twQ9L8Un2jNMY++F3u1RNstB9YtxV4c uLB2Fgq7nJfsmB2MJTXyNvU+Cm/e8shbfXEdGwtj30+pZUzCEgb6KXNpdyALT3XbYL /5WtG9YnZ59EMPiGHiL5r8DH9Q4zMP/fB5JpcnEdHKLowCPTz12xbkBCKDRg0+/j6c JxmN8yr9X/Fkc/CIVkwKRLWQJt7TuBWMLdqi72dkUsu3uWppDkmOOfHn1PhAX0foBP EM1fiRPHN22FJSqYS2QASa+s8d49PVFDetWWmS3QzrKjm4OocP/wl09Y7QP5eQykc+ 21RP10ruQn+Fg== Date: Fri, 17 Jun 2022 18:20:22 +0100 Message-Id: <20220617172023.16359-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 From patchwork Fri Jun 17 17:20:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 40096 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 5BFFD27BBEA; Fri, 17 Jun 2022 18:21:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 EA99E27BBE9 for ; Fri, 17 Jun 2022 18:21:16 +0100 (BST) Received: from localhost ([::1]:38316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2Fem-0002Ug-17 for patchwork@mira.cbaines.net; Fri, 17 Jun 2022 13:21:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2FeZ-0002TV-Nf for guix-patches@gnu.org; Fri, 17 Jun 2022 13:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2FeZ-0000F9-Fr for guix-patches@gnu.org; Fri, 17 Jun 2022 13:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2FeZ-0003lu-DA for guix-patches@gnu.org; Fri, 17 Jun 2022 13:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55999] [PATCH v2 2/2] gnu: packages: Update dub to v1.23.0. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jun 2022 17:21:03 +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.165548643614426 (code B ref 55999); Fri, 17 Jun 2022 17:21:03 +0000 Received: (at 55999) by debbugs.gnu.org; 17 Jun 2022 17:20:36 +0000 Received: from localhost ([127.0.0.1]:46873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2Fe7-0003kW-Ie for submit@debbugs.gnu.org; Fri, 17 Jun 2022 13:20:35 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2Fe6-0003kG-1r for 55999@debbugs.gnu.org; Fri, 17 Jun 2022 13:20:34 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7BA8843F01; Fri, 17 Jun 2022 19:20:33 +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 UTF8SMTP id qJS4GrlSYIrN; Fri, 17 Jun 2022 19:20:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1655486431; bh=CkEtsu0KTMR+DgwgfL2h/6hCGm0pTU9zPfmZV1NmWl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SYANKoKRx8AYj8xfMuX0IViLur3CudgJHPJDcP8Tky5BLanoRX4IByVjKl34+UZly fGQeuVzNZvyuSgHlC+AZtb3m2GZspakldS589AXej0JsN1n2OJnOZBEiZCSnxP3Icj u7UfRKIViaizzcH2t3QBE8FyY48wXLrha5rHsLtaK8sVVQ+6Yqbc81SnQNhRhASjux pOfyZRLQvGyWCOMwiKhwaWLN339D2yXpi07hShUjP6QeIwGhzUvzh1165xWDhM8MN9 C84hO+OVC9KgEuhiGmAZ6h48i/51n2R8ycWHAFgTJWr7UW9RCMb02u9R9zuAXk3Jw4 z2ewG2Jzhgmyg== Date: Fri, 17 Jun 2022 18:20:23 +0100 Message-Id: <20220617172023.16359-2-paren@disroot.org> In-Reply-To: <20220617172023.16359-1-paren@disroot.org> References: <20220617172023.16359-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 (dub): Update to version 1.23.0. This also fixes Dub's build, which was previously failing because of how ancient it was. --- gnu/packages/dlang.scm | 52 +++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 7010994d2c..34486f212c 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -437,35 +437,39 @@ (define (gnu-triplet->clang-arch system) (define-public dub (package (name "dub") - (version "1.7.2") + (version "1.23.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dlang/dub") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "073ibvgm1gphcqs1yjrav9ryp677nh3b194nxmvicwgvdc0sb6w9")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlang/dub") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'build - (lambda _ - (invoke "./build.sh"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "bin/dub" bin) - #t)))))) - (inputs - (list curl)) + (list #:tests? #f ; Tests try to install various packages. + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "LD" #$(ld-for-target)) + (invoke "./build.d"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "bin/dub" bin))))))) + (inputs (list curl)) (native-inputs - (list ldc)) + (list ldc + d-tools + (module-ref (resolve-interface + '(gnu packages commencement)) + 'ld-gold-wrapper))) (home-page "https://code.dlang.org/getting_started") (synopsis "Package and build manager for D projects") (description