From 6efd02551d19b6d792f1a257251c3f104b07c857 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Mon, 29 Jul 2024 11:43:59 +0200 Subject: [PATCH] gnu: skopeo: Update to 1.16.0. * gnu/packages/virtualization.scm (skopeo): Update to 1.16.0. [arguments]<#:phases>: Delete the `cc-to-gcc' phase. Change-Id: I35a91219c3c920f37f496df6322ae1e40fa1ccc3 Signed-off-by: Zheng Junjie --- gnu/packages/virtualization.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 061748bb4a..6932086b0d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2321,7 +2321,7 @@ (define-public umoci (define-public skopeo (package (name "skopeo") - (version "1.15.2") + (version "1.16.0") (source (origin (method git-fetch) (uri (git-reference @@ -2330,7 +2330,7 @@ (define-public skopeo (file-name (git-file-name name version)) (sha256 (base32 - "13y1fmv78hh5ycm7xlsg851y17s223q13b9srksnq6jcwgprqkm8")))) + "1vjhi4xvb3vdz9nm627bymih9nil1xm4m5zcmx088d76dnqm3l1k")))) (build-system gnu-build-system) (native-inputs (list go-1.21 @@ -2370,22 +2370,7 @@ (define-public skopeo ;; Required for detecting btrfs in hack/btrfs* due to bug in GNU ;; Make <4.4 causing CC not to be propagated into $(shell ...) ;; calls. Can be removed once we update to >4.3. - ;; - ;; This techically does nothing *now*, but after upstream - ;; issue[1] is solved and 'cc-to-gcc phase is removed, it will - ;; start being required. - ;; 1: https://github.com/containers/skopeo/issues/2278 (setenv "CC" #$(cc-for-target)))) - (add-after 'unpack 'cc-to-gcc - (lambda _ - (for-each (lambda (file) - (substitute* file - (("^cc( -.*)" all rest) - (string-append "\"$CC\"" rest)))) - '("hack/btrfs_tag.sh" - "hack/btrfs_installed_tag.sh" - "hack/libdm_tag.sh" - "hack/libsubid_tag.sh")))) (add-after 'install 'wrap-skopeo (lambda _ (wrap-program (string-append #$output "/bin/skopeo")