Merge remote-tracking branch 'origin/master' into staging-next

maintainers/maintainer-list.nix

@@ -21651,6 +21651,11 @@
     githubId = 77415970;
     name = "Redhawk";
   };
+  redianthus = {
+    github = "redianthus";
+    githubId = 16472988;
+    name = "redianthus";
+  };
   redlonghead = {
     email = "git@beardit.net";
     github = "Redlonghead";

nixos/modules/services/desktops/linyaps.nix

@@ -22,6 +22,8 @@ in
       package = lib.mkPackageOption pkgs "linyaps" { };
 
       boxPackage = lib.mkPackageOption pkgs "linyaps-box" { };
+
+      webStoreInstallerPackage = lib.mkPackageOption pkgs "linyaps-web-store-installer" { };
     };
   };
 
@@ -33,6 +35,7 @@ in
       systemPackages = [
         cfg.package
         cfg.boxPackage
+        cfg.webStoreInstallerPackage
       ];
     };
 

pkgs/by-name/li/linyaps-web-store-installer/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "linyaps-web-store-installer";
+  version = "1.6.8";
+
+  src = fetchFromGitHub {
+    owner = "OpenAtom-Linyaps";
+    repo = "linyaps-web-store-installer";
+    rev = finalAttrs.version;
+    hash = "sha256-KbtGoXzxZmo6x1bvzDZbwp/wl+dBojB6E+K87CAkI7g=";
+  };
+
+  postPatch = ''
+    substituteInPlace ll-installer/space.linglong.Installer.desktop \
+      --replace-fail "Exec=/usr/bin/ll-installer" "Exec=$out/bin/ll-installer"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+  ];
+
+  meta = {
+    description = "URI Handler for Linyaps Web Store";
+    homepage = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer";
+    changelog = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ hhr2020 ];
+    mainProgram = "ll-installer";
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/ll/lldpd/package.nix

@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
+  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    # Yes, this works and is required for cross :'/
+    export PATH=$PATH:${net-snmp.dev}/bin
+  '';
+
   enableParallelBuilding = true;
 
   outputs = [

pkgs/by-name/mu/mupdf/package.nix

@@ -3,6 +3,7 @@
   lib,
   fetchurl,
   fetchFromGitHub,
+  fetchpatch,
   copyDesktopItems,
   makeDesktopItem,
   desktopToDarwinBundle,
@@ -85,6 +86,19 @@ stdenv.mkDerivation rec {
     # Upstream C++ wrap script only defines fixed-sized integers on macOS but
     # this is required on aarch64-linux too.
     ./fix-cpp-build.patch
+  ]
+  # fix compatibility with Clang >= 20
+  ++ lib.optionals enableCxx [
+    (fetchpatch {
+      name = "scripts-wrap-parse.py-get_args-improve-caching-of-re.patch";
+      url = "https://github.com/ArtifexSoftware/mupdf/commit/559e45ac8c134712cd8eaee01536ea3841e3a449.patch";
+      hash = "sha256-gI3hzrNo6jj9eqQ9E/BJ3jxXi/sl1C5WRyYlkG3Gkfg=";
+    })
+    (fetchpatch {
+      name = "scripts-wrap-parse.py-get_args-fix-for-libclang-20.patch";
+      url = "https://github.com/ArtifexSoftware/mupdf/commit/4bbf411898341d3ba30f521a6c137a788793cd45.patch";
+      hash = "sha256-cxKNziAGjpDwEw/9ZQHslMeJbiqYo80899BDkUOIX8g=";
+    })
   ];
 
   postPatch = ''

pkgs/by-name/ne/net-snmp/package.nix

@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Clients and server for the SNMP network monitoring protocol";
-    homepage = "http://www.net-snmp.org/";
+    homepage = "https://www.net-snmp.org/";
     license = licenses.bsd3;
     platforms = platforms.unix;
   };

pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix

@@ -10,7 +10,7 @@
   ocaml,
   version ?
     if lib.versionAtLeast ocaml.version "5.3" then
-      "1.23.0"
+      "1.23.1"
     else if lib.versionAtLeast ocaml.version "5.2" then
       "1.21.0"
     else if lib.versionAtLeast ocaml.version "4.14" then
@@ -26,10 +26,10 @@
 let
   params =
     {
-      "1.23.0" = {
+      "1.23.1" = {
         name = "lsp";
         minimalOCamlVersion = "5.3";
-        sha256 = "sha256-fyvQI7VKgOrOFihtKIkcE2B2iUYFLJOZGKipzZU0Dn0=";
+        sha256 = "sha256-x0fjlAJmOeogRGfoWd6T6o6ZWNv0T3gNyyoYl8VtdXE=";
       };
       "1.22.0" = {
         name = "lsp";
@@ -96,7 +96,9 @@ buildDunePackage rec {
       ];
 
   propagatedBuildInputs =
-    if lib.versionAtLeast version "1.7.0" then
+    if lib.versionAtLeast version "1.23.1" then
+      [ yojson ]
+    else if lib.versionAtLeast version "1.7.0" then
       [ ]
     else
       [

pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix

@@ -24,7 +24,7 @@
   ocaml,
   version ?
     if lib.versionAtLeast ocaml.version "5.3" then
-      "1.23.0"
+      "1.23.1"
     else if lib.versionAtLeast ocaml.version "5.2" then
       "1.21.0"
     else if lib.versionAtLeast ocaml.version "4.14" then

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

@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  prelude,
+}:
+
+buildDunePackage rec {
+  pname = "synchronizer";
+  version = "0.1";
+
+  minimalOCamlVersion = "5.1";
+
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "synchronizer";
+    tag = version;
+    hash = "sha256-VlKqORXTXafT88GXHIYkz+A1VkEL3jP9SMqDdMyEdrw=";
+  };
+
+  propagatedBuildInputs = [
+    prelude
+  ];
+
+  meta = {
+    homepage = "https://github.com/OCamlPro/synchronizer";
+    description = "Synchronizer to make datastructures thread-safe";
+    changelog = "https://raw.githubusercontent.com/OCamlPro/synchronizer/${src.rev}/CHANGES.md";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [ redianthus ];
+  };
+}

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

@@ -4,26 +4,20 @@
   fetchurl,
   ipaddr,
   macaddr,
-  cmdliner,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "tuntap";
-  version = "2.0.0";
-
-  duneVersion = "3";
-
-  minimalOCamlVersion = "4.04.2";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${version}/tuntap-v${version}.tbz";
-    sha256 = "12wmls28h3jzikwyfw08d5f7ycsc9njwzbhd3qk2l8jnf5rakfsa";
+    url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${finalAttrs.version}/tuntap-${finalAttrs.version}.tbz";
+    hash = "sha256-J8YBl8w7xFloDqt/Xiz03KCIls5BR72VT8X/LYZMDN0=";
   };
 
   propagatedBuildInputs = [
     ipaddr
     macaddr
-    cmdliner
   ];
 
   # tests manipulate network devices and use network
@@ -34,6 +28,5 @@ buildDunePackage rec {
     description = "Bindings to the UNIX tuntap facility";
     homepage = "https://github.com/mirage/ocaml-tuntap";
     license = lib.licenses.isc;
-    mainProgram = "otunctl";
   };
-}
+})

pkgs/development/python-modules/pymupdf/default.nix

@@ -122,6 +122,7 @@ buildPythonPackage rec {
     # Requires downloads
     "test_4457"
     "test_4445"
+    "test_4533"
     # Not a git repository, so git ls-files fails
     "test_open2"
   ];

pkgs/top-level/ocaml-packages.nix

@@ -1973,6 +1973,8 @@ let
 
         swhid_core = callPackage ../development/ocaml-modules/swhid_core { };
 
+        synchronizer = callPackage ../development/ocaml-modules/synchronizer { };
+
         syslog = callPackage ../development/ocaml-modules/syslog { };
 
         syslog-message = callPackage ../development/ocaml-modules/syslog-message { };