Merge master into staging-next

pkgs/development/tools/misc/luarocks/darwin-3.0.x.patch

@@ -10,7 +10,7 @@ index f93e67a..2eb2db9 100644
 +      defaults.variables.STAT = "stat"
        defaults.variables.STATFLAG = "-f '%A'"
 -      local version = util.popen_read("sw_vers -productVersion")
-+      local version = "10.10"
++      local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12"
        version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
        if version >= 10 then
           version = 8

pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch

@@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644
        defaults.arch = "macosx-"..target_cpu
        defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
 -      local version = util.popen_read("sw_vers -productVersion")
-+      local version = "10.10"
++      local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12"
        version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
        if version >= 10 then
           version = 8

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

@@ -0,0 +1,42 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+}:
+
+with python3Packages; buildPythonApplication rec {
+  pname = "tinyprog";
+  # `python setup.py --version` from repo checkout
+  version = "1.0.24.dev99+ga77f828";
+
+  src = fetchFromGitHub {
+    owner = "tinyfpga";
+    repo = "TinyFPGA-Bootloader";
+    rev = "a77f828d3d6ae077e323ec96fc3925efab5aa9d7";
+    sha256 = "0jg47q0n1qkdrzri2q6n9a7czicj0qk58asz0xhzkajx1k9z3g5q";
+  };
+
+  sourceRoot = "source/programmer";
+
+  propagatedBuildInputs = [
+    pyserial
+    jsonmerge
+    intelhex
+    tqdm
+    six
+    packaging
+    pyusb
+  ];
+
+  nativeBuildInputs = [ setuptools_scm ];
+
+  preBuild = ''
+    export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer;
+    description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader";
+    maintainers = with maintainers; [ emily ];
+    license = licenses.asl20;
+  };
+}