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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+3 -1
View File
@@ -7684,7 +7684,7 @@ in {
sly = callPackage ../development/python-modules/sly { };
smart_open = callPackage ../development/python-modules/smart_open { };
smart-open = callPackage ../development/python-modules/smart-open { };
smartypants = callPackage ../development/python-modules/smartypants { };
@@ -8289,6 +8289,8 @@ in {
toggl-cli = callPackage ../development/python-modules/toggl-cli { };
token-bucket = callPackage ../development/python-modules/token-bucket { };
tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { });
tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { });