From ff17a22a9e7c3a6b75d54d9993d8ab9788c227f9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Sep 2025 05:20:22 +0200 Subject: [PATCH 01/10] =?UTF-8?q?ocamlPackages.tuntap:=202.0.0=20=E2=86=92?= =?UTF-8?q?=202.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/tuntap/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix index d1d2579e39df..3f07f7794e93 100644 --- a/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/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"; }; -} +}) From e59957e003215b7e2cfeeb31692b52eafd2575cd Mon Sep 17 00:00:00 2001 From: HHR2020 <76608828+HHR2020@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:41:52 +0800 Subject: [PATCH 02/10] linyaps-web-store-installer: init at 1.6.8 --- .../linyaps-web-store-installer/package.nix | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/li/linyaps-web-store-installer/package.nix diff --git a/pkgs/by-name/li/linyaps-web-store-installer/package.nix b/pkgs/by-name/li/linyaps-web-store-installer/package.nix new file mode 100644 index 000000000000..649e9002c5f2 --- /dev/null +++ b/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; + }; +}) From 495f606f98bb9e05e9907400ede39d1fc26f2d73 Mon Sep 17 00:00:00 2001 From: HHR2020 <76608828+HHR2020@users.noreply.github.com> Date: Fri, 3 Oct 2025 11:44:09 +0800 Subject: [PATCH 03/10] nixos/linyaps: add linyaps-web-store-installer --- nixos/modules/services/desktops/linyaps.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/desktops/linyaps.nix b/nixos/modules/services/desktops/linyaps.nix index 993a29167e89..ebbf57e0fcb0 100644 --- a/nixos/modules/services/desktops/linyaps.nix +++ b/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 ]; }; From 2236baec50513d9810951a9cf8f1fc32e237997e Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Sun, 21 Sep 2025 23:41:44 +0200 Subject: [PATCH 04/10] maintainers: add redianthus --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0aa55447d929..cbd27f09bfd0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21630,6 +21630,11 @@ githubId = 77415970; name = "Redhawk"; }; + redianthus = { + github = "redianthus"; + githubId = 16472988; + name = "redianthus"; + }; redlonghead = { email = "git@beardit.net"; github = "Redlonghead"; From 966ed9df873644910c69a557bf574c82bf2e2df9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Oct 2025 03:39:46 +0200 Subject: [PATCH 05/10] =?UTF-8?q?ocamlPackages.lsp:=201.23.0=20=E2=86=92?= =?UTF-8?q?=201.23.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 10 ++++++---- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 2ec0ec5ab60c..576db0dfe2b9 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/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 [ diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index c50fd2405c91..902c632fb76a 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/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 From 4c2316f556099ae37cc751801c2d3170962a2e86 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 6 Oct 2025 15:52:58 +0000 Subject: [PATCH 06/10] mupdf: fix build with enableCxx against Clang >= 20 --- pkgs/by-name/mu/mupdf/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 4536e8724de0..1d3b8cea5f99 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/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 = '' From a6dae01d158ffadfcec8f1c35420ee8a83f56dc9 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 6 Oct 2025 15:52:58 +0000 Subject: [PATCH 07/10] python3Packages.pymupdf: disable test requiring network access --- pkgs/development/python-modules/pymupdf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index ed5b711b247b..1ecf81796a86 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/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" ]; From 6c3c3951fb76343e5f8589db3ab0f82cea1d8f30 Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Fri, 3 Oct 2025 16:01:11 +0200 Subject: [PATCH 08/10] ocamlPackages.synchronizer: init at 0.1 --- .../ocaml-modules/synchronizer/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/synchronizer/default.nix diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix new file mode 100644 index 000000000000..8d827b2c0bd9 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f884a3d7ad7f..07345c1958b5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1977,6 +1977,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 { }; From dd52227aa5d9ebebd4eb7bab6195406662732e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 7 Oct 2025 02:31:33 +0200 Subject: [PATCH 09/10] lldpd: fix cross compilation --- pkgs/by-name/ll/lldpd/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ll/lldpd/package.nix b/pkgs/by-name/ll/lldpd/package.nix index e85b8cce0c92..5cfad1396ea9 100644 --- a/pkgs/by-name/ll/lldpd/package.nix +++ b/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 = [ From 1e3e32716170ef435ac3cfbcded147712d2c8b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 7 Oct 2025 02:31:40 +0200 Subject: [PATCH 10/10] net-snmp: update homepage to https --- pkgs/by-name/ne/net-snmp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix index 9a909316de25..7129bb8c008c 100644 --- a/pkgs/by-name/ne/net-snmp/package.nix +++ b/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; };