Merge branch 'staging-next' into staging

pkgs/development/tools/misc/hound/default.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "hound";
-  version = "unstable-2021-01-26";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "hound-search";
     repo = "hound";
-    rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9";
-    sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44";
+    rev = "v${version}";
+    sha256 = "0p5w54fr5xz19ff8k5xkyq3iqhjki8wc0hj2x1pnmk6hzrz6hf65";
   };
 
   vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6";

pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix

@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
 
   preConfigure = "echo ${version} > .tarball-version";
 
+  postInstall = ''
+    # rules printed by the following invocation are static,
+    # they come from hardcoded configs in libuuu/config.cpp:48
+    $out/bin/uuu -udev > udev-rules 2>stderr.txt
+    rules_file="$(cat stderr.txt|grep '1: put above udev run into'|sed 's|^.*/||')"
+    install -D udev-rules "$out/lib/udev/rules.d/$rules_file"
+  '';
+
   meta = with lib; {
     description = "Freescale/NXP I.MX chip image deploy tools";
     longDescription = ''