Merge pull request #64982 from NixOS/staging-next

Staging next
2019-07-25 15:48:30 +02:00
parent 5f33bcd953 34eebf6844
commit dcea5637d8
70 changed files with 985 additions and 741 deletions
@@ -37,13 +37,7 @@ let newPython = python3.override {
        sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
      };
    });
-    pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
-      version = "3.13";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
-      };
-    });
+    pyyaml = super.pyyaml_3;
  };
 };