From a879e35116043d5daf3d9d175b697d10b9177fd5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Jan 2021 09:10:55 +0100 Subject: gnu: guix: Update to 1w6i9z4. * gnu/packages/package-management.scm (guix): Update to 1w6i9z4. --- gnu/packages/package-management.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d12db70aca..60d8d4b8c6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2018 Oleg Pykhalov @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "db42ee65bd657bae9b1a598cbdbe86079dc85f81") - (revision 9)) + (commit "23862011c3d02814181399765a024c7fa3fadd97") + (revision 10)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1kizkw6cxh6mhc8kal2fglnhyp1i668b4ilqbxq72slbmf9jr9jl")) + "1w6i9z4z24yl8v1gf5m7fgf0bz42gg4dpnhi25fg4a4y5qi7aahk")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -301,6 +301,7 @@ $(prefix)/etc/init.d\n"))) (sqlite (assoc-ref inputs "guile-sqlite3")) (zlib (assoc-ref inputs "guile-zlib")) (lzlib (assoc-ref inputs "guile-lzlib")) + (zstd (assoc-ref inputs "guile-zstd")) (git (assoc-ref inputs "guile-git")) (bs (assoc-ref inputs "guile-bytestructures")) @@ -308,7 +309,7 @@ $(prefix)/etc/init.d\n"))) (gnutls (assoc-ref inputs "gnutls")) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git - bs ssh zlib lzlib)) + bs ssh zlib lzlib zstd)) (deps* ,@(if (%current-target-system) '(deps) '((cons avahi deps)))) @@ -362,6 +363,7 @@ $(prefix)/etc/init.d\n"))) ("guile-sqlite3" ,guile-sqlite3) ("guile-zlib" ,guile-zlib) ("guile-lzlib" ,guile-lzlib) + ("guile-zstd" ,guile-zstd) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) @@ -417,7 +419,8 @@ $(prefix)/etc/init.d\n"))) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) - ("guile-lzlib" ,guile-lzlib))) + ("guile-lzlib" ,guile-lzlib) + ("guile-zstd" ,guile-zstd))) (native-search-paths (list (search-path-specification (variable "GUIX_EXTENSIONS_PATH") -- cgit v1.2.3 From 1278b157c05ed59f426ab9fb466396fb3d15c9ba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 21 Jan 2021 09:34:25 +0100 Subject: gnu: guix: Update to d4a562b. * gnu/packages/package-management.scm (guix): Update to d4a562b. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 60d8d4b8c6..d2ab815337 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "23862011c3d02814181399765a024c7fa3fadd97") - (revision 10)) + (commit "d4a562ba7ac4549cc2d57eff7f440026a2045f45") + (revision 11)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1w6i9z4z24yl8v1gf5m7fgf0bz42gg4dpnhi25fg4a4y5qi7aahk")) + "05gkymzfl0fdb2zjyvvn7w15arfnn7fgpbn3bch9r5yc7ldxg868")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From dd988726fcfed305e8b265fb8d8ec01e64d3a58e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 Jan 2021 08:35:29 +0100 Subject: gnu: guix: Add search path spec for 'SSL_CERT_DIR'. * gnu/packages/package-management.scm (guix)[native-search-paths]: Add 'SSL_CERT_DIR'. --- gnu/packages/package-management.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d2ab815337..df5bd2eb81 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -424,7 +424,14 @@ $(prefix)/etc/init.d\n"))) (native-search-paths (list (search-path-specification (variable "GUIX_EXTENSIONS_PATH") - (files '("share/guix/extensions"))))) + (files '("share/guix/extensions"))) + + ;; (guix git) and (guix build download) honor this variable whose + ;; name comes from OpenSSL. + (search-path-specification + (variable "SSL_CERT_DIR") + (separator #f) ;single entry + (files '("etc/ssl/certs"))))) (home-page "https://www.gnu.org/software/guix/") (synopsis "Functional package manager for installed software packages and versions") -- cgit v1.2.3 From c95f7dc6f113dc66ca463e3a44c309c0c5ccd7f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Jan 2021 13:11:03 +0200 Subject: gnu: flatpak: Update to 1.10.1. * gnu/packages/package-management.scm (flatpak): Update to 1.10.1. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index df5bd2eb81..2f3f575d3f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018, 2019 Eric Bavier -;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen @@ -1358,14 +1358,14 @@ the boot loader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.8.2") + (version "1.10.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "1c45a0k7wx685n5b3ihv7dk0mm2kmwbw7cx8w5g2la62yxfn49kr")))) + (base32 "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. -- cgit v1.2.3 From fc68f611929df574c040e15f6653cee63401f8e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 24 Jan 2021 21:42:04 +0100 Subject: gnu: guix-jupyter: Update to 0.2.0. * gnu/packages/package-management.scm (guix-jupyter): Update to 0.2.0. [source]: Remove 'modules' and 'snippet'. --- gnu/packages/package-management.scm | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2f3f575d3f..7bfe21baf4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1140,7 +1140,7 @@ outputs of those builds.") (define-public guix-jupyter (package (name "guix-jupyter") - (version "0.1.0") + (version "0.2.0") (home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel") (source (origin (method git-fetch) @@ -1148,24 +1148,7 @@ outputs of those builds.") (commit (string-append "v" version)))) (sha256 (base32 - "01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2])\n")) - - ;; Avoid name clash and build failure now that - ;; 'define-json-mapping' is also provided by Guile-JSON, as - ;; of version 4.3. - (substitute* (find-files "." "\\.scm$") - (("define-json-mapping") - "define-json-mapping*") - (("<=>") - "<->")) - #t)) + "1bjddkj1px1xzm3gia87sclphwsnr4vb92vrfi8gh5dx0z73dmc5")) (file-name (string-append "guix-jupyter-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 90a6ce0b1852608185e3ba7fe09e585b43eac3be Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Jan 2021 12:04:04 +0100 Subject: gnu: guix-jupyter: Update to 0.2.1. * gnu/packages/package-management.scm (guix-jupyter): Update to 0.2.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7bfe21baf4..98af2187fa 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1140,7 +1140,7 @@ outputs of those builds.") (define-public guix-jupyter (package (name "guix-jupyter") - (version "0.2.0") + (version "0.2.1") (home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel") (source (origin (method git-fetch) @@ -1148,7 +1148,7 @@ outputs of those builds.") (commit (string-append "v" version)))) (sha256 (base32 - "1bjddkj1px1xzm3gia87sclphwsnr4vb92vrfi8gh5dx0z73dmc5")) + "1kqwfp5h95s6mirq5nbydsbmlhsinn32grz1ld5mbxvhl6sn2i0j")) (file-name (string-append "guix-jupyter-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3