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 
Fix cargo-flash build
This commit is contained in:
Jonathan Ringer
2021-05-16 18:27:14 -07:00
parent 6020fe2508 8aea69e5ab
commit d8e62d8e41
80 changed files with 906 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+4
View File
@@ -3115,6 +3115,8 @@ in {
hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };
hsluv = callPackage ../development/python-modules/hsluv { };
hstspreload = callPackage ../development/python-modules/hstspreload { };
html2text = callPackage ../development/python-modules/html2text { };
@@ -8243,6 +8245,8 @@ in {
torchvision = callPackage ../development/python-modules/torchvision { };
torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };
tornado = callPackage ../development/python-modules/tornado { };
# Used by circus and grab-site, 2020-08-29