From 366d69609bdc383ae4bb9e1ba4ae482b6e81dbee Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 30 Dec 2023 11:14:54 +0100 Subject: [PATCH] crc: move to by-name - update the update script --- .../default.nix => by-name/cr/crc/package.nix} | 0 .../cluster => by-name/cr}/crc/update.sh | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) rename pkgs/{applications/networking/cluster/crc/default.nix => by-name/cr/crc/package.nix} (100%) rename pkgs/{applications/networking/cluster => by-name/cr}/crc/update.sh (88%) diff --git a/pkgs/applications/networking/cluster/crc/default.nix b/pkgs/by-name/cr/crc/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/crc/default.nix rename to pkgs/by-name/cr/crc/package.nix diff --git a/pkgs/applications/networking/cluster/crc/update.sh b/pkgs/by-name/cr/crc/update.sh similarity index 88% rename from pkgs/applications/networking/cluster/crc/update.sh rename to pkgs/by-name/cr/crc/update.sh index 98bed3ee88e3..4e46cbc428cc 100755 --- a/pkgs/applications/networking/cluster/crc/update.sh +++ b/pkgs/by-name/cr/crc/update.sh @@ -47,25 +47,25 @@ WRITE_KEY=$(grep 'pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} | head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g') sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|gitHash = \".*\"|gitHash = \"${CRC_GIT_HASH}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|okdVersion = \".*\"|okdVersion = \"${OKD_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|microshiftVersion = \".*\"|microshiftVersion = \"${MICROSHIFT_VERSION:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \ - ${NIXPKGS_CRC_FOLDER}/default.nix + ${NIXPKGS_CRC_FOLDER}/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9498eeb390a6..1e0e3807c52e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -568,8 +568,6 @@ with pkgs; coost = callPackage ../development/libraries/coost { }; - crc = callPackage ../applications/networking/cluster/crc { }; - confetty = callPackage ../applications/misc/confetty { }; confy = callPackage ../applications/misc/confy { };