[bug#63004] Add support for disallowed-references to cmake and don't let ldc depend on tzdata

[bug#63004] Add support for disallowed-references to cmake and don't let ldc depend on tzdata

[Leo Famulari]

Here are some small patches to remove a bogus tzdata dependency from
ldc-bootstrap. This should be okay for master based on my tests.

[bug#63004] [PATCH 1/2] build-system/cmake: Add support for the #:disallowed-references key.

[Leo Famulari]

* guix/build-system/cmake.scm (cmake-build, cmake-cross-build):
Add #:disallowed-references.
---
 guix/build-system/cmake.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 09e3ac85db..ed979b9c6b 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -116,7 +116,8 @@ (define* (cmake-build name inputs
                       (substitutable? #t)
                       (imported-modules %cmake-build-system-modules)
                       (modules '((guix build cmake-build-system)
-                                 (guix build utils))))
+                                 (guix build utils)))
+                      disallowed-references)
   "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
 provides a 'CMakeLists.txt' file as its build system."
   (define build
@@ -158,6 +159,7 @@ (define build
                       #:target #f
                       #:graft? #f
                       #:substitutable? substitutable?
+                      #:disallowed-references disallowed-references
                       #:guile-for-build guile)))
 
 \f
@@ -193,7 +195,8 @@ (define* (cmake-cross-build name
                             (build (nix-system->gnu-triplet system))
                             (imported-modules %cmake-build-system-modules)
                             (modules '((guix build cmake-build-system)
-                                       (guix build utils))))
+                                       (guix build utils)))
+                            disallowed-references)
   "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and
 with INPUTS.  This assumes that SOURCE provides a 'CMakeLists.txt' file as its
 build system."
-- 
2.39.2

[bug#63004] [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on tzdata.

[Leo Famulari]

* gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata.
[native-inputs]: Add tzdata-for-tests.
[arguments]: Forbid references to tzdata-for-tests.
---
 gnu/packages/dlang.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index 729d6015ae..eafc0a7bbf 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -159,7 +159,8 @@ (define ldc-bootstrap
         (base32 "1kfs4fpr1525sv2ny10hlfppy8c075vjm8m649wr2b9411pkgfzx"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f                  ;skip in the bootstrap
+     `(#:disallowed-references (,tzdata-for-tests)
+       #:tests? #f                  ;skip in the bootstrap
        #:build-type "Release"
        #:configure-flags
         (list "-GNinja")
@@ -187,7 +188,6 @@ (define ldc-bootstrap
     (inputs
      `(("libconfig" ,libconfig)
        ("libedit" ,libedit)
-       ("tzdata" ,tzdata)
        ("zlib" ,zlib)))
     (native-inputs
      `(("lld-wrapper" ,(make-lld-wrapper lld-11 #:lld-as-ld? #t))
@@ -195,6 +195,7 @@ (define ldc-bootstrap
        ("ldc" ,gdmd)
        ("ninja" ,ninja)
        ("python-wrapper" ,python-wrapper)
+       ("tzdata" ,tzdata-for-tests)
        ("unzip" ,unzip)))
     (home-page "http://wiki.dlang.org/LDC")
     (synopsis "LLVM-based compiler for the D programming language")
-- 
2.39.2

[bug#63004] Add support for disallowed-references to cmake and don't let ldc depend on tzdata

[Ludovic Courtès]

Hi Leo,

The ‘cmake-build-system’ was pushed as
3b5b6683037dfb8f02d04ad3e6c2f04062db9a16 (a useful improvement).

The ‘ldc-bootstrap’ change LGTM!

Ludo’.

[bug#63004] Add support for disallowed-references to cmake and don't let ldc depend on tzdata

[Leo Famulari]

On Sat, May 06, 2023 at 05:16:18PM +0200, Ludovic Courtès wrote:
> Hi Leo,
> 
> The ‘cmake-build-system’ was pushed as
> 3b5b6683037dfb8f02d04ad3e6c2f04062db9a16 (a useful improvement).
> 
> The ‘ldc-bootstrap’ change LGTM!

Thanks for looking! Josselin helpfully pushed the ldc-bootstrap change
as d19c7c2791dc01d678ec017ad83868d5629b53f6

bug#63004: [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on tzdata.

[Josselin Poiret via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata.
> [native-inputs]: Add tzdata-for-tests.
> [arguments]: Forbid references to tzdata-for-tests.

LGTM, applied as d19c7c2791dc01d678ec017ad83868d5629b53f6.

Best,
-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]

[bug#63004] [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on tzdata.

[Leo Famulari]

On Wed, May 17, 2023 at 11:26:32PM +0200, Josselin Poiret wrote:
> Hi Leo,
> 
> Leo Famulari <leo@famulari.name> writes:
> 
> > * gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata.
> > [native-inputs]: Add tzdata-for-tests.
> > [arguments]: Forbid references to tzdata-for-tests.
> 
> LGTM, applied as d19c7c2791dc01d678ec017ad83868d5629b53f6.

Thank you!