mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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'.
This commit is contained in:
parent
50c17ddd9e
commit
a644c3a375
1 changed files with 9 additions and 5 deletions
|
@ -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 @@ (define build
|
|||
(guix build utils)
|
||||
(guix profiles)
|
||||
(ice-9 match)
|
||||
((oop goops) #:select (get-keyword))
|
||||
(srfi srfi-1))
|
||||
|
||||
(define machine-type
|
||||
|
@ -763,15 +762,20 @@ (define data-tarball-file-name (strip-store-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.
|
||||
(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"
|
||||
|
|
Loading…
Reference in a new issue