Unverified Commit 242246ee authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

Merge pull request #222219 from matthewpi/update/crc 

crc: 2.14.0 -> 2.15.0
parents 76c72030 eeeed328

pkgs/applications/networking/cluster/crc/default.nix

+7 −6
Original line number Diff line number Diff line
@@ -10,25 +10,26 @@ 
}:



let

  openShiftVersion = "4.12.1";

  okdVersion = "4.11.0-0.okd-2022-11-05-030711";

  openShiftVersion = "4.12.5";

  okdVersion = "4.12.0-0.okd-2023-02-18-033438";

  podmanVersion = "4.3.1";

  writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";

  gitHash = "sha256-zk/26cG2Rt3jpbhKgprtq2vx7pIQVi7cPUA90uoQa80=";

in

buildGoModule rec {

  version = "2.14.0";

  version = "2.15.0";

  pname = "crc";

  gitCommit = "868d96cd4f73dad72df54475c52c65f9741dc240";

  gitCommit = "72256c3cb00ac01519b26658dd5cfb0dd09b37a1";

  modRoot = "cmd/crc";



  src = fetchFromGitHub {

    owner = "crc-org";

    repo = "crc";

    rev = "v${version}";

    sha256 = "sha256-q1OJJTveXoNzW9lohQOY7LVR3jOyiQZX5nHBgRupxTM=";

    hash = gitHash;

  };



  vendorSha256 = null;

  vendorHash = null;



  nativeBuildInputs = [ git ];

pkgs/applications/networking/cluster/crc/update.sh

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ 
    https://api.github.com/repos/crc-org/crc/tags |

    jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")



CRC_GIT_PREFETCH=$(nix-prefetch-url --unpack https://github.com/crc-org/crc/archive/${CRC_COMMIT}.tar.gz)

CRC_GIT_HASH=$(nix hash to-sri --type sha256 ${CRC_GIT_PREFETCH})



FILE_MAKEFILE=${WORKDIR}/Makefile

curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE
@@ -46,6 +49,9 @@ sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \ 
sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \

    ${NIXPKGS_CRC_FOLDER}/default.nix



sed -i "s|gitHash = \".*\"|gitHash = \"${CRC_GIT_HASH}\"|" \

    ${NIXPKGS_CRC_FOLDER}/default.nix



sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \

    ${NIXPKGS_CRC_FOLDER}/default.nix