cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make it clearer that some things relate to package derivations

Browse source 
Rather than derivations in general.
This commit is contained in:
Christopher Baines 2020-04-24 09:12:39 +01:00
parent a0263a0eae
commit 6fb3892712
3 changed files with 114 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

8
guix-data-service/model/derivation.scm
View file

@ -47,8 +47,8 @@
select-derivation-source-file-data-by-file-name-hash
select-derivation-by-output-filename
select-derivations-using-output
select-derivations-in-revision
search-derivations-in-revision
select-package-derivations-in-revision
search-package-derivations-in-revision
select-derivation-outputs-in-revision
fix-derivation-output-details-hash-encoding
select-derivations-by-revision-name-and-version
@ -186,7 +186,7 @@ ORDER BY derivations.system DESC,
query
(list revision-commit-hash name version))))
(define* (select-derivations-in-revision conn
(define* (select-package-derivations-in-revision conn
commit-hash
#:key
systems
@ -307,7 +307,7 @@ ORDER BY derivations.file_name
(list after-name)
'())))))
(define* (search-derivations-in-revision conn
(define* (search-package-derivations-in-revision conn
commit-hash
search-query
#:key

28
guix-data-service/web/revision/controller.scm
View file

@ -53,7 +53,7 @@
render-revision-lint-warnings
render-revision-package-version
render-revision-packages
render-revision-derivations
render-revision-package-derivations
render-unknown-revision
render-view-revision))
@ -163,7 +163,7 @@
(render-unknown-revision mime-types
conn
commit-hash)))
(('GET "revision" commit-hash "derivations")
(('GET "revision" commit-hash "package-derivations")
(if (guix-commit-exists? conn commit-hash)
(let ((parsed-query-parameters
(guard-against-mutually-exclusive-query-parameters
@ -181,7 +181,7 @@
(all_results ,parse-checkbox-value)))
'((limit_results all_results)))))
(render-revision-derivations mime-types
(render-revision-package-derivations mime-types
conn
commit-hash
parsed-query-parameters
@ -189,7 +189,7 @@
(render-unknown-revision mime-types
conn
commit-hash)))
(('GET "revision" commit-hash "derivation-outputs")
(('GET "revision" commit-hash "package-derivation-outputs")
(if (guix-commit-exists? conn commit-hash)
(let ((parsed-query-parameters
(guard-against-mutually-exclusive-query-parameters
@ -686,7 +686,7 @@
version-history-link)
#:extra-headers http-headers-for-unchanging-content)))))
(define* (render-revision-derivations mime-types
(define* (render-revision-package-derivations mime-types
conn
commit-hash
query-parameters
@ -695,7 +695,8 @@
(header-text
`("Revision " (samp ,commit-hash)))
(header-link
(string-append "/revision/" commit-hash)))
(string-append "/revision/"
commit-hash)))
(if (any-invalid-query-parameters? query-parameters)
(case (most-appropriate-mime-type
'(application/json text/html)
@ -705,7 +706,7 @@
`((error . "invalid query"))))
(else
(render-html
#:sxml (view-revision-derivations commit-hash
#:sxml (view-revision-package-derivations commit-hash
query-parameters
(valid-systems conn)
(valid-targets->options
@ -724,7 +725,7 @@
(assq-ref query-parameters 'search_query))
(derivations
(if search-query
(search-derivations-in-revision
(search-package-derivations-in-revision
conn
commit-hash
search-query
@ -734,7 +735,7 @@
#:minimum-builds (assq-ref query-parameters 'minimum_builds)
#:limit-results limit-results
#:after-name (assq-ref query-parameters 'after_name))
(select-derivations-in-revision
(select-package-derivations-in-revision
conn
commit-hash
#:systems (assq-ref query-parameters 'system)
@ -763,7 +764,8 @@
`()))
(else
(render-html
#:sxml (view-revision-derivations commit-hash
#:sxml (view-revision-package-derivations
commit-hash
query-parameters
(valid-systems conn)
(valid-targets->options
@ -794,7 +796,8 @@
`((error . "invalid query"))))
(else
(render-html
#:sxml (view-revision-derivation-outputs commit-hash
#:sxml (view-revision-package-derivation-outputs
commit-hash
query-parameters
'()
'()
@ -838,7 +841,8 @@
`()))
(else
(render-html
#:sxml (view-revision-derivation-outputs commit-hash
#:sxml (view-revision-package-derivation-outputs
commit-hash
query-parameters
derivation-outputs
build-server-urls

16
guix-data-service/web/revision/html.scm
View file

@ -33,8 +33,8 @@
view-revision-package-and-version
view-revision
view-revision-packages
view-revision-derivations
view-revision-derivation-outputs
view-revision-package-derivations
view-revision-package-derivation-outputs
view-revision-system-tests
view-revision-channel-instances
view-revision-builds
@ -462,10 +462,10 @@
lint-warning-counts))
(div
(@ (class "col-md-6"))
(h3 "Derivations")
(h3 "Package derivations")
(a (@ (class "pull-right")
(href ,(string-append path-base "/derivations")))
"View derivations")
(href ,(string-append path-base "/package-derivations")))
"View package derivations")
(table
(@ (class "table")
(style "white-space: nowrap;"))
@ -473,7 +473,7 @@
(tr
(th "System")
(th "Target")
(th "Derivations")))
(th "Count")))
(tbody
,@(map (match-lambda
((system target count)
@ -1042,7 +1042,7 @@ figure {
'("green" "red" "#d2d3d4"))))))))
output-consistency))))))
(define* (view-revision-derivations commit-hash
(define* (view-revision-package-derivations commit-hash
query-parameters
valid-systems
valid-targets
@ -1170,7 +1170,7 @@ figure {
"Next page")))
'())))))))
(define* (view-revision-derivation-outputs commit-hash
(define* (view-revision-package-derivation-outputs commit-hash
query-parameters
derivation-outputs
build-server-urls