diff options
| author | Dzmitry Malyshau <kvark@fastmail.com> | 2021-11-19 12:25:50 -0500 |
|---|---|---|
| committer | Dzmitry Malyshau <kvark@fastmail.com> | 2021-11-19 12:25:50 -0500 |
| commit | 836ba699decfea81318f5219830182884312b812 (patch) | |
| tree | eb9fc3e97e434c7e7d88b6f8bb983a07b9aee17b | |
| parent | ca7a71747d195affa8217401e26f8f81dbf02691 (diff) | |
| download | nixpkgs-836ba699decfea81318f5219830182884312b812.tar nixpkgs-836ba699decfea81318f5219830182884312b812.tar.gz nixpkgs-836ba699decfea81318f5219830182884312b812.tar.bz2 nixpkgs-836ba699decfea81318f5219830182884312b812.tar.lz nixpkgs-836ba699decfea81318f5219830182884312b812.tar.xz nixpkgs-836ba699decfea81318f5219830182884312b812.tar.zst nixpkgs-836ba699decfea81318f5219830182884312b812.zip | |
moz-phab: rename patch files
| -rw-r--r-- | pkgs/applications/misc/moz-phab/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/misc/moz-phab/relax-hglib-version.diff (renamed from pkgs/applications/misc/moz-phab/D131618.diff) | 0 | ||||
| -rw-r--r-- | pkgs/development/python-modules/glean-parser/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/glean-sdk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch (renamed from pkgs/development/python-modules/glean-sdk/pr-1542.patch) | 0 |
5 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 3ed14b69d61..9666f974957 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -11,18 +11,19 @@ }: buildPythonApplication rec { - pname = "MozPhab"; + pname = "moz-phab"; version = "0.1.99"; src = fetchPypi { - inherit pname version; + pname = "MozPhab"; + inherit version; sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; }; patches = [ # Relax python-hglib requirement # https://phabricator.services.mozilla.com/D131618 - ./D131618.diff + ./relax-hglib-version.diff ]; propagatedBuildInputs = [ @@ -50,6 +51,6 @@ buildPythonApplication rec { homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; license = licenses.mpl20; maintainers = [ maintainers.kvark ]; - platforms = platforms.all; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/moz-phab/D131618.diff b/pkgs/applications/misc/moz-phab/relax-hglib-version.diff index 6d415242f46..6d415242f46 100644 --- a/pkgs/applications/misc/moz-phab/D131618.diff +++ b/pkgs/applications/misc/moz-phab/relax-hglib-version.diff diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index a9b47597149..feca6979b42 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest , pytest-runner , pythonOlder , setuptools-scm @@ -42,7 +41,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest pytest-runner ]; disabledTests = [ diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index ac9d4b5c778..e729d927cda 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { patches = [ # Fix the environment for spawned process # https://github.com/mozilla/glean/pull/1542 - ./pr-1542.patch + ./fix-spawned-process-environment.patch ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/development/python-modules/glean-sdk/pr-1542.patch b/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch index f9a7b2723eb..f9a7b2723eb 100644 --- a/pkgs/development/python-modules/glean-sdk/pr-1542.patch +++ b/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch |