From 58db095c86d366e9e3b801bc22359162fdad8b49 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Aug 2018 09:10:50 -0500 Subject: [PATCH] pythonPackages.pywatchman: move to python-modules pywatchman is licensed under BSD-3 https://github.com/facebook/watchman/commit/150f1fb4eff94c0248b54154fb356f768a131d60 --- .../python-modules/pywatchman/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +----------- 2 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/pywatchman/default.nix diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix new file mode 100644 index 00000000000..40aaea9c01a --- /dev/null +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, watchman }: + +buildPythonPackage rec { + pname = "pywatchman"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yf2gm20wc3djpb5larxii3l55xxby0il2ns3q0v1byyfnr7w16h"; + }; + + postPatch = '' + substituteInPlace pywatchman/__init__.py \ + --replace "'watchman'" "'${watchman}/bin/watchman'" + ''; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + description = "Watchman client for Python"; + homepage = https://facebook.github.io/watchman/; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27acc3d7121..ee9f158ce76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4429,21 +4429,7 @@ in { }; }; - pywatchman = buildPythonPackage rec { - name = "pywatchman-${version}"; - version = "1.4.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pywatchman/pywatchman-${version}.tar.gz"; - sha256 = "1yf2gm20wc3djpb5larxii3l55xxby0il2ns3q0v1byyfnr7w16h"; - }; - postPatch = '' - substituteInPlace pywatchman/__init__.py \ - --replace "'watchman'" "'${pkgs.watchman}/bin/watchman'" - ''; - # No tests in archive - doCheck = false; - - }; + pywatchman = callPackage ../development/python-modules/pywatchman { }; pywavelets = callPackage ../development/python-modules/pywavelets { };