[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: pack: Remove use of GOOPS in 'deb' backend.
From: |
guix-commits |
Subject: |
02/08: pack: Remove use of GOOPS in 'deb' backend. |
Date: |
Sat, 19 Nov 2022 13:59:53 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit a644c3a375f30a42663cb0e0a0f612fbe4132809
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Nov 19 17:15:19 2022 +0100
pack: Remove use of GOOPS in 'deb' backend.
* guix/scripts/pack.scm (debian-archive)[build]: Remove use of (oop goops).
Introduce 'keyword-ref' and use it instead of 'get-keyword'.
---
guix/scripts/pack.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index f81b3e6501..f65642fb85 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès
<ludo@gnu.org>
+;;; Copyright © 2015, 2017-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
@@ -702,7 +702,6 @@ Valid compressors are: ~a~%") compressor-name
%valid-compressors)))
(guix build utils)
(guix profiles)
(ice-9 match)
- ((oop goops) #:select (get-keyword))
(srfi srfi-1))
(define machine-type
@@ -763,15 +762,20 @@ Valid compressors are: ~a~%") compressor-name
%valid-compressors)))
(copy-file #+data-tarball data-tarball-file-name)
+ (define (keyword-ref lst keyword)
+ (match (memq keyword lst)
+ ((_ value . _) value)
+ (#f #f)))
+
;; Generate the control archive.
(define control-file
- (get-keyword #:control-file '#$extra-options))
+ (keyword-ref '#$extra-options #:control-file))
(define postinst-file
- (get-keyword #:postinst-file '#$extra-options))
+ (keyword-ref '#$extra-options #:postinst-file))
(define triggers-file
- (get-keyword #:triggers-file '#$extra-options))
+ (keyword-ref '#$extra-options #:triggers-file))
(define control-tarball-file-name
(string-append "control.tar"
- branch master updated (85f4d87b81 -> bb04b5e0ce), guix-commits, 2022/11/19
- 01/08: services: lightdm: Do not use GOOPS., guix-commits, 2022/11/19
- 02/08: pack: Remove use of GOOPS in 'deb' backend.,
guix-commits <=
- 05/08: doc: Build more man pages., guix-commits, 2022/11/19
- 08/08: gnu: moreutils: Fix corrupted manual pages., guix-commits, 2022/11/19
- 06/08: scripts: describe: Add branch information to json output., guix-commits, 2022/11/19
- 03/08: gnu: blender: Update to 3.3.1., guix-commits, 2022/11/19
- 07/08: scripts: describe: Add branch information to recutils output., guix-commits, 2022/11/19
- 04/08: gnu: python-check-manifest: Relax git security settings in tests., guix-commits, 2022/11/19