mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Move PACKAGES-WITH-*PATCHES to (guix packages)

Browse source 
* gnu/packages/cross-base.scm (package-with-extra-patches,
package-with-patches): Move procedures from here...
* guix/packages.scm (package-with-extra-patches, package-with-patches):
...to here, and export.
This commit is contained in:
Carl Dong 2020-04-06 14:02:42 -04:00
parent 8a4608b4bf
commit b066c25026
No known key found for this signature in database
GPG key ID: 0CC52153197991A5
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/cross-base.scm
View file

@ -70,18 +70,6 @@ (define (cross p target)
`(cons ,(string-append "--target=" target) `(cons ,(string-append "--target=" target)
,flags)))))) ,flags))))))
(define (package-with-patches original patches)
"Return package ORIGINAL with PATCHES applied."
(package (inherit original)
(source (origin (inherit (package-source original))
(patches patches)))))
(define (package-with-extra-patches original patches)
"Return package ORIGINAL with all PATCHES appended to its list of patches."
(package-with-patches original
(append (origin-patches (package-source original))
patches)))
(define (cross-binutils target) (define (cross-binutils target)
"Return a cross-Binutils for TARGET." "Return a cross-Binutils for TARGET."
(let ((binutils (package (inherit binutils) (let ((binutils (package (inherit binutils)

14
guix/packages.scm
View file

@ -111,6 +111,8 @@ (define-module (guix packages)
package-output package-output
package-grafts package-grafts
package-patched-vulnerabilities package-patched-vulnerabilities
package-with-patches
package-with-extra-patches
package/inherit package/inherit
transitive-input-references transitive-input-references
@ -654,6 +656,18 @@ (define (first-file directory)
#:properties `((type . origin) #:properties `((type . origin)
(patches . ,(length patches))))))) (patches . ,(length patches)))))))
(define (package-with-patches original patches)
"Return package ORIGINAL with PATCHES applied."
(package (inherit original)
(source (origin (inherit (package-source original))
(patches patches)))))
(define (package-with-extra-patches original patches)
"Return package ORIGINAL with all PATCHES appended to its list of patches."
(package-with-patches original
(append (origin-patches (package-source original))
patches)))
(define (transitive-inputs inputs) (define (transitive-inputs inputs)
"Return the closure of INPUTS when considering the 'propagated-inputs' "Return the closure of INPUTS when considering the 'propagated-inputs'
edges. Omit duplicate inputs, except for those already present in INPUTS edges. Omit duplicate inputs, except for those already present in INPUTS