Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-08 18:22:46 +00:00
committed by GitHub
86 changed files with 1267 additions and 220 deletions
+9 -3
View File
@@ -1239,6 +1239,8 @@ in {
cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
castepxbin = callPackage ../development/python-modules/castepxbin { };
casttube = callPackage ../development/python-modules/casttube { };
catalogue = callPackage ../development/python-modules/catalogue { };
@@ -1735,8 +1737,6 @@ in {
debugpy = callPackage ../development/python-modules/debugpy { };
debut = callPackage ../development/python-modules/debut { };
decorator = callPackage ../development/python-modules/decorator { };
decopatch = callPackage ../development/python-modules/decopatch { };
@@ -4829,6 +4829,8 @@ in {
pathvalidate = callPackage ../development/python-modules/pathvalidate { };
pathy = callPackage ../development/python-modules/pathy/default.nix { };
patiencediff = callPackage ../development/python-modules/patiencediff { };
patool = callPackage ../development/python-modules/patool { };
@@ -5872,7 +5874,9 @@ in {
phonemizer = callPackage ../development/python-modules/phonemizer { };
pyopencl = callPackage ../development/python-modules/pyopencl { };
pyopencl = callPackage ../development/python-modules/pyopencl {
mesa_drivers = pkgs.mesa.drivers;
};
pyopengl = callPackage ../development/python-modules/pyopengl { };
@@ -7619,6 +7623,8 @@ in {
spacy = callPackage ../development/python-modules/spacy { };
spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { };
spacy_models = callPackage ../development/python-modules/spacy/models.nix { };
spake2 = callPackage ../development/python-modules/spake2 { };