[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: packages: Define 'this-package' and 'this-origin'.
From: |
guix-commits |
Subject: |
02/03: packages: Define 'this-package' and 'this-origin'. |
Date: |
Sat, 30 Mar 2019 06:08:49 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit adb6462c4ce51fcdc94d3608ad6efb4adf716018
Author: Ludovic Courtès <address@hidden>
Date: Fri Mar 29 22:49:00 2019 +0100
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.
---
gnu/packages/gnucash.scm | 5 ++---
gnu/packages/version-control.scm | 5 ++---
guix/packages.scm | 4 ++++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 342df65..5b4da97 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -27,7 +27,6 @@
#: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 @@
,@(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"
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index fe9b64b..667b288 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -51,7 +51,6 @@
#: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 @@ as well as the classic centralized workflow.")
,@(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 @@ as well as the classic centralized workflow.")
,@(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.
diff --git a/guix/packages.scm b/guix/packages.scm
index 9d83de3..b402637 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -48,6 +48,7 @@
search-path-specification) ;for convenience
#:export (origin
origin?
+ this-origin
origin-uri
origin-method
origin-sha256
@@ -63,6 +64,7 @@
package
package?
+ this-package
package-name
package-upstream-name
package-version
@@ -156,6 +158,7 @@
(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 @@ name of its URI."
(define-record-type* <package>
package make-package
package?
+ this-package
(name package-name) ; string
(version package-version) ; string
(source package-source) ; <origin> instance