aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2019-11-26 07:17:24 +0000
committerChristopher Baines <mail@cbaines.net>2019-11-26 07:17:24 +0000
commitaf1324855e1ecaf9b1dd7afcc714d09aaa38f081 (patch)
treed0b87c81d3ac7d76348f36d6886203f3745ad0a9
parent32e1fee7ea1902dc16444f640c27d998657517d7 (diff)
downloaddata-service-af1324855e1ecaf9b1dd7afcc714d09aaa38f081.tar
data-service-af1324855e1ecaf9b1dd7afcc714d09aaa38f081.tar.gz
Fix the JSON output for the derivation history page
-rw-r--r--guix-data-service/web/repository/controller.scm32
-rw-r--r--guix-data-service/web/repository/html.scm2
2 files changed, 17 insertions, 17 deletions
diff --git a/guix-data-service/web/repository/controller.scm b/guix-data-service/web/repository/controller.scm
index cdc89d6..45fd6bd 100644
--- a/guix-data-service/web/repository/controller.scm
+++ b/guix-data-service/web/repository/controller.scm
@@ -124,22 +124,22 @@
mime-types)
((application/json)
(render-json
- `((versions . ,(list->vector
- (map (match-lambda
- ((package-version derivation-file-name
- first-guix-revision-commit
- first-datetime
- last-guix-revision-commit
- last-datetime)
- `((version . ,package-version)
- (derivation . ,derivation-file-name)
- (first_revision
- . ((commit . ,first-guix-revision-commit)
- (datetime . ,first-datetime)))
- (last_revision
- . ((commit . ,last-guix-revision-commit)
- (datetime . ,last-datetime))))))
- package-versions))))))
+ `((derivations . ,(list->vector
+ (map (match-lambda
+ ((package-version derivation-file-name
+ first-guix-revision-commit
+ first-datetime
+ last-guix-revision-commit
+ last-datetime)
+ `((version . ,package-version)
+ (derivation . ,derivation-file-name)
+ (first_revision
+ . ((commit . ,first-guix-revision-commit)
+ (datetime . ,first-datetime)))
+ (last_revision
+ . ((commit . ,last-guix-revision-commit)
+ (datetime . ,last-datetime))))))
+ package-derivations))))))
(else
(render-html
#:sxml (view-branch-package-derivations
diff --git a/guix-data-service/web/repository/html.scm b/guix-data-service/web/repository/html.scm
index a504ee5..610af22 100644
--- a/guix-data-service/web/repository/html.scm
+++ b/guix-data-service/web/repository/html.scm
@@ -318,7 +318,7 @@
"/repository/" git-repository-id
"/branch/" branch-name
"/package/" package-name
- ".json")))
+ "/derivation-history.json")))
"View JSON")
(h1 (@ (style "white-space: nowrap;"))
(samp ,package-name))))