all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Bruno Victal <mirai@makinata.eu>
To: 61829@debbugs.gnu.org
Cc: Bruno Victal <mirai@makinata.eu>
Subject: [bug#61829] [PATCH 07/11] services: guix-publish: Remove 'compression-level' field.
Date: Mon, 27 Feb 2023 00:11:40 +0000	[thread overview]
Message-ID: <014d8b0f1dc3cc1e9b05987bc71b4835e72e4a57.1677456515.git.mirai@makinata.eu> (raw)
In-Reply-To: <cover.1677456515.git.mirai@makinata.eu>

* gnu/services/base.scm (<guix-publish-configuration>)[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* <guix-publish-configuration>
               (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* <guix-publish-configuration>
   (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)
-- 
2.39.1





  parent reply	other threads:[~2023-02-27  0:13 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-27  0:10 [bug#61829] [PATCH 00/11] Purge pre-1.3.0 deprecated procedures & variables Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 01/11] gnu: Purge pre-1.3.0 deprecated packages Bruno Victal
2023-02-28 12:52   ` Simon Tournier
2023-03-02  2:29     ` Bruno Victal
2023-03-03 16:29       ` [bug#61829] [PATCH 00/11] Purge pre-1.3.0 deprecated procedures & variables Ludovic Courtès
2023-03-03 18:57       ` [bug#61829] [PATCH 01/11] gnu: Purge pre-1.3.0 deprecated packages Simon Tournier
2023-02-27  0:11 ` [bug#61829] [PATCH 02/11] gnu: curl-minimal: Remove variable Bruno Victal
2023-02-28 12:54   ` Simon Tournier
2023-02-27  0:11 ` [bug#61829] [PATCH 03/11] services: ntp-service-type: Remove deprecated server as strings support Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 04/11] services: sddm: Remove 'sddm-service' procedure Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 05/11] services: base: Remove 'console-keymap-service-type' variable Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 06/11] services: base: Remove 'console-font-service' procedure Bruno Victal
2023-02-27  0:11 ` Bruno Victal [this message]
2023-02-27  0:11 ` [bug#61829] [PATCH 08/11] services: desktop: Remove 'gnome-desktop-service' procedure Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 09/11] services: desktop: Remove 'mate-desktop-service' procedure Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 10/11] services: desktop: Remove 'xfce-desktop-service' procedure Bruno Victal
2023-02-27  0:11 ` [bug#61829] [PATCH 11/11] guix: packages: Remove 'origin-sha256' procedure Bruno Victal
2023-02-28 12:57   ` Simon Tournier
2023-04-07 16:02 ` bug#61829: [PATCH 00/11] Purge pre-1.3.0 deprecated procedures & variables Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=014d8b0f1dc3cc1e9b05987bc71b4835e72e4a57.1677456515.git.mirai@makinata.eu \
    --to=mirai@makinata.eu \
    --cc=61829@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.