01/02: .dir-locals.el: Properly indent 'wrap-script'.

2022-06-27 Thread guix-commits
apteryx pushed a commit to branch master
in repository guix.

commit b5e85191f96691b00f3612965e6edc09003c61a7
Author: Maxim Cournoyer 
AuthorDate: Tue Jun 28 00:37:34 2022 -0400

.dir-locals.el: Properly indent 'wrap-script'.

* .dir-locals.el (scheme-mode): Indent 'wrap-script' the same way as
'wrap-program'.
---
 .dir-locals.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.dir-locals.el b/.dir-locals.el
index da6a44ea08..9edabba5f8 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -121,6 +121,7 @@
(eval . (put 'run-with-store 'scheme-indent-function 1))
(eval . (put 'run-with-state 'scheme-indent-function 1))
(eval . (put 'wrap-program 'scheme-indent-function 1))
+   (eval . (put 'wrap-script 'scheme-indent-function 1))
(eval . (put 'with-imported-modules 'scheme-indent-function 1))
(eval . (put 'with-extensions 'scheme-indent-function 1))
(eval . (put 'with-parameters 'scheme-indent-function 1))



branch master updated (f5abd5b962 -> 8d810c209f)

2022-06-27 Thread guix-commits
apteryx pushed a change to branch master
in repository guix.

from f5abd5b962 gnu: emacs-vertico: Update to 0.25.
 new b5e85191f9 .dir-locals.el: Properly indent 'wrap-script'.
 new 8d810c209f h-client: Do not fail in pure environments.

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:
 .dir-locals.el|  1 +
 gnu/packages/hardware.scm | 29 +
 2 files changed, 30 insertions(+)



01/01: UNTESTED: gnu: icecat: Update to 91.11.0-guix0-preview1 [security fixes].

2022-06-27 Thread guix-commits
mhw pushed a commit to branch gnuzilla-updates
in repository guix.

commit bf6bf127936e48262243a5a97e2d6928cfe0ef75
Author: Mark H Weaver 
AuthorDate: Mon Jun 27 23:28:55 2022 -0400

UNTESTED: gnu: icecat: Update to 91.11.0-guix0-preview1 [security fixes].

Includes fixes for ???.

* gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update.
(icecat-source): Update gnuzilla commit, base version, and hashes.
---
 gnu/packages/gnuzilla.scm | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 6fbcf12a04..aa76704167 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -371,8 +371,8 @@ in C/C++.")
 ;; : Workaround 'snippet' limitations.
 (define computed-origin-method (@@ (guix packages) computed-origin-method))
 
-(define %icecat-version "91.10.0-guix0-preview1")
-(define %icecat-build-id "2022053100") ;must be of the form MMDDhhmmss
+(define %icecat-version "91.11.0-guix0-preview1")
+(define %icecat-build-id "2022062800") ;must be of the form MMDDhhmmss
 
 ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
 ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -394,11 +394,11 @@ in C/C++.")
   "firefox-" upstream-firefox-version ".source.tar.xz"))
 (sha256
  (base32
-  "1fz11rmbb0qjcp84wz7hmq7wy1zh9bk6vk47xwhrinmmifrqqnl2"
+  "1905595fsydd8q4bqxsp5gb4h9s47qjj90wjrqv4ky8yxs9bx6z5"
 
- (upstream-icecat-base-version "91.10.0") ; maybe older than 
base-version
+ (upstream-icecat-base-version "91.11.0") ; maybe older than 
base-version
  ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
- (gnuzilla-commit "4c39c619daf344f36962d958d809f6d42d3fce4e")
+ (gnuzilla-commit "65a61287a5142a9403ec00d973cb5e5d658a3c71")
  (gnuzilla-source
   (origin
 (method git-fetch)
@@ -410,7 +410,7 @@ in C/C++.")
   (string-take gnuzilla-commit 8)))
 (sha256
  (base32
-  "1fizsq0dphm40nj6vnvjp87v34iyg78gllv3jp5ssn43ln4jiyb7"
+  "02mg7vg0bv5lxkdg86z18mf43rx7sh5i2w69lnirr8zqcrr5yd48"
 
  ;; 'search-patch' returns either a valid file name or #f, so wrap it
  ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.



branch gnuzilla-updates created (now bf6bf12793)

2022-06-27 Thread guix-commits
mhw pushed a change to branch gnuzilla-updates
in repository guix.

  at bf6bf12793 UNTESTED: gnu: icecat: Update to 91.11.0-guix0-preview1 
[security fixes].

This branch includes the following new commits:

 new bf6bf12793 UNTESTED: gnu: icecat: Update to 91.11.0-guix0-preview1 
[security fixes].

The 1 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.




branch gnuzilla-updates deleted (was 7e0dbaaeb7)

2022-06-27 Thread guix-commits
mhw pushed a change to branch gnuzilla-updates
in repository guix.

 was 7e0dbaaeb7 UNTESTED: gnu: icecat: Update to 91.10.0-guix0-preview1 
[security fixes].

This change permanently discards the following revisions:

 discard 7e0dbaaeb7 UNTESTED: gnu: icecat: Update to 91.10.0-guix0-preview1 
[security fixes].



01/03: gnu: python2: Fix build with newer Expat.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 0e691ae1004686fd0b53454d90c760c4fb3995e9
Author: Marius Bakke 
AuthorDate: Tue Jun 28 00:06:37 2022 +0200

gnu: python2: Fix build with newer Expat.

* gnu/packages/patches/python-2.7-expat-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/python.scm (python-2.7)[source](patches): Add it.
---
 gnu/local.mk   |  1 +
 gnu/packages/patches/python-2.7-expat-compat.patch | 59 ++
 gnu/packages/python.scm|  1 +
 3 files changed, 61 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index d2617f771f..f28498126e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1652,6 +1652,7 @@ dist_patch_DATA = 
\
   %D%/packages/patches/pyqt-configure.patch\
   %D%/packages/patches/python-2-deterministic-build-info.patch \
   %D%/packages/patches/python-2.7-adjust-tests.patch   \
+  %D%/packages/patches/python-2.7-expat-compat.patch   \
   %D%/packages/patches/python-2.7-search-paths.patch   \
   %D%/packages/patches/python-2.7-site-prefixes.patch  \
   %D%/packages/patches/python-2.7-source-date-epoch.patch  \
diff --git a/gnu/packages/patches/python-2.7-expat-compat.patch 
b/gnu/packages/patches/python-2.7-expat-compat.patch
new file mode 100644
index 00..9cbdf8bd6a
--- /dev/null
+++ b/gnu/packages/patches/python-2.7-expat-compat.patch
@@ -0,0 +1,59 @@
+Fix test failure with newer Expat:
+
+  https://bugs.python.org/issue46811
+
+This is a backport of this upstream commit:
+
+  
https://github.com/python/cpython/commit/2cae93832f46b245847bdc252456ddf7742ef45e
+
+diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
+index 2eb642395b..1793f9365d 100644
+--- a/Lib/test/test_minidom.py
 b/Lib/test/test_minidom.py
+@@ -6,12 +6,14 @@ from StringIO import StringIO
+ from test import support
+ import unittest
+ 
++import pyexpat
+ import xml.dom
+ import xml.dom.minidom
+ import xml.parsers.expat
+ 
+ from xml.dom.minidom import parse, Node, Document, parseString
+ from xml.dom.minidom import getDOMImplementation
++from xml.parsers.expat import ExpatError
+ 
+ 
+ tstfile = support.findfile("test.xml", subdir="xmltestdata")
+@@ -1051,7 +1053,13 @@ class MinidomTest(unittest.TestCase):
+ 
+ # Verify that character decoding errors raise exceptions instead
+ # of crashing
+-self.assertRaises(UnicodeDecodeError, parseString,
++if pyexpat.version_info >= (2, 4, 5):
++self.assertRaises(ExpatError, parseString,
++b'')
++self.assertRaises(ExpatError, parseString,
++b'Comment \xe7a va ? Tr\xe8s bien ?')
++else:
++self.assertRaises(UnicodeDecodeError, parseString,
+ 'Comment \xe7a va ? Tr\xe8s bien 
?')
+ 
+ doc.unlink()
+diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
+index c75d55f05c..0855bc07ca 100644
+--- a/Lib/test/test_xml_etree.py
 b/Lib/test/test_xml_etree.py
+@@ -1482,12 +1482,6 @@ class BugsTest(unittest.TestCase):
+ b"\n"
+ b'tg')
+ 
+-def test_issue3151(self):
+-e = ET.XML('')
+-self.assertEqual(e.tag, '{${stuff}}localname')
+-t = ET.ElementTree(e)
+-self.assertEqual(ET.tostring(e), b'')
+-
+ def test_issue6565(self):
+ elem = ET.XML("")
+ self.assertEqual(summarize_list(elem), ['tag'])
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0922fd44a6..699af0d897 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -150,6 +150,7 @@
 "python-2.7-adjust-tests.patch"
 "python-cross-compile.patch"
 "python-2.7-CVE-2021-3177.patch"
+"python-2.7-expat-compat.patch"
 "python-2.7-no-static-lib.patch"))
(modules '((guix build utils)))
(snippet



03/03: gnu: harfbuzz: Use G-expression.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 4d6a9364bb03d5cda9090ac44bd3c9dd1ea9abe8
Author: Marius Bakke 
AuthorDate: Tue Jun 28 00:13:00 2022 +0200

gnu: harfbuzz: Use G-expression.

* gnu/packages/gtk.scm (harfbuzz)[arguments]: Convert to gexp.
---
 gnu/packages/gtk.scm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6071b5ee5a..ae3b5a91e5 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -268,10 +268,10 @@ output.  Experimental backends include OpenGL, BeOS, 
OS/2, and DirectFB.")
python-wrapper
which))
 (arguments
- `(#:configure-flags `("--with-graphite2"
-   "--with-gobject"
-   ,(string-append
- "--bindir=" (assoc-ref %outputs "bin") "/bin"
+ (list #:configure-flags
+   #~(list "--with-graphite2"
+   "--with-gobject"
+   (string-append "--bindir=" #$output:bin "/bin"
 (synopsis "OpenType text shaping engine")
 (description
  "HarfBuzz is an OpenType text shaping engine.")



02/03: gnu: harfbuzz: Update to 4.4.0.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 0e93273def1513390132d04db34a83e2698ac320
Author: Marius Bakke 
AuthorDate: Tue Jun 28 00:09:50 2022 +0200

gnu: harfbuzz: Update to 4.4.0.

* gnu/packages/gtk.scm (harfbuzz): Update to 4.4.0.
---
 gnu/packages/gtk.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 265cd1b2cb..6071b5ee5a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -244,7 +244,7 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, 
and DirectFB.")
 (define-public harfbuzz
   (package
 (name "harfbuzz")
-(version "4.3.0")
+(version "4.4.0")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://github.com/harfbuzz/harfbuzz;
@@ -252,7 +252,7 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, 
and DirectFB.")
   version ".tar.xz"))
   (sha256
(base32
-"0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"
+"1407i646hdxlsllhrknq3zs18z8p1v7585mx9a1i4hfqp7fmw0q2"
 (build-system gnu-build-system)
 (outputs '("out"
"bin"))  ;160K, only hb-view depend on cairo



branch core-updates updated (0b0750e831 -> 4d6a9364bb)

2022-06-27 Thread guix-commits
mbakke pushed a change to branch core-updates
in repository guix.

from 0b0750e831 gnu: CMake: Update to 3.23.2.
 new 0e691ae100 gnu: python2: Fix build with newer Expat.
 new 0e93273def gnu: harfbuzz: Update to 4.4.0.
 new 4d6a9364bb gnu: harfbuzz: Use G-expression.

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/local.mk   |  1 +
 gnu/packages/gtk.scm   | 12 ++---
 gnu/packages/patches/python-2.7-expat-compat.patch | 59 ++
 gnu/packages/python.scm|  1 +
 4 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 gnu/packages/patches/python-2.7-expat-compat.patch



08/15: gnu: doxygen: Update to 1.9.4.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 69bce0186333094db988df5cf7906fb7339f795f
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:09:36 2022 +0200

gnu: doxygen: Update to 1.9.4.

* gnu/packages/documentation.scm (doxygen): Update to 1.9.4.
---
 gnu/packages/documentation.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 9f87e67043..c1328bd1f1 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -187,7 +187,7 @@ markup) can be customized and extended by the user.")
 (define-public doxygen
   (package
 (name "doxygen")
-(version "1.9.1")
+(version "1.9.4")
 (home-page "https://www.doxygen.nl/;)
 (source (origin
  (method url-fetch)
@@ -198,7 +198,7 @@ markup) can be customized and extended by the user.")
".src.tar.gz")))
  (sha256
   (base32
-   "1lcif1qi20gf04qyjrx7x367669g17vz2ilgi4cmamp1whdsxbk7"
+   "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"
 (build-system cmake-build-system)
 (native-inputs
  (list bison flex libxml2 ;provides xmllint for the tests



07/15: gnu: harfbuzz: Remove input labels.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 21a895a27b94ade0980eda9f038f3f92a7c0dbcd
Author: Marius Bakke 
AuthorDate: Mon Jun 27 19:43:41 2022 +0200

gnu: harfbuzz: Remove input labels.

...and reindent.

* gnu/packages/gtk.scm (harfbuzz)[inputs]: Remove labels.
---
 gnu/packages/gtk.scm | 70 ++--
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e101f349ca..265cd1b2cb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -243,41 +243,41 @@ output.  Experimental backends include OpenGL, BeOS, 
OS/2, and DirectFB.")
 
 (define-public harfbuzz
   (package
-   (name "harfbuzz")
-   (version "4.3.0")
-   (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/harfbuzz/harfbuzz;
- "/releases/download/" version "/harfbuzz-"
- version ".tar.xz"))
- (sha256
-  (base32
-   "0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"
-   (build-system gnu-build-system)
-   (outputs '("out"
-  "bin")) ; 160K, only hb-view depend on cairo
-   (inputs
-(list cairo))
-   (propagated-inputs
-;; There are all in the Requires or Requires.private field of '.pc'.
-(list glib graphite2 icu4c))
-   (native-inputs
-`(("glib:bin" ,glib "bin")  ;for glib-mkenums
-  ("gobject-introspection" ,gobject-introspection)
-  ("pkg-config" ,pkg-config)
-  ("python" ,python-wrapper)
-  ("which" ,which)))
-   (arguments
-`(#:configure-flags `("--with-graphite2"
-  "--with-gobject"
-  ,(string-append
-"--bindir=" (assoc-ref %outputs "bin") "/bin"
-   (synopsis "OpenType text shaping engine")
-   (description
-"HarfBuzz is an OpenType text shaping engine.")
-   (license (license:x11-style "file://COPYING"
-   "See 'COPYING' in the distribution."))
-   (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/;)))
+(name "harfbuzz")
+(version "4.3.0")
+(source (origin
+  (method url-fetch)
+  (uri (string-append "https://github.com/harfbuzz/harfbuzz;
+  "/releases/download/" version "/harfbuzz-"
+  version ".tar.xz"))
+  (sha256
+   (base32
+"0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"
+(build-system gnu-build-system)
+(outputs '("out"
+   "bin"))  ;160K, only hb-view depend on cairo
+(inputs
+ (list cairo))
+(propagated-inputs
+ ;; There are all in the Requires or Requires.private field of '.pc'.
+ (list glib graphite2 icu4c))
+(native-inputs
+ (list `(,glib "bin")   ;for glib-mkenums
+   gobject-introspection
+   pkg-config
+   python-wrapper
+   which))
+(arguments
+ `(#:configure-flags `("--with-graphite2"
+   "--with-gobject"
+   ,(string-append
+ "--bindir=" (assoc-ref %outputs "bin") "/bin"
+(synopsis "OpenType text shaping engine")
+(description
+ "HarfBuzz is an OpenType text shaping engine.")
+(license (license:x11-style "file://COPYING"
+"See 'COPYING' in the distribution."))
+(home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/;)))
 
 (define-public libdatrie
   (package



13/15: gnu: CMake: Remove input labels.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 6cd881401112b1dae524aeb200283e07a7a26c68
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:38:53 2022 +0200

gnu: CMake: Remove input labels.

* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: Remove labels.
(cmake)[native-inputs]: Likewise.  Use MODIFY-INPUTS.
---
 gnu/packages/cmake.scm | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index b581217685..4fb74a7c51 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -213,17 +213,18 @@ using the CMake build system.")
(lambda* (#:key (configure-flags '()) #:allow-other-keys)
  (apply invoke "./configure" configure-flags))
 (inputs
- `(("bzip2" ,bzip2)
-   ("curl" ,curl)
-   ("expat" ,expat)
-   ("file" ,file)
-   ("jsoncpp" ,jsoncpp)
-   ("libarchive" ,libarchive)
-   ,@(if (hurd-target?)
- '()
- `(("libuv" ,libuv)))   ;not supported on the Hurd
-   ("rhash" ,rhash)
-   ("zlib" ,zlib)))
+ (append
+  (if (hurd-target?)
+  '()
+  (list libuv)) ;not supported on the Hurd
+  (list bzip2
+curl
+expat
+file
+jsoncpp
+libarchive
+rhash
+zlib)))
 (native-search-paths
  (list (search-path-specification
 (variable "CMAKE_PREFIX_PATH")
@@ -369,9 +370,8 @@ and workspaces that can be used in the compiler environment 
of your choice.")
 )))
 ;; Extra inputs required to build the documentation.
 (native-inputs
- `(,@(package-native-inputs cmake-minimal)
-   ("python-sphinx" ,python-sphinx)
-   ("texinfo" ,texinfo)))
+ (modify-inputs (package-native-inputs cmake-minimal)
+   (append python-sphinx texinfo)))
 (outputs '("out" "doc"))
 (properties (alist-delete 'hidden? (package-properties cmake-minimal)
 



09/15: gnu: doxygen: Use new style.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 80193fff5993a1d9e0edce7229a0d6c6e2437df5
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:10:01 2022 +0200

gnu: doxygen: Use new style.

* gnu/packages/documentation.scm (doxygen)[inputs]: Remove label.
[arguments]: Likewise.  Convert to G-expression.
---
 gnu/packages/documentation.scm | 71 ++
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index c1328bd1f1..f71461f572 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe 
 ;;; Copyright © 2020 Ricardo Wurmus 
 ;;; Copyright © 2020, 2021 Michael Rohleder 
-;;; Copyright © 2021 Marius Bakke 
+;;; Copyright © 2021, 2022 Marius Bakke 
 ;;; Copyright © 2022 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -190,45 +190,48 @@ markup) can be customized and extended by the user.")
 (version "1.9.4")
 (home-page "https://www.doxygen.nl/;)
 (source (origin
- (method url-fetch)
- (uri (list (string-append home-page "files/doxygen-"
-   version ".src.tar.gz")
-(string-append "mirror://sourceforge/doxygen/rel-"
-   version "/doxygen-" version
-   ".src.tar.gz")))
- (sha256
-  (base32
-   "0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"
+  (method url-fetch)
+  (uri (list (string-append home-page "files/doxygen-"
+version ".src.tar.gz")
+ (string-append "mirror://sourceforge/doxygen/rel-"
+version "/doxygen-" version
+".src.tar.gz")))
+  (sha256
+   (base32
+"0dqzgci82z950pzg6cpxvvqwybi2031flml3pj47hayhq3c9qpm1"
 (build-system cmake-build-system)
 (native-inputs
- (list bison flex libxml2 ;provides xmllint for the tests
-   python)) ;for creating the documentation
+ (list bison
+   flex
+   libxml2  ;provides xmllint for the tests
+   python)) ;for creating the documentation
 (inputs
- `(("bash" ,bash-minimal)))
+ (list bash-minimal))
 (arguments
  ;; Force cmake to use iconv header from cross-libc instead of the one
  ;; from native libc.
- `(,@(if (%current-target-system)
- '(#:configure-flags
-   (list (string-append "-DICONV_INCLUDE_DIR="
-(assoc-ref %build-inputs "cross-libc")
-"/include")))
- '())
-   #:test-target "tests"
-   #:phases (modify-phases %standard-phases
-  (add-after 'unpack 'disable-bibtex-test
-(lambda _
-  ;; Disable test that requires bibtex to avoid a
-  ;; circular dependency.
-  (for-each delete-file-recursively
-'("testing/012" "testing/012_cite.dox"
-  (add-before 'configure 'patch-sh
-  (lambda* (#:key inputs #:allow-other-keys)
-(substitute* "src/portable.cpp"
-  (("/bin/sh")
-   (string-append
-(assoc-ref inputs "bash") "/bin/sh")))
-#t)
+ (list
+  #:configure-flags
+  (if (%current-target-system)
+  #~(list (string-append "-DICONV_INCLUDE_DIR="
+ (assoc-ref %build-inputs "cross-libc")
+ "/include"))
+  #~'())
+  #:test-target "tests"
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-after 'unpack 'disable-bibtex-test
+(lambda _
+  ;; Disable test that requires bibtex to avoid a
+  ;; circular dependency.
+  (for-each delete-file-recursively
+'("testing/012" "testing/012_cite.dox"
+  (add-before 'configure 'patch-sh
+(lambda* (#:key inputs #:allow-other-keys)
+  (let ((/bin/sh (search-input-file inputs "/bin/sh")))
+(substitute* "src/portable.cpp"
+  (("/bin/sh")
+   /bin/sh
 (synopsis "Generate documentation from annotated sources")
 (description "Doxygen is the de facto standard tool for generating
 documentation from annotated C++ sources, but it also supports other popular



05/15: gnu: icu4c: Update to 71.1.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 20bc806b044057d657e8ba6d10b6515bd1b702d4
Author: Marius Bakke 
AuthorDate: Mon Jun 27 19:32:53 2022 +0200

gnu: icu4c: Update to 71.1.

* gnu/packages/icu4c.scm (icu4c): Update to 71.1.
(icu4c-71): Remove variable.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C-71 to
ICU4C.
---
 gnu/packages/chromium.scm |  2 +-
 gnu/packages/icu4c.scm| 20 ++--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index e9e20ab7b9..0ee6210394 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -887,7 +887,7 @@
glib
gtk+
harfbuzz-3.0
-   icu4c-71
+   icu4c
jsoncpp
lcms
libevent
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 1be214f67f..e0ace9acf3 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -41,7 +41,7 @@
 (define-public icu4c
   (package
(name "icu4c")
-   (version "69.1")
+   (version "71.1")
(source (origin
 (method url-fetch)
 (uri (string-append
@@ -51,7 +51,7 @@
   (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
   "-src.tgz"))
 (sha256
- (base32 "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"
+ (base32 "1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"
(build-system gnu-build-system)
;; When cross-compiling, this package needs a source directory of a
;; native-build of itself.
@@ -106,22 +106,6 @@ C/C++ part.")
(license x11)
(home-page "http://site.icu-project.org/;)))
 
-(define-public icu4c-71
-  (package
-(inherit icu4c)
-(version "71.1")
-(source (origin
-  (method url-fetch)
-  (uri (string-append
-
"https://github.com/unicode-org/icu/releases/download/release-;
-(string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
-"/icu4c-"
-(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-"-src.tgz"))
-  (sha256
-   (base32
-"1gqywaqj9jmdwrng9lm6inyqmi5j2cz36db9dcqg3yk13zjyd9v7"))
-
 (define-public icu4c-70
   (package
 (inherit icu4c)



11/15: gnu: CMake: Bootstrap with system jsoncpp.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 9dfd2ad73b80b7eb363b02930f20cc63396ab966
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:21:25 2022 +0200

gnu: CMake: Bootstrap with system jsoncpp.

* gnu/packages/cmake.scm (cmake-bootstrap)[arguments]: Remove
"--no-system-jsoncpp" from #:configure-flags.
[inputs]: Add JSONCPP.
(cmake-minimal)[inputs]: Remove.
---
 gnu/packages/cmake.scm | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index cf930c57fc..b581217685 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -171,7 +171,6 @@ using the CMake build system.")
(string-append "--parallel=" parallel-job-count)
(string-append "--prefix=" out)
"--system-libs"
-   "--no-system-jsoncpp"
;; By default, the man pages and other docs land
;; in PREFIX/man and PREFIX/doc, but we want them
;; in share/{man,doc}.  Note that unlike
@@ -218,6 +217,7 @@ using the CMake build system.")
("curl" ,curl)
("expat" ,expat)
("file" ,file)
+   ("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive)
,@(if (hurd-target?)
  '()
@@ -284,9 +284,6 @@ and workspaces that can be used in the compiler environment 
of your choice.")
 "Utilities"
 lstat)
   #t
-(inputs
- (modify-inputs (package-inputs cmake-bootstrap)
-   (prepend jsoncpp)))
 (build-system cmake-build-system)
 (arguments
  `(#:configure-flags



branch core-updates updated (1e39cc6481 -> 0b0750e831)

2022-06-27 Thread guix-commits
mbakke pushed a change to branch core-updates
in repository guix.

from 1e39cc6481 gnu: OpenSSL: Absorb graft.
 new 6ee0f40e83 gnu: ruby-sqlite3: Update to 1.4.4.
 new a83c462752 gnu: python-libxml2: Fix build failure.
 new e51c78d560 gnu: python-libxml2: Move definition closer to its 
inherited origin.
 new e437393b01 gnu: python-libxml2: Remove input labels.
 new 20bc806b04 gnu: icu4c: Update to 71.1.
 new febdbf0111 gnu: harfbuzz: Update to 4.3.0.
 new 21a895a27b gnu: harfbuzz: Remove input labels.
 new 69bce01863 gnu: doxygen: Update to 1.9.4.
 new 80193fff59 gnu: doxygen: Use new style.
 new 2ada32cc39 gnu: jsoncpp: Build with Meson.
 new 9dfd2ad73b gnu: CMake: Bootstrap with system jsoncpp.
 new 02f7c56ec4 gnu: libjpeg-turbo: Build with cmake-minimal.
 new 6cd8814011 gnu: CMake: Remove input labels.
 new b1fa242cb1 gnu: CMake: Use G-expressions.
 new 0b0750e831 gnu: CMake: Update to 3.23.2.

The 15 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/chromium.scm  |   4 +-
 gnu/packages/cmake.scm | 262 ++---
 gnu/packages/documentation.scm |  73 +++---
 gnu/packages/gtk.scm   |  73 +++---
 gnu/packages/icu4c.scm |  20 +-
 gnu/packages/image.scm |   7 +-
 gnu/packages/patches/cmake-curl-certificates.patch |  15 +-
 gnu/packages/ruby.scm  |   6 +-
 gnu/packages/serialization.scm |  11 +-
 gnu/packages/xml.scm   |  62 +++--
 10 files changed, 243 insertions(+), 290 deletions(-)



02/15: gnu: python-libxml2: Fix build failure.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit a83c462752649b058bef00bd3207451048f7d75e
Author: Marius Bakke 
AuthorDate: Mon Jun 27 20:34:33 2022 +0200

gnu: python-libxml2: Fix build failure.

This is a follow-up to commit 7dfa2ff7804b4d4ffb4c256c5aaea92b2487b369.

* gnu/packages/xml.scm (python-libxml2)[arguments]: Provide correct 
directory
for libxml2 headers.
---
 gnu/packages/xml.scm | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 5ce2b140a7..9435e21d92 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -316,12 +316,9 @@ formulas and hyperlinks to multiple worksheets in an Excel 
2007+ XLSX file.")
   "cross-libc" "libc")))
   (libxml2 (assoc-ref inputs "libxml2")))
   (substitute* "setup.py"
-;; For 'libxml2/libxml/tree.h'.
-(("ROOT = r'/usr'")
- (format #f "ROOT = r'~a'" libxml2))
-;; For 'iconv.h'.
+;; For libxml2 headers.
 (("/opt/include")
- (string-append glibc "/include")
+ (string-append libxml2 "/include")
 (inputs `(("libxml2" ,libxml2)))
 (synopsis "Python bindings for the libxml2 library")))
 



10/15: gnu: jsoncpp: Build with Meson.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 2ada32cc3963afd7f195cb82eade3baf0df2cf1f
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:19:22 2022 +0200

gnu: jsoncpp: Build with Meson.

* gnu/packages/serialization.scm (jsoncpp)[build-system]: Change to
MESON-BUILD-SYSTEM.
[arguments]: Remove.
---
 gnu/packages/serialization.scm | 11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 960c339ef9..d0e5425f8a 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -38,6 +38,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -423,15 +424,7 @@ in which the loaded data is arranged in memory.")
   (sha256
(base32
 "06zss7z56ykzwcsfdxarmini63hkf8i8gx70q3yw9wb0bw7wj9rv"
-(build-system cmake-build-system)
-(arguments
- `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES"
-   ,@(if (%current-target-system)
- `("-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF")
- '()))
-   ,@(if (%current-target-system)
- '()
- `(#:cmake ,cmake-bootstrap
+(build-system meson-build-system)
 (synopsis "C++ library for interacting with JSON")
 (description "JsonCpp is a C++ library that allows manipulating JSON 
values,
 including serialization and deserialization to and from strings.  It can also



14/15: gnu: CMake: Use G-expressions.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit b1fa242cb1f6a35eb4999ffa80fb574b9fb50fd3
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:54:15 2022 +0200

gnu: CMake: Use G-expressions.

* gnu/packages/cmake.scm (%common-build-phases): Remove trailing #t's.
(cmake-bootstrap, cmake-minimal, cmake, emacs-cmake-mode)[arguments]: Use
G-expressions.
---
 gnu/packages/cmake.scm | 225 -
 1 file changed, 109 insertions(+), 116 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 4fb74a7c51..fe49bdf0fa 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -31,6 +31,7 @@
 (define-module (gnu packages cmake)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
@@ -99,8 +100,7 @@ using the CMake build system.")
   (lambda _
 (delete-file "Auxiliary/cmake-mode.el")
 (substitute* "Auxiliary/CMakeLists.txt"
-  ((".*cmake-mode.el.*") ""))
-#t))
+  ((".*cmake-mode.el.*") ""
 ,@(if (target-x86-32?)
   '((add-after 'unpack 'skip-cpack-txz-test
   (lambda _
@@ -124,8 +124,7 @@ using the CMake build system.")
   "Source/cmExecProgramCommand.cxx"
   "Tests/CMakeLists.txt"
   "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
-  (("/bin/sh") (which "sh")))
-#t
+  (("/bin/sh") (which "sh")))
 
 (define %common-disabled-tests
   '(;; This test copies libgcc_s.so.1 from GCC and tries to modify its RPATH,
@@ -163,55 +162,54 @@ using the CMake build system.")
   (patches (search-patches "cmake-curl-certificates.patch"
 (build-system gnu-build-system)
 (arguments
- `(#:test-target "test"
-   #:configure-flags
-   (let ((out (assoc-ref %outputs "out"))
- (parallel-job-count (number->string (parallel-job-count
- (list "--verbose"
-   (string-append "--parallel=" parallel-job-count)
-   (string-append "--prefix=" out)
-   "--system-libs"
-   ;; By default, the man pages and other docs land
-   ;; in PREFIX/man and PREFIX/doc, but we want them
-   ;; in share/{man,doc}.  Note that unlike
-   ;; autoconf-generated configure scripts, cmake's
-   ;; configure prepends "PREFIX/" to what we pass
-   ;; to --mandir and --docdir.
-   "--mandir=share/man"
-   ,(string-append "--docdir=share/doc/cmake-"
-   (version-major+minor version))
+ (list
+  #:test-target "test"
+  #:configure-flags
+  #~(let ((parallel-job-count (number->string (parallel-job-count
+  (list "--verbose"
+(string-append "--parallel=" parallel-job-count)
+(string-append "--prefix=" #$output)
+"--system-libs"
+;; By default, the man pages and other docs land
+;; in PREFIX/man and PREFIX/doc, but we want them
+;; in share/{man,doc}.  Note that unlike
+;; autoconf-generated configure scripts, cmake's
+;; configure prepends "PREFIX/" to what we pass
+;; to --mandir and --docdir.
+"--mandir=share/man"
+(string-append "--docdir=share/doc/cmake-"
+   #$(version-major+minor version))
 
-   ;; By default CMake is built without any optimizations.  Use
-   ;; the recommended Release target for a ~2.5x speedup.
-   "--" "-DCMAKE_BUILD_TYPE=Release"))
-   #:make-flags
-   (let ((skipped-tests
-  (list ,@%common-disabled-tests
-"CTestTestSubdir" ; This test fails to build 2 of the 3 
tests.
-;; This test fails when ARGS (below) is in use, see
-;; .
-"CTestCoverageCollectGCOV")))
- (list
-  (string-append
-   ;; These arguments apply for the tests only.
-   "ARGS=-j " (number->string (parallel-job-count))
-   " --output-on-failure"
-   " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
-   #:phases
-   (modify-phases %standard-phases
- ,@(%common-build-phases)
- (add-before 'configure 'set-paths
-   (lambda _
- ;; Help cmake's bootstrap process to find system libraries
- (begin
-   (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
-   (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH")
-(getenv "C_INCLUDE_PATH")))
-   #t)))
- 

04/15: gnu: python-libxml2: Remove input labels.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit e437393b01ca0a049ae5276ffa77363026949d38
Author: Marius Bakke 
AuthorDate: Mon Jun 27 20:41:58 2022 +0200

gnu: python-libxml2: Remove input labels.

* gnu/packages/xml.scm (python-libxml2)[arguments]: Use G-expression.  
Remove
iconv header substitution which is no longer needed.
[inputs]: Remove labels.
---
 gnu/packages/xml.scm | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 0e0d714a1c..3868be388f 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -263,22 +263,22 @@ to output XPath results with a null delimiter.")))
 (build-system python-build-system)
 (outputs '("out"))
 (arguments
- `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'.
-   #:tests? #f
-   #:phases
-   (modify-phases %standard-phases
- (add-before
-  'build 'configure
-  (lambda* (#:key inputs #:allow-other-keys)
-(chdir "python")
-(let ((glibc   (assoc-ref inputs ,(if (%current-target-system)
-  "cross-libc" "libc")))
-  (libxml2 (assoc-ref inputs "libxml2")))
-  (substitute* "setup.py"
-;; For libxml2 headers.
-(("/opt/include")
- (string-append libxml2 "/include")
-(inputs `(("libxml2" ,libxml2)))
+ (list
+  ;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'.
+  #:tests? #f
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-before 'build 'configure
+(lambda* (#:key inputs #:allow-other-keys)
+  (chdir "python")
+  (let ((libxml2-headers (search-input-directory
+  inputs "include/libxml2")))
+(substitute* "setup.py"
+  ;; The build system ignores C_INCLUDE_PATH & co, so
+  ;; provide the absolute directory name.
+  (("/opt/include")
+   (dirname libxml2-headers)
+(inputs (list libxml2))
 (synopsis "Python bindings for the libxml2 library")))
 
 (define-public libxlsxwriter



15/15: gnu: CMake: Update to 3.23.2.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 0b0750e83144dc59b3c01f72c98c23c890e8de5b
Author: Marius Bakke 
AuthorDate: Mon Jun 27 22:13:22 2022 +0200

gnu: CMake: Update to 3.23.2.

* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.23.2.
(%preserved-third-party-files): Preserve bundled ELF header files.
* gnu/packages/patches/cmake-curl-certificates.patch: Adjust for upstream
changes.
---
 gnu/packages/cmake.scm |  6 --
 gnu/packages/patches/cmake-curl-certificates.patch | 15 ---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index fe49bdf0fa..00ea7c3054 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -142,6 +142,8 @@ using the CMake build system.")
 ;; be available along with the required headers.
 "Utilities/cmlibarchive/libarchive/archive_getdate.c"
 "Utilities/cmlibarchive/libarchive/archive_getdate.h"
+;; ELF headers.
+"Utilities/cmelf"
 ;; CMake header wrappers.
 "Utilities/cm3p"))
 
@@ -150,7 +152,7 @@ using the CMake build system.")
 (define-public cmake-bootstrap
   (package
 (name "cmake-bootstrap")
-(version "3.21.4")
+(version "3.23.2")
 (source (origin
   (method url-fetch)
   (uri (string-append "https://cmake.org/files/v;
@@ -158,7 +160,7 @@ using the CMake build system.")
   "/cmake-" version ".tar.gz"))
   (sha256
(base32
-"0y2rk316j9m1iqimgwah0z1ii3ggli65dw6hdn4ckx0mqaahlmyr"))
+"1ai6zycs4zj49d46lzz9b6l0q5hvlkyix66zd90rlvs6ac0b85pk"))
   (patches (search-patches "cmake-curl-certificates.patch"
 (build-system gnu-build-system)
 (arguments
diff --git a/gnu/packages/patches/cmake-curl-certificates.patch 
b/gnu/packages/patches/cmake-curl-certificates.patch
index 7fe2615271..8dd93de724 100644
--- a/gnu/packages/patches/cmake-curl-certificates.patch
+++ b/gnu/packages/patches/cmake-curl-certificates.patch
@@ -4,22 +4,23 @@ at all: .
 This changes CMake such that commands honor SSL_CERT_FILE and SSL_CERT_DIR
 as well as /etc/ssl/certs.
 
 cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:27:36.926907260 +0200
-+++ cmake-3.13.1/Source/cmCurl.cxx 2019-09-10 17:52:35.475903919 +0200
-@@ -2,11 +2,8 @@
+diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
+index 28ee24dfe9..6b2bb09ff5 100644
+--- a/Source/cmCurl.cxx
 b/Source/cmCurl.cxx
+@@ -2,10 +2,7 @@
 file Copyright.txt or https://cmake.org/licensing for details.  */
  #include "cmCurl.h"
  
 -#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) &&
\
 -  !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH)
  #  define CMAKE_FIND_CAFILE
- #  include "cmSystemTools.h"
 -#endif
  #include "cmStringAlgorithms.h"
+ #include "cmSystemTools.h"
  
- // curl versions before 7.21.5 did not provide this error code
-@@ -30,6 +27,19 @@
- ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile);
+@@ -38,6 +35,19 @@ std::string cmCurlSetCAInfo(::CURL* curl, const 
std::string& cafile)
+ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile.c_str());
  check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
}
 +



06/15: gnu: harfbuzz: Update to 4.3.0.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit febdbf04c07e01cd04507b53cecf8d0388a6
Author: Marius Bakke 
AuthorDate: Mon Jun 27 19:37:52 2022 +0200

gnu: harfbuzz: Update to 4.3.0.

* gnu/packages/gtk.scm (harfbuzz): Update to 4.3.0.
(harfbuzz-3.0): Remove variable.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from
HARFBUZZ-3.0 to HARFBUZZ.
---
 gnu/packages/chromium.scm |  2 +-
 gnu/packages/gtk.scm  | 17 ++---
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 0ee6210394..09a96eab02 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -886,7 +886,7 @@
gdk-pixbuf
glib
gtk+
-   harfbuzz-3.0
+   harfbuzz
icu4c
jsoncpp
lcms
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bf88930b9c..e101f349ca 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -244,7 +244,7 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, 
and DirectFB.")
 (define-public harfbuzz
   (package
(name "harfbuzz")
-   (version "2.8.2")
+   (version "4.3.0")
(source (origin
  (method url-fetch)
  (uri (string-append "https://github.com/harfbuzz/harfbuzz;
@@ -252,7 +252,7 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, 
and DirectFB.")
  version ".tar.xz"))
  (sha256
   (base32
-   "1rvv86wpm3y04fqns1655268rhvhvms469837709v2z2bhwn316m"
+   "0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"
(build-system gnu-build-system)
(outputs '("out"
   "bin")) ; 160K, only hb-view depend on cairo
@@ -279,19 +279,6 @@ output.  Experimental backends include OpenGL, BeOS, OS/2, 
and DirectFB.")
"See 'COPYING' in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/;)))
 
-(define-public harfbuzz-3.0
-  (package
-(inherit harfbuzz)
-(version "3.0.0")
-(source (origin
-  (method url-fetch)
-  (uri (string-append "https://github.com/harfbuzz/harfbuzz;
-  "/releases/download/" version
-  "/harfbuzz-" version ".tar.xz"))
-  (sha256
-   (base32
-"1ngk8vn06rryx3s4v5pbl91bw1j1pd4431n77rw3j5a533hhwsq3"))
-
 (define-public libdatrie
   (package
 (name "libdatrie")



03/15: gnu: python-libxml2: Move definition closer to its inherited origin.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit e51c78d5605da114389cb992666829b1f3d82da6
Author: Marius Bakke 
AuthorDate: Mon Jun 27 20:35:48 2022 +0200

gnu: python-libxml2: Move definition closer to its inherited origin.

* gnu/packages/xml.scm (python-libxml2): Move package definition after the
libxml2 variants.
---
 gnu/packages/xml.scm | 59 ++--
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 9435e21d92..0e0d714a1c 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -181,6 +181,7 @@ binary extension of XML for the purpose of storing and 
manipulating data in a
 hierarchical form with variable field lengths.")
 (license license:lgpl2.1)))
 
+;; Note: Remember to check python-libxml2 when updating this package.
 (define-public libxml2
   (package
 (name "libxml2")
@@ -251,6 +252,35 @@ project (but it is usable outside of the Gnome platform).")
 provides an @code{--xpath0} option to @command{xmllint} that enables it
 to output XPath results with a null delimiter.")))
 
+(define-public python-libxml2
+  (package/inherit libxml2
+(name "python-libxml2")
+(source (origin
+  (inherit (package-source libxml2))
+  (patches
+(append (search-patches "python-libxml2-utf8.patch")
+(origin-patches (package-source libxml2))
+(build-system python-build-system)
+(outputs '("out"))
+(arguments
+ `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'.
+   #:tests? #f
+   #:phases
+   (modify-phases %standard-phases
+ (add-before
+  'build 'configure
+  (lambda* (#:key inputs #:allow-other-keys)
+(chdir "python")
+(let ((glibc   (assoc-ref inputs ,(if (%current-target-system)
+  "cross-libc" "libc")))
+  (libxml2 (assoc-ref inputs "libxml2")))
+  (substitute* "setup.py"
+;; For libxml2 headers.
+(("/opt/include")
+ (string-append libxml2 "/include")
+(inputs `(("libxml2" ,libxml2)))
+(synopsis "Python bindings for the libxml2 library")))
+
 (define-public libxlsxwriter
   (package
 (name "libxlsxwriter")
@@ -293,35 +323,6 @@ formulas and hyperlinks to multiple worksheets in an Excel 
2007+ XLSX file.")
 (license (list license:bsd-2
license:public-domain ; third_party/md5
 
-(define-public python-libxml2
-  (package/inherit libxml2
-(name "python-libxml2")
-(source (origin
-  (inherit (package-source libxml2))
-  (patches
-(append (search-patches "python-libxml2-utf8.patch")
-(origin-patches (package-source libxml2))
-(build-system python-build-system)
-(outputs '("out"))
-(arguments
- `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'.
-   #:tests? #f
-   #:phases
-   (modify-phases %standard-phases
- (add-before
-  'build 'configure
-  (lambda* (#:key inputs #:allow-other-keys)
-(chdir "python")
-(let ((glibc   (assoc-ref inputs ,(if (%current-target-system)
-  "cross-libc" "libc")))
-  (libxml2 (assoc-ref inputs "libxml2")))
-  (substitute* "setup.py"
-;; For libxml2 headers.
-(("/opt/include")
- (string-append libxml2 "/include")
-(inputs `(("libxml2" ,libxml2)))
-(synopsis "Python bindings for the libxml2 library")))
-
 (define-public libxslt
   (package
 (name "libxslt")



12/15: gnu: libjpeg-turbo: Build with cmake-minimal.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 02f7c56ec43b6de5be6195857ab6cbc4f1662190
Author: Marius Bakke 
AuthorDate: Mon Jun 27 21:26:59 2022 +0200

gnu: libjpeg-turbo: Build with cmake-minimal.

* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Remove #:cmake.
---
 gnu/packages/image.scm | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 307b91864c..4d77e2d392 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1693,12 +1693,7 @@ is hereby granted."
 ((string-prefix? "riscv64" target)
  `("-DCMAKE_SYSTEM_PROCESSOR=riscv64"))
 (else '()))
-   '(
-   ,@(if (%current-target-system)
- '()
- ;; Use a special "bootstrap" CMake for the native build to work
- ;; around a circular dependency between CMake and this package.
- `(#:cmake ,cmake-bootstrap
+   '())
 (home-page "https://libjpeg-turbo.org/;)
 (synopsis "SIMD-accelerated JPEG image handling library")
 (description "libjpeg-turbo is a JPEG image codec that accelerates baseline



01/15: gnu: ruby-sqlite3: Update to 1.4.4.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 6ee0f40e8344750c16de4885dd2e25f2e37e5163
Author: Marius Bakke 
AuthorDate: Mon Jun 27 22:32:08 2022 +0200

gnu: ruby-sqlite3: Update to 1.4.4.

* gnu/packages/ruby.scm (ruby-sqlite3): Update to 1.4.4.
[native-inputs]: Change from RUBY-MINI-PORTILE to RUBY-MINI-PORTILE-2.
---
 gnu/packages/ruby.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index d6fe2f9fc0..5b65196c6c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -8761,14 +8761,14 @@ neither too verbose nor too minimal.")
 (define-public ruby-sqlite3
   (package
 (name "ruby-sqlite3")
-(version "1.4.2")
+(version "1.4.4")
 (source
  (origin
(method url-fetch)
(uri (rubygems-uri "sqlite3" version))
(sha256
 (base32
- "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"
+ "1z1wa639c278bsipczn6kv8b13fj85pi8gk7x462chqx6k0wm0ax"
 (build-system ruby-build-system)
 (arguments
  `(#:phases
@@ -8779,7 +8779,7 @@ neither too verbose nor too minimal.")
 (inputs
  (list sqlite))
 (native-inputs
- (list ruby-hoe ruby-rake-compiler ruby-mini-portile))
+ (list ruby-hoe ruby-rake-compiler ruby-mini-portile-2))
 (synopsis "Interface with SQLite3 databases")
 (description
  "This module allows Ruby programs to interface with the SQLite3 database



branch master updated: gnu: emacs-vertico: Update to 0.25.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new f5abd5b962 gnu: emacs-vertico: Update to 0.25.
f5abd5b962 is described below

commit f5abd5b96242903081c9e85b9ef6a0a661495bb7
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:29:36 2022 +0200

gnu: emacs-vertico: Update to 0.25.

* gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 0.25.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cf75b158da..106fcb34ea 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -31151,7 +31151,7 @@ and preferred services can easily be configured.")
 (define-public emacs-vertico
   (package
 (name "emacs-vertico")
-(version "0.24")
+(version "0.25")
 (source
  (origin
(method git-fetch)
@@ -31160,7 +31160,7 @@ and preferred services can easily be configured.")
  (commit version)))
(file-name (git-file-name name version))
(sha256
-(base32 "03p9rf80jnralxpydvxi88igs0r6qa6v41xf1fafwgsf235b49yi"
+(base32 "13lgvaxbbgc08q5dc2pmagnvg1hr2vvl6c9qxvpwqcj06kw9b5ln"
 (build-system emacs-build-system)
 (arguments
  `(#:phases



branch master updated: gnu: emacs-ebib: Update to 2.38.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new b443098345 gnu: emacs-ebib: Update to 2.38.
b443098345 is described below

commit b44309834537d1cdc82f819fb04aff42cf257a39
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:19:50 2022 +0200

gnu: emacs-ebib: Update to 2.38.

* gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.38.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0986064ecc..cf75b158da 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18831,7 +18831,7 @@ files to be expanded upon opening them.")
 (define-public emacs-ebib
   (package
 (name "emacs-ebib")
-(version "2.34")
+(version "2.38")
 (source
  (origin
(method git-fetch)
@@ -18840,7 +18840,7 @@ files to be expanded upon opening them.")
  (commit version)))
(file-name (git-file-name name version))
(sha256
-(base32 "0al846i1dn5wrx3r0ak63m80g9j9xk2q5cpcpk63lq0l0gfdff2m"
+(base32 "14pk3l0qhk219msxx6wxpf29dyx3kjcj769lcqyb5g05lclw9531"
 (build-system emacs-build-system)
 (propagated-inputs
  (list emacs-biblio emacs-ivy emacs-parsebib))



branch master updated: gnu: emacs-ctrlf: Update to 1.5.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 93eeaab4a8 gnu: emacs-ctrlf: Update to 1.5.
93eeaab4a8 is described below

commit 93eeaab4a8e717ab221ae684cdcee466d5bb88a4
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:18:24 2022 +0200

gnu: emacs-ctrlf: Update to 1.5.

* gnu/packages/emacs-xyz.scm (emacs-ctrlf): Update to 1.5.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4033b5302c..0986064ecc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2724,7 +2724,7 @@ is set.")
 (define-public emacs-ctrlf
   (package
 (name "emacs-ctrlf")
-(version "1.4")
+(version "1.5")
 (source
  (origin
(method git-fetch)
@@ -2733,7 +2733,7 @@ is set.")
  (commit (string-append "v" version
(file-name (git-file-name name version))
(sha256
-(base32 "04w708g7d1pnsc18h8fjyqkhk08jkq853alaidriamxyycvdwk0i"
+(base32 "1nd1yk86s0dyf87q77dg724f6629p270q3ar85jgp8gclw5plvyz"
 (build-system emacs-build-system)
 (home-page "https://github.com/raxod502/ctrlf/;)
 (synopsis "Single-buffer text search in Emacs")



branch master updated: gnu: emacs-corfu: Update to 0.26.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new ce4abdd450 gnu: emacs-corfu: Update to 0.26.
ce4abdd450 is described below

commit ce4abdd450553ecd3931f3186bb1cc15ba4117b9
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:15:35 2022 +0200

gnu: emacs-corfu: Update to 0.26.

* gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 0.26.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cc4b3d5939..4033b5302c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3193,7 +3193,7 @@ of bibliographic references.")
 (define-public emacs-corfu
   (package
 (name "emacs-corfu")
-(version "0.25")
+(version "0.26")
 (source
  (origin
(method git-fetch)
@@ -3202,7 +3202,7 @@ of bibliographic references.")
  (commit version)))
(file-name (git-file-name name version))
(sha256
-(base32 "1brq8dfn4mx5mxyqqikmhwpwlqdrfq1z0wprm6awxr89xk506g77"
+(base32 "00fmw6a1pjl4paawrhvbjw2ydnds3vxl2gjgzc9i13khnbv8wdq1"
 (build-system emacs-build-system)
 (arguments
  `(#:phases



branch master updated: gnu: emacs-cider: Update to 1.4.1.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 0387db4cd6 gnu: emacs-cider: Update to 1.4.1.
0387db4cd6 is described below

commit 0387db4cd6c10fca8212b5a4fc8f1d7e72d357b3
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:12:12 2022 +0200

gnu: emacs-cider: Update to 1.4.1.

* gnu/packages/emacs-xyz.scm (emacs-cider): Update to 1.4.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 228b9559d1..cc4b3d5939 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11981,7 +11981,7 @@ target will call @code{compile} on it.")
 (define-public emacs-cider
   (package
 (name "emacs-cider")
-(version "1.3.0")
+(version "1.4.1")
 (source
  (origin
(method git-fetch)
@@ -11990,7 +11990,7 @@ target will call @code{compile} on it.")
  (commit (string-append "v" version
(file-name (git-file-name name version))
(sha256
-(base32 "0mxlkxpzn7rzbzpzcw2z9x2ab2zvhrwr8h21kmfn3li3dha73gf1"
+(base32 "08635ln514nrglx6qyhaq1x7y7lw4mcd659ba8zs071yjiariarm"
 (build-system emacs-build-system)
 (arguments
  '(#:exclude;don't exclude 'cider-test.el'



branch master updated: gnu: emacs-bluetooth: Update to 0.3.1.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 45e755a9a0 gnu: emacs-bluetooth: Update to 0.3.1.
45e755a9a0 is described below

commit 45e755a9a0cb0e456cf0d2c35c3f3b280d4bdf56
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:09:33 2022 +0200

gnu: emacs-bluetooth: Update to 0.3.1.

* gnu/packages/emacs-xyz.scm (emacs-bluetooth): Update to 0.3.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 267061e4f8..228b9559d1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2653,14 +2653,14 @@ you can press @samp{C-M-n} to input multiple email 
addresses.")
 (define-public emacs-bluetooth
   (package
 (name "emacs-bluetooth")
-(version "0.3")
+(version "0.3.1")
 (source
  (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/;
"bluetooth-" version ".tar"))
(sha256
-(base32 "1q27hk4j7k0q9vqgn9nq7q0vhn9jdqbygs7d9lv5gwfhdzdnl4az"
+(base32 "1p10kcim5wqnbj2kiqv6hgjkzznaa48qysnnf8ym90mylsczr70z"
 (build-system emacs-build-system)
 (inputs
  (list bluez dbus))



branch master updated: gnu: emacs-citar: Update to 0.9.5.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new cf53edb49e gnu: emacs-citar: Update to 0.9.5.
cf53edb49e is described below

commit cf53edb49e86ce1568bda51bfc21e6e78db4d669
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 23:07:22 2022 +0200

gnu: emacs-citar: Update to 0.9.5.

* gnu/packages/emacs-xyz.scm (emacs-citar): Update to 0.9.5.
[propagated-inputs]: Add EMACS-CITEPROC-EL.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ff2ed00c47..267061e4f8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18887,7 +18887,7 @@ automatically fetched from well-curated sources, and 
formatted as BibTeX.")
 (define-public emacs-citar
   (package
 (name "emacs-citar")
-(version "0.9")
+(version "0.9.5")
 (source
  (origin
(method git-fetch)
@@ -18896,7 +18896,7 @@ automatically fetched from well-curated sources, and 
formatted as BibTeX.")
  (commit (string-append "v" version
(file-name (git-file-name name version))
(sha256
-(base32 "15jhpl2j4rm97cvvqzlfzxarvxvcsg64raz068psrsd2y7y2zh4c"
+(base32 "04asi5gr4p1d8llra3qwly2jp1ll3zs0hjcysrrvdcax0jcr473b"
 (build-system emacs-build-system)
 (arguments
  `(#:phases
@@ -18904,7 +18904,7 @@ automatically fetched from well-curated sources, and 
formatted as BibTeX.")
  (add-before 'build 'set-home
(lambda _ (setenv "HOME" "/tmp"))
 (propagated-inputs
- (list emacs-auctex emacs-org emacs-parsebib emacs-s))
+ (list emacs-auctex emacs-citeproc-el emacs-org emacs-parsebib emacs-s))
 (home-page "https://github.com/bdarcus/citar;)
 (synopsis "Emacs package to quickly find and act on bibliographic entries")
 (description



branch master updated: guix-europe: accounting: Add entries.

2022-06-27 Thread Andreas Enge
This is an automated email from the git hooks/post-receive script.

andreas pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
 new 8bf076b  guix-europe: accounting: Add entries.
8bf076b is described below

commit 8bf076bb95b677c40cc5c6046fa6ce6e98365ef7
Author: Andreas Enge 
AuthorDate: Mon Jun 27 22:10:31 2022 +0200

guix-europe: accounting: Add entries.

* guix-europe/accounting/accounting.ledger: Add entries.
---
 guix-europe/accounting/accounting.ledger | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/guix-europe/accounting/accounting.ledger 
b/guix-europe/accounting/accounting.ledger
index 0ed6c28..a5d478c 100644
--- a/guix-europe/accounting/accounting.ledger
+++ b/guix-europe/accounting/accounting.ledger
@@ -695,3 +695,14 @@
Assets:Bank €10
Income:Membership:2022
 
+2022-06-22 * Membership fee
+   Assets:Bank €20
+   Income:Membership:2021 -€10
+   Income:Membership:2022 -€10
+
+2022-06-23 * Membership fee
+   Assets:Bank €30
+   Income:Membership:2020 -€10
+   Income:Membership:2021 -€10
+   Income:Membership:2022 -€10
+



05/06: gnu: linux-libre 4.14: Update to 4.14.285.

2022-06-27 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit 78e5ee6d58d8a269afcb5384077568e3898510f6
Author: Leo Famulari 
AuthorDate: Sun Jun 26 19:22:34 2022 -0400

gnu: linux-libre 4.14: Update to 4.14.285.

* gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.285.
(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 e5784393f4..89d7a3864d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -430,7 +430,7 @@ 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.284")
+(define-public linux-libre-4.14-version "4.14.285")
 (define-public linux-libre-4.14-gnu-revision "gnu1")
 (define deblob-scripts-4.14
   (linux-libre-deblob-scripts
@@ -440,7 +440,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-(hash (base32 "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq")))
+(hash (base32 "0ynkcq2cm0q2qcmll1jg76msfa2a186xy5rv81ahfvylbjdkijfs")))
 (make-linux-libre-source version
  (%upstream-linux-source version hash)
  deblob-scripts-4.14)))



04/06: gnu: linux-libre 4.19: Update to 4.19.249.

2022-06-27 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit 7a357b1243741373766c9a29d200108e5be091bf
Author: Leo Famulari 
AuthorDate: Sun Jun 26 19:22:21 2022 -0400

gnu: linux-libre 4.19: Update to 4.19.249.

* gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.249.
(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 db0596c906..e5784393f4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -415,7 +415,7 @@ 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.248")
+(define-public linux-libre-4.19-version "4.19.249")
 (define-public linux-libre-4.19-gnu-revision "gnu1")
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
@@ -425,7 +425,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
(base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-(hash (base32 "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4")))
+(hash (base32 "14aiypira32hsw7wy9bhdw9rvfn705r0sb4415n9pfvi091bsjyf")))
 (make-linux-libre-source version
  (%upstream-linux-source version hash)
  deblob-scripts-4.19)))



03/06: gnu: linux-libre 5.4: Update to 5.4.201.

2022-06-27 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit 311938288412b1f9e5dfd38623a7fd81325f235a
Author: Leo Famulari 
AuthorDate: Sun Jun 26 19:22:07 2022 -0400

gnu: linux-libre 5.4: Update to 5.4.201.

* gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.201.
(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 7299d9d930..db0596c906 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -400,7 +400,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
 (%upstream-linux-source version hash)
 deblob-scripts-5.10)))
 
-(define-public linux-libre-5.4-version "5.4.200")
+(define-public linux-libre-5.4-version "5.4.201")
 (define-public linux-libre-5.4-gnu-revision "gnu1")
 (define deblob-scripts-5.4
   (linux-libre-deblob-scripts
@@ -410,7 +410,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
(base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6")))
 (define-public linux-libre-5.4-pristine-source
   (let ((version linux-libre-5.4-version)
-(hash (base32 "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga")))
+(hash (base32 "0qbfqfca4ism7k7y8grjqsxby3j50ach576szrljxxy140qxfgc1")))
(make-linux-libre-source version
 (%upstream-linux-source version hash)
 deblob-scripts-5.4)))



02/06: gnu: linux-libre 5.10: Update to 5.10.126.

2022-06-27 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit d2aa7be168e1f0ebed684b320b6d19432514e841
Author: Leo Famulari 
AuthorDate: Sun Jun 26 19:21:54 2022 -0400

gnu: linux-libre 5.10: Update to 5.10.126.

* gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.126.
(linux-libre-5.10-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 cc1be501e0..7299d9d930 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -385,7 +385,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
 (%upstream-linux-source version hash)
 deblob-scripts-5.15)))
 
-(define-public linux-libre-5.10-version "5.10.124")
+(define-public linux-libre-5.10-version "5.10.126")
 (define-public linux-libre-5.10-gnu-revision "gnu1")
 (define deblob-scripts-5.10
   (linux-libre-deblob-scripts
@@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
(base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8")))
 (define-public linux-libre-5.10-pristine-source
   (let ((version linux-libre-5.10-version)
-(hash (base32 "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc")))
+(hash (base32 "0qsg5mxvq11xdbssz3qsmd794c8nydq297jwmgfwbzwkx1ll61ci")))
(make-linux-libre-source version
 (%upstream-linux-source version hash)
 deblob-scripts-5.10)))



06/06: gnu: linux-libre 4.9: Update to 4.9.320.

2022-06-27 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit 2697cc8401ede8d5b81e636d51386608d7a70ec0
Author: Leo Famulari 
AuthorDate: Sun Jun 26 19:22:46 2022 -0400

gnu: linux-libre 4.9: Update to 4.9.320.

* gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.320.
(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 89d7a3864d..064eeb0218 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -445,7 +445,7 @@ 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.319")
+(define-public linux-libre-4.9-version "4.9.320")
 (define-public linux-libre-4.9-gnu-revision "gnu1")
 (define deblob-scripts-4.9
   (linux-libre-deblob-scripts
@@ -455,7 +455,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
(base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h")))
 (define-public linux-libre-4.9-pristine-source
   (let ((version linux-libre-4.9-version)
-(hash (base32 "11242bn95k51knm9da7xk7r10vk7iji06wix1cq4g5nzldrfp9sp")))
+(hash (base32 "16wq86i8ch488372v94r88xr9anda477d46xq43wkpmbj912gn9h")))
 (make-linux-libre-source version
  (%upstream-linux-source version hash)
  deblob-scripts-4.9)))



01/06: gnu: linux-libre 5.15: Update to 5.15.50.

2022-06-27 Thread guix-commits
lfam pushed a commit to branch master
in repository guix.

commit aca4376971cbe30f01a1b6aa64b9bb9efc02344d
Author: Leo Famulari 
AuthorDate: Sun Jun 26 19:21:36 2022 -0400

gnu: linux-libre 5.15: Update to 5.15.50.

* gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.50.
(linux-libre-5.15-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 8f7b4f4f5b..cc1be501e0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
 ;; The "longterm" kernels — the older releases with long-term upstream support.
 ;; Here are the support timelines:
 ;; 
-(define-public linux-libre-5.15-version "5.15.49")
+(define-public linux-libre-5.15-version "5.15.50")
 (define-public linux-libre-5.15-gnu-revision "gnu")
 (define deblob-scripts-5.15
   (linux-libre-deblob-scripts
@@ -380,7 +380,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
(base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24")))
 (define-public linux-libre-5.15-pristine-source
   (let ((version linux-libre-5.15-version)
-(hash (base32 "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j")))
+(hash (base32 "03yp3gz45059gkzqbijbg503rxx4wihjg4c3ikz10f526xym0kam")))
(make-linux-libre-source version
 (%upstream-linux-source version hash)
 deblob-scripts-5.15)))



branch master updated (0bd1c4fbbc -> 2697cc8401)

2022-06-27 Thread guix-commits
lfam pushed a change to branch master
in repository guix.

from 0bd1c4fbbc gnu: emacs-auctex: Update to 13.1.3.
 new aca4376971 gnu: linux-libre 5.15: Update to 5.15.50.
 new d2aa7be168 gnu: linux-libre 5.10: Update to 5.10.126.
 new 3119382884 gnu: linux-libre 5.4: Update to 5.4.201.
 new 7a357b1243 gnu: linux-libre 4.19: Update to 4.19.249.
 new 78e5ee6d58 gnu: linux-libre 4.14: Update to 4.14.285.
 new 2697cc8401 gnu: linux-libre 4.9: Update to 4.9.320.

The 6 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 | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)



branch master updated: guix-europe: minutes: Add minutes of the SAC.

2022-06-27 Thread Andreas Enge
This is an automated email from the git hooks/post-receive script.

andreas pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
 new 8934088  guix-europe: minutes: Add minutes of the SAC.
8934088 is described below

commit 893408827936777dded4cd0369d4465316c005d0
Author: Andreas Enge 
AuthorDate: Mon Jun 27 21:20:13 2022 +0200

guix-europe: minutes: Add minutes of the SAC.

* guix-europe/minutes/sac-20220625.txt: New file.
---
 guix-europe/minutes/sac-20220625.txt | 12 
 1 file changed, 12 insertions(+)

diff --git a/guix-europe/minutes/sac-20220625.txt 
b/guix-europe/minutes/sac-20220625.txt
new file mode 100644
index 000..a00399b
--- /dev/null
+++ b/guix-europe/minutes/sac-20220625.txt
@@ -0,0 +1,12 @@
+Minutes of the Solidary Administrative Council meeting of 2022-06-25
+
+
+Present: Andreas Enge, Manolis Ragkousis, Julien Lepiller, Simon Tournier
+
+
+1) Exclusion of members
+
+It is decided unanimously to exclude two members who have not paid their
+membership fees since 2020; the SAC stresses that they are welcome to
+adhere again to Guix Europe in the future.
+



branch master updated: guix-europe: minutes: Add minutes of the SAC.

2022-06-27 Thread Andreas Enge
This is an automated email from the git hooks/post-receive script.

andreas pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
 new 8dfe84c  guix-europe: minutes: Add minutes of the SAC.
8dfe84c is described below

commit 8dfe84cb0e70e9982399b374563fa499c499d612
Author: Andreas Enge 
AuthorDate: Mon Jun 27 21:13:27 2022 +0200

guix-europe: minutes: Add minutes of the SAC.

* guix-europe/minutes/sac-20220623.txt: New file.
---
 guix-europe/minutes/sac-20220623.txt | 21 +
 1 file changed, 21 insertions(+)

diff --git a/guix-europe/minutes/sac-20220623.txt 
b/guix-europe/minutes/sac-20220623.txt
new file mode 100644
index 000..3ad543b
--- /dev/null
+++ b/guix-europe/minutes/sac-20220623.txt
@@ -0,0 +1,21 @@
+Minutes of the Solidary Administrative Council meeting of 2022-06-23
+
+
+Present: Simon Tournier, Efraim Flashner, Julien Lepiller, Andreas Enge
+
+
+1) 10 years of Guix event, sponsoring
+
+It is decided unanimously to sponsor the event for the 10th anniversary
+of Guix, to be held from September 16 to 18 in Paris, with 200€.
+It is also decided unanimously to advance expenses required for this event,
+within the limits of promised reimbursements by other entities. The Guix
+Spending Committee, for instance, has agreed to a reimbursement of up to
+3000€ by the funds held at the FSF.
+
+
+2) 10 years of Guix event, publicity
+
+It is decided unanimously to use the 10th anniversary event to issue a
+call for membership.
+



02/02: gnu: OpenSSL: Absorb graft.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 1e39cc64811e12d41b08ad301629c5669f42137a
Author: Marius Bakke 
AuthorDate: Mon Jun 27 19:29:49 2022 +0200

gnu: OpenSSL: Absorb graft.

* gnu/packages/tls.scm (openssl): Update to 1.1.1p.
[replacement]: Remove.
(openssl/fixed): Remove variable.
---
 gnu/packages/tls.scm | 24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 7b2f43d993..0772eaeb76 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -350,8 +350,7 @@ OpenSSL for TARGET."
 (define-public openssl
   (package
 (name "openssl")
-(version "1.1.1n")
-(replacement openssl/fixed)
+(version "1.1.1p")
 (source (origin
   (method url-fetch)
   (uri (list (string-append 
"https://www.openssl.org/source/openssl-;
@@ -364,7 +363,7 @@ OpenSSL for TARGET."
   (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
   (sha256
(base32
-"0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"
+"0vyfibydji26wk1fmm0piz0810mfr7j4vaa2k5iwgiv6m8mbcqdz"
 (build-system gnu-build-system)
 (outputs '("out"
"doc";6.8 MiB of man3 pages and full HTML documentation
@@ -474,25 +473,6 @@ OpenSSL for TARGET."
 (license license:openssl)
 (home-page "https://www.openssl.org/;)))
 
-(define openssl/fixed
-  (package
-(inherit openssl)
-(name "openssl")
-(version "1.1.1p")
-(source (origin
-  (method url-fetch)
-  (uri (list (string-append 
"https://www.openssl.org/source/openssl-;
-version ".tar.gz")
- (string-append "ftp://ftp.openssl.org/source/;
-"openssl-" version ".tar.gz")
- (string-append "ftp://ftp.openssl.org/source/old/;
-(string-trim-right version 
char-set:letter)
-"/openssl-" version ".tar.gz")))
-  (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
-  (sha256
-   (base32
-"0vyfibydji26wk1fmm0piz0810mfr7j4vaa2k5iwgiv6m8mbcqdz"))
-
 (define-public openssl-3.0
   (package
 (inherit openssl)



01/02: Merge branch 'master' into core-updates

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 2a7648774f1bba5bb443c00b8ab1a2ab75b7416f
Merge: 43519035f9 0bd1c4fbbc
Author: Marius Bakke 
AuthorDate: Mon Jun 27 19:23:48 2022 +0200

Merge branch 'master' into core-updates

 doc/guix.texi  |  75 ++-
 etc/news.scm   |  26 +
 gnu/bootloader/grub.scm|  32 +
 gnu/build/bootloader.scm   |  37 +-
 gnu/build/image.scm|  14 +
 gnu/local.mk   |   3 +-
 gnu/packages/admin.scm |   7 +-
 gnu/packages/algebra.scm   |   3 +-
 gnu/packages/astronomy.scm | 104 +++-
 gnu/packages/backup.scm|   1 +
 gnu/packages/benchmark.scm |  63 +-
 gnu/packages/bootloaders.scm   |  13 +
 gnu/packages/c.scm |  68 +--
 gnu/packages/calendar.scm  |   1 +
 gnu/packages/check.scm |  24 +-
 gnu/packages/chromium.scm  |  20 +-
 gnu/packages/cluster.scm   | 132 +++--
 gnu/packages/cpp.scm   |   8 +-
 gnu/packages/databases.scm |  13 +-
 gnu/packages/dav.scm   |   1 +
 gnu/packages/dezyne.scm|   4 +-
 gnu/packages/diffoscope.scm|   4 +-
 gnu/packages/django.scm|   8 +-
 gnu/packages/dlang.scm | 401 ++---
 gnu/packages/docker.scm| 657 ++---
 gnu/packages/education.scm |  27 +-
 gnu/packages/emacs-xyz.scm | 522 +++-
 gnu/packages/emacs.scm |   2 +-
 gnu/packages/engineering.scm   |  19 +-
 gnu/packages/erlang.scm|   6 +-
 gnu/packages/file-systems.scm  |   4 +-
 gnu/packages/fonts.scm |  50 +-
 gnu/packages/fontutils.scm |  73 +++
 gnu/packages/freedesktop.scm   |  27 +
 gnu/packages/ftp.scm   |   8 +-
 gnu/packages/gcc.scm   |  16 +
 gnu/packages/geo.scm   |  45 +-
 gnu/packages/gnome-xyz.scm |  97 +++
 gnu/packages/graph.scm |   4 +-
 gnu/packages/graphics.scm  |  66 +++
 gnu/packages/guile-xyz.scm |  98 ++-
 gnu/packages/guile.scm |   4 +-
 gnu/packages/hardware.scm  | 206 ++-
 gnu/packages/ibus.scm  |  47 +-
 gnu/packages/icu4c.scm |  16 +
 gnu/packages/image.scm | 100 ++--
 gnu/packages/java.scm  |  34 ++
 gnu/packages/kde.scm   |   4 +-
 gnu/packages/license.scm   |   5 +-
 gnu/packages/linux.scm |  36 +-
 gnu/packages/lisp-xyz.scm  |  75 +++
 gnu/packages/lisp.scm  |   4 +-
 gnu/packages/llvm.scm  |  17 +-
 gnu/packages/mail.scm  | 158 ++---
 gnu/packages/maths.scm |   2 +
 gnu/packages/maven-parent-pom.scm  |   5 +
 gnu/packages/maven.scm |  27 +
 gnu/packages/messaging.scm |  27 +-
 gnu/packages/monitoring.scm|  52 +-
 gnu/packages/music.scm |  58 ++
 gnu/packages/networking.scm|  84 ++-
 gnu/packages/openstack.scm |  12 +-
 gnu/packages/package-management.scm|  15 +-
 gnu/packages/patches/cmh-support-fplll.patch   |  27 +
 gnu/packages/patches/docker-fix-tests.patch|  28 -
 .../patches/phoronix-test-suite-fsdg.patch | 308 ++
 gnu/packages/pep.scm   |   1 +
 gnu/packages/presentation.scm  |  10 +-
 gnu/packages/python-build.scm  |  71 +++
 gnu/packages/python-check.scm  |  31 +-
 gnu/packages/python-crypto.scm |  27 +
 gnu/packages/python-science.scm|   4 +-
 gnu/packages/python-web.scm|  97 ++-
 gnu/packages/python-xyz.scm| 418 +
 gnu/packages/radio.scm |  36 ++
 gnu/packages/ruby.scm  |  97 +++
 gnu/packages/samba.scm 

branch core-updates updated (43519035f9 -> 1e39cc6481)

2022-06-27 Thread guix-commits
mbakke pushed a change to branch core-updates
in repository guix.

from 43519035f9 gnu: libtiff: Explicitly depend on 'xz'.
 add e8fd7017c8 gnu: drbd-utils: Add release-monitoring-url.
 add 1216eb5a5a gnu: drbd-utils: Update to 9.21.2.
 add 946ec002b0 gnu: drbd-utils: Use new style.
 add b4a14edf69 gnu: drbd-utils: Generate manual pages.
 add c546a776d5 gnu: PostgreSQL: Update to 14.4.
 add c07235adfc gnu: emacs-elpher: Update to 3.4.1.
 add b66f8aa154 gnu: Add emacs-compat.
 add c4b9c2e6c8 gnu: emacs-consult: Update to 0.18.
 add b27c137cb8 gnu: emacs-flycheck: Update to 32.
 add d608201d6e gnu: emacs-vertico: Update to 0.24.
 add 0e415a8c6f gnu: emacs-embark: Update to 0.17.
 add 2773cc8927 gnu: emacs-web-mode: Update to 17.2.1.
 add deeec484a6 gnu: python-pyzmq: Remove bundled and generated code.
 add 7911f6ff04 gnu: fet: Update to 6.5.3.
 add 76baecf58f gnu: nar-herder: Add guile-lzlib as an input.
 add 55567ca434 gnu: networking: Add arp-scan
 add 7ba04443c5 gnu: sfeed: Update to 1.5.
 add 0fe0c739f5 gnu: Update kanshi to 1.2.0.
 add d13ffd1580 gnu: cmh: Add patch to work with current fplll.
 add acdd0c282f gnu: python-faiss: Fix build on Python 3.9.
 add c3f6049a41 gnu: python-nose2: Update to 0.11.0.
 add 779853e926 gnu: python-pika: Update to 1.2.1.
 add 3f310b6565 gnu: python-django-auth-ldap: Update to 4.1.0.
 add 3e17136cc4 gnu: python-django-netfields: Update to 1.3.0.
 add 41bf90f966 gnu: python-breathe: Update to 4.34.0.
 add a358602d35 gnu: python-ipython-sql: Update to 0.4.1.
 add c7738ffcad gnu: python-ipython-sql: Remove prettytable version 
constraint.
 add 705c609048 gnu: Add python-autopage.
 add 8dbc8d4802 gnu: python-cliff: Update to 3.10.1.
 add d29b206ef1 gnu: python-prettytable: Update to 3.3.0.
 add d485faf633 gnu: zabbix-cli: Use new style.
 add 258e69e104 gnu: dezyne: Update to 2.15.2.
 add 3589537dac gnu: sudo: Update to 1.9.11p3.
 add 4dbe1c96e4 build-system: chicken: Add version information to eggs if 
missing.
 add 961c9c07e1 gnu: zabbix-cli: Update to 2.3.0.
 add 964731ca52 gnu: presentty: Fix build.
 add ea8a7e8244 gnu: python-databricks-cli: Update to 0.17.0.
 add b7279f1f05 gnu: libcamera: Update to 0.0.0-1.
 add e9bd919270 gnu: libcamera: Remove input labels.
 add c1097a7d3d gnu: emacs-setup: Update to 1.3.0.
 add 06ec07dff5 gnu: emacs-idris-mode: Update to 1.0-1-9bc7697.
 add 1147e0bee3 gnu: emacs-haskell-mode: Update to 17.2-0-5a9f807.
 add 0e380c339b gnu: Add emacs-consult-eglot.
 add e4dde29e01 gnu: Add emacs-code-cells.
 add 0ea51a8177 gnu: llvm-9: Fix building on riscv64-linux.
 add ad002d1541 gnu: prusa-slicer: Update to 2.4.2
 add e74fa406e1 gnu: kicad: Update to 6.0.6.
 add 92121b8e9d gnu: Add phoronix-test-suite.
 add d9b497513f gnu: python-sanic-testing: Fix build.
 add 49f5c551fb gnu: python-minio: Update to 7.1.9.
 add eb3aee6cd0 gnu: python-lsp-server: Remove unneeded input.
 add 8ef4d33a17 gnu: python-pydantic: Update to 1.9.1.
 add 2511dcb8ef gnu: erlang: Update to 25.0.2.
 add d798e0a111 gnu: emacs-project: Update source hash.
 add 299be00adb gnu: emacs-jedi: Install and patch location of 
jediepcserver.
 add 1cad129384 gnu: Add basu.
 add 1766a502da gnu: sway: Switch from elogind to basu.
 add 4f9ac2afc7 gnu: emacs: Fix tramp-remote-path.
 add 3c0c6ee573 services: wireguard: Shepherd 'stop' method really stops.
 add 1635d39c3c gnu: Add farbfeld.
 add 344ac79873 gnu: sent: Add farbfeld to propagated-inputs.
 add aa2fd99fb1 gnu: sent: Apply guix style
 add 0f517f16bb gnu: sent: Remove input labels.
 add 1903b0cbcc gnu: reuse: Update to 1.0.0.
 add 1bcf4695f7 gnu: google-highway: Update to 0.17.0.
 add c9d78e4074 gnu: libjxl: Update to 0.6.1-0.b7076f18.
 add 2ccbf3a45c style: Keep values next to their keyword.
 add bdf4221767 refresh: Repurpose '-L' for '--load-path'.
 add 2873433c72 news: Add entry for 'guix refresh -L' change.
 add 4a1550516a gnu: python-py-cpuinfo: Update to 8.0.0-1.4d6987e.
 add 4f6ed3d2f8 gnu: ldc-bootstrap-0.17: Add support for aarch64-linux.
 add 9d30cfa337 guix system: Inline menu-entries in to bootcfg in 
perform-action.
 add c0afc06ecb gnu: python-bandit: Update to 1.7.4.
 add 4d67ec834e gnu: python-sphinx-autodoc-typehints: Update to 1.18.3.
 add 69bf6319f6 gnu: python-bottle: Update to 0.12.21.
 add 8e2ff622ed gnu: python-parso: Update to 0.8.3.
 add de52ffc6b4 gnu: Zabbix: Update to 6.0.5.
 add aa3e990424 gnu: icu4c: Add 71.1.
 add d6e649f91e gnu: ungoogled-chromium: Update to 103.0.5060.53-1.
 add 92773dedcd news: Add 'de' translation.
 add 3611f99aff gnu: Add hw-probe.
 add 80ba78ab98 gnu: Fix formatting of python-nbconvert description.
 add 5f7bb57c5a gnu: linux-libre 5.15: Update to 

05/05: gnu: libtiff: Explicitly depend on 'xz'.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 43519035f954b3dc41ac50a9a877fd802b864fdb
Author: Marius Bakke 
AuthorDate: Mon Jun 27 11:43:48 2022 +0200

gnu: libtiff: Explicitly depend on 'xz'.

...instead of linking to whatever happens to be in the build environment.

* gnu/packages/image.scm (libtiff)[inputs]: Add XZ.
---
 gnu/packages/image.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a3e73de8fa..18db5a1d9e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -584,7 +584,7 @@ extracting icontainer icon files.")
  #$name "-" #$(package-version this-package))
 "--disable-static")))
(inputs
-(list libjpeg-turbo zlib))
+(list libjpeg-turbo xz zlib))
(synopsis "Library for handling TIFF files")
(description
 "Libtiff provides support for the Tag Image File Format (TIFF), a format



branch core-updates updated (ea53e292a8 -> 43519035f9)

2022-06-27 Thread guix-commits
mbakke pushed a change to branch core-updates
in repository guix.

from ea53e292a8 gnu: Tcl/Tk: Update to 8.6.12.
 new 8b13d38fac gnu: libtiff: Add 'upstream-name' property.
 new 06747aa5b0 gnu: libtiff: Update to 4.4.0.
 new e8af8fc3e1 gnu: libtiff: Remove input labels.
 new be2d53225c gnu: libtiff: Use G-expressions.
 new 43519035f9 gnu: libtiff: Explicitly depend on 'xz'.

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/image.scm | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)



02/05: gnu: libtiff: Update to 4.4.0.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 06747aa5b04c1b1d12a6f90dab605e926cc03d9c
Author: Marius Bakke 
AuthorDate: Mon Jun 27 11:27:22 2022 +0200

gnu: libtiff: Update to 4.4.0.

* gnu/packages/image.scm (libtiff): Update to 4.4.0.
[source](uri): Switch to .xz tarball.
---
 gnu/packages/image.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4976b4c8e5..1521e09cfc 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -564,15 +564,15 @@ extracting icontainer icon files.")
 (define-public libtiff
   (package
(name "libtiff")
-   (version "4.3.0")
+   (version "4.4.0")
(source
  (origin
(method url-fetch)
(uri (string-append "https://download.osgeo.org/libtiff/tiff-;
-   version ".tar.gz"))
+   version ".tar.xz"))
(sha256
 (base32
- "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf"
+ "1h8xrcpbyf9id2hw2ms0cmpgx0li8gladjzj82ycgk28018pnc29"
(build-system gnu-build-system)
(outputs '("out"
   "doc"))   ;1.8 MiB of HTML documentation



04/05: gnu: libtiff: Use G-expressions.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit be2d53225c08ac09a2ecfc0044036e276e369383
Author: Marius Bakke 
AuthorDate: Mon Jun 27 11:29:34 2022 +0200

gnu: libtiff: Use G-expressions.

* gnu/packages/image.scm (libtiff)[arguments]: Convert to gexp.
---
 gnu/packages/image.scm | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index be31d1c35c..a3e73de8fa 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -96,6 +96,7 @@
   #:use-module (gnu packages fonts)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
@@ -577,13 +578,11 @@ extracting icontainer icon files.")
(outputs '("out"
   "doc"))   ;1.8 MiB of HTML documentation
(arguments
-;; Instead of using --docdir, this package has its own --with-docdir.
-`(#:configure-flags
-  (list (string-append "--with-docdir="
-   (assoc-ref %outputs "doc")
-   "/share/doc/"
-   ,name "-" ,(package-version this-package))
-"--disable-static")))
+(list #:configure-flags
+  ;; Instead of using --docdir, this package has its own --with-docdir.
+  #~(list (string-append "--with-docdir=" #$output:doc "/share/doc/"
+ #$name "-" #$(package-version this-package))
+"--disable-static")))
(inputs
 (list libjpeg-turbo zlib))
(synopsis "Library for handling TIFF files")



03/05: gnu: libtiff: Remove input labels.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit e8af8fc3e187025c791f8480595ec82e424460b8
Author: Marius Bakke 
AuthorDate: Mon Jun 27 11:28:29 2022 +0200

gnu: libtiff: Remove input labels.

* gnu/packages/image.scm (libtiff)[inputs]: Remove labels.
---
 gnu/packages/image.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1521e09cfc..be31d1c35c 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -584,8 +584,8 @@ extracting icontainer icon files.")
"/share/doc/"
,name "-" ,(package-version this-package))
 "--disable-static")))
-   (inputs `(("zlib" ,zlib)
- ("libjpeg" ,libjpeg-turbo)))
+   (inputs
+(list libjpeg-turbo zlib))
(synopsis "Library for handling TIFF files")
(description
 "Libtiff provides support for the Tag Image File Format (TIFF), a format



01/05: gnu: libtiff: Add 'upstream-name' property.

2022-06-27 Thread guix-commits
mbakke pushed a commit to branch core-updates
in repository guix.

commit 8b13d38facc5d13eb5bd5dde18e07194900efebc
Author: Marius Bakke 
AuthorDate: Mon Jun 27 11:27:01 2022 +0200

gnu: libtiff: Add 'upstream-name' property.

* gnu/packages/image.scm (libtiff)[properties]: New field.
---
 gnu/packages/image.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index f65e8dbf46..4976b4c8e5 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -594,6 +594,8 @@ Included are a library, libtiff, for reading and writing 
TIFF and a small
 collection of tools for doing simple manipulations of TIFF images.")
(license (license:non-copyleft "file://COPYRIGHT"
   "See COPYRIGHT in the distribution."))
+   (properties
+'((upstream-name . "tiff")))
(home-page "http://www.simplesystems.org/libtiff/;)))
 
 (define-public leptonica



branch master updated: gnu: emacs-bbdb: Update to 3.2.2.2.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 08fc2e13a1 gnu: emacs-bbdb: Update to 3.2.2.2.
08fc2e13a1 is described below

commit 08fc2e13a1727bcc0faf9289e3d1c0e1774151b5
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 18:47:58 2022 +0200

gnu: emacs-bbdb: Update to 3.2.2.2.

* gnu/packages/emacs-xyz.scm (emacs-bbdb): Update to 3.2.2.2.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 94a290590c..90c78cc379 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2576,14 +2576,14 @@ directories or regex patterns.")
 (define-public emacs-bbdb
   (package
 (name "emacs-bbdb")
-(version "3.2.1")
+(version "3.2.2.2")
 (source
  (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/;
"bbdb-" version ".tar"))
(sha256
-(base32 "01vsnifs47krq1srgdkk9agbv3p2fykl9nydr4nrfjxbqpnyh3ij"
+(base32 "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf"
 (build-system emacs-build-system)
 (arguments
  ;; XXX: The following file cannot be byte-compiled, because et requires



02/02: gnu: openssl: Update to 1.1.1p [security fixes].

2022-06-27 Thread guix-commits
efraim pushed a commit to branch master
in repository guix.

commit bcba5835e5579545609aa9b166da4a67d5d57d6f
Author: Efraim Flashner 
AuthorDate: Mon Jun 27 16:22:33 2022 +0300

gnu: openssl: Update to 1.1.1p [security fixes].

* gnu/packages/tls.scm (openssl/fixed): Update to 1.1.1p.
---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6a036623d8..9e52225d52 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -507,7 +507,7 @@ OpenSSL for TARGET."
   (package
 (inherit openssl)
 (name "openssl")
-(version "1.1.1n")
+(version "1.1.1p")
 (source (origin
   (method url-fetch)
   (uri (list (string-append 
"https://www.openssl.org/source/openssl-;
@@ -520,7 +520,7 @@ OpenSSL for TARGET."
   (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
   (sha256
(base32
-"0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"))
+"0vyfibydji26wk1fmm0piz0810mfr7j4vaa2k5iwgiv6m8mbcqdz"))
 
 (define-public openssl-3.0
   (package



branch master updated: gnu: emacs-auctex: Update to 13.1.3.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 0bd1c4fbbc gnu: emacs-auctex: Update to 13.1.3.
0bd1c4fbbc is described below

commit 0bd1c4fbbc8a438876d6efa4feb275de461a2484
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 18:51:31 2022 +0200

gnu: emacs-auctex: Update to 13.1.3.

* gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.1.3.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 90c78cc379..ff2ed00c47 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2902,14 +2902,14 @@ as a library for other Emacs packages.")
 (define-public emacs-auctex
   (package
 (name "emacs-auctex")
-(version "13.1.1")
+(version "13.1.3")
 (source
  (origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/;
"auctex-" version ".tar"))
(sha256
-(base32 "193sqq2wiq3lg99m8hifl9rjxdazpy638r99sqvmxmkfm98cr34r"
+(base32 "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk"
 (build-system emacs-build-system)
 ;; We use 'emacs' because AUCTeX requires dbus at compile time
 ;; ('emacs-minimal' does not provide dbus).



01/02: gnu: python-lit: Update to 14.0.3.

2022-06-27 Thread guix-commits
efraim pushed a commit to branch master
in repository guix.

commit 110ef1d2e70b339bb41e7707bf4be41953c827f8
Author: Efraim Flashner 
AuthorDate: Mon Jun 27 15:16:35 2022 +0300

gnu: python-lit: Update to 14.0.3.

* gnu/packages/check.scm (python-lit): Update to 14.0.3.
---
 gnu/packages/check.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index d67149d85a..6ad2b1acd8 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2017 Cyril Roelandt 
 ;;; Copyright © 2015 Federico Beffa 
 ;;; Copyright © 2015 Andreas Enge 
-;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner 

+;;; Copyright © 2015, 2016, 2018-2022 Efraim Flashner 
 ;;; Copyright © 2016, 2017 Leo Famulari 
 ;;; Copyright © 2016 Christine Lemmer-Webber 
 ;;; Copyright © 2016, 2017 Danny Milosavljevic 
@@ -2068,14 +2068,14 @@ programs, something like CSmith, a random generator of 
C programs.")
 (define-public python-lit
   (package
 (name "python-lit")
-(version "12.0.1")
+(version "14.0.3")
 (source
   (origin
 (method url-fetch)
 (uri (pypi-uri "lit" version))
 (sha256
  (base32
-  "01yggsb73s2gbq36xwifxl6k5ll5lkss5rwz59k9h3jnbnn7m5fj"
+  "162x7pddwl395c3mdb0mfn3f5z24x1jz6g27x303lfxpzidnn4m4"
 (build-system python-build-system)
 (arguments
  `(#:phases



branch master updated (08fc2e13a1 -> bcba5835e5)

2022-06-27 Thread guix-commits
efraim pushed a change to branch master
in repository guix.

from 08fc2e13a1 gnu: emacs-bbdb: Update to 3.2.2.2.
 new 110ef1d2e7 gnu: python-lit: Update to 14.0.3.
 new bcba5835e5 gnu: openssl: Update to 1.1.1p [security fixes].

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/check.scm | 6 +++---
 gnu/packages/tls.scm   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)



branch master updated: gnu: emacs-solarized-theme: Update to 2.0.0.

2022-06-27 Thread guix-commits
This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new b42e52a735 gnu: emacs-solarized-theme: Update to 2.0.0.
b42e52a735 is described below

commit b42e52a735722534cef53de874861a921b3d8734
Author: Nicolas Goaziou 
AuthorDate: Mon Jun 27 12:32:04 2022 +0200

gnu: emacs-solarized-theme: Update to 2.0.0.

* gnu/packages/emacs-xyz.scm (emacs-solarized-theme): Update to 2.0.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 54321637b9..94a290590c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8566,7 +8566,7 @@ variants.")
 (define-public emacs-solarized-theme
   (package
 (name "emacs-solarized-theme")
-(version "1.3.1")
+(version "2.0.0")
 (source
  (origin
(method git-fetch)
@@ -8575,7 +8575,7 @@ variants.")
  (commit (string-append "v" version
(file-name (git-file-name name version))
(sha256
-(base32 "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g"
+(base32 "17z6cj8ids88xj2i6zs1s0mxs0fhn3gr7g5nhhy8s8khnzmyy2vj"
 (build-system emacs-build-system)
 (propagated-inputs
  (list emacs-dash))



01/02: gnu: stumpwm: Update to 22.05.

2022-06-27 Thread guix-commits
glv pushed a commit to branch master
in repository guix.

commit 1967c0422693764687bbe99720a56008408fd4f1
Author: Elais Player 
AuthorDate: Sun Jun 26 14:48:57 2022 -0600

gnu: stumpwm: Update to 22.05.

* gnu/packages/wm.scm (stumpwm): Update to 22.05.
  [arguments]: Add 'fix-tests' phase.

Co-authored-by: Guillaume Le Vaillant 
---
 gnu/packages/wm.scm | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f0032cd4c7..ba39ccd0e9 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -37,7 +37,7 @@
 ;;; Copyright © 2020 Marcin Karpezo 
 ;;; Copyright © 2020 EuAndreh 
 ;;; Copyright © 2020 Michael Rohleder 
-;;; Copyright © 2020 Guillaume Le Vaillant 
+;;; Copyright © 2020, 2022 Guillaume Le Vaillant 
 ;;; Copyright © 2020 B. Wilson 
 ;;; Copyright © 2020 Niklas Eklund 
 ;;; Copyright © 2020 Robert Smith 
@@ -55,6 +55,7 @@
 ;;; Copyright © 2022 Pier-Hugues Pellerin 
 ;;; Copyright © 2022 Maxim Cournoyer 
 ;;; Copyright © 2022 muradm 
+;;; Copyright © 2022 Elais Player 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1820,7 +1821,7 @@ Wayland compositors supporting the wlr-output-management 
protocol.")
 (define-public stumpwm
   (package
 (name "stumpwm")
-(version "20.11")
+(version "22.05")
 (source
  (origin
(method git-fetch)
@@ -1829,7 +1830,7 @@ Wayland compositors supporting the wlr-output-management 
protocol.")
  (commit version)))
(file-name (git-file-name "stumpwm" version))
(sha256
-(base32 "1ghs6ihvmb3bz4q4ys1d3h6rdi96xyiw7l2ip7jh54c25049aymf"
+(base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan"
 (build-system asdf-build-system/sbcl)
 (native-inputs `(("fiasco" ,sbcl-fiasco)
  ("texinfo" ,texinfo)
@@ -1842,9 +1843,13 @@ Wayland compositors supporting the wlr-output-management 
protocol.")
   ("alexandria" ,sbcl-alexandria)))
 (outputs '("out" "lib"))
 (arguments
- '(#:asd-systems '("stumpwm")
-   #:phases
+ '(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+   (lambda _
+ (substitute* "stumpwm-tests.asd"
+   (("\"ALL-TESTS\"")
+"\"RUN-PACKAGE-TESTS\" :package"
  (add-after 'create-asdf-configuration 'build-program
(lambda* (#:key outputs #:allow-other-keys)
  (build-program



branch master updated (97766323bc -> 144a750f8b)

2022-06-27 Thread guix-commits
glv pushed a change to branch master
in repository guix.

from 97766323bc gnu: font-abattis-cantarell: Build from source.
 new 1967c04226 gnu: stumpwm: Update to 22.05.
 new 144a750f8b gnu: stumpwm: Improve package definition.

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/wm.scm | 102 +++-
 1 file changed, 54 insertions(+), 48 deletions(-)



02/02: gnu: stumpwm: Improve package definition.

2022-06-27 Thread guix-commits
glv pushed a commit to branch master
in repository guix.

commit 144a750f8b10e606751bc887bcb09e7fb7ae09ff
Author: Guillaume Le Vaillant 
AuthorDate: Mon Jun 27 11:15:44 2022 +0200

gnu: stumpwm: Improve package definition.

* gnu/packages/wm.scm (stumpwm)[inputs, native-inputs]: Remove labels.
  [arguments]: Use gexp and remote trailing #t in phases.
---
 gnu/packages/wm.scm | 99 +++--
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ba39ccd0e9..8fef7de77b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1832,57 +1832,58 @@ Wayland compositors supporting the 
wlr-output-management protocol.")
(sha256
 (base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan"
 (build-system asdf-build-system/sbcl)
-(native-inputs `(("fiasco" ,sbcl-fiasco)
- ("texinfo" ,texinfo)
-
- ;; To build the manual.
- ("autoconf" ,autoconf)
- ("automake" ,automake)))
-(inputs `(("cl-ppcre" ,sbcl-cl-ppcre)
-  ("clx" ,sbcl-clx)
-  ("alexandria" ,sbcl-alexandria)))
+(native-inputs
+ (list sbcl-fiasco
+   texinfo
+
+   ;; To build the manual.
+   autoconf
+   automake))
+(inputs
+ (list sbcl-alexandria
+   sbcl-cl-ppcre
+   sbcl-clx))
 (outputs '("out" "lib"))
 (arguments
- '(#:phases
-   (modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
-   (lambda _
- (substitute* "stumpwm-tests.asd"
-   (("\"ALL-TESTS\"")
-"\"RUN-PACKAGE-TESTS\" :package"
- (add-after 'create-asdf-configuration 'build-program
-   (lambda* (#:key outputs #:allow-other-keys)
- (build-program
-  (string-append (assoc-ref outputs "out") "/bin/stumpwm")
-  outputs
-  #:entry-program '((stumpwm:stumpwm) 0
- (add-after 'build-program 'create-desktop-file
-   (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(xsessions (string-append out "/share/xsessions")))
-   (mkdir-p xsessions)
-   (call-with-output-file
-   (string-append xsessions "/stumpwm.desktop")
- (lambda (file)
-   (format file
-"[Desktop Entry]~@
- Name=stumpwm~@
- Comment=The Stump Window Manager~@
- Exec=~a/bin/stumpwm~@
- TryExec=~@*~a/bin/stumpwm~@
- Icon=~@
- Type=Application~%"
-out)))
-   #t)))
- (add-after 'install 'install-manual
-   (lambda* (#:key (make-flags '()) outputs #:allow-other-keys)
- (let* ((out  (assoc-ref outputs "out"))
-(info (string-append out "/share/info")))
-   (invoke "./autogen.sh")
-   (invoke "sh" "./configure" "SHELL=sh")
-   (apply invoke "make" "stumpwm.info" make-flags)
-   (install-file "stumpwm.info" info)
-   #t))
+ (list
+  #:phases
+  #~(modify-phases %standard-phases
+  (add-after 'unpack 'fix-tests
+(lambda _
+  (substitute* "stumpwm-tests.asd"
+(("\"ALL-TESTS\"")
+ "\"RUN-PACKAGE-TESTS\" :package"
+  (add-after 'create-asdf-configuration 'build-program
+(lambda* (#:key outputs #:allow-other-keys)
+  (build-program
+   (string-append (assoc-ref outputs "out") "/bin/stumpwm")
+   outputs
+   #:entry-program '((stumpwm:stumpwm) 0
+  (add-after 'build-program 'create-desktop-file
+(lambda* (#:key outputs #:allow-other-keys)
+  (let* ((out (assoc-ref outputs "out"))
+ (xsessions (string-append out "/share/xsessions")))
+(mkdir-p xsessions)
+(call-with-output-file
+(string-append xsessions "/stumpwm.desktop")
+  (lambda (file)
+(format file
+ "[Desktop Entry]~@
+  Name=stumpwm~@
+  Comment=The Stump Window Manager~@
+  Exec=~a/bin/stumpwm~@
+  TryExec=~@*~a/bin/stumpwm~@
+  Icon=~@
+  Type=Application~%"
+ out))
+  (add-after 'install 'install-manual
+(lambda* (#:key (make-flags '()) outputs #:allow-other-keys)
+  (let* ((out  (assoc-ref outputs "out"))
+ (info (string-append out "/share/info")))
+(invoke "./autogen.sh")
+