guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: Revert "build-self: Avoid deprecated bindings."


From: guix-commits
Subject: 03/03: Revert "build-self: Avoid deprecated bindings."
Date: Mon, 22 Apr 2019 18:49:27 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit ffc8ab75f10ecaaf52cdc38f5846e9af8e2dadd5
Author: Ludovic Court├Ęs <address@hidden>
Date:   Tue Apr 23 00:47:41 2019 +0200

    Revert "build-self: Avoid deprecated bindings."
    
    This reverts commit fa9e6e8b676ca920a894cf3b48bfcb670077144f.
    
    By using the new bindings, we would prevent users of Guix prior to
    de9fbe9cdcf5f8deb08becfc54b523084fd67bda, such as version 0.16.0, to
    upgrade to current master.  Thus, we will keep using the old names for a
    while.
---
 build-aux/build-self.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 6ff1db4..9619e0e 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -399,9 +399,9 @@ files."
   (mlet %store-monad ((build  (build-program source version guile-version
                                              #:pull-version pull-version))
                       (system (if system (return system) (current-system)))
-                      (port   ((store-lift store-connection-socket)))
-                      (major  ((store-lift store-connection-major-version)))
-                      (minor  ((store-lift store-connection-minor-version))))
+                      (port   ((store-lift nix-server-socket)))
+                      (major  ((store-lift nix-server-major-version)))
+                      (minor  ((store-lift nix-server-minor-version))))
     (mbegin %store-monad
       (show-what-to-build* (list build))
       (built-derivations (list build))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]