git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127369 from 06kellyjac/octant
commit1d9d0415bc1ae2d831c67c23d45612f1d8c91f26 authorSandro <sandro.jaeckel@gmail.com> dateFri 18 Jun 2021, 17:58 (5 years ago) parenta0dd737862ab91
3 files changed+10−8
compare with master
unifiedsplit
pkgs/applications/networking/cluster/octant/default.nix+5−5 pkgs/applications/networking/cluster/octant/desktop.nix+3−3 pkgs/applications/networking/cluster/octant/update.sh+2
pkgs/applications/networking/cluster/octant/default.nix+5−5
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "octant";
5− version = "0.20.0";
5+ version = "0.21.0";
66
77 src =
88 let
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
1919 };
2020 in
2121 fetchsrc version {
22− x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A=";
23− aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg=";
24− x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI=";
25− aarch64-darwin = "sha256-+eZVg+B5YYf+XnDhNd6OU4+yFM9GtyiavcAr/EXh7XE=";
22+ x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng=";
23+ aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4=";
24+ x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE=";
25+ aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE=";
2626 };
2727
2828 dontConfigure = true;
pkgs/applications/networking/cluster/octant/desktop.nix+3−3
@@ -2,7 +2,7 @@
22
33let
44 pname = "octant-desktop";
5− version = "0.20.0";
5+ version = "0.21.0";
66 name = "${pname}-${version}";
77
88 inherit (stdenv.hostPlatform) system;
@@ -15,8 +15,8 @@ let
1515 src = fetchurl {
1616 url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
1717 sha256 = {
18− x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y=";
19− x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8=";
18+ x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y=";
19+ x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY=";
2020 }.${system};
2121 };
2222
pkgs/applications/networking/cluster/octant/update.sh+2
@@ -30,9 +30,11 @@ OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmwa
3030OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit")
3131OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64")
3232OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit")
33+OCTANT_DARWIN_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-arm64")
3334
3435sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV"
3536
3637replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256"
3738replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256"
3839replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256"
40+replace_sha "aarch64-darwin" "$OCTANT_DARWIN_AARCH64_SHA256"