Merge master into staging-next

2020-12-04 18:14:51 +00:00
parent 5524c43f2c b66ea6fc39
commit cb36dd7449
28 changed files with 89 additions and 81 deletions
@@ -5,7 +5,7 @@ let
  libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1;

 # IMPORTANT: You need permissions to access the stlink usb devices.
-# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
+# Add services.udev.packages = [ pkgs.stlink ] to your configuration.nix

 in stdenv.mkDerivation rec {
  pname = "stlink";