tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

Revert "build-system: node: Rewrite modify-json."

Browse Source 
This reverts commit dff01d4eb12016435b8fb8878294b79b25b3bf4a. The #:file
keyword argument was still part of the rest arguments, which lead to custom
file arguments being called as functions due to the `apply compose'.

Change-Id: I91d6b576adb7ebb5af6a584e999248b5cc410f6a
This commit is contained in:
Jelle Licht
2026-03-16 15:45:49 +01:00
parent e095512494
commit a4a3fe08c1
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
guix/build/node-build-system.scm
View File

@@ -55,11 +55,24 @@ to be written as json to the replacement FILE."
(lambda (in out)
(scm->json (proc (json->scm in)) out))))
(define* (modify-json #:key (file "package.json") #:rest modifications)
(define* (modify-json #:key (file "package.json") #:rest all-arguments)
"Provide package.json modifying callbacks such as (delete-dependencies ...)"
(with-atomic-json-file-replacement
(apply compose modifications)
file))
(let
(
(modifications
(let loop ((arguments all-arguments))
(cond
((null? arguments) '())
((keyword? (car arguments)) (loop (cddr arguments)))
(else (cons (car arguments) (loop (cdr arguments))))))))
(with-atomic-json-file-replacement
(lambda (package)
(fold
(lambda (modification package)
(modification package))
package
modifications))
file)))
(define (delete-dependencies dependencies-to-remove)
"Rewrite 'package.json' to allow the build to proceed without packages