Merge staging-next-21.05 into staging-21.05

lib/default.nix

@@ -123,8 +123,8 @@ let
     inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
       mergeDefaultOption mergeOneOption mergeEqualOption getValues
       getFiles optionAttrSetToDocList optionAttrSetToDocList'
-      scrubOptionValue literalExample showOption showFiles
-      unknownModule mkOption;
+      scrubOptionValue literalExpression literalExample literalDocBook
+      showOption showFiles unknownModule mkOption;
     inherit (self.types) isType setType defaultTypeMerge defaultFunctor
       isOptionType mkOptionType;
     inherit (self.asserts)

lib/options.nix

@@ -217,6 +217,10 @@ rec {
   */
   literalExample = text: { _type = "literalExample"; inherit text; };
 
+  # Compatibility shims for https://github.com/NixOS/nixpkgs/pull/136909
+  literalExpression = literalExample;
+  literalDocBook = literalExample;
+
   # Helper functions.
 
   /* Convert an option, described as a list of the option parts in to a

pkgs/development/libraries/nanopb/default.nix

@@ -5,6 +5,7 @@
 , protobuf
 , python3
 , stdenv
+, buildPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,}
     "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a
-    "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc"
+    "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc"
   ];
 
   postInstall = ''

pkgs/tools/misc/yubikey-manager/default.nix

@@ -1,5 +1,5 @@
 { python3Packages, fetchurl, lib,
-  yubikey-personalization, libu2f-host, libusb1 }:
+  yubikey-personalization, libu2f-host, libusb1, procps }:
 
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
@@ -10,6 +10,11 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E=";
   };
 
+  postPatch = ''
+    substituteInPlace "ykman/pcsc/__init__.py" \
+      --replace '/usr/bin/pkill' '${procps}/bin/pkill'
+  '';
+
   propagatedBuildInputs =
     with python3Packages; [
       click