Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-07-04 23:59:32 +02:00
50 changed files with 525 additions and 407 deletions
+1 -1
View File
@@ -2459,7 +2459,7 @@ in {
pretend = callPackage ../development/python-modules/pretend { };
detox = callPackage ../development/python-modules/detox { };
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
pbkdf2 = callPackage ../development/python-modules/pbkdf2 { };