unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Tomas Volf <~@wolfsden.cz>
To: 72350@debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [bug#72350] [PATCH] gnu: skopeo: Update to 1.16.0.
Date: Mon, 29 Jul 2024 11:43:59 +0200	[thread overview]
Message-ID: <81c13e3d988c12ae65e05d11313161d1e5722838.1722246239.git.~@wolfsden.cz> (raw)

* gnu/packages/virtualization.scm (skopeo): Update to 1.16.0.
[arguments]<#:phases>: Delete the `cc-to-gcc' phase.

Change-Id: I35a91219c3c920f37f496df6322ae1e40fa1ccc3
---
 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")

base-commit: b45cfc2fac5a0a368f16b7f049a0a4ff3bfb2421
-- 
2.45.2





             reply	other threads:[~2024-07-29  9:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-29  9:43 Tomas Volf [this message]
2024-07-30  9:09 ` bug#72350: [PATCH] gnu: skopeo: Update to 1.16.0 Zheng Junjie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='81c13e3d988c12ae65e05d11313161d1e5722838.1722246239.git.~@wolfsden.cz' \
    --to=~@wolfsden.cz \
    --cc=72350@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).