diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-15 00:09:46 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-15 00:09:46 +0100 |
| commit | 3cfe76bec06fbd8bb7e7cb3387866fefbcad674f (patch) | |
| tree | b66780d205fb50fd44d0bbb38f5df99cf3167ba1 /guix | |
| parent | ec836b46bf52a5f86c61f50e3a2c3330a7ee3665 (diff) | |
| parent | 574a71a7a9668aa184661c58e1f18a4d4fccd792 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build/asdf-build-system.scm | 9 | ||||
| -rw-r--r-- | guix/deprecation.scm | 8 | ||||
| -rw-r--r-- | guix/lint.scm | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index 1be2b3c5f0..f3f4b49bcf 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -79,6 +79,15 @@ valid." (let ((source (getcwd)) (target (source-directory out name)) (system-path (string-append out %system-install-prefix))) + ;; SBCL keeps the modification time of the source file in the compiled + ;; file, and the source files might just have been patched by a custom + ;; phase. Therefore we reset the modification time of all the source + ;; files before compiling. + (for-each (lambda (file) + (let ((s (lstat file))) + (unless (eq? (stat:type s) 'symlink) + (utime file 0 0 0 0)))) + (find-files source #:directories? #t)) (copy-recursively source target #:keep-mtime? #t) (mkdir-p system-path) (for-each diff --git a/guix/deprecation.scm b/guix/deprecation.scm index 468b2e9b7b..04d4d4a337 100644 --- a/guix/deprecation.scm +++ b/guix/deprecation.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,6 +44,7 @@ "Define a deprecated variable or procedure, along these lines: (define-deprecated foo bar 42) + (define-deprecated old new) (define-deprecated (baz x y) qux (qux y x)) This will write a deprecation warning to GUIX-WARNING-PORT." @@ -73,7 +74,10 @@ This will write a deprecation warning to GUIX-WARNING-PORT." #'(real args (... ...))) (id (identifier? #'id) - #'real)))))))))) + #'real))))))) + ((_ variable alias) + (identifier? #'alias) + #'(define-deprecated variable alias alias))))) (define-syntax-rule (define-deprecated/alias deprecated replacement) "Define as an alias a deprecated variable, procedure, or macro, along diff --git a/guix/lint.scm b/guix/lint.scm index ed2f06bc64..d2f24c61f8 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -300,6 +300,7 @@ of a package, and INPUT-NAMES, a list of package specifications such as "gobject-introspection" "googletest-source" "groff" + "gtk-doc" "help2man" "intltool" "itstool" |