Merge branch 'staging-next' into staging

This commit is contained in:
Vladimír Čunát
2020-10-25 09:47:04 +01:00
418 changed files with 7056 additions and 3808 deletions
+5 -1
View File
@@ -2397,6 +2397,8 @@ in {
gmusicapi = callPackage ../development/python-modules/gmusicapi { };
gntp = callPackage ../development/python-modules/gntp { };
gnureadline = callPackage ../development/python-modules/gnureadline { };
gnutls = callPackage ../development/python-modules/gnutls { };
@@ -4826,7 +4828,7 @@ in {
pybullet = callPackage ../development/python-modules/pybullet { };
pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; };
pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; };
pycallgraph = callPackage ../development/python-modules/pycallgraph { };
@@ -5022,6 +5024,8 @@ in {
pygmo = callPackage ../development/python-modules/pygmo { };
pygmt = callPackage ../development/python-modules/pygmt { };
pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; };
pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; };