diff options
| author | Franck Cuny <59291+fcuny@users.noreply.github.com> | 2025-02-06 08:45:49 -0800 |
|---|---|---|
| committer | Franck Cuny <59291+fcuny@users.noreply.github.com> | 2025-02-06 08:45:49 -0800 |
| commit | afbd54c1817caa5b824743cfc468df58277b364b (patch) | |
| tree | a8d99ee9492d455c722bfbbcad8c438e7d514f53 /pkgs | |
| parent | new work laptop (diff) | |
| download | infra-afbd54c1817caa5b824743cfc468df58277b364b.tar.gz | |
install additional work related tools
We're switching architecture too, so ensure we install the correct
binaries.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/hashi/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/sapi/default.nix | 11 |
2 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/hashi/default.nix b/pkgs/hashi/default.nix index 97de12a..885282a 100644 --- a/pkgs/hashi/default.nix +++ b/pkgs/hashi/default.nix @@ -5,14 +5,23 @@ ... }: let - url = "https://artifactory.rbx.com:443/artifactory/generic-rbx-local/hashi/0.1.4/bin/hashi_darwin-amd64"; + version = "0.1.4"; + sources = { + aarch64-darwin = { + url = "https://artifactory.rbx.com:443/artifactory/generic-rbx-local/hashi/${version}/bin/hashi_darwin-arm64"; + sha256 = "sha256-FU7auH1BNdsJsHrWBytK7FJpOll9nx0i29Z5Jd18guI="; + }; + }; in stdenv.mkDerivation rec { pname = "hashi"; - version = "0.1.4"; + inherit version; + src = fetchurl { - inherit url; - sha256 = "sha256-uX6AdOUfh6JEwS20kQwjp9Os12lVOGoCajOV9sYWXtA="; + inherit (sources.${stdenv.hostPlatform.system}) + url + sha256 + ; }; installPhase = '' @@ -33,6 +42,6 @@ stdenv.mkDerivation rec { description = "hashi command-line tool"; homepage = "http://go/hashicli"; license = licenses.unfree; - platforms = [ "x86_64-darwin" ]; + platforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/sapi/default.nix b/pkgs/sapi/default.nix index a939685..6b5b6c9 100644 --- a/pkgs/sapi/default.nix +++ b/pkgs/sapi/default.nix @@ -7,13 +7,9 @@ let version = "1.2.4"; sources = { - x86_64-darwin = { - url = "https://artifactory.rbx.com:443/artifactory/generic-rbx-local/sapi-cli/darwin-amd64/v${version}/sapi"; - sha256 = "sha256-Il/aqGzxtI84TdUAz4Fvw8RbAgGBZQPN3MZrOitrpVk="; - }; aarch64-darwin = { url = "https://artifactory.rbx.com:443/artifactory/generic-rbx-local/sapi-cli/darwin-arm64/v${version}/sapi"; - sha256 = "sha256-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx="; # Replace with actual SHA + sha256 = "sha256-rBgYTueVivUd3qM9h6fTq9fc7IKeAky1KXMSnO/uHcY="; }; }; in @@ -41,9 +37,6 @@ stdenv.mkDerivation rec { description = "sapi command-line tool"; homepage = "https://go/sapi"; license = licenses.unfree; - platforms = [ - "x86_64-darwin" - "aarch64-darwin" - ]; + platforms = [ "aarch64-darwin" ]; }; } |