branch master updated (079ee3b -> 170c6b0)
rekado pushed a change to branch master in repository guix. from 079ee3b gnu: Add sbcl-clsql-mysql. new 2fe3072 gnu: mumimu: Update to 1.2.0-2.6b42431. new 170c6b0 gnu: mumi: Update to 0.0.0-6.a933a62. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/mail.scm | 51 +-- 1 file changed, 9 insertions(+), 42 deletions(-)
02/02: gnu: mumi: Update to 0.0.0-6.a933a62.
rekado pushed a commit to branch master
in repository guix.
commit 170c6b03444b1bb059728efc85e14edd3688dfdb
Author: Ricardo Wurmus
AuthorDate: Sat Feb 29 08:52:51 2020 +0100
gnu: mumi: Update to 0.0.0-6.a933a62.
* gnu/packages/mail.scm (mumi): Update to 0.0.0-6.a933a62.
[inputs]: Remove guile-fibers; replace guile-json-1 with guile-json-3.
[source]: Remove snippet.
---
gnu/packages/mail.scm | 31 ---
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fbe55c2..544bb9d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2960,8 +2960,8 @@ replacement for the @code{urlview} program.")
(license gpl2+)))
(define-public mumi
- (let ((commit "8a57c87797ffb07baa88697130204184db643521")
-(revision "5"))
+ (let ((commit "a933a62a4b8528b416319759b9985db80f3fce14")
+(revision "6"))
(package
(name "mumi")
(version (git-version "0.0.0" revision commit))
@@ -2973,29 +2973,7 @@ replacement for the @code{urlview} program.")
(file-name (git-file-name name version))
(sha256
(base32
- "1575gn5p086sjxz5hvg6iyskq6cxf6vf50s9nsc4xgrbcqa3pv2c"))
-(modules '((guix build utils)))
-(snippet
- '(begin
-(substitute* "Makefile.am"
- ;; Install .go files to $prefix/lib instead of
- ;; $prefix/share.
- (("^godir[[:space:]]*=.*")
- "godir = \
-$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")
-
- ;; Install assets.
- (("^assetsdir.*" _)
- "\
-assetsdir= $(pkgdatadir)/assets
-assetscssdir = $(assetsdir)/css
-assetsimgdir = $(assetsdir)/img
-assetsjsdir = $(assetsdir)/js
-
-assetscss_DATA = $(wildcard assets/css/*)
-assetsimg_DATA = $(wildcard assets/img/*)
-assetsjs_DATA = $(wildcard assets/js/*)\n"))
-#t
+ "0vlda7vjzpd942iz5vb471hj7ypml5gwl9s1am92klv6nk2vnvcx"
(build-system gnu-build-system)
(arguments
`(#:modules ((guix build gnu-build-system)
@@ -3026,8 +3004,7 @@ assetsjs_DATA = $(wildcard assets/js/*)\n"))
(inputs
`(("guile-debbugs" ,guile-debbugs)
("guile-email" ,guile-email)
- ("guile-fibers" ,guile-fibers)
- ("guile-json" ,guile-json-1)
+ ("guile-json" ,guile-json-3)
("guile-syntax-highlight" ,guile-syntax-highlight)
("gnutls" ,gnutls) ;needed to talk to https://debbugs.gnu.org
("guile" ,guile-2.2)
01/02: gnu: mumimu: Update to 1.2.0-2.6b42431.
rekado pushed a commit to branch master
in repository guix.
commit 2fe3072ebf02c0abff1fc1b2eaad406cfe0fc4ae
Author: Ricardo Wurmus
AuthorDate: Sat Feb 29 08:51:31 2020 +0100
gnu: mumimu: Update to 1.2.0-2.6b42431.
* gnu/packages/mail.scm (mumimu): Update to 1.2.0-2.6b42431.
[arguments]: Do not patch Makefile.am or configure.ac.
[version]: Inherit from mu.
---
gnu/packages/mail.scm | 20 +---
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 7052664..fbe55c2 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -793,14 +793,12 @@ attachments, create new maildirs, and so on.")
(define mumimu
;; This is a fork of mu for use in Mumi that stores message bug IDs in its
;; database. It also renames the library to "mumimu" to avoid confusion.
- (let ((commit "ad30b5e9c85f0465aeeeac461d8c32d95775d450")
-(revision "1"))
+ (let ((commit "6b42431052c7cc9a2e147938e1b67f14a93e4ee5")
+(revision "2"))
(package
(inherit mu)
(name "mumimu")
- ;; TODO The version here used to be (package-version guile-email), but
- ;; that code caused problems
- (version (git-version "0.2.2" revision commit))
+ (version (git-version (package-version mu) revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -809,7 +807,7 @@ attachments, create new maildirs, and so on.")
(file-name (git-file-name name version))
(sha256
(base32
- "1y8r8csvkyxncgpi469dir4n4sga4z9xdzc18qh5s8bk29qj689n"
+ "044scxmjrckidqx935yza3aqnjyzrmhyvgx2gs2jyf68hl2qzb89"
(arguments
(substitute-keyword-arguments (package-arguments mu)
((#:tests? anything '())
@@ -817,15 +815,7 @@ attachments, create new maildirs, and so on.")
((#:phases phases)
`(modify-phases ,phases
(replace 'patch-configure
- (lambda _
- (delete-file "autogen.sh")
- (substitute* "configure.ac"
- ;; Use latest Guile
- (("guile-2.0") "guile-2.2"))
- (substitute* '("guile/Makefile.am"
-"guile/mu/Makefile.am")
- (("share/guile/site/2.0/") "share/guile/site/2.2/"))
- #t))
+ (lambda _ (delete-file "autogen.sh") #t))
(replace 'fix-ffi
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "guile/mumimu.scm"
02/08: gnu: Add cl-uffi.
glv pushed a commit to branch master in repository guix. commit 1aa7ad1ffba98708e577c9d86b1a4ad10b6d5429 Author: Guillaume Le Vaillant AuthorDate: Wed Feb 26 14:15:48 2020 +0100 gnu: Add cl-uffi. * gnu/packages/lisp-xyz.scm (sbcl-uffi, cl-uffi): New variables. --- gnu/packages/lisp-xyz.scm | 42 ++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f791acc..ca62ca6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10963,3 +10963,45 @@ interface for MySQL, PostgreSQL and SQLite.") (define-public cl-dbd-sqlite3 (sbcl-package->cl-source-package sbcl-dbd-sqlite3)) + +(define-public sbcl-uffi + (package +(name "sbcl-uffi") +(version "2.1.2") +(source + (origin + (method git-fetch) + (uri (git-reference + (url "http://git.kpe.io/uffi.git;) + (commit (string-append "v" version + (file-name (git-file-name name version)) + (sha256 +(base32 "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry" +(build-system asdf-build-system/sbcl) +(arguments + `(#:tests? #f ; TODO: Fix use of deprecated ASDF functions + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions + (lambda _ + (make-file-writable "doc/html.tar.gz") + #t) +(synopsis "Universal foreign function library for Common Lisp") +(description + "UFFI provides a universal foreign function interface (FFI) + for Common Lisp.") +(home-page "http://quickdocs.org/uffi/;) +(license license:llgpl))) + +(define-public cl-uffi + (package +(inherit (sbcl-package->cl-source-package sbcl-uffi)) +(arguments + `(#:phases + ;; asdf-build-system/source has its own phases and does not inherit + ;; from asdf-build-system/sbcl phases. + (modify-phases %standard-phases/source + (add-after 'unpack 'fix-permissions + (lambda _ + (make-file-writable "doc/html.tar.gz") + #t)))
08/08: gnu: Add sbcl-clsql-mysql.
glv pushed a commit to branch master
in repository guix.
commit 079ee3b5ea7e9e9bf34753df42957d280e8eabc5
Author: Guillaume Le Vaillant
AuthorDate: Fri Feb 28 23:07:17 2020 +0100
gnu: Add sbcl-clsql-mysql.
* gnu/packages/lisp-xyz.scm (sbcl-clsql-mysql): New variable.
---
gnu/packages/lisp-xyz.scm | 46 ++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 52e2d4a..0195698 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11151,3 +11151,49 @@ interfaces as well as a functional and an object
oriented interface.")
"")))
#t))
(synopsis "PostgreSQL driver for Common Lisp SQL interface library")))
+
+(define-public sbcl-clsql-mysql
+ (package
+(inherit sbcl-clsql)
+(name "sbcl-clsql-mysql")
+(inputs
+ `(("mysql" ,mysql)
+ ("sbcl-clsql" ,sbcl-clsql)
+ ("sbcl-clsql-uffi" ,sbcl-clsql-uffi)
+ ("zlib" ,zlib)))
+(arguments
+ (substitute-keyword-arguments (package-arguments sbcl-clsql)
+ ((#:phases phases '%standard-phases)
+`(modify-phases ,phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((lib (string-append "#p\""
+ (assoc-ref outputs "out")
+ "/lib/\"")))
+ (substitute* "clsql-mysql.asd"
+ (("#p\"/usr/lib/clsql/clsql_mysql\\.so\"")
+lib))
+ (substitute* "db-mysql/mysql-loader.lisp"
+ (("libmysqlclient" all)
+(string-append (assoc-ref inputs "mysql") "/lib/" all))
+ (("clsql-mysql-system::\\*library-file-dir\\*")
+lib)))
+ #t))
+ (add-before 'build 'build-helper-library
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((mysql (assoc-ref inputs "mysql"))
+ (inc-dir (string-append mysql "/include/mysql"))
+ (lib-dir (string-append mysql "/lib"))
+ (shared-lib-dir (string-append (assoc-ref outputs "out")
+ "/lib"))
+ (shared-lib (string-append shared-lib-dir
+ "/clsql_mysql.so")))
+ (mkdir-p shared-lib-dir)
+ (invoke "gcc" "-fPIC" "-shared"
+ "-I" inc-dir
+ "db-mysql/clsql_mysql.c"
+ "-Wl,-soname=clsql_mysql"
+ "-L" lib-dir "-lmysqlclient" "-lz"
+ "-o" shared-lib)
+ #t)))
+(synopsis "MySQL driver for Common Lisp SQL interface library")))
04/08: gnu: Add sbcl-clsql-uffi.
glv pushed a commit to branch master
in repository guix.
commit a5f4428770e32acf9dd70b95da6a0bc279fa0794
Author: Guillaume Le Vaillant
AuthorDate: Wed Feb 26 14:46:21 2020 +0100
gnu: Add sbcl-clsql-uffi.
* gnu/packages/lisp-xyz.scm (sbcl-clsql-uffi): New variable.
---
gnu/packages/lisp-xyz.scm | 10 ++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 4d656a3..c41a5b6 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11076,3 +11076,13 @@ interfaces as well as a functional and an object
oriented interface.")
(lambda _
(make-file-writable "doc/html.tar.gz")
#t)))
+
+(define-public sbcl-clsql-uffi
+ (package
+(inherit sbcl-clsql)
+(name "sbcl-clsql-uffi")
+(inputs
+ `(("cffi-uffi-compat" ,sbcl-cffi-uffi-compat)
+ ("clsql" ,sbcl-clsql)
+ ("uffi" ,sbcl-uffi)))
+(synopsis "UFFI helper functions for Common Lisp SQL interface library")))
05/08: gnu: Add sbcl-clsql-sqlite3.
glv pushed a commit to branch master
in repository guix.
commit 5ad8d7aa12afc5c76614a1bf2b03d33cc161cb2a
Author: Guillaume Le Vaillant
AuthorDate: Fri Feb 28 18:50:05 2020 +0100
gnu: Add sbcl-clsql-sqlite3.
* gnu/packages/lisp-xyz.scm (sbcl-clsql-sqlite3): New variable.
---
gnu/packages/lisp-xyz.scm | 21 +
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c41a5b6..2567bea 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11086,3 +11086,24 @@ interfaces as well as a functional and an object
oriented interface.")
("clsql" ,sbcl-clsql)
("uffi" ,sbcl-uffi)))
(synopsis "UFFI helper functions for Common Lisp SQL interface library")))
+
+(define-public sbcl-clsql-sqlite3
+ (package
+(inherit sbcl-clsql)
+(name "sbcl-clsql-sqlite3")
+(inputs
+ `(("clsql" ,sbcl-clsql)
+ ("clsql-uffi" ,sbcl-clsql-uffi)
+ ("sqlite" ,sqlite)))
+(arguments
+ (substitute-keyword-arguments (package-arguments sbcl-clsql)
+ ((#:phases phases '%standard-phases)
+`(modify-phases ,phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "db-sqlite3/sqlite3-loader.lisp"
+ (("libsqlite3")
+ (string-append (assoc-ref inputs "sqlite")
+ "/lib/libsqlite3")))
+ #t))
+(synopsis "SQLite3 driver for Common Lisp SQL interface library")))
branch master updated (512068a -> 079ee3b)
glv pushed a change to branch master in repository guix. from 512068a gnu: linux-libre: Update to 5.4.23. new 25cefc8 gnu: Add cl-cffi-uffi-compat. new 1aa7ad1 gnu: Add cl-uffi. new 5ae56f6 gnu: Add cl-clsql. new a5f4428 gnu: Add sbcl-clsql-uffi. new 5ad8d7a gnu: Add sbcl-clsql-sqlite3. new cd53df6 gnu: Add sbcl-clsql-postgresql. new f9680d5 gnu: Add sbcl-clsql-postgresql-socket3. new 079ee3b gnu: Add sbcl-clsql-mysql. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/lisp-xyz.scm | 247 ++ 1 file changed, 247 insertions(+)
07/08: gnu: Add sbcl-clsql-postgresql-socket3.
glv pushed a commit to branch master
in repository guix.
commit f9680d523015dd514a189cb0f60438edd3d83adb
Author: Guillaume Le Vaillant
AuthorDate: Fri Feb 28 19:33:55 2020 +0100
gnu: Add sbcl-clsql-postgresql-socket3.
* gnu/packages/lisp-xyz.scm (sbcl-clsql-postgresql-socket3): New variable.
---
gnu/packages/lisp-xyz.scm | 23 +++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 300638b..52e2d4a 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11128,3 +11128,26 @@ interfaces as well as a functional and an object
oriented interface.")
"/lib/libpq")))
#t))
(synopsis "PostgreSQL driver for Common Lisp SQL interface library")))
+
+(define-public sbcl-clsql-postgresql-socket3
+ (package
+(inherit sbcl-clsql)
+(name "sbcl-clsql-postgresql-socket3")
+(inputs
+ `(("cl-postgres" ,sbcl-cl-postgres)
+ ("clsql" ,sbcl-clsql)
+ ("md5" ,sbcl-md5)))
+(arguments
+ (substitute-keyword-arguments (package-arguments sbcl-clsql)
+ ((#:phases phases '%standard-phases)
+`(modify-phases ,phases
+ (add-after 'create-asd-file 'fix-asd-file
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib/" (%lisp-type)))
+ (asd (string-append lib
"/clsql-postgresql-socket3.asd")))
+ (substitute* asd
+ (("CLSQL-POSTGRESQL-SOCKET-SYSTEM::")
+"")))
+ #t))
+(synopsis "PostgreSQL driver for Common Lisp SQL interface library")))
01/08: gnu: Add cl-cffi-uffi-compat.
glv pushed a commit to branch master
in repository guix.
commit 25cefc87bc76e61288bf4e1a8832210de329baf9
Author: Guillaume Le Vaillant
AuthorDate: Wed Feb 26 12:00:33 2020 +0100
gnu: Add cl-cffi-uffi-compat.
* gnu/packages/lisp-xyz.scm (sbcl-cffi-uffi-compat, cl-cffi-uffi-compat):
New
variables.
---
gnu/packages/lisp-xyz.scm | 13 +
1 file changed, 13 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 292c9d7..f791acc 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -2573,6 +2573,19 @@ package.")
(define-public cl-cffi
(sbcl-package->cl-source-package sbcl-cffi))
+(define-public sbcl-cffi-uffi-compat
+ (package
+(inherit sbcl-cffi-toolchain)
+(name "sbcl-cffi-uffi-compat")
+(native-inputs
+ `(,@(package-inputs sbcl-cffi-bootstrap))) ; For fix-paths phase
+(inputs
+ `(("cffi" ,sbcl-cffi)))
+(synopsis "UFFI Compatibility Layer for CFFI")))
+
+(define-public cl-cffi-uffi-compat
+ (sbcl-package->cl-source-package sbcl-cffi-uffi-compat))
+
(define-public sbcl-cl-sqlite
(let ((commit "c738e66d4266ef63a1debc4ef4a1b871a068c112"))
(package
03/08: gnu: Add cl-clsql.
glv pushed a commit to branch master
in repository guix.
commit 5ae56f681bfbda09c2831e79280a1dee101aad0e
Author: Guillaume Le Vaillant
AuthorDate: Wed Feb 26 14:29:40 2020 +0100
gnu: Add cl-clsql.
* gnu/packages/lisp-xyz.scm (sbcl-clsql, cl-clsql): New variables.
---
gnu/packages/lisp-xyz.scm | 71 +++
1 file changed, 71 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index ca62ca6..4d656a3 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11005,3 +11005,74 @@ interface for MySQL, PostgreSQL and SQLite.")
(lambda _
(make-file-writable "doc/html.tar.gz")
#t)))
+
+(define-public sbcl-clsql
+ (package
+(name "sbcl-clsql")
+(version "6.7.0")
+(source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "http://git.kpe.io/clsql.git;)
+ (commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+(base32 "1v1k3s5bsy3lgd9gk459bzpb1r0kdjda25s29samxw4gsgf1fqvp"))
+ (snippet
+'(begin
+ ;; Remove precompiled libraries.
+ (delete-file "db-mysql/clsql_mysql.dll")
+ (delete-file "uffi/clsql_uffi.dll")
+ (delete-file "uffi/clsql_uffi.lib")
+ #t
+(build-system asdf-build-system/sbcl)
+(native-inputs
+ `(("cffi-uffi-compat" ,sbcl-cffi-uffi-compat)
+ ("rt" ,sbcl-rt)
+ ("uffi" ,sbcl-uffi)))
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-permissions
+ (lambda _
+ (make-file-writable "doc/html.tar.gz")
+ #t))
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (substitute* "clsql.asd"
+ (("clsql-tests :force t")
+"clsql-tests"))
+ #t)
+(synopsis "Common Lisp SQL Interface library")
+(description
+ "@code{clsql} is a Common Lisp interface to SQL RDBMS based on the
+Xanalys CommonSQL interface for Lispworks. It provides low-level database
+interfaces as well as a functional and an object oriented interface.")
+(home-page "http://clsql.kpe.io/;)
+(license license:llgpl)))
+
+(define-public cl-clsql
+ (package
+(inherit (sbcl-package->cl-source-package sbcl-clsql))
+(native-inputs
+ `(("rt" ,cl-rt)))
+(inputs
+ `(("mysql" ,mysql)
+ ("postgresql" ,postgresql)
+ ("sqlite" ,sqlite)
+ ("zlib" ,zlib)))
+(propagated-inputs
+ `(("cl-postgres" ,cl-postgres)
+ ("cffi-uffi-compat" ,cl-cffi-uffi-compat)
+ ("md5" ,cl-md5)
+ ("uffi" ,cl-uffi)))
+(arguments
+ `(#:phases
+ ;; asdf-build-system/source has its own phases and does not inherit
+ ;; from asdf-build-system/sbcl phases.
+ (modify-phases %standard-phases/source
+ (add-after 'unpack 'fix-permissions
+ (lambda _
+ (make-file-writable "doc/html.tar.gz")
+ #t)))
06/08: gnu: Add sbcl-clsql-postgresql.
glv pushed a commit to branch master
in repository guix.
commit cd53df62c9d0872331c6872727feeb5aca6cd3f6
Author: Guillaume Le Vaillant
AuthorDate: Fri Feb 28 19:15:36 2020 +0100
gnu: Add sbcl-clsql-postgresql.
* gnu/packages/lisp-xyz.scm (sbcl-clsql-postgresql): New variable.
---
gnu/packages/lisp-xyz.scm | 21 +
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 2567bea..300638b 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11107,3 +11107,24 @@ interfaces as well as a functional and an object
oriented interface.")
"/lib/libsqlite3")))
#t))
(synopsis "SQLite3 driver for Common Lisp SQL interface library")))
+
+(define-public sbcl-clsql-postgresql
+ (package
+(inherit sbcl-clsql)
+(name "sbcl-clsql-postgresql")
+(inputs
+ `(("clsql" ,sbcl-clsql)
+ ("clsql-uffi" ,sbcl-clsql-uffi)
+ ("postgresql" ,postgresql)))
+(arguments
+ (substitute-keyword-arguments (package-arguments sbcl-clsql)
+ ((#:phases phases '%standard-phases)
+`(modify-phases ,phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "db-postgresql/postgresql-loader.lisp"
+ (("libpq")
+ (string-append (assoc-ref inputs "postgresql")
+ "/lib/libpq")))
+ #t))
+(synopsis "PostgreSQL driver for Common Lisp SQL interface library")))
05/05: gnu: linux-libre: Update to 5.4.23.
mhw pushed a commit to branch master in repository guix. commit 512068a44f238843f3f5946f28c628906e2f2406 Author: Mark H Weaver AuthorDate: Fri Feb 28 13:11:21 2020 -0500 gnu: linux-libre: Update to 5.4.23. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.23. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 498c6e7..0289047 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.22") +(define-public linux-libre-5.4-version "5.4.23") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) -(hash (base32 "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6"))) +(hash (base32 "1jhyg2yc03fka92l7hwdajim6q5rk538hjdr1gwgvpfyyp6sla1z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4)))
02/05: gnu: linux-libre@4.9: Update to 4.9.215.
mhw pushed a commit to branch master in repository guix. commit f989f947508b1175219f0f1cfc36c08ccbdddf24 Author: Mark H Weaver AuthorDate: Fri Feb 28 13:09:42 2020 -0500 gnu: linux-libre@4.9: Update to 4.9.215. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.215. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 161fc7c..b7054e7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.214") +(define-public linux-libre-4.9-version "4.9.215") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) -(hash (base32 "10z4n792g88p46csla2g9b0m7vz40ln0901ffb2cfd3hmhyhjzxl"))) +(hash (base32 "0j4z2al318654z40w4f8zhh73zwpgn8igjr5k4mz401phm3jyvr3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9)))
01/05: gnu: linux-libre@4.4: Update to 4.4.215.
mhw pushed a commit to branch master in repository guix. commit 8ba4c3eab1a3e49cc0496f4a10e5d3676a9af969 Author: Mark H Weaver AuthorDate: Fri Feb 28 13:08:45 2020 -0500 gnu: linux-libre@4.4: Update to 4.4.215. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.215. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9f2a818..161fc7c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,10 +392,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.214") +(define-public linux-libre-4.4-version "4.4.215") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) -(hash (base32 "0v575wl85fg9c3ksdj570hxjcl9p1dxwzag3fm0qcrq75kp6bamn"))) +(hash (base32 "00zy6cxwb16pqziiqs25pz5llryx2v2nbk9vvzpzxa8x43ad7g18"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4)))
03/05: gnu: linux-libre@4.14: Update to 4.14.172.
mhw pushed a commit to branch master in repository guix. commit f9059c7a0b79b8f40939dca691f346c748101c44 Author: Mark H Weaver AuthorDate: Fri Feb 28 13:10:10 2020 -0500 gnu: linux-libre@4.14: Update to 4.14.172. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.172. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b7054e7..86e635c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.171") +(define-public linux-libre-4.14-version "4.14.172") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) -(hash (base32 "181jadiwfix23xmqfvg7hpacjd0523v7vy0frzn8g8dlwj4j9q2g"))) +(hash (base32 "0yi13cky6jdswca7nrjgcrdxk8rnqdbhblhy6mws103mjfms2613"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14)))
branch master updated (20c8713 -> 512068a)
mhw pushed a change to branch master in repository guix. from 20c8713 gnu: elogind: Enable tests again. new 8ba4c3e gnu: linux-libre@4.4: Update to 4.4.215. new f989f94 gnu: linux-libre@4.9: Update to 4.9.215. new f9059c7 gnu: linux-libre@4.14: Update to 4.14.172. new 87b3500 gnu: linux-libre@4.19: Update to 4.19.107. new 512068a gnu: linux-libre: Update to 5.4.23. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/linux.scm | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-)
04/05: gnu: linux-libre@4.19: Update to 4.19.107.
mhw pushed a commit to branch master in repository guix. commit 87b35007ce604efb3c8f16d08c4b92c646d7dac2 Author: Mark H Weaver AuthorDate: Fri Feb 28 13:10:48 2020 -0500 gnu: linux-libre@4.19: Update to 4.19.107. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.107. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 86e635c..498c6e7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.106") +(define-public linux-libre-4.19-version "4.19.107") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) -(hash (base32 "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33"))) +(hash (base32 "0h02pxzzwc5w2kfqw686bpxc13a93yq449lyzxxkxq1qilcsqjv5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19)))
branch staging updated (7fe9627 -> d614f0b)
mbakke pushed a change to branch staging in repository guix. from 7fe9627 Merge branch 'master' into staging add 37db237 gnu: icecat: Remove about:buildconfig store references. add c3435e2 gnu: Add emacs-org-superstar. add 760dfc6 gnu: u-boot-pinebook: Fix LCD video output. add d854ab1 gnu: python-construct: Update to 2.10.56. add 5eeb70a gnu: opensbi: Update to 0.6. add 2d9b058 gnu: opensbi-qemu-sifive-u: Mark as deprecated. add b4e0f0d gnu: Add emacs-exiftool. add 83ee1e9 gnu: Add emacs-password-generator. add b7d0590 gnu: emacs-evil-collection: Update to 20200219. add fdd4813 gnu: Add gnome-shell-extension-gsconnect. add f6a151c gnu: gnome-shell-extension-appindicator: Use the copy-build-system. add c456d18 gnu: gnome-shell-extension-noannoyance: Use the copy-build-system. add e10587c gnu: gnome-shell-extension-noannoyance: Fix synopsis and description. add a69bc73 gnu: Add lttng-ust. add 259e65a gnu: Add kicad-footprints. add c595150 gnu: Add kicad-packages3d. add ca839f3 gnu: Add kicad-templates. add 0528474 gnu: Remove kicad-library. add badc3c6 gnu: kicad-symbols: Update synopsis and description. add e707535 gnu: kicad: Add translations and search paths. add 0c01560 gnu: git-repo: Update to 2.4.1. add e64c5a8 gnu: git-repo: Really disable self update. add faa0fa3 gnu: earlyoom: Update to latest commit to resolve a test failure. add d24b3b0 gnu: rseqc: Update to 3.0.1. add 6c32e9b gnu: bedtools: Update to 2.29.2. add 0b61e1a gnu: git-annex: Update to 8.20200226. add e6cc426 gnu: vcftools: Update to 0.1.16. add 643d90b gnu: infernal: Update to 1.1.3. add af5271b gnu: Add rust-user32-sys-0.2. add 1f38bd3 gnu: Add rust-urlocator-0.1. add ad9e129 gnu: Add rust-openssl-sys-0.7. add 1240782 gnu: rust-gdi31-sys-0.2: Fix inputs. add 7c4e348 Revert "gnu: Add rust-libressl-pnacl-sys-2." add f1e4f87 gnu: Add rust-openssl-sys-extras-0.7. add b090c2f gnu: Add rust-openssl-0.7. add e3249fe gnu: Add rust-sha1-0.2. add 355658e gnu: Add rust-uuid-0.5. add 4b6f844 gnu: Add rust-core-foundation-0.6. add 67aee1c gnu: Add rust-core-graphics-0.17. add b5bda2c gnu: Add rust-core-text-13. add db8da4d gnu: Add rust-cocoa-0.19. add f78f0d7 gnu: Add rust-cocoa-0.18. add 4199ee1 gnu: Add rust-glutin-egl-sys-0.1. add 0d35d89 gnu: Add rust-glutin-gles2-sys-0.1. add 4bf4574 gnu: Add rust-glutin-glx-sys-0.1. add 8d715e6 gnu: Add rust-glutin-wgl-sys-0.1. add c4f37fc gnu: Add rust-weedle-0.10. add 11b8038 gnu: Add rust-wasm-bindgen-webidl-0.2. add 7c13962 gnu: rust-wasm-bindgen-test-macro-0.2: Update to 0.2.50. add d125c4f gnu: Add rust-wasm-bindgen-test-macro-0.3. add ede4cbc gnu: Add rust-wasm-bindgen-futures-0.4 and its dependencies. add deeedc2 gnu: rust-wasm-bindgen-test-0.2: Inherit from rust-wasm-bindgen-test-0.3. add 0f71a6a gnu: rust-wasm-bindgen-futures-0.3: Inherit from rust-wasm-bindgen-futures-0.4. add c6ce147 gnu: Add rust-wasm-bindgen-test-crate-a-0.1. add bed6f02 gnu: Add rust-wasm-bindgen-test-crate-b-0.1. add bf7ac9d gnu: rust-js-sys-0.3: Update to 0.3.35. add b8dbebd gnu: rust-wasm-bindgen-0.2: Update to 0.2.58. add d5eee77 gnu: Add rust-wayland-sys-0.23. add 36908ef gnu: Add rust-wayland-commons-0.23. add 7d28b64 gnu: Add rust-wayland-scanner-0.23. add 63f1301 gnu: Add rust-wayland-client-0.23. add 895bb1f gnu: Add rust-wayland-server-0.23. add 07a7f72 gnu: Add rust-wayland-protocols-0.23. add abd2e42 gnu: Add rust-smithay-client-toolkit-0.6. add 3571af3 gnu: Add rust-console-log-0.1. add 97d8c6c gnu: Add rust-winit-0.20. add 41c4270 gnu: Add rust-glutin-0.22. add d78c798 gnu: Add rust-wayland-sys-0.21. add 75e4ad6 gnu: Add rust-wayland-scanner-0.21. add 7592c7c gnu: Add rust-wayland-commons-0.21. add 77f099a gnu: Add rust-wayland-client-0.21. add 4bf64e8 gnu: Add rust-wayland-server-0.21. add bef4454 gnu: Add rust-wayland-protocols-0.21. add 78afc9a gnu: Add rust-smithay-client-toolkit-0.4. add b6bbd9f gnu: Add rust-winit-0.19. add b4d0afd gnu: Add rust-metal-0.14. add 61de013 gnu: Add rust-core-video-sys-0.1. add da9c2c1 gnu: Add rust-glutin-0.21. add a9e090c gnu: Add rust-glium-0.25. add eadeca1 gnu: Add rust-rusttype-0.7. add fbbd94b gnu: Add rust-andrew-0.2. add 337b421 gnu: Add rust-security-framework-0.3. add e4c27df gnu: Add rust-simd-0.1. add 46f8949 gnu: Add rust-instant-0.1. add 2933344 gnu: Add rust-smithay-clipboard-0.3. add 7cb8191 gnu: Add rust-native-tls-0.2. add d082ffe gnu: Add rust-http-req-0.5. add 22e9280 gnu: Add alacritty. add ba8992d gnu: emacs-edbi: Fix
01/01: Merge branch 'master' into staging
mbakke pushed a commit to branch staging in repository guix. commit d614f0bba90c86c836131eea3ebb9cbd30f19abf Merge: 7fe9627 20c8713 Author: Marius Bakke AuthorDate: Fri Feb 28 19:07:46 2020 +0100 Merge branch 'master' into staging gnu/packages/android.scm | 66 +- gnu/packages/aux-files/emacs/guix-emacs.el |5 +- gnu/packages/bioinformatics.scm| 50 +- gnu/packages/bootloaders.scm | 15 +- gnu/packages/crates-io.scm | 1783 ++-- gnu/packages/emacs-xyz.scm | 131 +- gnu/packages/emacs.scm | 49 +- gnu/packages/engineering.scm | 296 +++-- gnu/packages/firmware.scm | 12 +- gnu/packages/freedesktop.scm | 43 +- gnu/packages/gnome-xyz.scm | 159 ++- gnu/packages/gnuzilla.scm | 18 +- gnu/packages/guile-xyz.scm | 36 +- gnu/packages/haskell-apps.scm |4 +- gnu/packages/linux.scm | 30 +- gnu/packages/mail.scm |2 +- gnu/packages/package-management.scm|6 +- gnu/packages/python-xyz.scm|4 +- gnu/packages/terminals.scm | 182 +++ gnu/packages/tls.scm |4 +- gnu/packages/web.scm | 69 +- guix/build/copy-build-system.scm |8 +- guix/build/emacs-build-system.scm | 22 +- guix/build/emacs-utils.scm | 10 +- guix/scripts.scm | 12 +- guix/scripts/describe.scm | 15 +- guix/scripts/package.scm |7 +- guix/ui.scm|2 +- tests/swh.scm | 10 +- 29 files changed, 2583 insertions(+), 467 deletions(-) diff --cc gnu/packages/linux.scm index 10e27dc,9f2a818..b95aec9 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@@ -36,9 -36,10 +36,10 @@@ ;;; Copyright © 2019, 2020 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019 Pierre Langlois -;;; Copyright © 2019 Brice Waegeneire +;;; Copyright © 2019, 2020 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020 Oleg Pykhalov + ;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;;
branch master updated: gnu: elogind: Enable tests again.
This is an automated email from the git hooks/post-receive script.
mbakke pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 20c8713 gnu: elogind: Enable tests again.
20c8713 is described below
commit 20c87138a9ca1bbccef2ee91589f11ec7098
Author: Marius Bakke
AuthorDate: Fri Feb 28 18:54:49 2020 +0100
gnu: elogind: Enable tests again.
* gnu/packages/freedesktop.scm (elogind)[arguments]: Remove "-Dtests" from
#:configure-flags. Add phase 'adjust-tests'.
---
gnu/packages/freedesktop.scm | 43 +--
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9d10f51..9095696 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2016, 2017, 2019 Efraim Flashner
;;; Copyright © 2016 Kei Kebreau
;;; Copyright © 2017, 2018 Mark H Weaver
-;;; Copyright © 2017, 2018, 2019 Marius Bakke
+;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke
;;; Copyright © 2017, 2018, 2019 Rutger Helling
;;; Copyright © 2017 Brendan Tildesley
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice
@@ -306,7 +306,6 @@ the freedesktop.org XDG Base Directory specification.")
"-Dcgroup-controller=elogind"
"-Dman=true"
;; Disable some tests.
- "-Dtests=false"
"-Dslow-tests=false"))
#:phases
(modify-phases %standard-phases
@@ -324,6 +323,46 @@ the freedesktop.org XDG Base Directory specification.")
(("=/run/dbus/system_bus_socket")
"=/var/run/dbus/system_bus_socket"))
#t))
+ (add-after 'unpack 'adjust-tests
+ (lambda _
+ ;; This test tries to copy some bytes from /usr/lib/os-release,
+ ;; which does not exist in the build container. Choose something
+ ;; more likely to be available.
+ (substitute* "src/test/test-copy.c"
+ (("/usr/lib/os-release")
+"/etc/passwd"))
+ ;; Use a shebang that works in the build container.
+ (substitute* "src/test/test-exec-util.c"
+ (("#!/bin/sh")
+(string-append "#!" (which "sh"
+ ;; Do not look for files or directories that do not exist.
+ (substitute* "src/test/test-fs-util.c"
+ (("usr") "etc")
+ (("/etc/machine-id") "/etc/passwd"))
+ ;; FIXME: Why is sd_id128_get_machine_app_specific failing.
+ ;; Disable for now by hooking into the kernel support check.
+ (substitute* "src/test/test-id128.c"
+ (("if \\(r == -EOPNOTSUPP\\)")
+"if (1)"))
+ ;; This test expects that /sys is available.
+ (substitute* "src/test/test-mountpoint-util.c"
+ (("assert_se\\(path_is_mount_point\\(\"/sys.*")
+""))
+ ;; /bin/sh does not exist in the build container.
+ (substitute* "src/test/test-path-util.c"
+ (("/bin/sh") (which "sh")))
+ ;; This test uses sd_device_new_from_syspath to allocate a
+ ;; loopback device, but that fails because /sys is unavailable.
+ (substitute* "src/libelogind/sd-device/test-sd-device-thread.c"
+ ((".*sd_device_new_from_syspath.*/sys/class/net/lo.*")
+"return 77;"))
+ ;; Most of these tests require cgroups or an actual live
+ ;; logind system so that it can flicker the monitor, etc.
+ ;; Just skip it until a more narrow selection can be made.
+ (substitute* "src/libelogind/sd-login/test-login.c"
+ (("r = sd_pid_get_slice.*")
+"return 77;"))
+ #t))
(add-after 'unpack 'change-pid-file-path
(lambda _
(substitute* "src/login/elogind.c"
branch master updated: gnu: earlyoom: Update to 1.3.1.
This is an automated email from the git hooks/post-receive script.
apteryx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 9f7a441 gnu: earlyoom: Update to 1.3.1.
9f7a441 is described below
commit 9f7a441defcfe778b77416c39adf854fb5f587d7
Author: Maxim Cournoyer
AuthorDate: Fri Feb 28 10:34:36 2020 -0500
gnu: earlyoom: Update to 1.3.1.
* gnu/packages/linux.scm (earlyoom): Update to 1.3.1.
---
gnu/packages/linux.scm | 85 --
1 file changed, 40 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 50fa7b3..9f2a818 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2737,54 +2737,49 @@ kmod. The aim is to be compatible with tools,
configurations and indices
from the module-init-tools project.")
(license license:gpl2+))) ; library under lgpl2.1+
-;;; Use a recent commit, because the latest 1.3 tag suffers from test failures
-;;; (see:
-;;; https://github.com/rfjakob/earlyoom/issues/156#issuecomment-591997405).
(define-public earlyoom
- (let ((commit "7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea")
-(revision "1"))
-(package
- (name "earlyoom")
- (version (git-version "1.3" revision commit))
- (source (origin
-(method git-fetch)
-(uri (git-reference
- (url "https://github.com/rfjakob/earlyoom.git;)
- (commit commit)))
-(file-name (git-file-name name version))
-(sha256
- (base32
- "0sxk8gh734q4rbh9r1q8ab840bn4kffdm8j93x55jspnmmy1wd2c"
- (build-system gnu-build-system)
- (arguments
- `(#:phases (modify-phases %standard-phases
-(delete 'configure)
-(add-before 'check 'set-home
- (lambda _
-(setenv "HOME" (getcwd))
-#t))
-(add-after 'build 'install-contribs
- ;; Install what seems useful from the contrib directory.
- (lambda* (#:key outputs #:allow-other-keys)
-(let* ((out (assoc-ref outputs "out"))
- (contrib (string-append
- out "/share/earlyoom/contrib")))
- (install-file "contrib/notify_all_users.py" contrib)
- #t
- #:make-flags (let* ((prefix (assoc-ref %outputs "out")))
-(list "CC=gcc"
- (string-append "VERSION=v" ,version)
- (string-append "PREFIX=" prefix)
- (string-append "SYSCONFDIR=" prefix "/etc")))
- #:test-target "test"))
- (native-inputs `(("go" ,go) ;for the test suite
- ("pandoc" ,ghc-pandoc))) ;to generate the manpage
- (home-page "https://github.com/rfjakob/earlyoom;)
- (synopsis "Simple out of memory (OOM) daemon for the Linux kernel")
- (description "Early OOM is a minimalist out of memory (OOM) daemon that
+ (package
+(name "earlyoom")
+(version "1.3.1")
+(source (origin
+ (method git-fetch)
+ (uri (git-reference
+(url "https://github.com/rfjakob/earlyoom.git;)
+(commit (string-append "v" version
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+"06sd3jpkdrwqbphsf8jrgs5rxfi7j3xjmygjjvj4xjk4gncz7r2i"
+(build-system gnu-build-system)
+(arguments
+ `(#:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'check 'set-home
+(lambda _
+ (setenv "HOME" (getcwd))
+ #t))
+ (add-after 'build 'install-contribs
+;; Install what seems useful from the contrib directory.
+(lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (contrib (string-append
+ out "/share/earlyoom/contrib")))
+(install-file "contrib/notify_all_users.py" contrib)
+#t
+ #:make-flags (let* ((prefix (assoc-ref %outputs "out")))
+ (list "CC=gcc"
+(string-append "VERSION=v" ,version)
+(string-append "PREFIX=" prefix)
+(string-append "SYSCONFDIR=" prefix "/etc")))
+ #:test-target "test"))
+(native-inputs `(("go" ,go) ;for the test suite
+ ("pandoc" ,ghc-pandoc))) ;to generate the manpage
+
branch master updated: gnu: rust-yaml-rust-0.4: Don't skip build.
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 93f351c gnu: rust-yaml-rust-0.4: Don't skip build.
93f351c is described below
commit 93f351c72fd7c4d69782de01a9666e8fda5201cf
Author: Efraim Flashner
AuthorDate: Fri Feb 28 16:10:07 2020 +0200
gnu: rust-yaml-rust-0.4: Don't skip build.
* gnu/packages/crates-io.scm (rust-yaml-rust-0.4)[arguments]: Don't skip
build. Replace rust-quickcheck-0.8 with 0.7 in cargo-development-inputs.
---
gnu/packages/crates-io.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3352bfa..f50b6da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -21112,11 +21112,10 @@ to XDG Base Directory specification")
"0ka3qhqc5lvk3hz14wmsj32jhmh44blcbfrx5hfxli2gg38kv4k5"
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-linked-hash-map" ,rust-linked-hash-map-0.5))
#:cargo-development-inputs
- (("rust-quickcheck" ,rust-quickcheck-0.8
+ (("rust-quickcheck" ,rust-quickcheck-0.7
(home-page "https://chyh1990.github.io/yaml-rust/;)
(synopsis "The missing YAML 1.2 parser for rust")
(description
branch master updated: gnu: Add lighttpd.
This is an automated email from the git hooks/post-receive script.
rekado pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 9b17c4f gnu: Add lighttpd.
9b17c4f is described below
commit 9b17c4f7b8a7665e9c0ddce71dc5c35467c6eda1
Author: Ricardo Wurmus
AuthorDate: Fri Feb 28 13:53:14 2020 +0100
gnu: Add lighttpd.
* gnu/packages/web.scm (lighttpd): New variable.
---
gnu/packages/web.scm | 65 +++-
1 file changed, 64 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1ada569..c6e59cf 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2013 Aljosha Papsch
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
;;; Copyright © 2014, 2015, 2016 Mark H Weaver
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus
;;; Copyright © 2018 Raoul Jean Pierre Bonnal
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier
@@ -114,12 +114,14 @@
#:use-module (gnu packages libevent)
#:use-module (gnu packages libidn)
#:use-module (gnu packages libunistring)
+ #:use-module (gnu packages libunwind)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages markup)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages nss)
+ #:use-module (gnu packages openldap)
#:use-module (gnu packages openstack)
#:use-module (gnu packages base)
#:use-module (gnu packages package-management)
@@ -548,6 +550,67 @@ supported at your website.")
;; binary:
(package-license nginx)))
+(define-public lighttpd
+ (package
+(name "lighttpd")
+(version "1.4.55")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.lighttpd.net/lighttpd/;
+ "releases-" (version-major+minor version)
".x/"
+ "lighttpd-" version ".tar.xz"))
+ (sha256
+ (base32
+"09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va"
+(build-system gnu-build-system)
+(arguments
+ `(#:configure-flags
+ (list "--with-krb5"
+ "--with-ldap"
+ "--with-libev"
+ "--with-libunwind"
+ "--with-openssl"
+ "--with-pam"
+ "--with-sasl")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'embed-/bin/sh-reference
+ (lambda _
+ (substitute* "src/mod_ssi.c"
+ (("/bin/sh") (which "sh")))
+ #t))
+ (add-after 'unpack 'fix-tests
+ (lambda _
+ (setenv "SHELL" (which "sh"))
+ ;; gethostbyaddr fails
+ (substitute* "tests/LightyTest.pm"
+ (("\\{HOSTNAME\\} = \\$name;")
+"{HOSTNAME} = \"127.0.0.1\";"))
+ #t)
+(inputs
+ `(("cyrus-sasl" ,cyrus-sasl)
+ ("libev" ,libev)
+ ("libunwind" ,libunwind)
+ ("linux-pam" ,linux-pam)
+ ("mit-krb5" ,mit-krb5)
+ ("openldap" ,openldap)
+ ("openssl" ,openssl)
+ ("pcre" ,pcre)
+ ("pcre:bin" ,pcre "bin")
+ ("zlib" ,zlib)))
+(native-inputs
+ `(("perl" ,perl) ; for tests
+ ("pkg-config" ,pkg-config)
+ ("which" ,which)))
+(home-page "https://www.lighttpd.net/;)
+(synopsis "Lightweight HTTP and reverse proxy server")
+(description
+ "Lighttpd is a secure, fast, compliant, and very flexible web-server that
+has been optimized for high-performance environments. It has a very low
+memory footprint compared to other webservers. Its features include FastCGI,
+CGI, authentication, output compression, URL rewriting and many more.")
+(license license:bsd-3)))
+
(define-public fcgi
(package
(name "fcgi")
branch master updated: gnu: guix: Update to c2f9ea2.
This is an automated email from the git hooks/post-receive script. civodul pushed a commit to branch master in repository guix. The following commit(s) were added to refs/heads/master by this push: new 6813cb3 gnu: guix: Update to c2f9ea2. 6813cb3 is described below commit 6813cb3fb358829c03910345493587dc1eaee436 Author: Ludovic Courtès AuthorDate: Fri Feb 28 11:22:45 2020 +0100 gnu: guix: Update to c2f9ea2. * gnu/packages/package-management.scm (guix): Update to c2f9ea2. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6c80806..221cbd5 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") -(commit "50299ade040e934fa5533768aacb081eb340af3f") -(revision 13)) +(commit "c2f9ea2b502a617bb69227d5f858eee9d4288a6a") +(revision 14)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "0rbnyy0vqmsl7z350cdazm5xzx74cdia3nxp0msk8xalyb76hff4")) + "0hg6yrqlzqiv4gmk9liqar6m9qhhn66q75jsmh86awjwq4qmvyab")) (file-name (string-append "guix-" version "-checkout" (build-system gnu-build-system) (arguments
02/02: gnu: Remove guile-debbugs-next.
rekado pushed a commit to branch master
in repository guix.
commit a954dc57f2b642b3873732128012b537cc22abb3
Author: Ricardo Wurmus
AuthorDate: Fri Feb 28 10:06:53 2020 +0100
gnu: Remove guile-debbugs-next.
* gnu/packages/guile-xyz.scm (guile-debbugs-next): Remove variable.
* gnu/packages/mail.scm (mumi)[inputs]: Replace guile-debbugs-next with
guile-debbugs.
---
gnu/packages/guile-xyz.scm | 25 -
gnu/packages/mail.scm | 2 +-
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b35ee7c..08f909b 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1020,31 +1020,6 @@ Extensions) compliant email messages and reading emails
from the mbox
format.")
(license license:agpl3+)))
-(define-public guile-debbugs-next
- (let ((commit "fb0ae064037a38a0d526e08b4ad24c52e205edb9")
-(revision "2"))
-(package (inherit guile-debbugs)
- (name "guile-debbugs")
- (version (git-version "0.0.3" revision commit))
- (source (origin
-(method git-fetch)
-(uri (git-reference
- (url
"https://git.savannah.gnu.org/git/guile-debbugs.git;)
- (commit commit)))
-(file-name (git-file-name name version))
-(sha256
- (base32
- "195sacx2xc1mzzfljj62nfpi8mxn0rc6dabxckizjksnhb5irfwy"
- (build-system gnu-build-system)
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("autoconf" ,autoconf)
- ("automake" ,automake)
- ("texinfo" ,texinfo)))
- (inputs
- `(("guile" ,guile-2.2)
- ("guile-email" ,guile-email))
-
(define-public guile-newt
(package
(name "guile-newt")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index a2e8503..7052664 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3034,7 +3034,7 @@ assetsjs_DATA = $(wildcard assets/js/*)\n"))
(,go ,(getenv "GUILE_LOAD_COMPILED_PATH"
#t))
(inputs
- `(("guile-debbugs" ,guile-debbugs-next)
+ `(("guile-debbugs" ,guile-debbugs)
("guile-email" ,guile-email)
("guile-fibers" ,guile-fibers)
("guile-json" ,guile-json-1)
01/02: gnu: guile-debbugs: Update to 0.0.3.
rekado pushed a commit to branch master
in repository guix.
commit 5144f5425a4d81405e0db7c53c7c992ac9840af4
Author: Ricardo Wurmus
AuthorDate: Fri Feb 28 10:06:21 2020 +0100
gnu: guile-debbugs: Update to 0.0.3.
* gnu/packages/guile-xyz.scm (guile-debbugs): Update to 0.0.3.
[source]: Remove snippet.
[propagated-inputs]: Add guile-email.
---
gnu/packages/guile-xyz.scm | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 37a5198..b35ee7c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -970,20 +970,17 @@ using S-expressions.")
(define-public guile-debbugs
(package
(name "guile-debbugs")
-(version "0.0.2")
+(version "0.0.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-"
version ".tar.gz"))
(sha256
(base32
-"16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i"))
- (modules '((guix build utils)))
- (snippet
- '(substitute* "Makefile.in"
- (("^godir = (.*)/ccache" _ prefix)
- (string-append "godir = " prefix "/site-ccache"))
+"1cc63nw3xdfjrfk8c58r6d5lidmfq5cpqcy32yd5xp81yccprvn9"
(build-system gnu-build-system)
+(propagated-inputs
+ `(("guile-email" ,guile-email)))
(native-inputs
`(("guile" ,guile-2.2)
("pkg-config" ,pkg-config)))
branch master updated (28c0621 -> a954dc5)
rekado pushed a change to branch master in repository guix. from 28c0621 gnu: delft-icon-theme: Update to 1.11. new 5144f54 gnu: guile-debbugs: Update to 0.0.3. new a954dc5 gnu: Remove guile-debbugs-next. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/guile-xyz.scm | 36 gnu/packages/mail.scm | 2 +- 2 files changed, 5 insertions(+), 33 deletions(-)
03/03: gnu: delft-icon-theme: Update to 1.11.
ambrevar pushed a commit to branch master in repository guix. commit 28c06217fb986219000cfb4c0c6ec602ad17b8d4 Author: Leo Prikler AuthorDate: Thu Feb 27 15:47:39 2020 +0100 gnu: delft-icon-theme: Update to 1.11. * gnu/packages/gnome-xyz.scm (delft-icon-theme): Update to 1.11. Signed-off-by: Pierre Neidhardt --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index b0bc35c..b8cd32d 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -90,7 +90,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (define-public delft-icon-theme (package (name "delft-icon-theme") -(version "1.10") +(version "1.11") (source (origin (method git-fetch) @@ -99,7 +99,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (commit (string-append "v" version (sha256 (base32 - "0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) + "1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6")) (file-name (git-file-name name version (build-system copy-build-system) (arguments
01/03: build-system: copy-build-system: Keep symlinks symbolic.
ambrevar pushed a commit to branch master in repository guix. commit a3b1f878dfeddfc8516fba8483e3191a3e4c887e Author: Leo Prikler AuthorDate: Thu Feb 27 14:49:11 2020 +0100 build-system: copy-build-system: Keep symlinks symbolic. guix/build/copy-build-system.scm (install)[install-file]: Read symlinks as is done in install-simple through copy-recursively. Signed-off-by: Pierre Neidhardt --- guix/build/copy-build-system.scm | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm index 6d9dc8f..a86f0cd 100644 --- a/guix/build/copy-build-system.scm +++ b/guix/build/copy-build-system.scm @@ -91,7 +91,13 @@ if TARGET ends with a '/', the source is installed underneath." file (format (current-output-port) "`~a' -> `~a'~%" file dest) (mkdir-p (dirname dest)) - (copy-file file dest))) + (let ((stat (lstat file))) +(case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest)) (define* (make-file-predicate suffixes matches-regexp #:optional (default-value #t)) "Return a predicate that returns #t if its file argument matches the
02/03: gnu: delft-icon-theme: Use the copy-build-system.
ambrevar pushed a commit to branch master
in repository guix.
commit 3282137d0e4a32cd1c6b049e6ce7c44ab65bfdff
Author: Leo Prikler
AuthorDate: Fri Feb 21 17:17:56 2020 +0100
gnu: delft-icon-theme: Use the copy-build-system.
* gnu/packages/gnome-xyz.scm (delft-icon-theme): Use the copy-build-system.
Signed-off-by: Pierre Neidhardt
---
gnu/packages/gnome-xyz.scm | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index bedaacf..b0bc35c 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -101,19 +101,17 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and
others.")
(base32
"0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s"))
(file-name (git-file-name name version
-(build-system trivial-build-system)
+(build-system copy-build-system)
(arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (copy-recursively (assoc-ref %build-inputs "source") "icons")
- (substitute* "icons/Delft/index.theme"
- (("gnome") "Adwaita"))
- (delete-file "icons/README.md")
- (delete-file "icons/LICENSE")
- (delete-file "icons/logo.jpg")
- (copy-recursively "icons" (string-append %output "/share/icons")
+ `(#:install-plan
+ `(("." "share/icons" #:exclude ("README.md" "LICENSE" "logo.jpg")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-index.theme
+ (lambda _
+(substitute* "Delft/index.theme"
+ (("gnome") "Adwaita"))
+#t)
(home-page "https://www.gnome-look.org/p/1199881/;)
(synopsis "Continuation of Faenza icon theme with up to date app icons")
(description "Delft is a fork of the popular icon theme Faenza with up to
branch master updated (2e76ddd -> 28c0621)
ambrevar pushed a change to branch master in repository guix. from 2e76ddd gnu: OpenSSL: Do not inherit grafts on replacement package. new a3b1f87 build-system: copy-build-system: Keep symlinks symbolic. new 3282137 gnu: delft-icon-theme: Use the copy-build-system. new 28c0621 gnu: delft-icon-theme: Update to 1.11. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/gnome-xyz.scm | 26 -- guix/build/copy-build-system.scm | 8 +++- 2 files changed, 19 insertions(+), 15 deletions(-)
