branch master updated (e61f092 -> 340ee00)
kkebreau pushed a change to branch master in repository guix. from e61f092 gnu: Patch duplicity with --ignore-mdc-error. new 340ee00 gnu: Add povray. 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/graphics.scm | 66 +++ 1 file changed, 66 insertions(+)
01/01: gnu: Add povray.
kkebreau pushed a commit to branch master
in repository guix.
commit 340ee00bbf91a8e0ea567d00d7ff54dd025abc05
Author: Kei Kebreau
Date: Mon Jul 30 16:25:21 2018 -0400
gnu: Add povray.
* gnu/packages/graphics.scm (povray): New variable.
---
gnu/packages/graphics.scm | 66 +++
1 file changed, 66 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index ad5ff8e..6632c9a 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice
;;; Copyright © 2018 Mathieu Othacehe
;;; Copyright © 2018 Alex Kost
+;;; Copyright © 2018 Kei Kebreau
;;;
;;; This file is part of GNU Guix.
;;;
@@ -456,6 +457,71 @@ virtual reality, scientific visualization and modeling.")
;; LGPL 2.1, but with 4 exceptions. This version is called OSGPL.
(license license:lgpl2.1)))
+(define-public povray
+ (package
+(name "povray")
+(version "3.7.0.8")
+(source (origin
+ (method git-fetch)
+ (uri (git-reference
+(url "https://github.com/POV-Ray/povray;)
+(commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+"1q114n4m3r7qy3yn954fq7p46rg7ypdax5fazxr9yj1jklf1lh6z"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete bundled libraries.
+ (delete-file-recursively "libraries")
+ #t
+(build-system gnu-build-system)
+(native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)))
+(inputs
+ `(("boost" ,boost)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)
+ ("openexr" ,openexr)
+ ("sdl" ,sdl)
+ ("zlib" ,zlib)))
+(arguments
+ '(#:configure-flags
+ (list "COMPILED_BY=Guix"
+ (string-append "--with-boost-libdir="
+(assoc-ref %build-inputs "boost") "/lib")
+ "CXXFLAGS=-std=c++11"
+ "--disable-optimiz-arch")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'run-prebuild
+ (lambda _
+ (setenv "HOME" (getcwd))
+ (with-directory-excursion "unix"
+ (substitute* "prebuild.sh"
+ (("/bin/sh") (which "sh")))
+ (invoke "sh" "prebuild.sh"))
+ #t))
+ ;; The bootstrap script is run by the prebuild script in the
+ ;; "run-prebuild" phase.
+ (delete 'bootstrap
+(synopsis "Tool for creating three-dimensional graphics")
+(description
+ "@code{POV-Ray} is short for the Persistence of Vision Raytracer, a tool
+for producing high-quality computer graphics. @code{POV-Ray} creates
+three-dimensional, photo-realistic images using a rendering technique called
+ray-tracing. It reads in a text file containing information describing the
+objects and lighting in a scene and generates an image of that scene from the
+view point of a camera also described in the text file. Ray-tracing is not a
+fast process by any means, but it produces very high quality images with
+realistic reflections, shading, perspective and other effects.")
+(home-page "http://www.povray.org/;)
+(license license:agpl3+)))
+
(define-public rapicorn
(package
(name "rapicorn")
master updated (fb11e79 -> 7d7f683)
snape pushed a change to branch master. from fb11e79 database: Fix the evaluations limit issue. new 7d7f683 doc: Fix database description. Summary of changes: doc/cuirass.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
[no subject]
branch: master
commit 7d7f6831069933e8961656385e178c03f0a492a9
Author: Clément Lassieur
Date: Sat Aug 4 18:33:04 2018 +0200
doc: Fix database description.
* doc/cuirass.texi (Database schema): Add 'Outputs' to the database
description.
---
doc/cuirass.texi | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/cuirass.texi b/doc/cuirass.texi
index 6cf82ba..d4c6ae1 100644
--- a/doc/cuirass.texi
+++ b/doc/cuirass.texi
@@ -249,8 +249,9 @@ Cuirass uses a SQLite database to store information about
jobs and past
build results, but also to coordinate the execution of jobs.
The database contains the following tables: @code{Specifications},
-@code{Inputs}, @code{Stamps}, @code{Evaluations}, @code{Derivations} and
-@code{Builds}. The purpose of each of these tables is explained below.
+@code{Inputs}, @code{Stamps}, @code{Evaluations}, @code{Derivations},
+@code{Builds} and @code{Outputs}. The purpose of each of these tables is
+explained below.
@section Specifications
@cindex specifications, database
[no subject]
branch: master commit dc27cb369c7bc358717e586262fdb2a7d509ff29 Author: Clément Lassieur Date: Sat Aug 4 16:20:59 2018 +0200 database: Remove unused DB-FORMAT-BUILD procedure. * src/cuirass/database.scm (db-format-build): Remove it. --- src/cuirass/database.scm | 17 - 1 file changed, 17 deletions(-) diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm index 1a51705..1f86a1d 100644 --- a/src/cuirass/database.scm +++ b/src/cuirass/database.scm @@ -443,23 +443,6 @@ log file for DRV." (cons `(,name . ((#:path . ,path))) outputs)) -(define (db-format-build db build) - (match build -(#(id timestamp starttime stoptime log status derivation job-name system - nix-name repo-name) - `((#:id . ,id) - (#:timestamp . ,timestamp) - (#:starttime . ,starttime) - (#:stoptime . ,stoptime) - (#:log. ,log) - (#:status . ,status) - (#:derivation . ,derivation) - (#:job-name . ,job-name) - (#:system . ,system) - (#:nix-name . ,nix-name) - (#:repo-name . ,repo-name) - (#:outputs. ,(db-get-outputs db id)) - (define (db-get-builds db filters) "Retrieve all builds in database DB which are matched by given FILTERS. FILTERS is an assoc list whose possible keys are 'id | 'jobset | 'job |
[no subject]
branch: master commit 4c044c658a6f7b40ca78b4d1c56ca225d62c1129 Author: Clément Lassieur Date: Sat Aug 4 16:22:57 2018 +0200 Rename 'repo-name' to 'specification'. * src/cuirass/database.scm (db-get-builds): Rename 'repo-name' to 'specification'. * src/cuirass/http.scm (build->hydra-build): Idem. --- src/cuirass/database.scm | 4 ++-- src/cuirass/http.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm index 130a9c3..1a51705 100644 --- a/src/cuirass/database.scm +++ b/src/cuirass/database.scm @@ -497,7 +497,7 @@ Assumes that if group id stays the same the group headers stay the same." (define (finish-group) (match repeated-row (#(timestamp starttime stoptime log status derivation job-name system - nix-name repo-name) + nix-name specification) `((#:id . ,repeated-builds-id) (#:timestamp . ,timestamp) (#:starttime . ,starttime) @@ -508,7 +508,7 @@ Assumes that if group id stays the same the group headers stay the same." (#:job-name . ,job-name) (#:system . ,system) (#:nix-name . ,nix-name) - (#:repo-name . ,repo-name) + (#:specification . ,specification) (#:outputs. ,outputs) (define (same-group? builds-id) diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm index 2d66ff9..16bbda0 100644 --- a/src/cuirass/http.scm +++ b/src/cuirass/http.scm @@ -79,7 +79,7 @@ (build-status started) `((#:id . ,(assq-ref build #:id)) -(#:jobset . ,(assq-ref build #:repo-name)) +(#:jobset . ,(assq-ref build #:specification)) (#:job . ,(assq-ref build #:job-name)) ;; Hydra's API uses "timestamp" as the time of the last useful event for
[no subject]
branch: master commit d36ec7a3852772e2bac14f79ea9c2faa111b5d92 Author: Clément Lassieur Date: Sat Aug 4 16:07:31 2018 +0200 database: Limit SQL queries to 80 columns. --- src/cuirass/database.scm | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm index 56f421d..130a9c3 100644 --- a/src/cuirass/database.scm +++ b/src/cuirass/database.scm @@ -563,12 +563,21 @@ AND (:jobset IS NULL OR (:jobset = Specifications.name)) AND (:job IS NULL OR (:job = Derivations.job_name)) AND (:system IS NULL OR (:system = Derivations.system)) AND (:evaluation IS NULL OR (:evaluation = Builds.evaluation)) -AND (:status IS NULL OR (:status = 'done' AND Builds.status >= 0) OR (:status = 'pending' AND Builds.status < 0)) -AND (:borderlowtime IS NULL OR :borderlowid IS NULL OR ((:borderlowtime, :borderlowid) < (Builds.stoptime, Builds.id))) -AND (:borderhightime IS NULL OR :borderhighid IS NULL OR ((:borderhightime, :borderhighid) > (Builds.stoptime, Builds.id))) +AND (:status IS NULL OR (:status = 'done' AND Builds.status >= 0) + OR (:status = 'pending' AND Builds.status < 0)) +AND (:borderlowtime IS NULL OR :borderlowid IS NULL + OR ((:borderlowtime, :borderlowid) < (Builds.stoptime, Builds.id))) +AND (:borderhightime IS NULL OR :borderhighid IS NULL + OR ((:borderhightime, :borderhighid) > (Builds.stoptime, Builds.id))) ORDER BY -CASE WHEN :borderlowtime IS NULL OR :borderlowid IS NULL THEN Builds.stoptime ELSE -Builds.stoptime END DESC, -CASE WHEN :borderlowtime IS NULL OR :borderlowid IS NULL THEN Builds.id ELSE -Builds.id END DESC +CASE WHEN :borderlowtime IS NULL + OR :borderlowid IS NULL THEN Builds.stoptime + ELSE -Builds.stoptime +END DESC, +CASE WHEN :borderlowtime IS NULL + OR :borderlowid IS NULL THEN Builds.id + ELSE -Builds.id +END DESC LIMIT :nr) ORDER BY ~a, id ASC;" order)) (stmt (sqlite-prepare db stmt-text #:cache? #t)))
master updated (99241ef -> fb11e79)
snape pushed a change to branch master. from 99241ef http: Change the paramater format from two-elements lists to pairs. new d36ec7a database: Limit SQL queries to 80 columns. new 4c044c6 Rename 'repo-name' to 'specification'. new dc27cb3 database: Remove unused DB-FORMAT-BUILD procedure. new fb11e79 database: Fix the evaluations limit issue. Summary of changes: src/cuirass/database.scm | 57 +--- src/cuirass/http.scm | 2 +- 2 files changed, 26 insertions(+), 33 deletions(-)
[no subject]
branch: master
commit fb11e79c2e3bfa6ebe2b4e4a09889d0aff7f35fe
Author: Clément Lassieur
Date: Sat Aug 4 14:46:37 2018 +0200
database: Fix the evaluations limit issue.
* src/cuirass/database.scm (db-get-evaluations-build-summary): Use a 'LEFT
JOIN' instead of a 'JOIN', with 'Evaluations' on the left, so that
evaluations
are displayed even when they don't have associated builds.
---
src/cuirass/database.scm | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm
index 1f86a1d..4927f2a 100644
--- a/src/cuirass/database.scm
+++ b/src/cuirass/database.scm
@@ -639,11 +639,7 @@ FROM Evaluations ORDER BY id DESC LIMIT " limit ";"))
(define (db-get-evaluations-build-summary db spec limit border-low border-high)
(let loop ((rows (sqlite-exec db "
SELECT E.id, E.commits, B.succeeded, B.failed, B.scheduled
-FROM (SELECT id, evaluation, SUM(status=0) as succeeded,
-SUM(status>0) as failed, SUM(status<0) as scheduled
-FROM Builds
-GROUP BY evaluation) B
-JOIN
+FROM
(SELECT id, commits
FROM Evaluations
WHERE (specification=" spec ")
@@ -651,6 +647,11 @@ AND (" border-low "IS NULL OR (id >" border-low "))
AND (" border-high "IS NULL OR (id <" border-high "))
ORDER BY CASE WHEN " border-low "IS NULL THEN id ELSE -id END DESC
LIMIT " limit ") E
+LEFT JOIN
+(SELECT id, evaluation, SUM(status=0) as succeeded,
+SUM(status>0) as failed, SUM(status<0) as scheduled
+FROM Builds
+GROUP BY evaluation) B
ON B.evaluation=E.id
ORDER BY E.id ASC;"))
(evaluations '()))
@@ -660,9 +661,9 @@ ORDER BY E.id ASC;"))
(loop rest
(cons `((#:id . ,id)
(#:commits . ,commits)
- (#:succeeded . ,succeeded)
- (#:failed . ,failed)
- (#:scheduled . ,scheduled))
+ (#:succeeded . ,(or succeeded 0))
+ (#:failed . ,(or failed 0))
+ (#:scheduled . ,(or scheduled 0)))
evaluations))
(define (db-get-evaluations-id-min db spec)
branch master updated (a058b5c -> e61f092)
cbaines pushed a change to branch master in repository guix. from a058b5c gnu: linux-libre: Update to 4.17.12. new e61f092 gnu: Patch duplicity with --ignore-mdc-error. 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/backup.scm | 9 + 1 file changed, 9 insertions(+)
01/01: gnu: Patch duplicity with --ignore-mdc-error.
cbaines pushed a commit to branch master
in repository guix.
commit e61f092c877da5a9dc5dcdd82690bd3c191769e1
Author: Christopher Baines
Date: Sat Jul 21 12:35:10 2018 +0100
gnu: Patch duplicity with --ignore-mdc-error.
Modify the package to patch gnu.py with an unreleased upstream change to fix
duplicity working with recent releases of GnuPG. This change make the
package
build again.
* gnu/packages/backup.scm (duplicity)[arguments]: Patch gnu.py within the
patch-source phase.
---
gnu/packages/backup.scm | 9 +
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 9884f58..0733d9c 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -105,6 +105,15 @@
(substitute* "duplicity/gpginterface.py"
(("self.call = 'gpg'")
(string-append "self.call = '" (assoc-ref inputs "gnupg")
"/bin/gpg'")))
+
+ ;; This matches up with an unreleased upstream fix, it should be
+ ;; removed when the package is updated
+ ;;
https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1308
+ (substitute* "duplicity/gpg.py"
+ (("--no-secmem-warning'\\)")
+"--no-secmem-warning')
+gnupg.options.extra_args.append('--ignore-mdc-error')"))
+
(substitute* '("testing/functional/__init__.py"
"testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
