Merge branch 'version-1.0.1'
This commit is contained in:
commit
99f47b53f7
|
@ -324,6 +324,7 @@ EXAMPLES = \
|
||||||
gnu/system/examples/beaglebone-black.tmpl \
|
gnu/system/examples/beaglebone-black.tmpl \
|
||||||
gnu/system/examples/desktop.tmpl \
|
gnu/system/examples/desktop.tmpl \
|
||||||
gnu/system/examples/lightweight-desktop.tmpl \
|
gnu/system/examples/lightweight-desktop.tmpl \
|
||||||
|
gnu/system/examples/docker-image.tmpl \
|
||||||
gnu/system/examples/vm-image.tmpl
|
gnu/system/examples/vm-image.tmpl
|
||||||
|
|
||||||
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
||||||
|
|
50
NEWS
50
NEWS
|
@ -11,6 +11,56 @@ Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
|
||||||
Please send Guix bug reports to bug-guix@gnu.org.
|
Please send Guix bug reports to bug-guix@gnu.org.
|
||||||
|
|
||||||
|
* Changes in 1.0.1 (since 1.0.0)
|
||||||
|
** Package management
|
||||||
|
*** The ‘https_proxy’ environment variable is now honored
|
||||||
|
** Distribution
|
||||||
|
*** ‘guix system docker-image’ now produces images with an entry point
|
||||||
|
*** New ‘--network’ option for ‘guix system container’
|
||||||
|
*** ‘gcc’ package is now hidden; ‘gcc-toolchain’ is what users want
|
||||||
|
*** ‘mcron’ service now logs to /var/log/mcron.log
|
||||||
|
*** Dovecot: ‘auth-verbose-passwords?’ renamed from ‘auth-verbose-passwords’
|
||||||
|
*** ‘slim’ service now allows for multiple instances on different VTs
|
||||||
|
*** 70 new packages
|
||||||
|
*** 483 package updates
|
||||||
|
|
||||||
|
Noteworthy updates:
|
||||||
|
gdb 8.3, ghc 8.4.3, glibc 2.28, gnupg 2.2.15, go 1.12.1, guile 2.2.4,
|
||||||
|
icecat 60.6.2-guix1, icedtea 3.7.0, linux-libre 5.1.2, python 3.7.0,
|
||||||
|
rust 1.34.1, shepherd 0.6.1
|
||||||
|
|
||||||
|
** Programming interfaces
|
||||||
|
*** New (guix lzlib) module, to be used eventually for substitute compression
|
||||||
|
** Noteworthy bug fixes
|
||||||
|
*** Installer appends packages to ‘%base-packages’
|
||||||
|
(<https://bugs.gnu.org/35541>)
|
||||||
|
*** Installer allows for arbitrary-long passphrases and passwords
|
||||||
|
(<https://bugs.gnu.org/35716>)
|
||||||
|
*** ‘network-manager-applet’ is provided as part of ‘%desktop-services’
|
||||||
|
(<https://bugs.gnu.org/35554>)
|
||||||
|
*** Installer can create Btrfs file systems
|
||||||
|
(<https://bugs.gnu.org/35655>)
|
||||||
|
*** Installer password entry visibility can be toggled
|
||||||
|
(<https://bugs.gnu.org/35540>)
|
||||||
|
*** ‘guix-daemon.service’ file for systemd selects a valid UTF-8 locale
|
||||||
|
(<https://bugs.gnu.org/35671>)
|
||||||
|
*** ‘gnome-tweak-tool’ starts correctly
|
||||||
|
(<https://bugs.gnu.org/35597>)
|
||||||
|
*** ‘getlogin’ C function now works as expected
|
||||||
|
(<https://bugs.gnu.org/35553>)
|
||||||
|
*** Leading zeros are preserved when serializing FAT UUIDs
|
||||||
|
(<https://bugs.gnu.org/35582>)
|
||||||
|
*** ‘guix search’ now searches output names
|
||||||
|
(<https://bugs.gnu.org/35588>)
|
||||||
|
*** ‘guix environment’ in non ad-hoc mode honors package transformations
|
||||||
|
(<https://bugs.gnu.org/35618>)
|
||||||
|
*** ‘guix refresh’ correctly determines the latest version for GitHub
|
||||||
|
(<https://bugs.gnu.org/35684>)
|
||||||
|
|
||||||
|
** Native language support
|
||||||
|
*** New preliminary translation of the manual to Russian
|
||||||
|
*** Updated translations: da, de, es, fr
|
||||||
|
|
||||||
* Changes in 1.0.0 (since 0.16.0)
|
* Changes in 1.0.0 (since 0.16.0)
|
||||||
** Package management
|
** Package management
|
||||||
*** New ‘-v’/‘--verbosity’ option for all commands
|
*** New ‘-v’/‘--verbosity’ option for all commands
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -24,17 +24,37 @@
|
||||||
(guix grafts)
|
(guix grafts)
|
||||||
(guix packages)
|
(guix packages)
|
||||||
(guix derivations)
|
(guix derivations)
|
||||||
|
(gnu packages)
|
||||||
|
(gnu packages certs)
|
||||||
(gnu packages emacs)
|
(gnu packages emacs)
|
||||||
(gnu packages make-bootstrap)
|
(gnu packages make-bootstrap)
|
||||||
|
(gnu packages ssh)
|
||||||
(srfi srfi-1)
|
(srfi srfi-1)
|
||||||
(srfi srfi-26)
|
(srfi srfi-26)
|
||||||
(ice-9 format))
|
(ice-9 format))
|
||||||
|
|
||||||
|
(define (packages-for-system system)
|
||||||
|
"Return the list of packages to check for SYSTEM."
|
||||||
|
(let ((base (list %bootstrap-tarballs emacs nss-certs openssh)))
|
||||||
|
;; On Intel systems, make sure key packages proposed by the installer are
|
||||||
|
;; available.
|
||||||
|
(if (member system '("x86_64-linux" "i686-linux"))
|
||||||
|
(append (map specification->package
|
||||||
|
'("xfce" "gnome" "mate" "enlightenment"
|
||||||
|
"openbox" "awesome" "i3-wm" "ratpoison"
|
||||||
|
"network-manager-applet" "xlockmore"
|
||||||
|
"linux-libre" "grub-hybrid" "xorg-server"
|
||||||
|
"libreoffice"
|
||||||
|
;; FIXME: Add IceCat when Rust is available on i686.
|
||||||
|
#;"icecat"))
|
||||||
|
base)
|
||||||
|
base)))
|
||||||
|
|
||||||
(with-store store
|
(with-store store
|
||||||
(parameterize ((%graft? #f))
|
(parameterize ((%graft? #f))
|
||||||
(let* ((native (append-map (lambda (system)
|
(let* ((native (append-map (lambda (system)
|
||||||
(map (cut package-derivation store <> system)
|
(map (cut package-derivation store <> system)
|
||||||
(list %bootstrap-tarballs emacs)))
|
(packages-for-system system)))
|
||||||
%hydra-supported-systems))
|
%hydra-supported-systems))
|
||||||
(cross (map (cut package-cross-derivation store
|
(cross (map (cut package-cross-derivation store
|
||||||
%bootstrap-tarballs <>)
|
%bootstrap-tarballs <>)
|
||||||
|
|
|
@ -751,12 +751,8 @@ by pressing the Exit button.~%~%")))
|
||||||
(disk (mklabel device label)))
|
(disk (mklabel device label)))
|
||||||
(disk-commit disk)
|
(disk-commit disk)
|
||||||
disk)))
|
disk)))
|
||||||
(initial-partitions (disk-partitions disk))
|
|
||||||
(scheme (symbol-append method '- (run-scheme-page)))
|
(scheme (symbol-append method '- (run-scheme-page)))
|
||||||
(user-partitions (append
|
(user-partitions (auto-partition! disk #:scheme scheme)))
|
||||||
(auto-partition! disk #:scheme scheme)
|
|
||||||
(create-special-user-partitions
|
|
||||||
initial-partitions))))
|
|
||||||
(run-disk-page (list disk) user-partitions
|
(run-disk-page (list disk) user-partitions
|
||||||
#:guided? #t)))
|
#:guided? #t)))
|
||||||
((eq? method 'manual)
|
((eq? method 'manual)
|
||||||
|
|
|
@ -895,7 +895,10 @@ partitions (except the ESP on a GPT disk, if present) are wiped. SCHEME is the
|
||||||
desired partitioning scheme. It can be 'entire-root or
|
desired partitioning scheme. It can be 'entire-root or
|
||||||
'entire-root-home. 'entire-root will create a swap partition and a root
|
'entire-root-home. 'entire-root will create a swap partition and a root
|
||||||
partition occupying all the remaining space. 'entire-root-home will create a
|
partition occupying all the remaining space. 'entire-root-home will create a
|
||||||
swap partition, a root partition and a home partition."
|
swap partition, a root partition and a home partition.
|
||||||
|
|
||||||
|
Return the complete list of partitions on DISK, including the ESP when it
|
||||||
|
exists."
|
||||||
(let* ((device (disk-device disk))
|
(let* ((device (disk-device disk))
|
||||||
(disk-type (disk-disk-type disk))
|
(disk-type (disk-disk-type disk))
|
||||||
(has-extended? (disk-type-check-feature
|
(has-extended? (disk-type-check-feature
|
||||||
|
@ -1001,10 +1004,13 @@ swap partition, a root partition and a home partition."
|
||||||
(mount-point "/home")))))))
|
(mount-point "/home")))))))
|
||||||
(new-partitions* (force-user-partitions-formatting
|
(new-partitions* (force-user-partitions-formatting
|
||||||
new-partitions)))
|
new-partitions)))
|
||||||
|
(append (if esp-partition
|
||||||
|
(list (partition->user-partition esp-partition))
|
||||||
|
'())
|
||||||
(create-adjacent-partitions! disk
|
(create-adjacent-partitions! disk
|
||||||
new-partitions*
|
new-partitions*
|
||||||
#:last-partition-end
|
#:last-partition-end
|
||||||
(or end-esp-partition 0)))))
|
(or end-esp-partition 0))))))
|
||||||
|
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -117,7 +117,11 @@
|
||||||
(let ((minified (open-pipe* OPEN_READ "uglify-js" file)))
|
(let ((minified (open-pipe* OPEN_READ "uglify-js" file)))
|
||||||
(call-with-output-file installed
|
(call-with-output-file installed
|
||||||
(lambda (port)
|
(lambda (port)
|
||||||
(dump-port minified port)))))
|
(dump-port minified port)))
|
||||||
|
|
||||||
|
(let ((exit (close-pipe minified)))
|
||||||
|
(unless (zero? exit)
|
||||||
|
(error "dear, uglify-js failed" exit)))))
|
||||||
(else
|
(else
|
||||||
(install-file file (dirname installed))))))
|
(install-file file (dirname installed))))))
|
||||||
(find-files "."))
|
(find-files "."))
|
||||||
|
|
|
@ -110,8 +110,8 @@
|
||||||
;; Latest version of Guix, which may or may not correspond to a release.
|
;; Latest version of Guix, which may or may not correspond to a release.
|
||||||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||||
;; start precisely like this.
|
;; start precisely like this.
|
||||||
(let ((version "1.0.0")
|
(let ((version "1.0.1")
|
||||||
(commit "326dcbf1b3c30aa525185fda435c34cb9495dd04")
|
(commit "820429517f9cc8333704a839b4346ac4b02468c4")
|
||||||
(revision 1))
|
(revision 1))
|
||||||
(package
|
(package
|
||||||
(name "guix")
|
(name "guix")
|
||||||
|
@ -128,7 +128,7 @@
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0k9v9lh69q353x055id1sq1gx4p8idg8ifrgidv5s73wdil2cflm"))
|
"1vfp7ps1k1cwn8p0gsgarlxcy982hzyvb7zqnj66jqd258a1qfgh"))
|
||||||
(file-name (string-append "guix-" version "-checkout"))))
|
(file-name (string-append "guix-" version "-checkout"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -92,14 +92,18 @@ root ALL=(ALL) ALL
|
||||||
;; Use the DHCP client service rather than NetworkManager.
|
;; Use the DHCP client service rather than NetworkManager.
|
||||||
(service dhcp-client-service-type))
|
(service dhcp-client-service-type))
|
||||||
|
|
||||||
;; Remove GDM, NetworkManager, and wpa-supplicant, which don't make
|
;; Remove GDM, ModemManager, NetworkManager, and wpa-supplicant,
|
||||||
;; sense in a VM.
|
;; which don't make sense in a VM.
|
||||||
(remove (lambda (service)
|
(remove (lambda (service)
|
||||||
(let ((type (service-kind service)))
|
(let ((type (service-kind service)))
|
||||||
(memq type (list gdm-service-type
|
(or (memq type
|
||||||
|
(list gdm-service-type
|
||||||
wpa-supplicant-service-type
|
wpa-supplicant-service-type
|
||||||
cups-pk-helper-service-type
|
cups-pk-helper-service-type
|
||||||
network-manager-service-type))))
|
network-manager-service-type
|
||||||
|
modem-manager-service-type))
|
||||||
|
(eq? 'network-manager-applet
|
||||||
|
(service-type-name type)))))
|
||||||
(modify-services %desktop-services
|
(modify-services %desktop-services
|
||||||
(login-service-type config =>
|
(login-service-type config =>
|
||||||
(login-configuration
|
(login-configuration
|
||||||
|
|
16917
po/doc/guix-manual.de.po
16917
po/doc/guix-manual.de.po
File diff suppressed because it is too large
Load Diff
|
@ -10,7 +10,7 @@ msgstr ""
|
||||||
"Project-Id-Version: guix 1.0.1-pre1\n"
|
"Project-Id-Version: guix 1.0.1-pre1\n"
|
||||||
"Report-Msgid-Bugs-To: ludo@gnu.org\n"
|
"Report-Msgid-Bugs-To: ludo@gnu.org\n"
|
||||||
"POT-Creation-Date: 2019-05-10 20:54+0200\n"
|
"POT-Creation-Date: 2019-05-10 20:54+0200\n"
|
||||||
"PO-Revision-Date: 2019-05-11 15:32+0200\n"
|
"PO-Revision-Date: 2019-05-16 15:43+0200\n"
|
||||||
"Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
|
"Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
|
||||||
"Language-Team: Spanish <es@tp.org.es>\n"
|
"Language-Team: Spanish <es@tp.org.es>\n"
|
||||||
"Language: es\n"
|
"Language: es\n"
|
||||||
|
@ -4393,10 +4393,9 @@ msgstr "error: ~a: variable sin asignar"
|
||||||
msgid "entering debugger; type ',bt' for a backtrace\n"
|
msgid "entering debugger; type ',bt' for a backtrace\n"
|
||||||
msgstr "entrando en el depurador; teclee ',bt' para ver la pila de llamadas\n"
|
msgstr "entrando en el depurador; teclee ',bt' para ver la pila de llamadas\n"
|
||||||
|
|
||||||
# FUZZY
|
|
||||||
#: guix/ui.scm:405
|
#: guix/ui.scm:405
|
||||||
msgid "hint: "
|
msgid "hint: "
|
||||||
msgstr "indicación: "
|
msgstr "consejo: "
|
||||||
|
|
||||||
#: guix/ui.scm:422
|
#: guix/ui.scm:422
|
||||||
msgid "Did you forget a @code{use-modules} form?"
|
msgid "Did you forget a @code{use-modules} form?"
|
||||||
|
@ -4690,8 +4689,8 @@ msgstr[1] "~:[Se realizarían los siguientes injertos:~%~{ ~a~%~}~;~]"
|
||||||
#, scheme-format
|
#, scheme-format
|
||||||
msgid "~:[The following profile hook would be built:~%~{ ~a~%~}~;~]"
|
msgid "~:[The following profile hook would be built:~%~{ ~a~%~}~;~]"
|
||||||
msgid_plural "~:[The following profile hooks would be built:~%~{ ~a~%~}~;~]"
|
msgid_plural "~:[The following profile hooks would be built:~%~{ ~a~%~}~;~]"
|
||||||
msgstr[0] "~:[Se construiría el siguiente procedimiento de extensión del perfil:~%~{ ~a~%~}~;~]"
|
msgstr[0] "~:[Se construiría la siguiente extensión del perfil:~%~{ ~a~%~}~;~]"
|
||||||
msgstr[1] "~:[Se construirían los siguientes procedimientos de extensión del perfil:~%~{ ~a~%~}~;~]"
|
msgstr[1] "~:[Se construirían los siguientes extensiones del perfil:~%~{ ~a~%~}~;~]"
|
||||||
|
|
||||||
#: guix/ui.scm:1041
|
#: guix/ui.scm:1041
|
||||||
#, scheme-format
|
#, scheme-format
|
||||||
|
@ -4724,8 +4723,8 @@ msgstr[1] "~:[Se realizarán los siguientes injertos:~%~{ ~a~%~}~;~]"
|
||||||
#, scheme-format
|
#, scheme-format
|
||||||
msgid "~:[The following profile hook will be built:~%~{ ~a~%~}~;~]"
|
msgid "~:[The following profile hook will be built:~%~{ ~a~%~}~;~]"
|
||||||
msgid_plural "~:[The following profile hooks will be built:~%~{ ~a~%~}~;~]"
|
msgid_plural "~:[The following profile hooks will be built:~%~{ ~a~%~}~;~]"
|
||||||
msgstr[0] "~:[Se construirá el siguiente procedimiento de extensión del perfil:~%~{ ~a~%~}~;~]"
|
msgstr[0] "~:[Se construirá la siguiente extensión del perfil:~%~{ ~a~%~}~;~]"
|
||||||
msgstr[1] "~:[Se construirán los siguientes procedimientos de extensión del perfil:~%~{ ~a~%~}~;~]"
|
msgstr[1] "~:[Se construirán las siguientes extensiones del perfil:~%~{ ~a~%~}~;~]"
|
||||||
|
|
||||||
#: guix/ui.scm:1124
|
#: guix/ui.scm:1124
|
||||||
#, scheme-format
|
#, scheme-format
|
||||||
|
@ -4920,7 +4919,7 @@ msgstr[1] "injertando ~a paquetes en ~a..."
|
||||||
#: guix/status.scm:484
|
#: guix/status.scm:484
|
||||||
#, scheme-format
|
#, scheme-format
|
||||||
msgid "running profile hook of type '~a'..."
|
msgid "running profile hook of type '~a'..."
|
||||||
msgstr "ejecutando el procedimiento de extensión del perfil del tipo '~a'..."
|
msgstr "ejecutando la extensión del perfil del tipo '~a'..."
|
||||||
|
|
||||||
#: guix/status.scm:487
|
#: guix/status.scm:487
|
||||||
#, scheme-format
|
#, scheme-format
|
||||||
|
@ -5197,12 +5196,12 @@ msgstr "URLS"
|
||||||
# FUZZY
|
# FUZZY
|
||||||
#: nix/nix-daemon/guix-daemon.cc:115
|
#: nix/nix-daemon/guix-daemon.cc:115
|
||||||
msgid "use URLS as the default list of substitute providers"
|
msgid "use URLS as the default list of substitute providers"
|
||||||
msgstr "usa URLS como la lista predeterminada de proveedoras de sustituciones"
|
msgstr "usa URLS como lista predeterminada de proveedoras de sustituciones"
|
||||||
|
|
||||||
# FUZZY
|
# FUZZY
|
||||||
#: nix/nix-daemon/guix-daemon.cc:117
|
#: nix/nix-daemon/guix-daemon.cc:117
|
||||||
msgid "do not use the 'build hook'"
|
msgid "do not use the 'build hook'"
|
||||||
msgstr "no usa el procedimiento de extensión de construcción"
|
msgstr "no se usa el procedimiento de extensión de construcción (build-hook)"
|
||||||
|
|
||||||
#: nix/nix-daemon/guix-daemon.cc:119
|
#: nix/nix-daemon/guix-daemon.cc:119
|
||||||
msgid "cache build failures"
|
msgid "cache build failures"
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
(or (not dyninfo) ;static executable
|
(or (not dyninfo) ;static executable
|
||||||
(lset<= string=?
|
(lset<= string=?
|
||||||
(list (string-append "libguile-" (effective-version))
|
(list (string-append "libguile-" (effective-version))
|
||||||
"libgc" "libunistring" "libffi")
|
"libc")
|
||||||
(map (lambda (lib)
|
(map (lambda (lib)
|
||||||
(string-take lib (string-contains lib ".so")))
|
(string-take lib (string-contains lib ".so")))
|
||||||
(elf-dynamic-info-needed dyninfo))))))
|
(elf-dynamic-info-needed dyninfo))))))
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
(lambda (port)
|
(lambda (port)
|
||||||
(display "int main () { puts(\"hello\"); }" port)))
|
(display "int main () { puts(\"hello\"); }" port)))
|
||||||
(invoke c-compiler "t.c"
|
(invoke c-compiler "t.c"
|
||||||
"-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
|
"-Wl,--enable-new-dtags" "-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
|
||||||
(let* ((dyninfo (elf-dynamic-info
|
(let* ((dyninfo (elf-dynamic-info
|
||||||
(parse-elf (call-with-input-file "a.out"
|
(parse-elf (call-with-input-file "a.out"
|
||||||
get-bytevector-all))))
|
get-bytevector-all))))
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# GNU Guix --- Functional package management for GNU
|
# GNU Guix --- Functional package management for GNU
|
||||||
# Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
# Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
#
|
#
|
||||||
|
@ -27,8 +27,9 @@ guix pack --version
|
||||||
# the test in the user's global store if possible, on the grounds that
|
# the test in the user's global store if possible, on the grounds that
|
||||||
# binaries may already be there or can be built or downloaded inexpensively.
|
# binaries may already be there or can be built or downloaded inexpensively.
|
||||||
|
|
||||||
NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
|
storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
|
||||||
localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
|
localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
|
||||||
|
NIX_STORE_DIR="$storedir"
|
||||||
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
|
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
|
||||||
export NIX_STORE_DIR GUIX_DAEMON_SOCKET
|
export NIX_STORE_DIR GUIX_DAEMON_SOCKET
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,9 @@ guix pack --version
|
||||||
# run it on the user's global store if possible, on the grounds that binaries
|
# run it on the user's global store if possible, on the grounds that binaries
|
||||||
# may already be there or can be built or downloaded inexpensively.
|
# may already be there or can be built or downloaded inexpensively.
|
||||||
|
|
||||||
NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
|
storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
|
||||||
localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
|
localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
|
||||||
|
NIX_STORE_DIR="$storedir"
|
||||||
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
|
GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
|
||||||
export NIX_STORE_DIR GUIX_DAEMON_SOCKET
|
export NIX_STORE_DIR GUIX_DAEMON_SOCKET
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue