about summary refs log tree commit diff
path: root/pkgs/development/python-modules/omegaconf
diff options
context:
space:
mode:
authorBen Darwin <bcdarwin@gmail.com>2021-08-18 21:04:56 -0400
committerBen Darwin <bcdarwin@gmail.com>2021-08-23 20:16:14 -0400
commit6ae24c90f0b9173243e5c6ec5b8e4a91f9051145 (patch)
tree5b5e0389a4787e6f5638c8a1e20da7785eb12f33 /pkgs/development/python-modules/omegaconf
parentd97fcbee7b2e4af5f33803a29bddfb4b6166e783 (diff)
python3Packages.hydra: 0.11.3 -> 1.1.1
Diffstat (limited to 'pkgs/development/python-modules/omegaconf')
-rw-r--r--pkgs/development/python-modules/omegaconf/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix
index 72823b013fc21..13f3981955cda 100644
--- a/pkgs/development/python-modules/omegaconf/default.nix
+++ b/pkgs/development/python-modules/omegaconf/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest-mock
-, pytestCheckHook, pyyaml, isPy27, jre_minimal, antlr4-python3-runtime }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook
+, pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }:
 
 buildPythonPackage rec {
   pname = "omegaconf";
   version = "2.1.0";
 
-  disabled = isPy27;
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "omry";
@@ -14,8 +14,12 @@ buildPythonPackage rec {
     sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"]' 'setup_requires=[]'
+  '';
+
   checkInputs = [ pytestCheckHook pytest-mock ];
-  nativeBuildInputs = [ jre_minimal pytest-runner ];
+  nativeBuildInputs = [ jre_minimal ];
   propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ];
 
   disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ];  # needs pydevd - not in Nixpkgs