diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2019-04-12 19:31:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 19:31:41 +0200 |
| commit | 6ebcac79f3683f5b260e4d5b7481ad5c54068f8a (patch) | |
| tree | 0d54e8559d62866714a57fcda20a592228817e2d /pkgs/development/tools | |
| parent | 628ba24e77b2c6f82f4c2d9e8a31d93fa06f2743 (diff) | |
| parent | bcfc8ce784fc8d6bbf2271aa6edbdb305094b58b (diff) | |
| download | nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.tar nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.tar.gz nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.tar.bz2 nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.tar.lz nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.tar.xz nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.tar.zst nixlib-6ebcac79f3683f5b260e4d5b7481ad5c54068f8a.zip | |
Merge pull request #59340 from marsam/update-buck
buck: 2017.10.01.01 -> 2019.01.10.01
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/buck/default.nix | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index 18ced2628783..d4e5c5a38dcd 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "buck-${version}"; - version = "2017.10.01.01"; + pname = "buck"; + version = "2019.01.10.01"; src = fetchFromGitHub { owner = "facebook"; - repo = "buck"; + repo = pname; rev = "v${version}"; - sha256 = "05nyyb6f0hv1h67zzvdq8297yl8zjhpbasx35lxnrsjz0m1h8ngw"; + sha256 = "0987s399v4ba2a3crca12vsg9001xcb5drhqi564ninpa5vxamr2"; }; patches = [ ./pex-mtime.patch ]; @@ -20,23 +20,17 @@ stdenv.mkDerivation rec { buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ]; nativeBuildInputs = [ makeWrapper ]; - targets = [ "buck" "buckd" ]; - buildPhase = '' ant - for exe in ${toString targets}; do - ./bin/buck build //programs:$exe - done + ./bin/buck build -c buck.release_version=${version} buck ''; installPhase = '' - for exe in ${toString targets}; do - install -D -m755 buck-out/gen/programs/$exe.pex $out/bin/$exe - wrapProgram $out/bin/$exe \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" - done + install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck + wrapProgram $out/bin/buck \ + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}" ''; meta = with stdenv.lib; { |