branch master updated (eb5ece7 -> 8eb49ec)
kkebreau pushed a change to branch master in repository guix. from eb5ece7 gnu: openbabel: Fix crash when opening NWChem output files. new 8eb49ec gnu: minetest: Update to 0.4.17. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/games.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-)
01/01: gnu: minetest: Update to 0.4.17.
kkebreau pushed a commit to branch master
in repository guix.
commit 8eb49ec52754ac7ab0a67588d79dfd99817cd135
Author: Kei Kebreau
Date: Sat Jul 21 23:00:57 2018 -0400
gnu: minetest: Update to 0.4.17.
* gnu/packages/games.scm (minetest-data, minetest): Update to 0.4.17.
---
gnu/packages/games.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ca86703..ab1e3fd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1575,7 +1575,7 @@ match, cannon keep, and grave-itation pit.")
(define minetest-data
(package
(name "minetest-data")
-(version "0.4.16")
+(version "0.4.17")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1584,7 +1584,7 @@ match, cannon keep, and grave-itation pit.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
-"0nibpm600rbv9dg1zgcsl5grlbqx0b5l6cg1lp6sqkwvjialb4ga"
+"0pa9skjwbq27aky6dgr7g3mb0a7c5rpa6xmz2qh0nm618z5hgazh"
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)
@@ -1617,7 +1617,7 @@ match, cannon keep, and grave-itation pit.")
(define-public minetest
(package
(name "minetest")
-(version "0.4.16")
+(version "0.4.17")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1626,7 +1626,7 @@ match, cannon keep, and grave-itation pit.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
-"0mbnf1ma4gsw9ah68ply04059xkfx5psdxwalxp78sgmx4ypkwqf"
+"0wpbad5bssbbgspgdcq3hhq4bhckrj53nhymsz34d8g01j0csr46"
(build-system cmake-build-system)
(arguments
'(#:configure-flags
01/01: gnu: openbabel: Fix crash when opening NWChem output files.
kkebreau pushed a commit to branch master
in repository guix.
commit eb5ece73a84439d21219a802c0dcb88d54046371
Author: Kei Kebreau
Date: Sat Jul 21 12:47:34 2018 -0400
gnu: openbabel: Fix crash when opening NWChem output files.
* gnu/packages/patches/openbabel-fix-crash-on-nwchem-output.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/chemistry.scm (openbabel)[source]: Use it.
---
gnu/local.mk | 1 +
gnu/packages/chemistry.scm | 4 ++-
.../openbabel-fix-crash-on-nwchem-output.patch | 34 ++
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e55c2bf..8ad81e6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -979,6 +979,7 @@ dist_patch_DATA =
\
%D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch \
%D%/packages/patches/omake-fix-non-determinism.patch \
%D%/packages/patches/ola-readdir-r.patch \
+ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \
%D%/packages/patches/opencascade-oce-glibc-2.26.patch\
%D%/packages/patches/openblas-fix-tests-i686.patch \
%D%/packages/patches/openexr-missing-samples.patch \
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index a81c14b..418b4be 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -213,7 +213,9 @@ NumPy < 1.9.")
version "/" name "-" version ".tar.gz"))
(sha256
(base32
-"1z3d6xm70dpfikhwdnbzc66j2l49vq105ch041wivrfz5ic3ch90"
+"1z3d6xm70dpfikhwdnbzc66j2l49vq105ch041wivrfz5ic3ch90"))
+ (patches
+ (search-patches "openbabel-fix-crash-on-nwchem-output.patch"
(build-system cmake-build-system)
(arguments
`(#:configure-flags
diff --git a/gnu/packages/patches/openbabel-fix-crash-on-nwchem-output.patch
b/gnu/packages/patches/openbabel-fix-crash-on-nwchem-output.patch
new file mode 100644
index 000..879df02
--- /dev/null
+++ b/gnu/packages/patches/openbabel-fix-crash-on-nwchem-output.patch
@@ -0,0 +1,34 @@
+From 52cea818bf68f8a2d3c48d55d00c2f8b7da25e4c Mon Sep 17 00:00:00 2001
+From: Daniel Hogan
+Date: Tue, 28 Mar 2017 22:21:18 -0600
+Subject: [PATCH] Remove delete statement.
+
+When from_scratch is true, coordinates is not allocated. A separate if
+statement was added to handle the case when from_scratch is true that
+does not try to free coordinates.
+---
+ src/formats/nwchemformat.cpp | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/formats/nwchemformat.cpp b/src/formats/nwchemformat.cpp
+index 6f625ad5b..79298555f 100644
+--- a/src/formats/nwchemformat.cpp
b/src/formats/nwchemformat.cpp
+@@ -232,11 +232,14 @@ static const char* OPTIMIZATION_END_PATTERN = "
Optimization converged";
+ break;
+ tokenize(vs,buffer);
+ }
+-if ((from_scratch)||(i != natoms))
+- {
++if (from_scratch)
++{
++return;
++}
++if (i != natoms) {
+ delete[] coordinates;
+ return;
+- }
++}
+ molecule->AddConformer(coordinates);
+ }
+
branch master updated (889e7fa -> eb5ece7)
kkebreau pushed a change to branch master in repository guix. from 889e7fa gnu: youtube-dl: Update to 2018.07.10. new eb5ece7 gnu: openbabel: Fix crash when opening NWChem output files. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/local.mk | 1 + gnu/packages/chemistry.scm | 4 ++- .../openbabel-fix-crash-on-nwchem-output.patch | 34 ++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openbabel-fix-crash-on-nwchem-output.patch
branch master updated (e435101 -> 889e7fa)
lfam pushed a change to branch master in repository guix. from e435101 gnu: calibre: Update to 3.28.0. new 889e7fa gnu: youtube-dl: Update to 2018.07.10. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: youtube-dl: Update to 2018.07.10.
lfam pushed a commit to branch master in repository guix. commit 889e7fab3c04be98a59b880bf44fbdaa6ddf0a4e Author: Björn Höfling Date: Sat Jul 21 10:34:09 2018 +0200 gnu: youtube-dl: Update to 2018.07.10. * gnu/packages/video.scm (youtube-dl): Update to 2018.07.10. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9419ef8..7bf4e43 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1225,7 +1225,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") -(version "2018.06.19") +(version "2018.07.10") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/; @@ -1233,7 +1233,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 -"0ys2mc84r7mjpn7rykb57sn3ii1kp3divjdn2ivwqknj8jrzg3z6" +"1rigah941k2drzx5qz937lk68gw9jrizj5lgd9f9znp0bgi2d0xd" (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion
branch master updated (56e5339 -> e435101)
andreas pushed a change to branch master in repository guix. from 56e5339 gnu: libgaiagraphics: Fix typo. new e435101 gnu: calibre: Update to 3.28.0. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
01/01: gnu: calibre: Update to 3.28.0.
andreas pushed a commit to branch master in repository guix. commit e4351015ec5c4f74a66aed2e16931cf74c4d5830 Author: Andreas Enge Date: Sat Jul 21 19:24:14 2018 +0200 gnu: calibre: Update to 3.28.0. * gnu/packages/ebook.scm (calibre): Update to 3.28.0. --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index bf4b6a7..a78e3e8 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -75,7 +75,7 @@ (define-public calibre (package (name "calibre") -(version "3.17.0") +(version "3.28.0") (source (origin (method url-fetch) @@ -84,7 +84,7 @@ version ".tar.xz")) (sha256 (base32 - "1w6hw1s0d4daa4q2ykzhxdndiq61l8z7ls7rxh7k7p62ia0i5sxp")) + "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils)))
branch web-interface created (now 6a540b1)
tsholokhova pushed a change to branch web-interface. at 6a540b1 Add web-interface. This branch includes the following new commits: new 80030d9 Add static files. new 6a540b1 Add web-interface.
[no subject]
branch: web-interface
commit 6a540b1ad4716525f5671251d4e54965e642415f
Author: TSholokhova
Date: Sat Jul 21 15:39:10 2018 +0200
Add web-interface.
Add basic HTML templates, main and specification builds pages.
* src/cuirass/templates.scm: New file. Add main page template. Add
builds tables (latest and queue). Add hyperref from the main page to the builds
pages.
* Makefile.am (dist_pkgmodule_DATA): Add it.
* src/cuirass/http.scm (url-handler): Add handler for “status”
endpoint. (%static-directory, file-mime-types): New variables. (url-handler):
Add handler for “/status/”; add handler for static files.
Implement first feature. Add bootstrap style.
* src/cuirass/templates.scm: Bootstrap based html templates. New
functions: evaluation-info-table, build-eval-table, pagination.
* src/cuirass/database.scm: Add new requests to database:
db-get-evaluations-info, db-get-evaluations-count. Add evaluation filter to
db-get-builds.
* src/cuirass/http.scm (url-handler): Change "status" endpoint to
"/". Add endpoints: ("jobset" name), ("eval" id).
Change HTML5 to XHTML. Fix codestyle.
* src/cuirass/http.scm (respond-html): Add XHTML preamble and
content-type.
* src/cuirass/templates.scm (html-page): Add XHTML preamble; fix
codestyle.
* src/cuirass/database.scm: Fix codestyle.
Add white-list.
* src/cuirass/http.scm (respond-static-file, file-white-list): Add
white list check.
Update id pagination.
* src/cuirass/http.scm: Change parameters.
* src/cuirass/templates.scm: Fix pagination function. Added min and
max functions for lists.
* src/cuirass/database.scm: Add borders parameters to evaluation
request.
Update id pagination (previous+last buttons).
* src/cuirass/templates.scm: Add buttons for pagination.
* src/cuirass/database.scm(db-get-evaluations-build-summary):
Implement different order for low and high borders.
Add pagination for each evaluation page.
* src/cuirass/templates.scm (build-eval-table): Add pagination.
* src/cuirass/database.scm: Add border filters for pagination in
db-get-builds. Add functions for searching max and min stoptimes.
* src/cuirass/http.scm: Add pagination parameters in "eval" query.
Fix codestyle.
* src/cuirass/templates.scm: Fix codestyle.
* src/cuirass/database.scm: Fix codestyle.
* src/cuirass/http.scm: Fix codestyle.
* tests/database.scm: Fix test.
* Makefile.am: Add static files paths.
---
Makefile.am | 19 +-
src/cuirass/database.scm | 149 +++-
src/cuirass/http.scm | 153 -
src/cuirass/templates.scm | 171 ++
tests/database.scm| 2 +-
5 files changed, 443 insertions(+), 51 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d372b9e..ed38317 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,10 @@ pkgmoduledir = $(guilesitedir)/$(PACKAGE)
pkgobjectdir = $(guileobjectdir)/$(PACKAGE)
webmoduledir = $(guilesitedir)/web/server
webobjectdir = $(guileobjectdir)/web/server
+staticdir = $(pkgdatadir)/static
+cssdir = $(staticdir)/css
+fontsdir = $(staticdir)/fonts
+imagesdir = $(staticdir)/images
dist_pkgmodule_DATA = \
src/cuirass/base.scm \
@@ -39,7 +43,8 @@ dist_pkgmodule_DATA = \
src/cuirass/http.scm \
src/cuirass/logging.scm \
src/cuirass/ui.scm \
- src/cuirass/utils.scm
+ src/cuirass/utils.scm \
+ src/cuirass/templates.scm
nodist_pkgmodule_DATA = \
src/cuirass/config.scm
@@ -56,6 +61,18 @@ nodist_webobject_DATA = \
dist_pkgdata_DATA = src/schema.sql
+dist_css_DATA =\
+ src/static/css/bootstrap.css \
+ src/static/css/open-iconic-bootstrap.css
+dist_fonts_DATA = \
+ src/static/fonts/open-iconic.eot \
+ src/static/fonts/open-iconic.otf \
+ src/static/fonts/open-iconic.svg \
+ src/static/fonts/open-iconic.ttf \
+ src/static/fonts/open-iconic.woff
+dist_images_DATA = \
+ src/static/images/logo.png
+
TEST_EXTENSIONS = .scm .sh
AM_TESTS_ENVIRONMENT = \
env GUILE_AUTO_COMPILE='0' \
diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm
index a1398bc..dda808c 100644
--- a/src/cuirass/database.scm
+++ b/src/cuirass/database.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016, 2017 Mathieu Lirzin
;;; Copyright © 2017 Mathieu Othacehe
;;; Copyright © 2018 Ludovic Courtès
+;;;
branch web-interface deleted (was 417c7ef)
tsholokhova pushed a change to branch web-interface. was 417c7ef Fix codestyle. * src/cuirass/templates.scm: Fix codestyle. * src/cuirass/database.scm: Fix codestyle. * src/cuirass/http.scm: Fix codestyle. * tests/database.scm: Fix test. * Makefile.am: Add static files paths. This change permanently discards the following revisions: discards 417c7ef Fix codestyle. * src/cuirass/templates.scm: Fix codestyle. * src/cuirass/database.scm: Fix codestyle. * src/cuirass/http.scm: Fix codestyle. * tests/database.scm: Fix test. * Makefile.am: Add static files paths. discards c31a5d3 Add pagination for each evaluation page. discards 643f25f Update id pagination (previous+last buttons). * src/cuirass/templates.scm: Add buttons for pagination. * src/cuirass/database.scm(db-get-evaluations-build-summary): Implement different order for low and high borders. discards 5d61dea Update id pagination. discards 450c6bb Add white-list. discards ac0fd3c Change HTML5 to XHTML. Fix codestyle. discards 7091f46 Implement first feature. Add bootstrap style. discards 8e31e6f Add basic HTML templates, main and specification builds pages.
web-interface updated (c31a5d3 -> 417c7ef)
tsholokhova pushed a change to branch web-interface. from c31a5d3 Add pagination for each evaluation page. new 417c7ef Fix codestyle. * src/cuirass/templates.scm: Fix codestyle. * src/cuirass/database.scm: Fix codestyle. * src/cuirass/http.scm: Fix codestyle. * tests/database.scm: Fix test. * Makefile.am: Add static files paths. Summary of changes: Makefile.am | 16 + src/cuirass/database.scm | 151 +++--- src/cuirass/http.scm | 114 -- src/cuirass/templates.scm | 106 +++- tests/database.scm| 2 +- 5 files changed, 179 insertions(+), 210 deletions(-)
[no subject]
branch: web-interface
commit 417c7eff906ac211891d35557c31cafa213f5c17
Author: TSholokhova
Date: Sat Jul 21 15:19:32 2018 +0200
Fix codestyle.
* src/cuirass/templates.scm: Fix codestyle.
* src/cuirass/database.scm: Fix codestyle.
* src/cuirass/http.scm: Fix codestyle.
* tests/database.scm: Fix test.
* Makefile.am: Add static files paths.
---
Makefile.am | 16 +
src/cuirass/database.scm | 151 +++---
src/cuirass/http.scm | 114 --
src/cuirass/templates.scm | 106 +++-
tests/database.scm| 2 +-
5 files changed, 179 insertions(+), 210 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 75848ef..ed38317 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,10 @@ pkgmoduledir = $(guilesitedir)/$(PACKAGE)
pkgobjectdir = $(guileobjectdir)/$(PACKAGE)
webmoduledir = $(guilesitedir)/web/server
webobjectdir = $(guileobjectdir)/web/server
+staticdir = $(pkgdatadir)/static
+cssdir = $(staticdir)/css
+fontsdir = $(staticdir)/fonts
+imagesdir = $(staticdir)/images
dist_pkgmodule_DATA = \
src/cuirass/base.scm \
@@ -57,6 +61,18 @@ nodist_webobject_DATA = \
dist_pkgdata_DATA = src/schema.sql
+dist_css_DATA =\
+ src/static/css/bootstrap.css \
+ src/static/css/open-iconic-bootstrap.css
+dist_fonts_DATA = \
+ src/static/fonts/open-iconic.eot \
+ src/static/fonts/open-iconic.otf \
+ src/static/fonts/open-iconic.svg \
+ src/static/fonts/open-iconic.ttf \
+ src/static/fonts/open-iconic.woff
+dist_images_DATA = \
+ src/static/images/logo.png
+
TEST_EXTENSIONS = .scm .sh
AM_TESTS_ENVIRONMENT = \
env GUILE_AUTO_COMPILE='0' \
diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm
index 37494da..dda808c 100644
--- a/src/cuirass/database.scm
+++ b/src/cuirass/database.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2016, 2017 Mathieu Lirzin
;;; Copyright © 2017 Mathieu Othacehe
;;; Copyright © 2018 Ludovic Courtès
+;;; Copyright © 2018 Tatiana Sholokhova
;;;
;;; This file is part of Cuirass.
;;;
@@ -55,6 +56,7 @@
read-sql-file
read-quoted-string
sqlite-exec
+assqx-ref
;; Parameters.
%package-database
%package-schema-file
@@ -382,21 +384,21 @@ log file for DRV."
(#:outputs. ,(db-get-outputs db id))
(#:branch . ,branch)
+;; XXX Change caller and remove
+(define (assqx-ref filters key)
+ (match filters
+(()
+ #f)
+(((xkey xvalue) rest ...)
+ (if (eq? key xkey)
+ xvalue
+ (assqx-ref rest key)
+
(define (db-get-builds db filters)
"Retrieve all builds in database DB which are matched by given FILTERS.
FILTERS is an assoc list which possible keys are 'project | 'jobset | 'job |
'system | 'nr | 'order | 'status | 'evaluation "
- ;; XXX Change caller and remove
- (define (assqx-ref filters key)
-(match filters
- (()
- #f)
- (((xkey xvalue) rest ...)
- (if (eq? key xkey)
- xvalue
- (assqx-ref rest key)
-
(define (format-output name path)
`(,name . ((#:path . ,path
@@ -454,12 +456,11 @@ Assumes that if group id stays the same the group headers
stay the same."
(let ((outputs (cons-output x-output-name x-output-path outputs)))
(collect-outputs repeated-builds-id repeated-row outputs rest)))
((#(x-builds-id x-output-name x-output-path other-cells ...) . rest)
- (cons (finish-group) ;finish current group
-
+ (cons (finish-group);finish current group
;; Start new group.
(let* ((outputs (cons-output x-output-name x-output-path '()))
(x-repeated-row (list->vector other-cells)))
- (collect-outputs x-builds-id x-repeated-row outputs rest))
+ (collect-outputs x-builds-id x-repeated-row outputs
rest))
(define (group-outputs rows)
(match rows
@@ -468,26 +469,23 @@ Assumes that if group id stays the same the group headers
stay the same."
(let ((x-repeated-row (list->vector other-cells)))
(collect-outputs x-builds-id x-repeated-row '() rows)
- (let* ((order (match (assq 'order filters)
- ;(('order 'build-id) "Builds.id ASC")
- ;(('order 'decreasing-build-id) "Builds.id DESC")
- ;(('order 'finish-time) "Builds.stoptime DESC")
- ;(('order 'start-time) "Builds.starttime DESC")
- ;(('order 'submission-time) "Builds.timestamp DESC")
- ;(('order 'status+submission-time)
- (('order
