From 56052a15ef00c54bbbf36e18f47d1a148349d5cd Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 31 Jan 2021 16:26:07 +0000 Subject: cloudfoundry-cli: 7.0.1 -> 7.2.0, switching to buildGoModule --- .../development/tools/cloudfoundry-cli/default.nix | 44 +++++++++------------- 1 file changed, 18 insertions(+), 26 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 4d7e226463fd..de032cc60e99 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "cloudfoundry-cli"; - version = "7.0.1"; - - goPackagePath = "code.cloudfoundry.org/cli"; - - subPackages = [ "." ]; + version = "7.2.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; }; + # vendor directory stale + deleteVendor = true; + vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + + subPackages = [ "." ]; # upstream have helpfully moved the bash completion script to a separate # repo which receives no releases or even tags @@ -24,24 +25,16 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; - makeTarget = let hps = stdenv.hostPlatform.system; in - if hps == "x86_64-darwin" then - "out/cf-cli_osx" - else if hps == "x86_64-linux" then - "out/cf-cli_linux_x86-64" - else if hps == "i686-linux" then - "out/cf-cli_linux_i686" - else - throw "make target for this platform unknown"; - - buildPhase = '' - cd go/src/${goPackagePath} - CF_BUILD_DATE="1970-01-01" make $makeTarget - cp $makeTarget out/cf - ''; + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" + "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}" + ]; - installPhase = '' - install -Dm555 out/cf "$out/bin/cf" + postInstall = '' + mv "$out/bin/cli" "$out/bin/cf" installShellCompletion --bash $bashCompletionScript ''; @@ -50,6 +43,5 @@ buildGoPackage rec { homepage = "https://github.com/cloudfoundry/cli"; maintainers = with maintainers; [ ris ]; license = licenses.asl20; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } -- cgit v1.2.3 From 1e01f697c2a8996765e3c6a8ebe08f8cab1c65d7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 31 Jan 2021 16:30:23 +0000 Subject: cloudfoundry-cli: relocate to pkgs/applications/networking/cluster --- .../cluster/cloudfoundry-cli/default.nix | 47 ++++++++++++++++++++++ .../development/tools/cloudfoundry-cli/default.nix | 47 ---------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix delete mode 100644 pkgs/development/tools/cloudfoundry-cli/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix new file mode 100644 index 000000000000..de032cc60e99 --- /dev/null +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: + +buildGoModule rec { + pname = "cloudfoundry-cli"; + version = "7.2.0"; + + src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = "cli"; + rev = "v${version}"; + sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; + }; + # vendor directory stale + deleteVendor = true; + vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; + + subPackages = [ "." ]; + + # upstream have helpfully moved the bash completion script to a separate + # repo which receives no releases or even tags + bashCompletionScript = fetchurl { + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; + sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" + "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}" + ]; + + postInstall = '' + mv "$out/bin/cli" "$out/bin/cf" + installShellCompletion --bash $bashCompletionScript + ''; + + meta = with lib; { + description = "The official command line client for Cloud Foundry"; + homepage = "https://github.com/cloudfoundry/cli"; + maintainers = with maintainers; [ ris ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix deleted file mode 100644 index de032cc60e99..000000000000 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl, installShellFiles }: - -buildGoModule rec { - pname = "cloudfoundry-cli"; - version = "7.2.0"; - - src = fetchFromGitHub { - owner = "cloudfoundry"; - repo = "cli"; - rev = "v${version}"; - sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv"; - }; - # vendor directory stale - deleteVendor = true; - vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2"; - - subPackages = [ "." ]; - - # upstream have helpfully moved the bash completion script to a separate - # repo which receives no releases or even tags - bashCompletionScript = fetchurl { - url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; - sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; - }; - - nativeBuildInputs = [ installShellFiles ]; - - buildFlagsArray = [ - "-ldflags=" - "-s" - "-w" - "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" - "-X code.cloudfoundry.org/cli/version.binaryVersion=${version}" - ]; - - postInstall = '' - mv "$out/bin/cli" "$out/bin/cf" - installShellCompletion --bash $bashCompletionScript - ''; - - meta = with lib; { - description = "The official command line client for Cloud Foundry"; - homepage = "https://github.com/cloudfoundry/cli"; - maintainers = with maintainers; [ ris ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c4eaa8e71ab..e598d3ba85db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11857,7 +11857,7 @@ in cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; - cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; clpm = callPackage ../development/tools/clpm {}; -- cgit v1.2.3