[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/11: services: guix-publish: Remove 'compression-level' field.
From: |
guix-commits |
Subject: |
07/11: services: guix-publish: Remove 'compression-level' field. |
Date: |
Fri, 7 Apr 2023 12:01:57 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit d442b7759662c925243f73678b647c4427ef7ac0
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Mon Feb 27 00:11:40 2023 +0000
services: guix-publish: Remove 'compression-level' field.
* 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.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
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 74215b677a..e5c6bf5335 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -223,7 +223,6 @@
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
@@ -1986,10 +1985,7 @@ proxy of 'guix-daemon'...~%")
(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
@@ -2003,25 +1999,14 @@ proxy of 'guix-daemon'...~%")
(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)
- branch master updated (110dc3fde9 -> 5481aaacb5), guix-commits, 2023/04/07
- 03/11: services: ntp-service-type: Remove deprecated server as strings support., guix-commits, 2023/04/07
- 01/11: gnu: Purge pre-1.3.0 deprecated packages., guix-commits, 2023/04/07
- 10/11: services: desktop: Remove 'xfce-desktop-service' procedure., guix-commits, 2023/04/07
- 02/11: gnu: curl-minimal: Remove variable., guix-commits, 2023/04/07
- 11/11: packages: Remove 'origin-sha256' procedure., guix-commits, 2023/04/07
- 04/11: services: sddm: Remove 'sddm-service' procedure., guix-commits, 2023/04/07
- 06/11: services: base: Remove 'console-font-service' procedure., guix-commits, 2023/04/07
- 05/11: services: base: Remove 'console-keymap-service-type' variable., guix-commits, 2023/04/07
- 07/11: services: guix-publish: Remove 'compression-level' field.,
guix-commits <=
- 09/11: services: desktop: Remove 'mate-desktop-service' procedure., guix-commits, 2023/04/07
- 08/11: services: desktop: Remove 'gnome-desktop-service' procedure., guix-commits, 2023/04/07