From c6f285c761832935ae77219e0f6bfd205a676d13 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Tue, 11 Oct 2022 11:18:16 -0700
Subject: [PATCH] all: use new acquire feature

---
 cosmo-kuroko/Dockerfile | 3 +--
 cosmo-muon/Dockerfile   | 3 +--
 cosmo-perl/Dockerfile   | 3 +--
 cosmo-yices/Dockerfile  | 6 ++----
 cosmo/Dockerfile        | 3 +--
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/cosmo-kuroko/Dockerfile b/cosmo-kuroko/Dockerfile
index 0a5b458..1952d40 100644
--- a/cosmo-kuroko/Dockerfile
+++ b/cosmo-kuroko/Dockerfile
@@ -8,8 +8,7 @@ ARG KUROKO_SHA256=b1d38c48afdc06633d848dc27cb5d37bebbb7c99c59d3649c155350f06cd93
 
 RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
     --mount=type=tmpfs,target=/tmp : \
- && acquire from=github repo=kuroko-lang/kuroko dest=/kuroko \
-    commit="$KUROKO_COMMIT" checksum="$KUROKO_SHA256" \
+ && acquire from=github repo=kuroko-lang/kuroko dest=/kuroko env=KUROKO \
 ;
 
 FROM localhost/cosmo AS builder
diff --git a/cosmo-muon/Dockerfile b/cosmo-muon/Dockerfile
index 56e7716..7fe886a 100644
--- a/cosmo-muon/Dockerfile
+++ b/cosmo-muon/Dockerfile
@@ -5,8 +5,7 @@ ARG MUON_COMMIT=ab1e044c93c9c87e496ff7c4028ddf4218b91445
 ARG MUON_SHA256=006425edf914444b87108ee062c9f56ee57804a2726f757c44c329f213465182
 RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
     --mount=type=tmpfs,target=/tmp : \
- && acquire from=sourcehut repo=lattis/muon dest=/muon \
-    commit="$MUON_COMMIT" checksum="$MUON_SHA256" \
+ && acquire from=sourcehut repo=lattis/muon dest=/muon env=MUON \
 ;
 
 FROM localhost/cosmo AS builder
diff --git a/cosmo-perl/Dockerfile b/cosmo-perl/Dockerfile
index 0b38e38..72b1fda 100644
--- a/cosmo-perl/Dockerfile
+++ b/cosmo-perl/Dockerfile
@@ -11,8 +11,7 @@ ARG PERLTIDY_SHA256=50496a6952904ef28f495919fc0a67801a63c87779c61308ce1ca5b32467
 
 RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
     --mount=type=tmpfs,target=/tmp : \
- && acquire from=github repo=Perl/perl5 dest=/perl \
-    commit="$PERL_COMMIT" checksum="$PERL_SHA256" \
+ && acquire from=github repo=Perl/perl5 dest=/perl env=PERL \
 \
  && name=perltidy \
  && remote_fn="Perl-Tidy-$PERLTIDY_VERSION.tar.gz" \
diff --git a/cosmo-yices/Dockerfile b/cosmo-yices/Dockerfile
index 348475c..8202074 100644
--- a/cosmo-yices/Dockerfile
+++ b/cosmo-yices/Dockerfile
@@ -15,8 +15,7 @@ ARG KISSAT_SHA256=031fca7efcb17c6f1921dd056052bd373de724e445fc2ed37bfdd595414811
 
 RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
     --mount=type=tmpfs,target=/tmp : \
- && acquire from=github repo=SRI-CSL/yices2 dest=/yices \
-    commit="$YICES_COMMIT" checksum="$YICES_SHA256" \
+ && acquire from=github repo=SRI-CSL/yices2 dest=/yices env=YICES \
 \
  && name=gmp \
  && remote_fn="$name-$GMP_VERSION.tar.xz" \
@@ -26,8 +25,7 @@ RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
  && export sha256="$GMP_SHA256" \
  && acquire \
 \
- && acquire from=github repo=arminbiere/kissat dest=/kissat \
-    commit="$KISSAT_COMMIT" checksum="$KISSAT_SHA256" \
+ && acquire from=github repo=arminbiere/kissat dest=/kissat env=KISSAT \
 ;
 
 FROM localhost/cosmo AS builder
diff --git a/cosmo/Dockerfile b/cosmo/Dockerfile
index 7c60754..e023258 100644
--- a/cosmo/Dockerfile
+++ b/cosmo/Dockerfile
@@ -8,8 +8,7 @@ FROM localhost/notwa-util AS downloader
 ARG COSMO_COMMIT COSMO_SHA256
 RUN --mount=type=cache,id=common,target=/media/common,sharing=locked \
     --mount=type=tmpfs,target=/tmp : \
- && acquire from=github repo=jart/cosmopolitan dest=/cosmopolitan \
-    commit="$COSMO_COMMIT" checksum="$COSMO_SHA256" \
+ && acquire from=github repo=jart/cosmopolitan dest=/cosmopolitan env=COSMO \
 ;
 
 FROM alpine:3.16 AS builder