sharlatan pushed a commit to branch python-team-pyproject-build-system in repository guix.
commit 57e9776eee4b748144962633f0a9dd3731d94b94 Author: Lars-Dominik Braun <[email protected]> AuthorDate: Sat May 13 15:31:22 2023 +0200 gnu: criu: Remove temporary workaround. * gnu/packages/virtualization.scm (criu)[arguments]: Import ensure-no-mtimes-pre-1980 from python-build-system and remove copied code. Change-Id: I2ab9eb51dfa66fcf5b0144eab73d63055400e30c --- gnu/packages/virtualization.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bfca5885c6..215e84b676 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1988,8 +1988,12 @@ client desktops. (string-append "XMLTO=" (search-input-file %build-inputs "/bin/xmlto"))) - #:modules ((ice-9 ftw) - ,@%default-gnu-modules) + #:modules ((guix build gnu-build-system) + (guix build utils) + ((guix build python-build-system) + #:select (ensure-no-mtimes-pre-1980))) + #:imported-modules ,(append %gnu-build-system-modules + %python-build-system-modules) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2000,18 +2004,10 @@ client desktops. (("ARMV.*:=.*") "ARMV := 7\n")) ;; Hard-code the correct PLUGINDIR above. (substitute* "criu/include/plugin.h" - (("/var") (string-append (assoc-ref outputs "out")))))) - ;; TODO: use - ;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980) - ;; when it no longer throws due to trying to call UTIME on symlinks. + (("/var") (string-append (assoc-ref outputs "out")))) + )) (add-after 'unpack 'ensure-no-mtimes-pre-1980 - (lambda _ - (let ((early-1980 315619200)) ; 1980-01-02 UTC - (ftw "." (lambda (file stat flag) - (unless (or (<= early-1980 (stat:mtime stat)) - (eq? (stat:type stat) 'symlink)) - (utime file early-1980 early-1980)) - #t))))) + ensure-no-mtimes-pre-1980) (add-before 'build 'fix-symlink (lambda* (#:key inputs #:allow-other-keys) ;; The file 'images/google/protobuf/descriptor.proto' points to
