Merge branch 'master' into staging-next

2021-07-08 04:38:15 -04:00
parent 15c347a298 44188d6472
commit 280e629ee0
95 changed files with 1938 additions and 1064 deletions
@@ -25,9 +25,8 @@ buildPythonPackage rec {
    sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338=";
  };

-  # Allow later aniso8601 releases
-  # https://github.com/graphql-python/graphene/pull/1331
  patches = [ (fetchpatch {
+    # Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331
    url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch";
    sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk=";
  }) ];