mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
packages: Define 'this-package' and 'this-origin'.
* guix/packages.scm (<origin>): Choose 'this-origin' as the 'this' identifier. (<package>): Choose 'this-package'. * gnu/packages/gnucash.scm (gnucash)[arguments]: Use 'this-package' instead of 'this-record'. * gnu/packages/version-control.scm (git)[arguments]: Likewise.
This commit is contained in:
parent
d2be7e3c4b
commit
adb6462c4c
3 changed files with 8 additions and 6 deletions
|
@ -27,7 +27,6 @@ (define-module (gnu packages gnucash)
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module ((guix records) #:select (this-record))
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
|
@ -165,14 +164,14 @@ (define-public gnucash
|
|||
,@(transitive-input-references
|
||||
'inputs
|
||||
(map (lambda (l)
|
||||
(assoc l (package-inputs this-record)))
|
||||
(assoc l (package-inputs this-package)))
|
||||
'("perl-finance-quote"
|
||||
"perl-date-manip"))))
|
||||
(list
|
||||
,@(transitive-input-references
|
||||
'inputs
|
||||
(map (lambda (l)
|
||||
(assoc l (package-inputs this-record)))
|
||||
(assoc l (package-inputs this-package)))
|
||||
'("perl-finance-quote")))))))))
|
||||
'("gnucash"
|
||||
"gnc-fq-check"
|
||||
|
|
|
@ -51,7 +51,6 @@ (define-module (gnu packages version-control)
|
|||
#:use-module (guix build-system haskell)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module ((guix records) #:select (this-record))
|
||||
#:use-module (gnu packages apr)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages documentation)
|
||||
|
@ -409,7 +408,7 @@ (define-public git
|
|||
,@(transitive-input-references
|
||||
'inputs
|
||||
(map (lambda (l)
|
||||
(assoc l (package-inputs this-record)))
|
||||
(assoc l (package-inputs this-package)))
|
||||
'("perl-authen-sasl"
|
||||
"perl-net-smtp-ssl"
|
||||
"perl-io-socket-ssl")))))))
|
||||
|
@ -422,7 +421,7 @@ (define-public git
|
|||
,@(transitive-input-references
|
||||
'inputs
|
||||
(map (lambda (l)
|
||||
(assoc l (package-inputs this-record)))
|
||||
(assoc l (package-inputs this-package)))
|
||||
'("perl-cgi")))))))
|
||||
|
||||
;; Tell 'git-submodule' where Perl is.
|
||||
|
|
|
@ -48,6 +48,7 @@ (define-module (guix packages)
|
|||
search-path-specification) ;for convenience
|
||||
#:export (origin
|
||||
origin?
|
||||
this-origin
|
||||
origin-uri
|
||||
origin-method
|
||||
origin-sha256
|
||||
|
@ -63,6 +64,7 @@ (define-module (guix packages)
|
|||
|
||||
package
|
||||
package?
|
||||
this-package
|
||||
package-name
|
||||
package-upstream-name
|
||||
package-version
|
||||
|
@ -156,6 +158,7 @@ (define-module (guix packages)
|
|||
(define-record-type* <origin>
|
||||
origin make-origin
|
||||
origin?
|
||||
this-origin
|
||||
(uri origin-uri) ; string
|
||||
(method origin-method) ; procedure
|
||||
(sha256 origin-sha256) ; bytevector
|
||||
|
@ -247,6 +250,7 @@ (define %hydra-supported-systems
|
|||
(define-record-type* <package>
|
||||
package make-package
|
||||
package?
|
||||
this-package
|
||||
(name package-name) ; string
|
||||
(version package-version) ; string
|
||||
(source package-source) ; <origin> instance
|
||||
|
|
Loading…
Reference in a new issue