mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-15 19:35:25 -05:00
4c0c65acfa
* Makefile.am (MODULES): Remove guix/zlib.scm and guix/lzlib.scm,
(SCM_TESTS): remove tests/zlib.scm, tests/lzlib.scm.
* build-aux/build-self.scm (make-config.scm): Remove unused %libz variable.
* configure.ac: Remove LIBZ and LIBLZ variables and check instead for
Guile-zlib and Guile-lzlib.
* doc/guix.texi ("Requirements"): Remove zlib requirement and add Guile-zlib
and Guile-lzlib instead.
* gnu/packages/package-management.scm (guix)[native-inputs]: Add "guile-zlib"
and "guile-lzlib",
[inputs]: remove "zlib" and "lzlib",
[propagated-inputs]: ditto,
[arguments]: add "guile-zlib" and "guile-lzlib" to Guile load path.
* guix/config.scm.in (%libz, %liblz): Remove them.
* guix/lzlib.scm: Remove it.
* guix/man-db.scm: Use (zlib) instead of (guix zlib).
* guix/profiles.scm (manual-database): Do not stub (guix config) in imported
modules list, instead add "guile-zlib" to the extension list.
* guix/scripts/publish.scm: Use (zlib) instead of (guix zlib) and (lzlib)
instead of (guix lzlib),
(string->compression-type, effective-compression): do not check for zlib and
lzlib availability.
* guix/scripts/substitute.scm (%compression-methods): Do not check for lzlib
availability.
* guix/self.scm (specification->package): Add "guile-zlib" and "guile-lzlib"
and remove "zlib" and "lzlib",
(compiled-guix): remove "zlib" and "lzlib" arguments and add guile-zlib and
guile-lzlib to the dependencies, also do not pass "zlib" and "lzlib" to
"make-config.scm" procedure,
(make-config.scm): remove "zlib" and "lzlib" arguments as well as %libz and
%liblz variables.
* guix/utils.scm (lzip-port): Use (lzlib) instead of (guix lzlib) and do not
check for lzlib availability.
* guix/zlib.scm: Remove it.
* m4/guix.m4 (GUIX_LIBZ_LIBDIR, GUIX_LIBLZ_FILE_NAME): Remove them.
* tests/lzlib.scm: Use (zlib) instead of (guix zlib) and (lzlib)
instead of (guix lzlib), and do not check for zlib and lzlib availability.
* tests/publish.scm: Ditto.
* tests/substitute.scm: Do not check for lzlib availability.
* tests/utils.scm: Ditto.
* tests/zlib.scm: Remove it.
98 lines
2.5 KiB
Scheme
98 lines
2.5 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
|
;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (guix config)
|
|
#:export (%guix-package-name
|
|
%guix-version
|
|
%guix-bug-report-address
|
|
%guix-home-page-url
|
|
|
|
%storedir
|
|
%localstatedir
|
|
%sysconfdir
|
|
|
|
%store-directory
|
|
%state-directory
|
|
%store-database-directory
|
|
%config-directory
|
|
|
|
%system
|
|
%gzip
|
|
%bzip2
|
|
%xz))
|
|
|
|
;;; Commentary:
|
|
;;;
|
|
;;; Compile-time configuration of Guix. When adding a substitution variable
|
|
;;; here, make sure to equip (guix scripts pull) to substitute it.
|
|
;;;
|
|
;;; Code:
|
|
|
|
(define %guix-package-name
|
|
"@PACKAGE_NAME@")
|
|
|
|
(define %guix-version
|
|
"@PACKAGE_VERSION@")
|
|
|
|
(define %guix-bug-report-address
|
|
"@PACKAGE_BUGREPORT@")
|
|
|
|
(define %guix-home-page-url
|
|
"@PACKAGE_URL@")
|
|
|
|
(define %storedir
|
|
"@storedir@")
|
|
|
|
(define %localstatedir
|
|
"@guix_localstatedir@")
|
|
|
|
(define %sysconfdir
|
|
"@guix_sysconfdir@")
|
|
|
|
(define %store-directory
|
|
(or (and=> (getenv "NIX_STORE_DIR") canonicalize-path)
|
|
%storedir))
|
|
|
|
(define %state-directory
|
|
;; This must match `NIX_STATE_DIR' as defined in `nix/local.mk'.
|
|
(or (getenv "GUIX_STATE_DIRECTORY")
|
|
(string-append %localstatedir "/guix")))
|
|
|
|
(define %store-database-directory
|
|
(or (getenv "GUIX_DATABASE_DIRECTORY")
|
|
(string-append %state-directory "/db")))
|
|
|
|
(define %config-directory
|
|
;; This must match `GUIX_CONFIGURATION_DIRECTORY' as defined in `nix/local.mk'.
|
|
(or (getenv "GUIX_CONFIGURATION_DIRECTORY")
|
|
(string-append %sysconfdir "/guix")))
|
|
|
|
(define %system
|
|
"@guix_system@")
|
|
|
|
(define %gzip
|
|
"@GZIP@")
|
|
|
|
(define %bzip2
|
|
"@BZIP2@")
|
|
|
|
(define %xz
|
|
"@XZ@")
|
|
|
|
;;; config.scm ends here
|