summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-23 00:47:41 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-23 00:47:41 +0200
commitffc8ab75f10ecaaf52cdc38f5846e9af8e2dadd5 (patch)
treee96ffa9f68ef7ef5113510c9dd4f11ecf41fa873
parent70da04c37beef7b9a83156edf987bdd7c71356c6 (diff)
downloadguix-ffc8ab75f10ecaaf52cdc38f5846e9af8e2dadd5.tar.gz
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.
-rw-r--r--build-aux/build-self.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 6ff1db4c48..9619e0e5b2 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))