cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

crc: 2.15.0 -> 2.30.0, fix build and update

Browse source
This commit is contained in:
Paul Meyer 2023-12-30 10:08:46 +01:00
parent e7958ec8a5
commit 95bc6c920e
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/networking/cluster/crc/default.nix
View file

@ -10,16 +10,17 @@
}: }:
let let
openShiftVersion = "4.12.5"; openShiftVersion = "4.14.3";
okdVersion = "4.12.0-0.okd-2023-02-18-033438"; okdVersion = "4.14.0-0.okd-2023-12-01-225814";
podmanVersion = "4.3.1"; microshiftVersion = "4.14.3";
writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; podmanVersion = "4.4.4";
gitHash = "sha256-zk/26cG2Rt3jpbhKgprtq2vx7pIQVi7cPUA90uoQa80="; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
gitCommit = "b6532a3c38f2c81143153fed022bc4ebf3f2f508";
gitHash = "sha256-LH1vjWVzSeSswnMibn4YVjV2glauQGDXP+6i9kGzzU4=";
in in
buildGoModule rec { buildGoModule rec {
version = "2.15.0"; version = "2.30.0";
pname = "crc"; pname = "crc";
gitCommit = "72256c3cb00ac01519b26658dd5cfb0dd09b37a1";
modRoot = "cmd/crc"; modRoot = "cmd/crc";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -44,12 +45,13 @@ buildGoModule rec {
tags = [ "containers_image_openpgp" ]; tags = [ "containers_image_openpgp" ];
ldflags = [ ldflags = [
"-X github.com/crc-org/crc/pkg/crc/version.crcVersion=${version}" "-X github.com/crc-org/crc/v2/pkg/crc/version.crcVersion=${version}"
"-X github.com/crc-org/crc/pkg/crc/version.ocpVersion=${openShiftVersion}" "-X github.com/crc-org/crc/v2/pkg/crc/version.ocpVersion=${openShiftVersion}"
"-X github.com/crc-org/crc/pkg/crc/version.okdVersion=${okdVersion}" "-X github.com/crc-org/crc/v2/pkg/crc/version.okdVersion=${okdVersion}"
"-X github.com/crc-org/crc/pkg/crc/version.podmanVersion=${podmanVersion}" "-X github.com/crc-org/crc/v2/pkg/crc/version.podmanVersion=${podmanVersion}"
"-X github.com/crc-org/crc/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}" "-X github.com/crc-org/crc/v2/pkg/crc/version.microshiftVersion=${microshiftVersion}"
"-X github.com/crc-org/crc/pkg/crc/segment.WriteKey=${writeKey}" "-X github.com/crc-org/crc/v2/pkg/crc/version.commitSha=${builtins.substring 0 8 gitCommit}"
"-X github.com/crc-org/crc/v2/pkg/crc/segment.WriteKey=${writeKey}"
]; ];
preBuild = '' preBuild = ''

8
pkgs/applications/networking/cluster/crc/update.sh
View file

@ -40,7 +40,10 @@ OKD_VERSION=$(grep 'OKD_VERSION' ${FILE_MAKEFILE} |
PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} | PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} |
head -n1 | awk '{print $3}') head -n1 | awk '{print $3}')
WRITE_KEY=$(grep '$(REPOPATH)/pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} | MICROSHIFT_VERSION=$(grep 'MICROSHIFT_VERSION' ${FILE_MAKEFILE} |
head -n1 | awk '{print $3}')
WRITE_KEY=$(grep 'pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} |
head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g') head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g')
sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \ sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \
@ -61,5 +64,8 @@ sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \
sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix ${NIXPKGS_CRC_FOLDER}/default.nix
sed -i "s|microshiftVersion = \".*\"|microshiftVersion = \"${MICROSHIFT_VERSION:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix
sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \ sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \
${NIXPKGS_CRC_FOLDER}/default.nix ${NIXPKGS_CRC_FOLDER}/default.nix