diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-17 22:33:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-17 22:33:13 +0100 |
commit | 14d646edec6eeaaaaf7517fcefd1d998a33792f3 (patch) | |
tree | e03950a1e2c40b18298619435a34b8691a003bd9 /pkgs/development/tools/heroku | |
parent | 9f768ff43cece413e922f93cf861a28eaa969c41 (diff) | |
parent | db571e9b78811f848c20185e8b3ed9b52b187e89 (diff) |
Merge pull request #46804 from bobvanderlinden/pr-heroku-7.16.0
heroku: 5.6.32 -> 7.16.0
Diffstat (limited to 'pkgs/development/tools/heroku')
-rw-r--r-- | pkgs/development/tools/heroku/default.nix | 80 |
1 files changed, 21 insertions, 59 deletions
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 9c5cbb1aa2859..69370e89c343c 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -1,70 +1,32 @@ -{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub -, nodejs-6_x, postgresql, ruby }: +{ stdenv, lib, fetchurl, makeWrapper, nodejs }: -with stdenv.lib; - -let - cli = buildGoPackage rec { - name = "cli-${version}"; - version = "5.6.32"; - - goPackagePath = "github.com/heroku/cli"; - - src = fetchFromGitHub { - owner = "heroku"; - repo = "cli"; - rev = "v${version}"; - sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz"; - }; - - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - -X=main.Channel=stable - -X=main.Autoupdate=no - ''; - - preCheck = '' - export HOME=/tmp - ''; - - doCheck = true; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "heroku-${version}"; - version = "3.43.16"; + version = "7.16.0"; - meta = { - homepage = https://toolbelt.heroku.com; - description = "Everything you need to get started using Heroku"; - maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ]; - license = licenses.mit; - platforms = with platforms; unix; - broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447 + src = fetchurl { + url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; + sha256 = "434573b4773ce7ccbb21b43b19529475d941fa7dd219b01b75968b42e6b62abe"; }; - binPath = lib.makeBinPath [ postgresql ruby ]; - buildInputs = [ makeWrapper ]; - doUnpack = false; - - src = fetchurl { - url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; - sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7"; - }; + dontBuild = true; installPhase = '' - mkdir -p $out - - tar xzf $src -C $out --strip-components=1 - install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku - - wrapProgram $out/bin/heroku \ - --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ - --set XDG_DATA_HOME $out/share \ - --set XDG_DATA_DIRS $out/share \ - --prefix PATH : ${binPath} + mkdir -p $out/share/heroku $out/bin + cp -pr * $out/share/heroku + substituteInPlace $out/share/heroku/bin/run \ + --replace "/usr/bin/env node" "${nodejs}/bin/node" + makeWrapper $out/share/heroku/bin/run $out/bin/heroku \ + --set HEROKU_DISABLE_AUTOUPDATE 1 ''; + + meta = { + homepage = https://toolbelt.heroku.com; + description = "Everything you need to get started using Heroku"; + maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ]; + license = lib.licenses.mit; + platforms = with lib.platforms; unix; + }; } |