Felix Lechner <felix.lechner@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 20 Dec 2023 16:18:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 20 11:18:17 2023
Received: from localhost ([127.0.0.1]:41673 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rFzGw-0000gu-0R
for submit <at> debbugs.gnu.org; Wed, 20 Dec 2023 11:18:17 -0500
Received: from lists.gnu.org ([2001:470:142::17]:58134)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <dziltener@HIDDEN>) id 1rFzGg-0000g5-9y
for submit <at> debbugs.gnu.org; Wed, 20 Dec 2023 11:18:13 -0500
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 <dziltener@HIDDEN>)
id 1rFzGL-0007A4-EH
for guix-patches@HIDDEN; Wed, 20 Dec 2023 11:17:45 -0500
Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199]
helo=lyrion.dc3-a.pub1.infomaniak.cloud)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <dziltener@HIDDEN>)
id 1rFzGI-0001Q1-2h
for guix-patches@HIDDEN; Wed, 20 Dec 2023 11:17:36 -0500
X-Spam: yes
X-Spam-Score: 7.9 / 15
X-Spam-Status: Yes, score=7.900 required=15.000
tests=[ARC_NA=0.000, ASN=0.000, BROKEN_HEADERS=8.000
DATE_IN_PAST=0.000, FROM_EQ_ENVFROM=0.000, FROM_HAS_DN=0.000
MID_RHS_MATCH_FROM=0.000, MIME_GOOD=-0.100, MIME_TRACE=0.000
RCPT_COUNT_TWO=0.000, RCVD_COUNT_ONE=0.000, RCVD_TLS_ALL=0.000
RCVD_VIA_SMTP_AUTH=0.000, TO_DN_NONE=0.000, TO_MATCH_ENVRCPT_ALL=0.000]
Received: from localhost (<unknown> [2a00:1f:99c0:1b01:7384:ea2f:bee8:8ee7])
by lyrion.dc3-a.pub1.infomaniak.cloud (OpenSMTPD) with ESMTPSA id d5afc13c
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Wed, 20 Dec 2023 16:17:30 +0000 (UTC)
Message-ID: <1505528f59e239bcbc5b42e1f4b7393f@HIDDEN>
Received-SPF: pass client-ip=195.15.241.199; envelope-from=dziltener@HIDDEN;
helo=lyrion.dc3-a.pub1.infomaniak.cloud
X-Spam_score_int: 76
X-Spam_score: 7.6
X-Spam_bar: +++++++
X-Spam_report: (7.6 / 5.0 requ) BAYES_00=-1.9, MISSING_DATE=1.36,
MISSING_FROM=1, MISSING_HEADERS=1.021, MISSING_SUBJECT=1.799,
RCVD_IN_SBL_CSS=3.335, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001, TVD_RCVD_IP=0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no
X-Spam_action: reject
From: dziltener@HIDDEN
Date: Wed, 20 Dec 2023 11:17:37 -0500
X-Spam-Score: 4.1 (++++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: From f4001dd77c56c77e135343c630033619a5cca2e1 Mon Sep 17
00:00:00
2001 From: Daniel Ziltener <dziltener@HIDDEN> Date: Sun,
10 Dec 2023 15:26:10
+0100 Subject: [PATCH] guix: chicken-build-system: fi [...]
Content analysis details: (4.1 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
1.2 MISSING_HEADERS Missing To: header
0.9 SPF_FAIL SPF: sender does not match SPF record (fail)
[SPF failed: Please see http://www.openspf.org/Why?s=mfrom;
id=dziltener%40lyrion.ch; ip=2001%3A470%3A142%3A%3A17; r=debbugs.gnu.org]
-0.0 T_SCC_BODY_TEXT_LINE No description available.
1.8 MISSING_SUBJECT Missing Subject: header
0.2 NO_SUBJECT Extra score for no subject
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 6.8 (++++++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: From f4001dd77c56c77e135343c630033619a5cca2e1 Mon Sep 17 00:00:00
2001 From: Daniel Ziltener <dziltener@HIDDEN> Date: Sun, 10 Dec 2023 15:26:10
+0100 Subject: [PATCH] guix: chicken-build-system: fi [...]
Content analysis details: (6.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
1.2 MISSING_HEADERS Missing To: header
0.9 SPF_FAIL SPF: sender does not match SPF record (fail)
[SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=dziltener%40lyrion.ch;ip=2001%3A470%3A142%3A%3A17;r=debbugs.gnu.org]
3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS
[195.15.241.199 listed in zen.spamhaus.org]
0.1 URIBL_CSS_A Contains URL's A record listed in the Spamhaus CSS
blocklist
[URIs: lyrion.ch]
0.1 URIBL_CSS Contains an URL's NS IP listed in the Spamhaus CSS
blocklist
[URIs: lyrion.ch]
-0.0 T_SCC_BODY_TEXT_LINE No description available.
1.8 MISSING_SUBJECT Missing Subject: header
0.2 NO_SUBJECT Extra score for no subject
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
From f4001dd77c56c77e135343c630033619a5cca2e1 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@HIDDEN>
Date: Sun, 10 Dec 2023 15:26:10 +0100
Subject: [PATCH] guix: chicken-build-system: fixes to make it actually work
To: guix-patches@HIDDEN
Cc: dziltener@HIDDEN
---
guix/build-system/chicken.scm | 50 ++++++++++++++++++++---------
guix/build/chicken-build-system.scm | 17 ++++------
2 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm
index 9f518e66e6..17c3b7b144 100644
--- a/guix/build-system/chicken.scm
+++ b/guix/build-system/chicken.scm
@@ -45,8 +45,8 @@ (define %chicken-build-system-modules
,@%gnu-build-system-modules))
(define (default-chicken)
+ "Return the default Chicken package."
;; Lazily resolve the binding to avoid a circular dependency.
- ;; TODO is this actually needed in every build system?
(let ((chicken (resolve-interface '(gnu packages chicken))))
(module-ref chicken 'chicken)))
@@ -77,18 +77,32 @@ (define private-keywords
,@native-inputs))
(outputs outputs)
(build chicken-build)
- (arguments (strip-keyword-arguments private-keywords arguments)))))
+ (arguments
+ (substitute-keyword-arguments
+ (strip-keyword-arguments private-keywords arguments)
+ ((#:extra-directories extra-directories)
+ `(list ,@(append-map
+ (lambda (name)
+ (match (assoc name inputs)
+ ((_ pkg)
+ (match (package-transitive-propagated-inputs pkg)
+ (((propagated-names . _) ...)
+ (cons name propagated-names))))))
+ extra-directories))))))))
(define* (chicken-build name inputs
#:key
source
(phases '%standard-phases)
- (outputs '("out"))
+ (outputs '("out" "static"))
(search-paths '())
(egg-name "")
(unpack-path "")
(build-flags ''())
+ (configure-flags ''())
+ (extra-directories ''())
(tests? #t)
+ (parallel-build? #f)
(system (%current-system))
(guile #f)
(imported-modules %chicken-build-system-modules)
@@ -99,19 +113,23 @@ (define builder
(with-imported-modules imported-modules
#~(begin
(use-modules #$@(sexp->gexp modules))
- (chicken-build #:name #$name
- #:source #+source
- #:system #$system
- #:phases #$phases
- #:outputs #$(outputs->gexp outputs)
- #:search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- search-paths))
- #:egg-name #$egg-name
- #:unpack-path #$unpack-path
- #:build-flags #$build-flags
- #:tests? #$tests?
- #:inputs #$(input-tuples->gexp inputs)))))
+ #$(with-build-variables inputs-outputs
+ #~(chicken-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:phases #$phases
+ #:configure-flags #$configure-flags
+ #:extra-directories #$extra-directories
+ #:parallel-build? #$parallel-build?
+ #:outputs #$(outputs->gexp outputs)
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specification->sexp
+ search-paths))
+ #:egg-name #$egg-name
+ #:unpack-path #$unpack-path
+ #:build-flags #$build-flags
+ #:tests? #$tests?
+ #:inputs #$(input-tuples->gexp inputs))))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
diff --git a/guix/build/chicken-build-system.scm b/guix/build/chicken-build-system.scm
index 8f9f59cc25..6a4f0c43eb 100644
--- a/guix/build/chicken-build-system.scm
+++ b/guix/build/chicken-build-system.scm
@@ -42,13 +42,12 @@ (define (chicken-package? name)
(define* (setup-chicken-environment #:key inputs outputs #:allow-other-keys)
(setenv "CHICKEN_INSTALL_REPOSITORY"
- (string-concatenate
- ;; see TODO item about binary version above
- (append (list (assoc-ref outputs "out") "/var/lib/chicken/11/")
- (let ((oldenv (getenv "CHICKEN_INSTALL_REPOSITORY")))
- (if oldenv
- (list ":" oldenv)
- '())))))
+ (string-append (assoc-ref outputs "out") "/var/lib/chicken/11/"))
+ (setenv "CHICKEN_INSTALL_PREFIX"
+ (string-append (assoc-ref outputs "out") "/bin/"))
+ (setenv "CHICKEN_REPOSITORY_PATH"
+ (string-append (getenv "CHICKEN_REPOSITORY_PATH")
+ ":" (getenv "CHICKEN_INSTALL_REPOSITORY")))
(setenv "CHICKEN_EGG_CACHE" (getcwd))
#t)
@@ -104,10 +103,6 @@ (define* (check #:key egg-name tests? #:allow-other-keys)
;; there is no "-test-only" option, but we've already run install
;; so this just runs tests.
;; i think it's a fair assumption that phases won't be reordered.
- (setenv "CHICKEN_REPOSITORY_PATH"
- (string-append (getenv "CHICKEN_INSTALL_REPOSITORY")
- ":"
- (getenv "CHICKEN_REPOSITORY_PATH")))
(when tests?
(invoke "chicken-install" "-cached" "-test" "-no-install" egg-name)))
--
2.43.0
dziltener@HIDDEN:help-debbugs@HIDDEN.
Your message did not contain a Subject field. They are recommended and useful because the title of a $gBug is determined using this field. Please remember to include a Subject field in your messages in future.
Full text available.
help-debbugs@HIDDEN:bug#67934; Package debbugs.gnu.org.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.