public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-13 12:26:48 +00:00
committed by GitHub
parent e59f22faf5 5687a345be
commit 7465594428
19 changed files with 377 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+5 -1
View File
@@ -806,6 +806,8 @@ in
albert = libsForQt5.callPackage ../applications/misc/albert {};
auditwheel = callPackage ../tools/package-management/auditwheel { };
gobgp = callPackage ../tools/networking/gobgp { };
metapixel = callPackage ../tools/graphics/metapixel { };
@@ -26375,7 +26377,9 @@ in
# customConfig = builtins.readFile ./tabbed.config.h;
};
taffybar = callPackage ../applications/window-managers/taffybar {};
taffybar = callPackage ../applications/window-managers/taffybar {
inherit (haskellPackages) ghcWithPackages taffybar;
};
tagainijisho = callPackage ../applications/office/tagainijisho {};
pkgs/top-level/python-packages.nix
+10
View File
@@ -2567,6 +2567,8 @@ in {
fpylll = callPackage ../development/python-modules/fpylll { };
fpyutils = callPackage ../development/python-modules/fpyutils { };
freebox-api = callPackage ../development/python-modules/freebox-api { };
freetype-py = callPackage ../development/python-modules/freetype-py { };
@@ -4123,8 +4125,12 @@ in {
mcstatus = callPackage ../development/python-modules/mcstatus { };
md-toc = callPackage ../development/python-modules/md-toc { };
md2gemini = callPackage ../development/python-modules/md2gemini { };
mdformat = callPackage ../development/python-modules/mdformat { };
mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
MDP = callPackage ../development/python-modules/mdp { };
@@ -4371,6 +4377,10 @@ in {
mypy = callPackage ../development/python-modules/mypy { };
mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { };
mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { };
mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };