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/all-packages.nix
+16 -7
View File
@@ -7070,6 +7070,8 @@ in
ntlmrecon = callPackage ../tools/security/ntlmrecon { };
numberstation = callPackage ../applications/misc/numberstation { };
nvchecker = with python3Packages; toPythonApplication nvchecker;
miller = callPackage ../tools/text/miller { };
@@ -9714,7 +9716,10 @@ in
whsniff = callPackage ../applications/networking/sniffers/whsniff { };
wiiuse = callPackage ../development/libraries/wiiuse { };
wiiuse = callPackage ../development/libraries/wiiuse {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth;
};
woeusb = callPackage ../tools/misc/woeusb { };
@@ -11605,7 +11610,9 @@ in
cargo-embed = callPackage ../development/tools/rust/cargo-embed { };
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
cargo-flash = callPackage ../development/tools/rust/cargo-flash { };
cargo-flash = callPackage ../development/tools/rust/cargo-flash {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -15531,7 +15538,9 @@ in
libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { };
libacr38u = callPackage ../tools/security/libacr38u { };
libacr38u = callPackage ../tools/security/libacr38u {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
libadwaita = callPackage ../development/libraries/libadwaita { };
@@ -18394,9 +18403,7 @@ in
yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt {
pythonPackages = python3Packages;
};
yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
@@ -28596,7 +28603,9 @@ in
superTux = callPackage ../games/supertux { };
superTuxKart = callPackage ../games/super-tux-kart { };
superTuxKart = callPackage ../games/super-tux-kart {
inherit (darwin.apple_sdk.frameworks) Cocoa IOKit OpenAL;
};
synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
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