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'.master
parent
50c17ddd9e
commit
a644c3a375
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; 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 © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
|
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
|
||||||
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
||||||
|
@ -702,7 +702,6 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
|
||||||
(guix build utils)
|
(guix build utils)
|
||||||
(guix profiles)
|
(guix profiles)
|
||||||
(ice-9 match)
|
(ice-9 match)
|
||||||
((oop goops) #:select (get-keyword))
|
|
||||||
(srfi srfi-1))
|
(srfi srfi-1))
|
||||||
|
|
||||||
(define machine-type
|
(define machine-type
|
||||||
|
@ -763,15 +762,20 @@ Valid compressors are: ~a~%") compressor-name %valid-compressors)))
|
||||||
|
|
||||||
(copy-file #+data-tarball data-tarball-file-name)
|
(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.
|
;; Generate the control archive.
|
||||||
(define control-file
|
(define control-file
|
||||||
(get-keyword #:control-file '#$extra-options))
|
(keyword-ref '#$extra-options #:control-file))
|
||||||
|
|
||||||
(define postinst-file
|
(define postinst-file
|
||||||
(get-keyword #:postinst-file '#$extra-options))
|
(keyword-ref '#$extra-options #:postinst-file))
|
||||||
|
|
||||||
(define triggers-file
|
(define triggers-file
|
||||||
(get-keyword #:triggers-file '#$extra-options))
|
(keyword-ref '#$extra-options #:triggers-file))
|
||||||
|
|
||||||
(define control-tarball-file-name
|
(define control-tarball-file-name
|
||||||
(string-append "control.tar"
|
(string-append "control.tar"
|
||||||
|
|
Reference in New Issue