From 1c40a3eb05e434ddcafb40c48c5d7c2bc5645648 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 20 Sep 2018 23:54:11 +0200 Subject: [PATCH] circleci-cli: 0.1.0 -> 0.1.2307 (#46983) * circleci-cli: 0.1.0 -> 0.1.2307 We are also building from source now, instead of using a pre-packaged version. This means we need Go. Also did minor refactors. * circleci-cli: removed unneeded dependencies --- .../tools/misc/circleci-cli/default.nix | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 62c7cf3d8774..cc062eca932e 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,28 +1,22 @@ -{ stdenv, fetchFromGitHub, docker, makeWrapper }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let + owner = "CircleCI-Public"; pname = "circleci-cli"; - version = "0.1.0"; + version = "0.1.2307"; +in +buildGoPackage rec { + name = "${pname}-${version}"; + inherit version; - src = fetchFromGitHub { - owner = "circleci"; - repo = "local-cli"; + src = fetchFromGitHub { + inherit owner; + repo = pname; rev = "v${version}"; - sha256 = "1bv1ck5zvyl6pyvbfglizg8ybna4yg2nz441kiv5rmp4g27n6db2"; + sha256 = "0z71jnq42idvhgpgn3mdpbajmgn4b41rpifv5qxn3h1pgi08f75s"; }; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/bin/" - cp "$src/circleci.sh" "$out/bin/circleci" - ''; - - postFixup = '' - wrapProgram $out/bin/circleci \ - --prefix "PATH" : "${docker}/bin" - ''; + goPackagePath = "github.com/${owner}/${pname}"; meta = with stdenv.lib; { # Box blurb edited from the AUR package circleci-cli