rekado pushed a commit to branch python-team in repository guix. commit 0f5f56ca6d7e8decc4851d45af62b7c736751a9f Author: Lars-Dominik Braun <l...@6xq.net> 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 | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 251fe00aa0..c1b682cb70 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1911,8 +1911,12 @@ client desktops. (string-append "XMLTO=" (search-input-file %build-inputs "/bin/xmlto"))) - #:modules ((ice-9 ftw) - ,@%gnu-build-system-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 @@ -1935,17 +1939,8 @@ client desktops. (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. (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