JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #119247 from jonringer/bump-buck

Browse Source 
buck: 2019.10.17.01 -> 2021.01.12.01
This commit is contained in:
Sandro 2021-04-22 03:36:17 +02:00 committed by GitHub
commit 7f9965695f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/build-managers/buck/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: { lib, stdenv, fetchFromGitHub, jdk11, ant, python3, watchman, bash, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "buck"; pname = "buck";
version = "2019.10.17.01"; version = "2021.01.12.01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1irgp8yq1z11bq3b83yxvj35wqqq7y7b8q4d4y0hc05ac19ja0vj"; sha256 = "sha256-NFiMQ+cG93R10LlkfUMzZ4TnV0uO5G+8S5TiMI6hU5o=";
}; };
patches = [ ./pex-mtime.patch ]; patches = [ ./pex-mtime.patch ];
@ -17,20 +17,21 @@ stdenv.mkDerivation rec {
grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g" grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g"
''; '';
buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ]; nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ];
nativeBuildInputs = [ makeWrapper ];
buildPhase = '' buildPhase = ''
# Set correct version, see https://github.com/facebook/buck/issues/2607
echo v${version} > .buckrelease
ant ant
PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck
''; '';
installPhase = '' installPhase = ''
install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck
wrapProgram $out/bin/buck \ wrapProgram $out/bin/buck \
--prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : "${lib.makeBinPath [ jdk11 watchman python3 ]}"
--prefix PATH : "${lib.makeBinPath [jdk watchman]}"
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -12438,9 +12438,7 @@ in
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
buck = callPackage ../development/tools/build-managers/buck { buck = callPackage ../development/tools/build-managers/buck { };
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
buildkite-agent = buildkite-agent3; buildkite-agent = buildkite-agent3;
buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";