elisp/guix-repl.el

@@ -309,6 +309,7 @@ this address (it should be defined by
     (with-current-buffer buffer
       (geiser-repl-mode)
       (geiser-impl--set-buffer-implementation impl)
+      (geiser-repl--set-this-buffer-project 'guix)
       (geiser-repl--autodoc-mode -1)
       (goto-char (point-max))
       (let ((prompt (geiser-con--combined-prompt

scheme/emacs-guix/actions.scm

@@ -38,6 +38,7 @@
   #:use-module (guix derivations)
   #:use-module (guix ui)
   #:autoload   (guix scripts) (build-package)
+  #:autoload   (guix scripts build) (log-url)
   #:autoload   (guix scripts package) (build-and-use-profile
                                        delete-generations)
   #:use-module (emacs-guix utils)
@@ -197,6 +198,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

scheme/emacs-guix/pack.scm

@@ -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

scheme/emacs-guix/profiles.scm

@@ -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
@@ -118,10 +120,6 @@ 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))
-
 (define* (search-paths profiles #:key (type 'exact))
   "Return a list with 'search paths' environment variables for PROFILES."
   (let* ((manifests (map profile-manifest profiles))

scheme/emacs-guix/system.scm

@@ -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)