amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/asdf: Fix package transform.

Browse source 
* guix/build-system/asdf.scm (package-with-build-system):
  [find-input-package]: New function.
  [rewrite]: Use it.
This commit is contained in:
Guillaume Le Vaillant 2019-10-17 16:43:09 +02:00 • committed by Pierre Neidhardt
parent f733862cc9
commit 5cace974a4
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
guix/build-system/asdf.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -32,6 +33,7 @@
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (gnu packages)
#:export (%asdf-build-system-modules #:export (%asdf-build-system-modules
%asdf-build-modules %asdf-build-modules
asdf-build asdf-build
@ -160,13 +162,22 @@ set up using CL source package conventions."
(define (has-from-build-system? pkg) (define (has-from-build-system? pkg)
(eq? from-build-system (package-build-system pkg))) (eq? from-build-system (package-build-system pkg)))
(define (find-input-package pkg)
(let* ((name (package-name pkg))
(new-name (transform-package-name name))
(pkgs (find-packages-by-name new-name)))
(if (null? pkgs) #f (list-ref pkgs 0))))
(define transform (define transform
(mlambda (pkg) (mlambda (pkg)
(define rewrite (define rewrite
(match-lambda (match-lambda
((name content . rest) ((name content . rest)
(let* ((is-package? (package? content)) (let* ((is-package? (package? content))
(new-content (if is-package? (transform content) content))) (new-content (if is-package?
(or (find-input-package content)
(transform content))
content)))
`(,name ,new-content ,@rest))))) `(,name ,new-content ,@rest)))))
;; Special considerations for source packages: CL inputs become ;; Special considerations for source packages: CL inputs become