diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2018-11-02 06:42:05 -0500 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2018-11-02 07:07:52 -0500 |
commit | 91ce8c050fdc1bd3fb29caa54cade79adb04979d (patch) | |
tree | eb00eb471770263a7ace70e182acbfca75d3ec76 /pkgs/development | |
parent | c7c278dc0fdf97aea865efebb76454df6b44af2b (diff) | |
download | nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.tar nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.tar.gz nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.tar.bz2 nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.tar.lz nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.tar.xz nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.tar.zst nixlib-91ce8c050fdc1bd3fb29caa54cade79adb04979d.zip |
pyre: 0.0.14 -> 0.0.17
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/pyre/default.nix | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index a0ea5f59f255..382e733cb98b 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -3,7 +3,13 @@ let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - pyre-version = "0.0.14"; + pyre-version = "0.0.17"; # also change typeshed revision below with $pyre-src/.typeshed-version + pyre-src = fetchFromGitHub { + owner = "facebook"; + repo = "pyre-check"; + rev = "v${pyre-version}"; + sha256 = "0y86a3g5xbgh0byksyx5jw7yq7w840x85dhz9inz6mkg5j06mcis"; + }; versionFile = writeScript "version.ml" '' cat > "./version.ml" <<EOF open Core @@ -20,12 +26,7 @@ let pyre-bin = stdenv.mkDerivation { name = "pyre-${pyre-version}"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "pyre-check"; - rev = "v${pyre-version}"; - sha256 = "0c8xzaa3ljqb6llr041sydw0l4xqn7x21nw9vaymdxh35nx9bp2v"; - }; + src = pyre-src; nativeBuildInputs = [ makeWrapper ]; @@ -49,7 +50,6 @@ let export HOME=. # "external" because https://github.com/facebook/pyre-check/pull/8/files - cp Makefile.template Makefile sed "s/%VERSION%/external/" dune.in > dune cp ${versionFile} ./scripts/generate-version-number.sh @@ -83,14 +83,12 @@ let }; typeshed = stdenv.mkDerivation { name = "typeshed"; - # typeshed doesn't have versions, it seems to be synchronized with - # mypy relases. I'm assigning a random version here (same as pyre). version = pyre-version; src = fetchFromGitHub { owner = "python"; repo = "typeshed"; - rev = "a08c6ea"; - sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk"; + rev = "bc3f9fe1d3c43b00c04cedb23e0eeebc9e1734b6"; + sha256 = "06b2kj4n49h4sgi8hn5kalmir8llhanfdc7f1924cxvrkj5ry94b"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = "cp -r $src $out"; @@ -98,19 +96,8 @@ typeshed = stdenv.mkDerivation { in python3.pkgs.buildPythonApplication rec { pname = "pyre-check"; version = pyre-version; - src = fetchFromGitHub { - owner = "facebook"; - repo = "pyre-check"; - rev = "v${pyre-version}"; - sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l"; - }; - patches = [ - (fetchpatch { - url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch"; - sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy"; - }) - ./pyre-bdist-wheel.patch - ]; + src = pyre-src; + patches = [ ./pyre-bdist-wheel.patch ]; # The build-pypi-package script does some funky stuff with build # directories - easier to patch it a bit than to replace it @@ -119,21 +106,21 @@ in python3.pkgs.buildPythonApplication rec { mkdir ./build substituteInPlace scripts/build-pypi-package.sh \ --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ - --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build" + --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$PWD/build" substituteInPlace client/buck.py \ --replace '"buck"' '"${buck}/bin/buck"' substituteInPlace client/tests/buck_test.py \ --replace '"buck"' '"${buck}/bin/buck"' ''; - buildInputs = [ pyre-bin rsync ]; + buildInputs = [ pyre-bin ]; + nativeBuildInputs = [ rsync ]; # only required for build-pypi-package.sh propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ]; buildPhase = '' bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed} cp -r build/dist dist ''; checkPhase = '' - sed -i 's/which python3/command -v python3/g' scripts/run-python-tests.sh bash scripts/run-python-tests.sh ''; } |