[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: Rename some derivation comparison procedures
|
From: |
Christopher Baines |
|
Subject: |
02/05: Rename some derivation comparison procedures |
|
Date: |
Sat, 31 Oct 2020 11:56:08 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository data-service.
commit c05cbd8438dac68c7454e5e79f0fefd1f39367f6
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sat Oct 31 13:52:08 2020 +0000
Rename some derivation comparison procedures
As they actually just relate to package derivations.
---
guix-data-service/web/compare/controller.scm | 16 ++++++++--------
guix-data-service/web/compare/html.scm | 28 ++++++++++++++--------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/guix-data-service/web/compare/controller.scm
b/guix-data-service/web/compare/controller.scm
index 9db338d..841f148 100644
--- a/guix-data-service/web/compare/controller.scm
+++ b/guix-data-service/web/compare/controller.scm
@@ -126,8 +126,8 @@
(build_status ,parse-build-status #:multi-value)))
'((base_commit base_datetime)
(target_commit target_datetime)))))
- (render-compare-by-datetime/derivations mime-types
- parsed-query-parameters)))
+ (render-compare-by-datetime/package-derivations mime-types
+
parsed-query-parameters)))
(('GET "compare" "packages")
(let* ((parsed-query-parameters
(parse-query-parameters
@@ -531,7 +531,7 @@
(with-thread-postgresql-connection
valid-targets)))
(render-html
- #:sxml (compare/derivations
+ #:sxml (compare/package-derivations
query-parameters
systems
(valid-targets->options targets)
@@ -576,7 +576,7 @@
(with-thread-postgresql-connection
valid-targets)))
(render-html
- #:sxml (compare/derivations
+ #:sxml (compare/package-derivations
query-parameters
systems
(valid-targets->options targets)
@@ -584,8 +584,8 @@
derivation-changes)
#:extra-headers
http-headers-for-unchanging-content)))))))))))
-(define (render-compare-by-datetime/derivations mime-types
- query-parameters)
+(define (render-compare-by-datetime/package-derivations mime-types
+ query-parameters)
(define (derivations->alist derivations)
(map (match-lambda
((file-name system target buildstatus)
@@ -606,7 +606,7 @@
'((error . "invalid query"))))
(else
(render-html
- #:sxml (compare-by-datetime/derivations
+ #:sxml (compare-by-datetime/package-derivations
query-parameters
(parallel-via-thread-pool-channel
(with-thread-postgresql-connection valid-systems))
@@ -663,7 +663,7 @@
#:extra-headers http-headers-for-unchanging-content))
(else
(render-html
- #:sxml (compare-by-datetime/derivations
+ #:sxml (compare-by-datetime/package-derivations
query-parameters
(parallel-via-thread-pool-channel
(with-thread-postgresql-connection
valid-systems))
diff --git a/guix-data-service/web/compare/html.scm
b/guix-data-service/web/compare/html.scm
index 97dce70..50962b8 100644
--- a/guix-data-service/web/compare/html.scm
+++ b/guix-data-service/web/compare/html.scm
@@ -25,8 +25,8 @@
#:use-module (guix-data-service web view html)
#:export (compare
compare/derivation
- compare/derivations
- compare-by-datetime/derivations
+ compare/package-derivations
+ compare-by-datetime/package-derivations
compare/packages
compare-invalid-parameters))
@@ -598,11 +598,11 @@
target-value))))))))))))
environment-variables))))))))))
-(define (compare/derivations query-parameters
- valid-systems
- valid-targets
- valid-build-statuses
- derivation-changes)
+(define (compare/package-derivations query-parameters
+ valid-systems
+ valid-targets
+ valid-build-statuses
+ derivation-changes)
(layout
#:body
`(,(header)
@@ -760,12 +760,12 @@
(cdr data-columns))))))
(vector->list derivation-changes)))))))))))
-(define (compare-by-datetime/derivations query-parameters
- valid-systems
- valid-build-statuses
- base-revision-details
- target-revision-details
- derivation-changes)
+(define (compare-by-datetime/package-derivations query-parameters
+ valid-systems
+ valid-build-statuses
+ base-revision-details
+ target-revision-details
+ derivation-changes)
(layout
#:body
`(,(header)
@@ -832,7 +832,7 @@
(href ,(let ((query-parameter-string
(query-parameters->string query-parameters)))
(string-append
- "/compare/derivations.json"
+ "/compare/package-derivations.json"
(if (string-null? query-parameter-string)
""
(string-append "?" query-parameter-string))))))