diff options
| author | Dzmitry Malyshau <kvark@fastmail.com> | 2021-11-25 11:18:07 -0500 |
|---|---|---|
| committer | Dzmitry Malyshau <kvark@fastmail.com> | 2021-11-25 11:18:07 -0500 |
| commit | cbfec29e810db7d49221cd4e840df66c9fd9402d (patch) | |
| tree | eb207bfa9655c47716ed9c7d86d55393342b78e9 | |
| parent | 836ba699decfea81318f5219830182884312b812 (diff) | |
| download | nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.tar nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.tar.gz nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.tar.bz2 nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.tar.lz nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.tar.xz nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.tar.zst nixpkgs-cbfec29e810db7d49221cd4e840df66c9fd9402d.zip | |
moz-phab: use substituteInPlace instead of a patch
| -rw-r--r-- | pkgs/applications/misc/moz-phab/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/misc/moz-phab/relax-hglib-version.diff | 13 |
2 files changed, 6 insertions, 18 deletions
diff --git a/pkgs/applications/misc/moz-phab/default.nix b/pkgs/applications/misc/moz-phab/default.nix index 9666f974957..886e06a382b 100644 --- a/pkgs/applications/misc/moz-phab/default.nix +++ b/pkgs/applications/misc/moz-phab/default.nix @@ -20,11 +20,12 @@ buildPythonApplication rec { sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; }; - patches = [ - # Relax python-hglib requirement - # https://phabricator.services.mozilla.com/D131618 - ./relax-hglib-version.diff - ]; + # Relax python-hglib requirement + # https://phabricator.services.mozilla.com/D131618 + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + ''; propagatedBuildInputs = [ distro diff --git a/pkgs/applications/misc/moz-phab/relax-hglib-version.diff b/pkgs/applications/misc/moz-phab/relax-hglib-version.diff deleted file mode 100644 index 6d415242f46..00000000000 --- a/pkgs/applications/misc/moz-phab/relax-hglib-version.diff +++ /dev/null @@ -1,13 +0,0 @@ -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", - ], - |