guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 4c5cce5c44dd3dec9441582da0e129740a85a1ea
Author: Jonas Meeuws <[email protected]>
AuthorDate: Tue Sep 23 17:41:24 2025 +0200
gnu: gdmd: Move to gcc.
* gnu/packages/dlang.scm (gdmd): Move from here ...
* gnu/packages/gcc.scm: ... to here.
Change-Id: I43fa2f66f812edc6c74442c7d911fe902265f5e0
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/dlang.scm | 38 +-------------------------------------
gnu/packages/gcc.scm | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index f4e0cd0137..abe41df52c 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2021, 2024 Maxim Cournoyer <[email protected]>
;;; Copyright © 2022 ( <[email protected]>
;;; Copyright © 2022 Esther Flashner <[email protected]>
+;;; Copyright © 2025-2026 Jonas Meeuws <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -111,43 +112,6 @@ which runs D source files as scripts, and @code{dustmite},
which reduces D code
to a minimal test case.")
(license license:boost1.0)))
-(define-public gdmd
- (let ((commit "ff2c97a47408fb71c18a2d453294d18808a97cc5")
- (revision "1"))
- (package
- (name "gdmd")
- (version (git-version "0.1.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/D-Programming-GDC/gdmd";)
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0pd70clk70069xcjysaas7zszzmigrcw1zl2xxv8kzdg7y7xrzvm"))))
- (build-system copy-build-system)
- (arguments
- (list
- #:install-plan
- #~'(("dmd-script" "bin/gdmd")
- ("dmd-script.1" "share/man/man1/gdmd.1"))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'adjust-gdc-location
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "dmd-script"
- (("my \\$gdc_dir.*")
- (string-append "my $gdc_dir = \""
- (dirname (search-input-file inputs
"/bin/gdc"))
- "\";\n"))))))))
- (inputs (list gdc perl))
- (home-page "https://github.com/D-Programming-GDC/gdmd";)
- (synopsis "DMD-like wrapper for GDC")
- (description "This package provides a DMD-like wrapper for the
-@acronym{GNU D Compiler,GDC}.")
- (license license:gpl3+))))
-
;; We use GDC, the D frontend for GCC, to bootstrap ldc. We then use
;; ldc to bootstrap itself so that no reference remains to GDC.
(define-public ldc-bootstrap
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 6fe940db6a..c3d4e4a0e6 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -56,8 +56,10 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix memoization)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module (guix search-paths)
#:use-module (guix utils)
@@ -1554,6 +1556,43 @@ also includes the druntime and phobos libraries."
(define-public gdc gdc-14)
+(define-public gdmd
+ (let ((commit "ff2c97a47408fb71c18a2d453294d18808a97cc5")
+ (revision "1"))
+ (package
+ (name "gdmd")
+ (version (git-version "0.1.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/D-Programming-GDC/gdmd";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0pd70clk70069xcjysaas7zszzmigrcw1zl2xxv8kzdg7y7xrzvm"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:install-plan
+ #~'(("dmd-script" "bin/gdmd")
+ ("dmd-script.1" "share/man/man1/gdmd.1"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-gdc-location
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "dmd-script"
+ (("my \\$gdc_dir.*")
+ (string-append "my $gdc_dir = \""
+ (dirname (search-input-file inputs
"/bin/gdc"))
+ "\";\n"))))))))
+ (inputs (list gdc perl))
+ (home-page "https://github.com/D-Programming-GDC/gdmd";)
+ (synopsis "DMD-like wrapper for GDC")
+ (description "This package provides a DMD-like wrapper for the
+@acronym{GNU D Compiler,GDC}.")
+ (license gpl3+))))
+
(define-public gm2
(hidden-package
(let ((base (custom-gcc gcc-14
