Merge pull request #46804 from bobvanderlinden/pr-heroku-7.16.0
heroku: 5.6.32 -> 7.16.0
This commit is contained in:
commit
14d646edec
|
@ -1,70 +1,32 @@
|
||||||
{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
|
{ stdenv, lib, fetchurl, makeWrapper, nodejs }:
|
||||||
, nodejs-6_x, postgresql, ruby }:
|
|
||||||
|
|
||||||
with stdenv.lib;
|
stdenv.mkDerivation rec {
|
||||||
|
name = "heroku-${version}";
|
||||||
|
version = "7.16.0";
|
||||||
|
|
||||||
let
|
src = fetchurl {
|
||||||
cli = buildGoPackage rec {
|
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
|
||||||
name = "cli-${version}";
|
sha256 = "434573b4773ce7ccbb21b43b19529475d941fa7dd219b01b75968b42e6b62abe";
|
||||||
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 {
|
buildInputs = [ makeWrapper ];
|
||||||
name = "heroku-${version}";
|
|
||||||
version = "3.43.16";
|
dontBuild = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
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 = {
|
meta = {
|
||||||
homepage = https://toolbelt.heroku.com;
|
homepage = https://toolbelt.heroku.com;
|
||||||
description = "Everything you need to get started using Heroku";
|
description = "Everything you need to get started using Heroku";
|
||||||
maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
|
maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
|
||||||
license = licenses.mit;
|
license = lib.licenses.mit;
|
||||||
platforms = with platforms; unix;
|
platforms = with lib.platforms; unix;
|
||||||
broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447
|
|
||||||
};
|
};
|
||||||
|
|
||||||
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";
|
|
||||||
};
|
|
||||||
|
|
||||||
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}
|
|
||||||
'';
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8386,7 +8386,9 @@ with pkgs;
|
||||||
inherit (perlPackages) LocaleGettext;
|
inherit (perlPackages) LocaleGettext;
|
||||||
};
|
};
|
||||||
|
|
||||||
heroku = callPackage ../development/tools/heroku { };
|
heroku = callPackage ../development/tools/heroku {
|
||||||
|
nodejs = nodejs-10_x;
|
||||||
|
};
|
||||||
|
|
||||||
htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
|
htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue