From patchwork Mon Feb 27 00:11:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47411 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B0CF716BFB; Mon, 27 Feb 2023 00:12:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4512416937 for ; Mon, 27 Feb 2023 00:12:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR7d-0000o2-7i; Sun, 26 Feb 2023 19:12:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR7b-0000n4-84 for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR7a-0007MR-Vx for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR7a-0005TX-RJ for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 01/11] gnu: Purge pre-1.3.0 deprecated packages. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745671620996 (code B ref 61829); Mon, 27 Feb 2023 00:12:02 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:11:56 +0000 Received: from localhost ([127.0.0.1]:45290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7T-0005SJ-Fm for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:56 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:51954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7P-0005Rb-Oq for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:53 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 7E42D20BD3 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 28F348009B; Mon, 27 Feb 2023 01:11:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id u1ahIahUY6w2; Mon, 27 Feb 2023 01:11:49 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6AA1580098; Mon, 27 Feb 2023 01:11:49 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:34 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bioinformatics.scm (deeptools): Remove variable. * gnu/packages/efi.scm (efi_analyzer): Ditto. * gnu/packages/guile.scm (guile-2.2/bug-fix, guile-json): Ditto. * gnu/packages/image.scm (libjpeg): Ditto. * gnu/packages/kde.scm (kdevplatform): Ditto * gnu/packages/linphone.scm (linphoneqt): Ditto. * gnu/packages/maths.scm (blis-sandybridge, blis-haswell, blis-knl): Ditto. * gnu/packages/mpi.scm (hwloc-2.0): Ditto. * gnu/packages/music.scm (python-abjad, zlfo): Ditto. * gnu/packages/perl.scm (perl-base, perl-parent): Ditto. * gnu/packages/tryton.scm (python-trytond): Ditto. * gnu/packages/video.scm (gnome-mpv): Ditto. * tests/graph.scm: Use guile-json-1. --- gnu/packages/bioinformatics.scm | 2 -- gnu/packages/efi.scm | 4 ---- gnu/packages/guile.scm | 8 -------- gnu/packages/image.scm | 3 --- gnu/packages/kde.scm | 3 --- gnu/packages/linphone.scm | 3 --- gnu/packages/maths.scm | 4 ---- gnu/packages/mpi.scm | 2 -- gnu/packages/music.scm | 7 ------- gnu/packages/perl.scm | 6 ------ gnu/packages/tryton.scm | 3 --- gnu/packages/video.scm | 3 --- tests/graph.scm | 2 +- 13 files changed, 1 insertion(+), 49 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9e8f7e92f8..377661404c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3349,8 +3349,6 @@ (define-public python-deeptools ;; remainder of the code is licensed under the MIT license. (license (list license:bsd-3 license:expat)))) -(define-deprecated deeptools python-deeptools) - (define-public cutadapt (package (name "cutadapt") diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 4625538d26..75eb24bf86 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -96,10 +96,6 @@ (define-public efi-analyzer information.") (license license:bsd-2)))) -(define-public efi_analyzer - ;; For a short while the package name contained an underscore. - (deprecated-package "efi_analyzer" efi-analyzer)) - (define-public sbsigntools (package (name "sbsigntools") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2fd9b711ce..e11627a67e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -291,8 +291,6 @@ (define-public guile-2.2 (variable "GUILE_LOAD_COMPILED_PATH") (files '("lib/guile/2.2/site-ccache"))))))) -(define-deprecated guile-2.2/bug-fix guile-2.2) - (define-public guile-2.2.4 (package (inherit guile-2.2) @@ -650,12 +648,6 @@ (define-public guile-json-1 ;; Version 1.2.0 switched to GPLv3+ (from LGPLv3+). (license license:gpl3+))) -;; Deprecate the 'guile-json' alias to force the use 'guile-json-1' or -;; 'guile-json-3'. In the future, we may reuse 'guile-json' as an alias for -;; 'guile-json-3'. -(define-deprecated guile-json guile-json-1) -(export guile-json) - (define-public guile2.0-json (package-for-guile-2.0 guile-json-1)) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5071dd588f..a7784949a5 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1712,9 +1712,6 @@ (define-public libjpeg-turbo license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions -(define-deprecated libjpeg libjpeg-turbo) -(export libjpeg) - (define-public niftilib (package (name "niftilib") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 728051b9e4..5b6d638e4a 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -412,9 +412,6 @@ (define-public kdevelop-pg-qt for some KDevelop language plugins (Ruby, PHP, CSS...).") (license license:lgpl2.0+))) -;; kdevplatform was merged into kdevelop as of 5.2.x -(define-deprecated kdevplatform kdevelop) - (define-public kdiagram (package (name "kdiagram") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 84bc16805c..d41d368e67 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -876,9 +876,6 @@ (define-public linphone-desktop (home-page "https://linphone.org/technical-corner/linphone") (license license:gpl3+))) -(define-public linphoneqt - (deprecated-package "linphoneqt" linphone-desktop)) - (define-public msopenh264 (let ((commit "88697cc95140017760d6da408cb0efdc5e86e40a") (revision "0")) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 280465e284..58bcd8bc09 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4902,10 +4902,6 @@ (define-public blis access to BLIS implementations via traditional BLAS routine calls.") (license license:bsd-3))) -(define-public blis-sandybridge (deprecated-package "blis-sandybridge" blis)) -(define-public blis-haswell (deprecated-package "blis-haswell" blis)) -(define-public blis-knl (deprecated-package "blis-knl" blis)) - (define ignorance blis) (define-public openlibm diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e8c20919d7..f97bba24d7 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -180,8 +180,6 @@ (define-public hwloc-2 (("hwloc_topology_init" all) (string-append "exit (77);\n" all))))))))))) -(define-deprecated hwloc-2.0 hwloc-2) - (define-public hwloc ;; The latest stable series of hwloc. hwloc-2) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f4a570189b..30092965c8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1543,9 +1543,6 @@ (define-public abjad typographic detail of symbols on the page.") (license license:expat))) -(define-public python-abjad - (deprecated-package "python-abjad" abjad)) - (define-public abjad-ext-rmakers (package (name "abjad-ext-rmakers") @@ -6491,10 +6488,6 @@ (define-public zplugins (home-page "https://www.zrythm.org/en/plugins.html") (license license:agpl3+))) -(define-public zlfo - ;; The "zlfo" package is now included in zplugins - (deprecated-package "zlfo" zplugins)) - (define-public remid-lv2 (package (name "remid-lv2") diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 41b68baea8..a6b5a7b013 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -817,9 +817,6 @@ (define-public perl-bareword-filehandles (description "This module disables bareword filehandles.") (license (package-license perl)))) -(define-public perl-base - (deprecated-package "perl-base" perl)) - (define-public perl-browser-open (package (name "perl-browser-open") @@ -8598,9 +8595,6 @@ (define-public perl-par-dist distributions.") (license (package-license perl)))) -(define-public perl-parent - (deprecated-package "perl-parent" perl)) - (define-public perl-path-class (package (name "perl-path-class") diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index 8e561cad45..0b367675ae 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -100,9 +100,6 @@ (define-public trytond and security.") (license license:gpl3+))) -(define-public python-trytond - (deprecated-package "python-trytond" trytond)) - (define-public tryton (package (name "tryton") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f63d5494de..aaf0fdd670 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2347,9 +2347,6 @@ (define-public gallery-dl images and image hosting sites.") (license license:gpl2))) -(define-public gnome-mpv - (deprecated-package "gnome-mpv" celluloid)) - (define-public mpv-mpris (package (name "mpv-mpris") diff --git a/tests/graph.scm b/tests/graph.scm index 6674b5cc8f..a6186ff7e8 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -477,7 +477,7 @@ (define (edge->tuple source target) '("libffi" "guile" "guile-json") (run-with-store %store (mlet %store-monad ((path (shortest-path (specification->package "libffi") - guile-json + guile-json-1 %reverse-package-node-type))) (return (map package-name path))))) From patchwork Mon Feb 27 00:11:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47415 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F57216C03; Mon, 27 Feb 2023 00:13:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6034416884 for ; Mon, 27 Feb 2023 00:13:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8b-0001G7-C9; Sun, 26 Feb 2023 19:13:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0001Ez-7y for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8Z-0007c4-Ih for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8Z-0005Ws-Du for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 02/11] gnu: curl-minimal: Remove variable. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745673021150 (code B ref 61829); Mon, 27 Feb 2023 00:13:03 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:10 +0000 Received: from localhost ([127.0.0.1]:45314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7i-0005Uy-6b for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:10 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:51978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7V-0005Sn-2I for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:57 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id C440F20BE8 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6802580098; Mon, 27 Feb 2023 01:11:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PPBb09WzPPcD; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C1B4D80097; Mon, 27 Feb 2023 01:11:49 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:35 +0000 Message-Id: <551c2fabd7202726360d0aaf4f4feacd8caf605c.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/curl.scm (curl-minimal): Remove variable. * gnu/packages/astronomy.scm (python-fitsio, gnuastro): Use curl. * gnu/packages/games.scm (odamex): Ditto. * gnu/packages/sync.scm (onedrive): Ditto. --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/curl.scm | 3 --- gnu/packages/games.scm | 2 +- gnu/packages/sync.scm | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b6ed1e2f49..fe4ec637c6 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -438,7 +438,7 @@ (define-public python-fitsio (("self.use_system_fitsio") "True") (("self.system_fitsio_includedir") includedir) (("self.system_fitsio_libdir") libdir)))))))) - (inputs (list curl-minimal)) + (inputs (list curl)) (propagated-inputs (list python-numpy cfitsio)) (home-page "https://github.com/esheldon/fitsio") @@ -605,7 +605,7 @@ (define-public gnuastro '(#:configure-flags '("--disable-static"))) (inputs (list cfitsio - curl-minimal + curl gsl libgit2 libjpeg-turbo diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 45bd2e6d36..bd00a6d274 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -170,9 +170,6 @@ (define curl-7.84.0 "NUM_THREADS 100\n")))))) (else phases))))))) -(define-public curl-minimal - (deprecated-package "curl-minimal" curl)) - (define-public curl-ssh (package/inherit curl (arguments diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a5783c1d1b..0ee51e3d7f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7616,7 +7616,7 @@ (define-public odamex ("sdl-mixer" ,sdl2-mixer) ("zlib" ,zlib) ("libpng" ,libpng) - ("curl" ,curl-minimal) + ("curl" ,curl) ("alsa-lib" ,alsa-lib))) (home-page "https://odamex.net/") (synopsis "Multiplayer Doom port") diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index b0d8b4274e..75cd67fd2d 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -408,7 +408,7 @@ (define-public onedrive (list pkg-config)) (inputs (list bash-minimal - curl-minimal + curl ldc libnotify sqlite)) From patchwork Mon Feb 27 00:11:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47410 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5B65416BFB; Mon, 27 Feb 2023 00:12:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F8B716937 for ; Mon, 27 Feb 2023 00:12:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR7f-0000qE-TU; Sun, 26 Feb 2023 19:12:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR7c-0000nK-AG for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR7b-0007Mk-Q8 for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR7b-0005Tr-MK for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 03/11] services: ntp-service-type: Remove deprecated server as strings support. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745671721010 (code B ref 61829); Mon, 27 Feb 2023 00:12:03 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:11:57 +0000 Received: from localhost ([127.0.0.1]:45294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7U-0005Si-NZ for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:57 -0500 Received: from smtpm7.myservices.hosting ([185.26.105.208]:47724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7Q-0005Re-0e for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:54 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm7.myservices.hosting (Postfix) with ESMTP id 61FD120C76 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 18F578009B; Mon, 27 Feb 2023 01:11:51 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PxR3fy5uAd91; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 1B55A8009A; Mon, 27 Feb 2023 01:11:50 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:36 +0000 Message-Id: <2046be031f35d2eb4e9ed278c06a2e832d565671.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm ()[servers]: Rename accessor to ntp-configuration-servers. (ntp-configuration-servers): Remove helper procedure. (ntp-shepherd-service): Remove helper procedure usage. * tests/networking.scm: Remove obsolete test. --- gnu/services/networking.scm | 57 +++++++++++++------------------------ tests/networking.scm | 11 ------- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index dacf64c2d1..ef66393937 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -481,36 +481,19 @@ (define-record-type* ntp-configuration? (ntp ntp-configuration-ntp (default ntp)) - (servers %ntp-configuration-servers ;list of objects + (servers ntp-configuration-servers ;list of objects (default %ntp-servers)) (allow-large-adjustment? ntp-allow-large-adjustment? (default #t))) ;as recommended in the ntpd manual -(define (ntp-configuration-servers ntp-configuration) - ;; A wrapper to support the deprecated form of this field. - (let ((ntp-servers (%ntp-configuration-servers ntp-configuration))) - (match ntp-servers - (((? string?) (? string?) ...) - (format (current-error-port) "warning: Defining NTP servers as strings is \ -deprecated. Please use records instead.\n") - (map (lambda (addr) - (ntp-server - (type 'server) - (address addr) - (options '()))) ntp-servers)) - ((($ ) ($ ) ...) - ntp-servers)))) - (define (ntp-shepherd-service config) (match-record config (ntp servers allow-large-adjustment?) - (let ((servers (ntp-configuration-servers config))) - ;; TODO: Add authentication support. - (define config - (string-append "driftfile /var/run/ntpd/ntp.drift\n" - (string-join (map ntp-server->string servers) - "\n") - " + ;; TODO: Add authentication support. + (define config + (string-append "driftfile /var/run/ntpd/ntp.drift\n" + (string-join (map ntp-server->string servers) "\n") + " # Disable status queries as a workaround for CVE-2013-5211: # . restrict default kod nomodify notrap nopeer noquery limited @@ -524,21 +507,21 @@ (define (ntp-shepherd-service config) # option by default, as documented in the 'ntp.conf' manual. restrict source notrap nomodify noquery\n")) - (define ntpd.conf - (plain-file "ntpd.conf" config)) + (define ntpd.conf + (plain-file "ntpd.conf" config)) - (list (shepherd-service - (provision '(ntpd)) - (documentation "Run the Network Time Protocol (NTP) daemon.") - (requirement '(user-processes networking)) - (start #~(make-forkexec-constructor - (list (string-append #$ntp "/bin/ntpd") "-n" - "-c" #$ntpd.conf "-u" "ntpd" - #$@(if allow-large-adjustment? - '("-g") - '())) - #:log-file "/var/log/ntpd.log")) - (stop #~(make-kill-destructor))))))) + (list (shepherd-service + (provision '(ntpd)) + (documentation "Run the Network Time Protocol (NTP) daemon.") + (requirement '(user-processes networking)) + (start #~(make-forkexec-constructor + (list (string-append #$ntp "/bin/ntpd") "-n" + "-c" #$ntpd.conf "-u" "ntpd" + #$@(if allow-large-adjustment? + '("-g") + '())) + #:log-file "/var/log/ntpd.log")) + (stop #~(make-kill-destructor)))))) (define %ntp-accounts (list (user-account diff --git a/tests/networking.scm b/tests/networking.scm index f2421370d2..fbf8db7a02 100644 --- a/tests/networking.scm +++ b/tests/networking.scm @@ -43,17 +43,6 @@ (define %ntp-server-sample "server some.ntp.server.org iburst version 3 maxpoll 16 prefer" (ntp-server->string %ntp-server-sample)) -(test-equal "ntp configuration servers deprecated form" - (ntp-configuration-servers - (ntp-configuration - (servers (list "example.pool.ntp.org")))) - (ntp-configuration-servers - (ntp-configuration - (servers (list (ntp-server - (type 'server) - (address "example.pool.ntp.org") - (options '()))))))) - ;;; ;;; OpenNTPD From patchwork Mon Feb 27 00:11:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47408 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 14C9E16A98; Mon, 27 Feb 2023 00:12:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6A48116937 for ; Mon, 27 Feb 2023 00:12:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR7c-0000nM-39; Sun, 26 Feb 2023 19:12:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR7b-0000mx-0b for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR7a-0007MJ-On for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR7a-0005TQ-8S for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 04/11] services: sddm: Remove 'sddm-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745671520982 (code B ref 61829); Mon, 27 Feb 2023 00:12:02 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:11:55 +0000 Received: from localhost ([127.0.0.1]:45287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7T-0005SF-42 for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:55 -0500 Received: from smtpm8.myservices.hosting ([185.26.105.209]:34388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7P-0005Rd-Ow for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:53 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm8.myservices.hosting (Postfix) with ESMTP id 33CA220D86 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D7D9580098; Mon, 27 Feb 2023 01:11:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 1FhAozaeP9Ki; Mon, 27 Feb 2023 01:11:50 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6CF7C8009D; Mon, 27 Feb 2023 01:11:50 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:37 +0000 Message-Id: <554a9c36519877c185b6cab50bfa3be532f00657.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/sddm.scm (sddm-service): Remove procedure. --- gnu/services/sddm.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 694ad736dc..9e02f1cc81 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -324,9 +324,3 @@ (define sddm-service-type (description "Run SDDM, a display and log-in manager for X11 and Wayland.")))) - -(define-deprecated (sddm-service #:optional (config (sddm-configuration))) - sddm-service-type - "Run the @uref{https://github.com/sddm/sddm,SDDM display manager} -with the given @var{config}, a @code{} object." - (service sddm-service-type config)) From patchwork Mon Feb 27 00:11:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47409 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2CF6916BFB; Mon, 27 Feb 2023 00:12:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A352A16937 for ; Mon, 27 Feb 2023 00:12:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR7d-0000o1-7F; Sun, 26 Feb 2023 19:12:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR7b-0000nD-NI for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR7b-0007Mb-F7 for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR7b-0005Tk-An for guix-patches@gnu.org; Sun, 26 Feb 2023 19:12:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 05/11] services: base: Remove 'console-keymap-service-type' variable. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745671621003 (code B ref 61829); Mon, 27 Feb 2023 00:12:03 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:11:56 +0000 Received: from localhost ([127.0.0.1]:45292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7U-0005Sa-Cr for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:56 -0500 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:48794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7Q-0005Rf-7Z for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:54 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 85C2920D75 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 3C36680098; Mon, 27 Feb 2023 01:11:51 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7P0LtterjUg4; Mon, 27 Feb 2023 01:11:51 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C748D80097; Mon, 27 Feb 2023 01:11:50 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:38 +0000 Message-Id: <92183462f795f9b38709f2f6a4cbe39ddf39bd78.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm (console-keymap-service-type): Remove variable. --- gnu/services/base.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 7ad1e765bd..b83e778856 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -808,21 +808,6 @@ (define virtual-terminal-service-type #t ;default to UTF-8 (description "Ensure the Linux virtual terminals run in UTF-8 mode."))) -(define console-keymap-service-type - (shepherd-service-type - 'console-keymap - (lambda (files) - (shepherd-service - (documentation (string-append "Load console keymap (loadkeys).")) - (provision '(console-keymap)) - (start #~(lambda _ - (zero? (system* #$(file-append kbd "/bin/loadkeys") - #$@files)))) - (respawn? #f))) - (description "@emph{This service is deprecated in favor of the -@code{keyboard-layout} field of @code{operating-system}.} Load the given list -of console keymaps with @command{loadkeys}."))) - (define %default-console-font ;; Note: the 'font-gnu-unifont' package cannot be cross-compiled (yet), but ;; its "psf" output is the same whether it's built natively or not, hence From patchwork Mon Feb 27 00:11:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47414 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 77D6D16BFB; Mon, 27 Feb 2023 00:13:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 44A8916937 for ; Mon, 27 Feb 2023 00:13:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8b-0001G3-6i; Sun, 26 Feb 2023 19:13:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0001Ex-7s for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8Z-0007bt-01 for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8Y-0005Wd-KJ for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 06/11] services: base: Remove 'console-font-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745672921134 (code B ref 61829); Mon, 27 Feb 2023 00:13:02 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:09 +0000 Received: from localhost ([127.0.0.1]:45310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7h-0005Uk-JZ for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:09 -0500 Received: from smtpm4.myservices.hosting ([185.26.105.235]:56098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7S-0005Rw-J2 for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:54 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 0D97820D51 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id BC95D8009F; Mon, 27 Feb 2023 01:11:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id joMd68nXaVw2; Mon, 27 Feb 2023 01:11:53 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 2B2078009A; Mon, 27 Feb 2023 01:11:51 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:39 +0000 Message-Id: <124066a347786c68528576cb6993b2cb6c3a03a6.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm (console-font-service): Remove procedure. --- gnu/services/base.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b83e778856..483a4ccd05 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -880,14 +880,6 @@ (define console-font-service-type \"/share/consolefonts/ter-132n\"))) ; for HDPI @end example\n"))) -(define* (console-font-service tty #:optional (font "LatGrkCyr-8x16")) - "This procedure is deprecated in favor of @code{console-font-service-type}. - -Return a service that sets up Unicode support in @var{tty} and loads -@var{font} for that tty (fonts are per virtual console in Linux.)" - (simple-service (symbol-append 'console-font- (string->symbol tty)) - console-font-service-type `((,tty . ,font)))) - (define %default-motd (plain-file "motd" "This is the GNU operating system, welcome!\n\n")) From patchwork Mon Feb 27 00:11:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47412 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5FBAA16A98; Mon, 27 Feb 2023 00:13:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4EF9016937 for ; Mon, 27 Feb 2023 00:13:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8h-0001IW-Ah; Sun, 26 Feb 2023 19:13:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8d-0001Go-HW for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0007ce-Su for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8a-0005XE-Nf for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 07/11] services: guix-publish: Remove 'compression-level' field. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745673121172 (code B ref 61829); Mon, 27 Feb 2023 00:13:04 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:11 +0000 Received: from localhost ([127.0.0.1]:45320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7j-0005VL-5h for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:11 -0500 Received: from smtpm4.myservices.hosting ([185.26.105.235]:56126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7a-0005TP-G0 for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:02 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 3165C20D51 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id DCEC98009A; Mon, 27 Feb 2023 01:11:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id QA1hrEoCZHdQ; Mon, 27 Feb 2023 01:11:53 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 7D16C80097; Mon, 27 Feb 2023 01:11:51 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:40 +0000 Message-Id: <014d8b0f1dc3cc1e9b05987bc71b4835e72e4a57.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm ()[compression-level]: Remove field. (guix-publish-configuration-compression-level): Remove procedure. (default-compression): Remove compression-level helper code. --- gnu/services/base.scm | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 483a4ccd05..8d72ff900b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -222,7 +222,6 @@ (define-module (gnu services base) guix-publish-configuration-port guix-publish-configuration-host guix-publish-configuration-compression - guix-publish-configuration-compression-level ;deprecated guix-publish-configuration-nar-path guix-publish-configuration-cache guix-publish-configuration-ttl @@ -1953,10 +1952,7 @@ (define-record-type* (default #f)) (compression guix-publish-configuration-compression (thunked) - (default (default-compression this-record - (current-source-location)))) - (compression-level %guix-publish-configuration-compression-level ;deprecated - (default #f)) + (default (default-compression this-record))) (nar-path guix-publish-configuration-nar-path ;string (default "nar")) (cache guix-publish-configuration-cache ;#f | string @@ -1970,25 +1966,14 @@ (define-record-type* (negative-ttl guix-publish-configuration-negative-ttl ;#f | integer (default #f))) -(define-deprecated (guix-publish-configuration-compression-level config) - "Return a compression level, the old way." - (match (guix-publish-configuration-compression config) - (((_ level) _ ...) level))) - -(define (default-compression config properties) +(define (default-compression config) "Return the default 'guix publish' compression according to CONFIG, and raise a deprecation warning if the 'compression-level' field was used." - (match (%guix-publish-configuration-compression-level config) - (#f - ;; Default to low compression levels when there's no cache so that users - ;; get good bandwidth by default. - (if (guix-publish-configuration-cache config) - '(("gzip" 5) ("zstd" 19)) - '(("gzip" 3) ("zstd" 3)))) ;zstd compresses faster - (level - (warn-about-deprecation 'compression-level properties - #:replacement 'compression) - `(("gzip" ,level))))) + ;; Default to low compression levels when there's no cache so that users + ;; get good bandwidth by default. + (if (guix-publish-configuration-cache config) + '(("gzip" 5) ("zstd" 19)) + '(("gzip" 3) ("zstd" 3)))) ;zstd compresses faster (define (guix-publish-shepherd-service config) (define (config->compression-options config) From patchwork Mon Feb 27 00:11:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47417 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0E52216C03; Mon, 27 Feb 2023 00:13:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 83AC216884 for ; Mon, 27 Feb 2023 00:13:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8e-0001HK-6g; Sun, 26 Feb 2023 19:13:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8Z-0001El-Kt for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8Y-0007bo-Dj for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8Y-0005WV-3y for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 08/11] services: desktop: Remove 'gnome-desktop-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745672921125 (code B ref 61829); Mon, 27 Feb 2023 00:13:02 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:09 +0000 Received: from localhost ([127.0.0.1]:45308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7h-0005Uf-9f for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:09 -0500 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:37288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7S-0005S2-U9 for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:55 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id 4222D20DDC for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id EEF618009A; Mon, 27 Feb 2023 01:11:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9W9UHuvd_S4x; Mon, 27 Feb 2023 01:11:53 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D064080098; Mon, 27 Feb 2023 01:11:51 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:41 +0000 Message-Id: <93c0eaacb83c2c600612cfb708731542b5014f2d.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/desktop.scm (gnome-desktop-service): Remove procedure. --- gnu/services/desktop.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 2034b3d099..de2b4296ae 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1402,15 +1402,10 @@ (define gnome-desktop-service-type (default-value (gnome-desktop-configuration)) (description "Run the GNOME desktop environment."))) -(define-deprecated (gnome-desktop-service #:key (config - (gnome-desktop-configuration))) - gnome-desktop-service-type - "Return a service that adds the @code{gnome} package to the system profile, -and extends polkit with the actions from @code{gnome-settings-daemon}." - (service gnome-desktop-service-type config)) - -;; MATE Desktop service. -;; TODO: Add mate-screensaver. + +;;; +;;; MATE Desktop service. +;;; TODO: Add mate-screensaver. (define-record-type* mate-desktop-configuration make-mate-desktop-configuration From patchwork Mon Feb 27 00:11:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47418 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 326D516BFB; Mon, 27 Feb 2023 00:13:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 41B4216884 for ; Mon, 27 Feb 2023 00:13:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8d-0001H4-Ru; Sun, 26 Feb 2023 19:13:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0001F0-8O for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8Z-0007bv-70 for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8Z-0005Wk-04 for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 09/11] services: desktop: Remove 'mate-desktop-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745673021143 (code B ref 61829); Mon, 27 Feb 2023 00:13:02 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:10 +0000 Received: from localhost ([127.0.0.1]:45312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7h-0005Up-S8 for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:10 -0500 Received: from smtpm6.myservices.hosting ([185.26.105.207]:54064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7T-0005S5-3K for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:55 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm6.myservices.hosting (Postfix) with ESMTP id 78F0020DA7 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 2F50E80098; Mon, 27 Feb 2023 01:11:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LleNaHPLmDwh; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 2D01F8009B; Mon, 27 Feb 2023 01:11:52 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:42 +0000 Message-Id: <90335a8328b727043296c366dfd069658003caf6.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/desktop.scm (mate-desktop-service): Remove procedure. --- gnu/services/desktop.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index de2b4296ae..08f05fbdf9 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1435,14 +1435,6 @@ (define mate-desktop-service-type (default-value (mate-desktop-configuration)) (description "Run the MATE desktop environment."))) -(define-deprecated (mate-desktop-service #:key - (config - (mate-desktop-configuration))) - mate-desktop-service-type - "Return a service that adds the @code{mate} package to the system profile, -and extends polkit with the actions from @code{mate-settings-daemon}." - (service mate-desktop-service-type config)) - ;;; ;;; XFCE desktop service. From patchwork Mon Feb 27 00:11:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47413 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB80D16A98; Mon, 27 Feb 2023 00:13:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2BD1E16937 for ; Mon, 27 Feb 2023 00:13:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8c-0001GX-4f; Sun, 26 Feb 2023 19:13:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0001F3-BF for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0007cA-1n for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8Z-0005Wz-SB for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 10/11] services: desktop: Remove 'xfce-desktop-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745673021157 (code B ref 61829); Mon, 27 Feb 2023 00:13:03 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:10 +0000 Received: from localhost ([127.0.0.1]:45316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7i-0005V5-IS for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:10 -0500 Received: from smtpm4.myservices.hosting ([185.26.105.235]:56114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7W-0005T1-Jy for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:58 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id B38BA20D55 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6A9D48009A; Mon, 27 Feb 2023 01:11:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id uhHvzeyb12kr; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 848558009D; Mon, 27 Feb 2023 01:11:52 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:43 +0000 Message-Id: <98fb7c7335eb9aff42e83cb3df571f9be98c6397.1677456515.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/desktop.scm (xfce-desktop-service): Remove procedure. --- gnu/services/desktop.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 08f05fbdf9..1bbc7c5d12 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1465,16 +1465,7 @@ (define xfce-desktop-service-type (default-value (xfce-desktop-configuration)) (description "Run the Xfce desktop environment."))) -(define-deprecated (xfce-desktop-service #:key (config - (xfce-desktop-configuration))) - xfce-desktop-service-type - "Return a service that adds the @code{xfce} package to the system profile, -and extends polkit with the ability for @code{thunar} to manipulate the file -system as root from within a user session, after the user has authenticated -with the administrator's password." - (service xfce-desktop-service-type config)) - -+ + ;;; ;;; Lxqt desktop service. ;;; From patchwork Mon Feb 27 00:11:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47416 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8C17616C03; Mon, 27 Feb 2023 00:13:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D579116884 for ; Mon, 27 Feb 2023 00:13:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWR8f-0001I8-U8; Sun, 26 Feb 2023 19:13:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWR8d-0001Gq-Ep for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWR8a-0007cZ-Eu for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWR8a-0005X6-Am for guix-patches@gnu.org; Sun, 26 Feb 2023 19:13:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61829] [PATCH 11/11] guix: packages: Remove 'origin-sha256' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 00:13:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61829 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61829@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61829-submit@debbugs.gnu.org id=B61829.167745673121166 (code B ref 61829); Mon, 27 Feb 2023 00:13:04 +0000 Received: (at 61829) by debbugs.gnu.org; 27 Feb 2023 00:12:11 +0000 Received: from localhost ([127.0.0.1]:45318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7i-0005VC-Qy for submit@debbugs.gnu.org; Sun, 26 Feb 2023 19:12:11 -0500 Received: from smtpm6.myservices.hosting ([185.26.105.207]:54078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWR7X-0005T4-2C for 61829@debbugs.gnu.org; Sun, 26 Feb 2023 19:11:59 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm6.myservices.hosting (Postfix) with ESMTP id 0481F20DA8 for <61829@debbugs.gnu.org>; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B1C5580098; Mon, 27 Feb 2023 01:11:54 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id wIp74fiVXNxu; Mon, 27 Feb 2023 01:11:54 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id D82F78009E; Mon, 27 Feb 2023 01:11:52 +0100 (CET) From: Bruno Victal Date: Mon, 27 Feb 2023 00:11:44 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/packages.scm (origin-sha256): Remove procedure. * tests/import-utils.scm (test-import-utils) [alist->package with explicit source]: Use content-hash-value. --- guix/packages.scm | 9 --------- tests/import-utils.scm | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 041a872f9d..bded89b1e0 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -73,7 +73,6 @@ (define-module (guix packages) origin-uri origin-method origin-hash - origin-sha256 ;deprecated origin-file-name origin-actual-file-name origin-patches @@ -345,14 +344,6 @@ (define-syntax-rule (origin fields ...) specifications to 'hash'." (origin-compatibility-helper (fields ...) ())) -(define-deprecated (origin-sha256 origin) - origin-hash - (let ((hash (origin-hash origin))) - (unless (eq? (content-hash-algorithm hash) 'sha256) - (raise (condition (&message - (message (G_ "no SHA256 hash for origin")))))) - (content-hash-value hash))) - (define (print-origin origin port) "Write a concise representation of ORIGIN to PORT." (match origin diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 44dff14597..1565dd610a 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -141,7 +141,7 @@ (define-module (test-import-utils) (license:license? (package-license pkg)) (build-system? (package-build-system pkg)) (origin? (package-source pkg)) - (equal? (origin-sha256 (package-source pkg)) + (equal? (content-hash-value (origin-hash (package-source pkg))) (base32 "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))))) (test-equal "alist->package with false license" ;