Merge staging-next into staging

lib/types.nix

@@ -579,7 +579,7 @@ rec {
       absolute ? null,
     }:
       throwIf (inStore != null && absolute != null && inStore && !absolute) "In pathWith, inStore means the path must be absolute" mkOptionType {
-        name = "pathWith";
+        name = "path";
         description = (
           (if absolute == null then "" else (if absolute then "absolute " else "relative ")) +
           "path" +
@@ -588,7 +588,7 @@ rec {
         descriptionClass = "noun";
 
         merge = mergeEqualOption;
-        functor = defaultFunctor "pathWith" // {
+        functor = defaultFunctor "path" // {
           type = pathWith;
           payload = {inherit inStore absolute; };
           binOp = lhs: rhs: if lhs == rhs then lhs else null;

pkgs/by-name/ea/easytier/package.nix

@@ -11,20 +11,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.1.2";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-iY4HluL5TlYuKDBrz0fvLwJg/aX9lKiCyFs4V5WhQZs=";
+    hash = "sha256-Heb2ax2yUuGmqzIjrqjHUL3QZoofp7ATrIEN27ZA/Zs=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-KV7CdSEbmR7HIfKsS1sKsPqMz9Ku/rfbV8WmFkMC9oI=";
+  cargoHash = "sha256-U2ZK9GlfTjXsA7Fjd288YDlqSZNl3vHryLG1FE/GH5c=";
 
-  nativeBuildInputs = [ protobuf ];
+  nativeBuildInputs = [
+    protobuf
+    rustPlatform.bindgenHook
+  ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security

pkgs/by-name/en/enumer/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "enumer";
-  version = "1.5.9";
+  version = "1.5.11";
 
   src = fetchFromGitHub {
     owner = "dmarkham";
     repo = "enumer";
     tag = "v${version}";
-    hash = "sha256-NYL36GBogFM48IgIWhFa1OLZNUeEi0ppS6KXybnPQks=";
+    hash = "sha256-zFx4Djar2nC/kanoEkmHTumon2MwKMsoZU6/heUPW2I=";
   };
 
-  vendorHash = "sha256-CJCay24FlzDmLjfZ1VBxih0f+bgBNu+Xn57QgWT13TA=";
+  vendorHash = "sha256-w9T9PWMJjBJP2MmhGC7e78zbszgCwtVrfO5AQlu/ugQ=";
 
   meta = with lib; {
     description = "Go tool to auto generate methods for enums";

pkgs/by-name/sl/slackdump/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "3.0.5";
+  version = "3.0.7";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${version}";
-    hash = "sha256-iNXCqiDTD5z1dNIsQiTNAmVqx2HpTNDCdhY5X2FoC8k=";
+    hash = "sha256-IlWnlWCtcp/vT9hUaWyQXyaieOnhI1eW8PluJu4buHk=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -32,7 +32,7 @@ buildGoModule rec {
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-c3Z4p/u7+fMV9kydh7fqRxSEERJI3cw1XoIPcMp0mL4=";
+  vendorHash = "sha256-g38rP8h3+eo92S/0gqP8F/BY5HoxK1uCdHTKGCFv2dE=";
 
   __darwinAllowLocalNetworking = true;
 

pkgs/by-name/st/stevenblack-blocklist/package.nix

@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.15.15";
+  version = "3.15.17";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-wycPhloUQY24wUDFWd/URRlFUiW2hi/wcohrWQ5R8E4=";
+    hash = "sha256-NjGiPINGJb6EHnRH3ubiorT4069eYWYj1WooOyE2vDM=";
   };
 
   outputs = [

pkgs/by-name/su/supabase-cli/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.10.2";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-OuX2fD+b5B5d3ir638ZuNQpt/HuEUhc1chrPyq03qSE=";
+    hash = "sha256-SMjP+9YRmU7FVBeM7n+iZri2LBZDtZw52EjXmlBIbyQ=";
   };
 
-  vendorHash = "sha256-8CMmwMBqrfeiXp2XgpXruOkBhdUUf7W4okvn2Z3+MYA=";
+  vendorHash = "sha256-WFTnaZ+qOYkKE9vy3GWBbPK/TppUKCIwdU25KU318Lc=";
 
   ldflags = [
     "-s"

pkgs/by-name/t3/t3/package.nix

@@ -0,0 +1,38 @@
+{
+  fetchFromGitHub,
+  help2man,
+  lib,
+  nix-update-script,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "t3";
+  version = "1.0.8";
+
+  src = fetchFromGitHub {
+    owner = "flox";
+    repo = "t3";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SaSBFqMh6zOty0mnYL4RJxAxbB1LJusKLdMn7Atv+As=";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "VERSION=${finalAttrs.version}"
+  ];
+  nativeBuildInputs = [ help2man ];
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Next generation tee with colorized output streams and precise time stamping";
+    homepage = "https://github.com/flox/t3";
+    changelog = "https://github.com/flox/t3/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ limeytexan ];
+    platforms = lib.platforms.unix;
+    mainProgram = "t3";
+  };
+})

pkgs/by-name/tr/tracelinks/package.nix

@@ -0,0 +1,36 @@
+{
+  fetchFromGitHub,
+  help2man,
+  lib,
+  nix-update-script,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tracelinks";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "flox";
+    repo = "tracelinks";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GftF2s2eRrkfzw2NpzTZ6Uhehcg2tMSOcsjHJssQJzU=";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "VERSION=${finalAttrs.version}"
+  ];
+  nativeBuildInputs = [ help2man ];
+  doCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Report on symbolic links encountered in path traversals";
+    homepage = "https://github.com/flox/tracelinks";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ limeytexan ];
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch

@@ -0,0 +1,28 @@
+diff --git a/Modules/_ssl.c b/Modules/_ssl.c
+index e637830..80728d2 100644
+--- a/Modules/_ssl.c
++++ b/Modules/_ssl.c
+@@ -656,6 +656,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
+                     errstr = "Some I/O error occurred";
+                 }
+             } else {
++                if (ERR_GET_LIB(e) == ERR_LIB_SYS) {
++                    // A system error is being reported; reason is set to errno
++		    errno = ERR_GET_REASON(e);
++		    return PyErr_SetFromErrno(PyExc_OSError);
++                }
+                 p = PY_SSL_ERROR_SYSCALL;
+             }
+             break;
+@@ -681,6 +686,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno)
+                 errstr = "EOF occurred in violation of protocol";
+             }
+ #endif
++            if (ERR_GET_LIB(e) == ERR_LIB_SYS) {
++                // A system error is being reported; reason is set to errno
++                errno = ERR_GET_REASON(e);
++                return PyErr_SetFromErrno(PyExc_OSError);
++            }
+             break;
+         }
+         default:

pkgs/development/interpreters/python/cpython/default.nix

@@ -299,6 +299,15 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   ] ++ optionals (pythonOlder "3.12") [
     # https://github.com/python/cpython/issues/90656
     ./loongarch-support.patch
+    # fix failing tests with openssl >= 3.4
+    # https://github.com/python/cpython/pull/127361
+  ] ++ optionals (pythonAtLeast "3.10" && pythonOlder "3.11") [
+    ./3.10/raise-OSError-for-ERR_LIB_SYS.patch
+  ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [
+    (fetchpatch {
+      url = "https://github.com/python/cpython/commit/f4b31edf2d9d72878dab1f66a36913b5bcc848ec.patch";
+      sha256 = "sha256-w7zZMp0yqyi4h5oG8sK4z9BwNEkqg4Ar+en3nlWcxh0=";
+    })
   ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [
     # backport fix for https://github.com/python/cpython/issues/95855
     ./platform-triplet-detection.patch

pkgs/development/ocaml-modules/dream/default.nix

@@ -0,0 +1,67 @@
+{
+  lib,
+  buildDunePackage,
+  dream-pure,
+  lwt_ppx,
+  camlp-streams,
+  caqti-lwt,
+  cstruct,
+  digestif,
+  dream-httpaf,
+  graphql-lwt,
+  h2-lwt-unix,
+  httpun-lwt-unix,
+  httpun-ws,
+  lambdasoup,
+  lwt_ssl,
+  magic-mime,
+  markup,
+  mirage-clock,
+  mirage-crypto-rng,
+  mirage-crypto-rng-lwt,
+  multipart_form-lwt,
+  ssl,
+  unstrctrd,
+  uri,
+  yojson,
+}:
+
+buildDunePackage {
+  pname = "dream";
+
+  inherit (dream-pure) version src;
+
+  # Compatibility with httpun 0.2.0 and h2 0.13
+  patches = [ ./httpun.patch ];
+
+  buildInputs = [ lwt_ppx ];
+
+  propagatedBuildInputs = [
+    camlp-streams
+    caqti-lwt
+    cstruct
+    digestif
+    dream-httpaf
+    dream-pure
+    graphql-lwt
+    h2-lwt-unix
+    httpun-lwt-unix
+    httpun-ws
+    lambdasoup
+    lwt_ssl
+    magic-mime
+    markup
+    mirage-clock
+    mirage-crypto-rng
+    mirage-crypto-rng-lwt
+    multipart_form-lwt
+    ssl
+    unstrctrd
+    uri
+    yojson
+  ];
+
+  meta = dream-pure.meta // {
+    description = "Tidy, feature-complete Web framework";
+  };
+}

pkgs/development/ocaml-modules/dream/httpaf.nix

@@ -0,0 +1,23 @@
+{
+  lib,
+  buildDunePackage,
+  dream-pure,
+  lwt_ppx,
+  httpun-ws,
+}:
+
+buildDunePackage {
+  pname = "dream-httpaf";
+
+  inherit (dream-pure) version src;
+
+  buildInputs = [ lwt_ppx ];
+  propagatedBuildInputs = [
+    dream-pure
+    httpun-ws
+  ];
+
+  meta = dream-pure.meta // {
+    description = "Shared http/af stack for Dream (server) and Hyper (client)";
+  };
+}

pkgs/development/ocaml-modules/dream/httpun.patch

@@ -0,0 +1,20 @@
+diff --git a/src/http/adapt.ml b/src/http/adapt.ml
+index c6bd416..5b01e17 100644
+--- a/src/http/adapt.ml
++++ b/src/http/adapt.ml
+@@ -74,7 +74,7 @@ let forward_body
+     response
+     (Httpun.Body.Writer.write_string body)
+     (Httpun.Body.Writer.write_bigstring body)
+-    (Httpun.Body.Writer.flush body)
++    (fun f -> Httpun.Body.Writer.flush body (fun _ -> f ()))
+     (fun _code -> Httpun.Body.Writer.close body)
+ 
+ let forward_body_h2
+@@ -85,5 +85,5 @@ let forward_body_h2
+     response
+     (H2.Body.Writer.write_string body)
+     (H2.Body.Writer.write_bigstring body)
+-    (H2.Body.Writer.flush body)
++    (fun f -> H2.Body.Writer.flush body (fun _ -> f ()))
+     (fun _code -> H2.Body.Writer.close body)

pkgs/development/ocaml-modules/dream/pure.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  buildDunePackage,
+  fetchurl,
+  lwt_ppx,
+  base64,
+  hmap,
+  lwt,
+  ptime,
+  uri,
+}:
+
+buildDunePackage rec {
+  pname = "dream-pure";
+  version = "1.0.0-alpha8";
+
+  src = fetchurl {
+    url = "https://github.com/aantron/dream/releases/download/${version}/dream-${version}.tar.gz";
+    hash = "sha256-I+2BKJDAP+XJl0pJYano5iEmvte8fX0UQLhGUslc8pY=";
+  };
+
+  buildInputs = [ lwt_ppx ];
+
+  propagatedBuildInputs = [
+    base64
+    hmap
+    lwt
+    ptime
+    uri
+  ];
+
+  meta = {
+    description = "Shared HTTP types for Dream (server) and Hyper (client)";
+    homepage = "https://aantron.github.io/dream/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}

pkgs/servers/home-assistant/custom-components/localtuya/package.nix

@@ -5,21 +5,21 @@
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "rospogrigio";
+  owner = "xZetsubou";
   domain = "localtuya";
-  version = "5.2.2";
+  version = "2025.2.1";
 
   src = fetchFromGitHub {
-    owner = "rospogrigio";
-    repo = "localtuya";
-    rev = "v${version}";
-    hash = "sha256-GexGUu4hevRDGF7gv7Jklr5YZJV+QH3kZN7p+eK9HlM=";
+    owner = "xZetsubou";
+    repo = "hass-localtuya";
+    rev = version;
+    hash = "sha256-on/KuZSJOCBGNRnGtxgGB5bquznjeJ+xMYNVnW67m0s=";
   };
 
   meta = with lib; {
-    changelog = "https://github.com/rospogrigio/localtuya/releases/tag/${version}";
-    description = "Home Assistant custom Integration for local handling of Tuya-based devices";
-    homepage = "https://github.com/rospogrigio/localtuya";
+    changelog = "https://github.com/xZetsubou/hass-localtuya/releases/tag/${version}";
+    description = "Home Assistant custom Integration for local handling of Tuya-based devices, fork from local-tuya";
+    homepage = "https://github.com/xZetsubou/hass-localtuya";
     maintainers = with maintainers; [ rhoriguchi ];
     license = licenses.gpl3Only;
   };

pkgs/top-level/ocaml-packages.nix

@@ -383,6 +383,12 @@ let
 
     dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { };
 
+    dream = callPackage ../development/ocaml-modules/dream { };
+
+    dream-httpaf = callPackage ../development/ocaml-modules/dream/httpaf.nix { };
+
+    dream-pure = callPackage ../development/ocaml-modules/dream/pure.nix { };
+
     dscheck = callPackage ../development/ocaml-modules/dscheck { };
 
     dssi = callPackage ../development/ocaml-modules/dssi { };