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

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

@ -47,8 +47,8 @@
select-derivation-source-file-data-by-file-name-hash select-derivation-source-file-data-by-file-name-hash
select-derivation-by-output-filename select-derivation-by-output-filename
select-derivations-using-output select-derivations-using-output
select-derivations-in-revision select-package-derivations-in-revision
search-derivations-in-revision search-package-derivations-in-revision
select-derivation-outputs-in-revision select-derivation-outputs-in-revision
fix-derivation-output-details-hash-encoding fix-derivation-output-details-hash-encoding
select-derivations-by-revision-name-and-version select-derivations-by-revision-name-and-version
@ -186,15 +186,15 @@ ORDER BY derivations.system DESC,
query query
(list revision-commit-hash name version)))) (list revision-commit-hash name version))))
(define* (select-derivations-in-revision conn (define* (select-package-derivations-in-revision conn
commit-hash commit-hash
#:key #:key
systems systems
targets targets
minimum-builds minimum-builds
maximum-builds maximum-builds
limit-results limit-results
after-name) after-name)
(define criteria (define criteria
(string-join (string-join
`(,@(filter-map `(,@(filter-map
@ -307,16 +307,16 @@ ORDER BY derivations.file_name
(list after-name) (list after-name)
'()))))) '())))))
(define* (search-derivations-in-revision conn (define* (search-package-derivations-in-revision conn
commit-hash commit-hash
search-query search-query
#:key #:key
systems systems
targets targets
minimum-builds minimum-builds
maximum-builds maximum-builds
limit-results limit-results
after-name) after-name)
(define criteria (define criteria
(string-join (string-join
`(,@(filter-map `(,@(filter-map

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

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

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

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