Merge pull request #222219 from matthewpi/update/crc

crc: 2.14.0 -> 2.15.0

authored by Ilan Joselevich and committed by GitHub 242246ee 76c72030

+13 -6
+7 -6
pkgs/applications/networking/cluster/crc/default.nix
··· 10 }: 11 12 let 13 - openShiftVersion = "4.12.1"; 14 - okdVersion = "4.11.0-0.okd-2022-11-05-030711"; 15 podmanVersion = "4.3.1"; 16 writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; 17 in 18 buildGoModule rec { 19 - version = "2.14.0"; 20 pname = "crc"; 21 - gitCommit = "868d96cd4f73dad72df54475c52c65f9741dc240"; 22 modRoot = "cmd/crc"; 23 24 src = fetchFromGitHub { 25 owner = "crc-org"; 26 repo = "crc"; 27 rev = "v${version}"; 28 - sha256 = "sha256-q1OJJTveXoNzW9lohQOY7LVR3jOyiQZX5nHBgRupxTM="; 29 }; 30 31 - vendorSha256 = null; 32 33 nativeBuildInputs = [ git ]; 34
··· 10 }: 11 12 let 13 + openShiftVersion = "4.12.5"; 14 + okdVersion = "4.12.0-0.okd-2023-02-18-033438"; 15 podmanVersion = "4.3.1"; 16 writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; 17 + gitHash = "sha256-zk/26cG2Rt3jpbhKgprtq2vx7pIQVi7cPUA90uoQa80="; 18 in 19 buildGoModule rec { 20 + version = "2.15.0"; 21 pname = "crc"; 22 + gitCommit = "72256c3cb00ac01519b26658dd5cfb0dd09b37a1"; 23 modRoot = "cmd/crc"; 24 25 src = fetchFromGitHub { 26 owner = "crc-org"; 27 repo = "crc"; 28 rev = "v${version}"; 29 + hash = gitHash; 30 }; 31 32 + vendorHash = null; 33 34 nativeBuildInputs = [ git ]; 35
+6
pkgs/applications/networking/cluster/crc/update.sh
··· 25 https://api.github.com/repos/crc-org/crc/tags | 26 jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") 27 28 FILE_MAKEFILE=${WORKDIR}/Makefile 29 curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE 30 ··· 44 ${NIXPKGS_CRC_FOLDER}/default.nix 45 46 sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ 47 ${NIXPKGS_CRC_FOLDER}/default.nix 48 49 sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \
··· 25 https://api.github.com/repos/crc-org/crc/tags | 26 jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") 27 28 + CRC_GIT_PREFETCH=$(nix-prefetch-url --unpack https://github.com/crc-org/crc/archive/${CRC_COMMIT}.tar.gz) 29 + CRC_GIT_HASH=$(nix hash to-sri --type sha256 ${CRC_GIT_PREFETCH}) 30 + 31 FILE_MAKEFILE=${WORKDIR}/Makefile 32 curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE 33 ··· 47 ${NIXPKGS_CRC_FOLDER}/default.nix 48 49 sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ 50 + ${NIXPKGS_CRC_FOLDER}/default.nix 51 + 52 + sed -i "s|gitHash = \".*\"|gitHash = \"${CRC_GIT_HASH}\"|" \ 53 ${NIXPKGS_CRC_FOLDER}/default.nix 54 55 sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \