moz-phab: enable tests, remove pkgs dependency

pkgs/applications/misc/moz-phab/D131618.diff

@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -15,7 +15,7 @@
+     install_requires=[
+         "distro",
+         "glean-sdk>=36.0.0",
+-        "python-hglib==2.6.1",
++        "python-hglib>=2.6.2",
+         "sentry-sdk>=0.14.3",
+         "setuptools",
+     ],
+

pkgs/applications/misc/moz-phab/default.nix

@@ -1,27 +1,44 @@
-{ lib, python3Packages, pkgs }:
+{ lib
+, buildPythonApplication
+, fetchPypi
+, mercurial
+# build inputs
+, distro
+, glean-sdk
+, python-hglib
+, sentry-sdk
+, setuptools
+}:
 
-python3Packages.buildPythonApplication rec {
+buildPythonApplication rec {
   pname = "MozPhab";
   version = "0.1.99";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  patches = [
+    # Relax python-hglib requirement
+    # https://phabricator.services.mozilla.com/D131618
+    ./D131618.diff
+  ];
+
+  propagatedBuildInputs = [
     distro
     glean-sdk
     python-hglib
     sentry-sdk
     setuptools
   ];
-  buildInputs = [
-    pkgs.mercurial
+  checkInputs = [
+    mercurial
   ];
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1741683
-  doCheck = false;
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
 
   meta = with lib; {
     description = "Phabricator CLI from Mozilla to support submission of a series of commits";

pkgs/development/python-modules/glean-parser/default.nix

@@ -1,28 +1,38 @@
 { lib
-, pkgs
-, python3Packages
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pytest
+, pytest-runner
+, pythonOlder
 , setuptools-scm
+# build inputs
+, appdirs
+, click
+, diskcache
+, jinja2
+, jsonschema
+, pyyaml
+, yamllint
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "glean_parser";
   version = "4.3.1";
 
-  disabled = python3Packages.pythonOlder "3.6";
+  disabled = pythonOlder "3.6";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-wZSro1pX/50TlSfFMh71JlmXlJlONVutTDFL06tkw+s=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     appdirs
     click
     diskcache
     jinja2
     jsonschema
-    pytest
-    pytest-runner
     pyyaml
     yamllint
   ];
@@ -31,7 +41,9 @@ python3Packages.buildPythonPackage rec {
   ];
 
   checkInputs = [
-    python3Packages.pytestCheckHook
+    pytestCheckHook
+    pytest
+    pytest-runner
   ];
   disabledTests = [
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668

pkgs/development/python-modules/glean-sdk/default.nix

@@ -1,16 +1,20 @@
 { lib
-, pkgs
-, python3Packages
+, buildPythonPackage
+, fetchPypi
 , rustPlatform
+, rustc
+, cargo
 , setuptools-rust
-, fetchpatch
+# build inputs
+, cffi
+, glean-parser
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "glean-sdk";
   version = "42.2.0";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74=";
   };
@@ -28,12 +32,12 @@ python3Packages.buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    pkgs.rustc
-    pkgs.cargo
+    rustc
+    cargo
     setuptools-rust
     rustPlatform.cargoSetupHook
   ];
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     cffi
     glean-parser
   ];

pkgs/development/python-modules/python-hglib/default.nix

@@ -1,22 +1,25 @@
 { lib
-, python3Packages
+, buildPythonPackage
+, fetchPypi
+, mercurial
+, nose
 }:
 
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "python-hglib";
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1741686
-  version = "2.6.1";
+  version = "2.6.2";
 
-  src = python3Packages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-fB+gy00zLdbshAmwR4fOukYj6X+zeGVvfKsLmWxso7I=";
+    sha256 = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg=";
   };
 
-  buildInputs = [
-  ];
+  checkInputs = [ mercurial nose ];
 
-  # attempts to create a temporary `HGTMP` folder
-  doCheck = false;
+  preCheck = ''
+    export HGTMP=$(mktemp -d)
+    export HGUSER=test
+  '';
 
   pythonImportsCheck = [ "hglib" ];
 

pkgs/top-level/all-packages.nix

@@ -7047,7 +7047,7 @@ with pkgs;
 
   motion = callPackage ../applications/video/motion { };
 
-  moz-phab = callPackage ../applications/misc/moz-phab { };
+  moz-phab = python3Packages.callPackage ../applications/misc/moz-phab { };
 
   mtail = callPackage ../servers/monitoring/mtail { };