scheme: Remove @@ for Guile 3.x support.
Support Guile 3.x. * scheme/emacs-guix/profiles.scm: Remove @@ for search-path-environment-variables. * scheme/emacs-guix/system.scm: Remove @@ for operating-system-firmware. * scheme/emacs-guix/pack.scm: Remove @@ for %compressors, compressor-name, and %formats. * scheme/emacs-guix/actions.scm: Remove @@ from log-url.
This commit is contained in:
parent
41fba4eec8
commit
d61d827906
|
@ -197,6 +197,6 @@ Return #f if the build log is not found."
|
|||
(let* ((derivation (package-derivation store package))
|
||||
(file (derivation-file-name derivation)))
|
||||
(or (log-file store file)
|
||||
((@@ (guix scripts build) log-url) store file))))))
|
||||
(log-url store file))))))
|
||||
|
||||
;;; actions.scm ends here
|
||||
|
|
|
@ -28,8 +28,7 @@
|
|||
|
||||
(define (compressor-names)
|
||||
"Return a list of names of available pack compressors."
|
||||
(map (@@ (guix scripts pack) compressor-name)
|
||||
(@@ (guix scripts pack) %compressors)))
|
||||
(map compressor-name %compressors))
|
||||
|
||||
(define (pack-format-names)
|
||||
"Return a list of names of available pack formats."
|
||||
|
@ -37,6 +36,6 @@
|
|||
((name . _proc)
|
||||
(symbol->string name))
|
||||
(_ #f))
|
||||
(@@ (guix scripts pack) %formats)))
|
||||
%formats))
|
||||
|
||||
;;; pack.scm ends here
|
||||
|
|
|
@ -29,6 +29,8 @@
|
|||
#:use-module (srfi srfi-1)
|
||||
#:use-module (guix profiles)
|
||||
#:use-module (guix search-paths)
|
||||
#:use-module ((guix scripts package)
|
||||
#:select (search-path-environment-variables))
|
||||
#:autoload (guix store roots) (user-owned? gc-roots)
|
||||
#:export (manifest-entry->name+version+output
|
||||
manifest-entries-by-name
|
||||
|
@ -119,8 +121,7 @@ of RESULT. ENTRIES is a list of manifest entries with NAME/VERSION."
|
|||
;;; Search paths
|
||||
|
||||
(define search-path-environment-variables
|
||||
;; It is not exported from (guix scripts package) module.
|
||||
(@@ (guix scripts package) search-path-environment-variables))
|
||||
search-path-environment-variables)
|
||||
|
||||
(define* (search-paths profiles #:key (type 'exact))
|
||||
"Return a list with 'search paths' environment variables for PROFILES."
|
||||
|
|
|
@ -27,6 +27,8 @@
|
|||
(define-module (emacs-guix system)
|
||||
#:use-module (gnu system)
|
||||
#:use-module (gnu bootloader)
|
||||
#:use-module ((gnu system)
|
||||
#:select (operating-system-firmware))
|
||||
#:use-module (guix utils)
|
||||
#:use-module (emacs-guix emacs)
|
||||
#:use-module (emacs-guix utils)
|
||||
|
@ -51,8 +53,7 @@
|
|||
(define (system-firmware-sexp os)
|
||||
"Return sexp for the firmware packages of OS."
|
||||
(map package-specification
|
||||
;; 'operating-system-firmware' is not exported.
|
||||
((@@ (gnu system) operating-system-firmware) os)))
|
||||
(operating-system-firmware os)))
|
||||
|
||||
(define %system-param-alist
|
||||
`((kernel . ,system-kernel-sexp)
|
||||
|
|
Loading…
Reference in New Issue