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

octant: cleanup

Browse source 
- Remove unneeded quotes around `${system}`
- Cleanup meta
- Correct the variable names in `update.sh`
  - Luckily even though the names were a jumble the correct shas were
    being put in the right places
This commit is contained in:
06kellyjac 2021-03-26 10:32:37 +00:00
parent c8d2f4a3a8
commit 44719bd496
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/cluster/octant/default.nix
View file

@ -6,7 +6,7 @@ let
x86_64-linux = "Linux-64bit"; x86_64-linux = "Linux-64bit";
aarch64-linux = "Linux-arm64"; aarch64-linux = "Linux-arm64";
x86_64-darwin = "macOS-64bit"; x86_64-darwin = "macOS-64bit";
}."${system}" or (throw "Unsupported system: ${system}"); }.${system} or (throw "Unsupported system: ${system}");
baseurl = "https://github.com/vmware-tanzu/octant/releases/download"; baseurl = "https://github.com/vmware-tanzu/octant/releases/download";
fetchsrc = version: sha256: fetchzip { fetchsrc = version: sha256: fetchzip {
url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz"; url = "${baseurl}/v${version}/octant_${version}_${suffix}.tar.gz";
@ -48,12 +48,14 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://octant.dev/"; homepage = "https://octant.dev/";
changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md";
description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters."; description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters";
longDescription = '' longDescription = ''
Octant is a tool for developers to understand how applications run on a Kubernetes cluster. Octant is a tool for developers to understand how applications run on a
It aims to be part of the developer's toolkit for gaining insight and approaching complexity found in Kubernetes. Kubernetes cluster.
Octant offers a combination of introspective tooling, cluster navigation, and object management along with a It aims to be part of the developer's toolkit for gaining insight and
plugin system to further extend its capabilities. approaching complexity found in Kubernetes. Octant offers a combination of
introspective tooling, cluster navigation, and object management along
with a plugin system to further extend its capabilities.
''; '';
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ jk ]; maintainers = with maintainers; [ jk ];

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

@ -28,11 +28,11 @@ replace_sha() {
OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//')
OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit")
OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64")
OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit")
sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV"
replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256"
replace_sha "x86_64-darwin" "$OCTANT_LINUX_AARCH64_SHA256" replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256"
replace_sha "aarch64-linux" "$OCTANT_DARWIN_X64_SHA256" replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256"