nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Ludovic Courtès 2019-03-29 22:49:00 +01:00
parent d2be7e3c4b
commit adb6462c4c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/gnucash.scm
View File

@ -27,7 +27,6 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module ((guix records) #:select (this-record))
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
@ -165,14 +164,14 @@
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (package-inputs this-record))) (assoc l (package-inputs this-package)))
'("perl-finance-quote" '("perl-finance-quote"
"perl-date-manip")))) "perl-date-manip"))))
(list (list
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (package-inputs this-record))) (assoc l (package-inputs this-package)))
'("perl-finance-quote"))))))))) '("perl-finance-quote")))))))))
'("gnucash" '("gnucash"
"gnc-fq-check" "gnc-fq-check"

5
gnu/packages/version-control.scm
View File

@ -51,7 +51,6 @@
#:use-module (guix build-system haskell) #:use-module (guix build-system haskell)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module ((guix records) #:select (this-record))
#:use-module (gnu packages apr) #:use-module (gnu packages apr)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
@ -409,7 +408,7 @@ as well as the classic centralized workflow.")
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (package-inputs this-record))) (assoc l (package-inputs this-package)))
'("perl-authen-sasl" '("perl-authen-sasl"
"perl-net-smtp-ssl" "perl-net-smtp-ssl"
"perl-io-socket-ssl"))))))) "perl-io-socket-ssl")))))))
@ -422,7 +421,7 @@ as well as the classic centralized workflow.")
,@(transitive-input-references ,@(transitive-input-references
'inputs 'inputs
(map (lambda (l) (map (lambda (l)
(assoc l (package-inputs this-record))) (assoc l (package-inputs this-package)))
'("perl-cgi"))))))) '("perl-cgi")))))))
;; Tell 'git-submodule' where Perl is. ;; Tell 'git-submodule' where Perl is.

4
guix/packages.scm
View File

@ -48,6 +48,7 @@
search-path-specification) ;for convenience search-path-specification) ;for convenience
#:export (origin #:export (origin
origin? origin?
this-origin
origin-uri origin-uri
origin-method origin-method
origin-sha256 origin-sha256
@ -63,6 +64,7 @@
package package
package? package?
this-package
package-name package-name
package-upstream-name package-upstream-name
package-version package-version
@ -156,6 +158,7 @@
(define-record-type* <origin> (define-record-type* <origin>
origin make-origin origin make-origin
origin? origin?
this-origin
(uri origin-uri) ; string (uri origin-uri) ; string
(method origin-method) ; procedure (method origin-method) ; procedure
(sha256 origin-sha256) ; bytevector (sha256 origin-sha256) ; bytevector
@ -247,6 +250,7 @@ name of its URI."
(define-record-type* <package> (define-record-type* <package>
package make-package package make-package
package? package?
this-package
(name package-name) ; string (name package-name) ; string
(version package-version) ; string (version package-version) ; string
(source package-source) ; <origin> instance (source package-source) ; <origin> instance