From d114362d74ae79e03bb2dc2dc3183924d9d84a71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Jul 2025 00:37:19 +0000 Subject: [PATCH 01/29] amfora: 1.10.0 -> 1.11.0 --- pkgs/by-name/am/amfora/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix index 9af81c3cb66a..8a6ee884bd16 100644 --- a/pkgs/by-name/am/amfora/package.nix +++ b/pkgs/by-name/am/amfora/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; tag = "v${version}"; - hash = "sha256-KOuKgxH3n4rdF+oj/TwEcRqX1sn4A9e23FNwQMhMVO4="; + hash = "sha256-6nY/wVqhSm+ZLA8ktrgmxoYiHK1r96aNbSf8+1YMXf8="; }; - vendorHash = "sha256-T/hnlQMDOZV+QGl7xp29sBGfb4VXcXqN6PDoBFdpp4M="; + vendorHash = "sha256-zZuFZtG0KKJ29t/9XyjRPIvyZqItxH2KwyKcAx3nuNM="; postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop From f620c2275abc762f1dba815674819c42b80e8392 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 17:02:01 +0000 Subject: [PATCH 02/29] delve: 1.25.0 -> 1.25.1 --- pkgs/by-name/de/delve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index 7cbef6ba718b..8fb047e049b3 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "delve"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-bp8pYWS3Vpg0R2Xfe5agDTENzLGu9r43BgORa8VrP+Y="; + hash = "sha256-I7GGpLGhOp29+2V3CSSGnItSwhyrM+2yZxQsGRN812U="; }; patches = [ From 8807211b192e4a26dd74ad706f190a5089c3f4b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Jul 2025 20:39:55 +0000 Subject: [PATCH 03/29] quarkus: 3.23.4 -> 3.24.4 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index f91d1f1bec5e..e0ec3fc63f6d 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.23.4"; + version = "3.24.4"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-drN28p+tHCxvVFfBw+nlPZxtiF6sIseiW16/FxwxRLI="; + hash = "sha256-MvLqKqFFrd3EV/9TEhYqn7lArWfNYzUg4UNUSFT2Nek="; }; nativeBuildInputs = [ makeWrapper ]; From 8864720898fd57880e0996a09a9183823cbb3430 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 20 Jul 2025 10:25:47 +0200 Subject: [PATCH 04/29] libwacom: mark unavailable for static --- pkgs/by-name/li/libwacom/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix index 5132dd488156..193b3f9bc3c4 100644 --- a/pkgs/by-name/li/libwacom/package.nix +++ b/pkgs/by-name/li/libwacom/package.nix @@ -82,5 +82,9 @@ stdenv.mkDerivation (finalAttrs: { description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; teams = [ lib.teams.freedesktop ]; license = lib.licenses.hpnd; + badPlatforms = [ + # Mandatory shared library. + lib.systems.inspect.platformPatterns.isStatic + ]; }; }) From 60dbe2fc241b8df7a3ae7aa038c779082b0e302a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Jul 2025 12:36:29 +0000 Subject: [PATCH 05/29] wofi: 1.4.1 -> 1.5 --- pkgs/by-name/wo/wofi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/wofi/package.nix b/pkgs/by-name/wo/wofi/package.nix index 587ac8d03732..60e345f986cb 100644 --- a/pkgs/by-name/wo/wofi/package.nix +++ b/pkgs/by-name/wo/wofi/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "wofi"; - version = "1.4.1"; + version = "1.5"; src = fetchFromSourcehut { repo = "wofi"; owner = "~scoopta"; rev = "v${version}"; - sha256 = "sha256-aedoUhVfk8ljmQ23YxVmGZ00dPpRftW2dnRAgXmtV/w="; + sha256 = "sha256-7C4rO1Uf7qmzYAr60auILzYyKrJ//TJzTwU1PrBWdVA="; vc = "hg"; }; From bc46fa357ce9362c9a0dcd42ed9ef765b5b3f6de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Jul 2025 16:55:03 +0000 Subject: [PATCH 06/29] jami: 20250613.0 -> 20250718.0 --- .../networking/instant-messengers/jami/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 5524ed9fcf0e..42408ec599b0 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -68,14 +68,14 @@ stdenv.mkDerivation rec { pname = "jami"; - version = "20250613.0"; + version = "20250718.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-+6DTbYq50UPSQ+KipXhWje1bZs64wZrS37z2Na1RtN8="; + hash = "sha256-EEiuymfu28bJ6pfBKwlsCGDq7XlKGZYK+2WjPJ+tcxw="; fetchSubmodules = true; }; From 1bfa1a001587112a92e4dcbdab0d28e0dbd2e0fd Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 22 Jul 2025 02:46:25 +0200 Subject: [PATCH 07/29] bcc: modernize --- pkgs/by-name/bc/bcc/libbcc-path.patch | 11 ---- pkgs/by-name/bc/bcc/package.nix | 86 ++++++++++++--------------- 2 files changed, 39 insertions(+), 58 deletions(-) delete mode 100644 pkgs/by-name/bc/bcc/libbcc-path.patch diff --git a/pkgs/by-name/bc/bcc/libbcc-path.patch b/pkgs/by-name/bc/bcc/libbcc-path.patch deleted file mode 100644 index 187bb3aadd00..000000000000 --- a/pkgs/by-name/bc/bcc/libbcc-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source.org/src/python/bcc/libbcc.py 2018-05-13 08:35:06.850522883 +0100 -+++ source/src/python/bcc/libbcc.py 2018-05-13 08:36:24.602733151 +0100 -@@ -14,7 +14,7 @@ - - import ctypes as ct - --lib = ct.CDLL("libbcc.so.0", use_errno=True) -+lib = ct.CDLL("@out@/lib/libbcc.so.0", use_errno=True) - - # keep in sync with bpf_common.h - lib.bpf_module_create_b.restype = ct.c_void_p diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index c45d4b854b7e..27cd51936203 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -16,15 +16,14 @@ nixosTests, python3Packages, readline, - stdenv, + replaceVars, zip, }: python3Packages.buildPythonApplication rec { pname = "bcc"; version = "0.35.0"; - - disabled = !stdenv.hostPlatform.isLinux; + pyproject = false; src = fetchFromGitHub { owner = "iovisor"; @@ -32,12 +31,36 @@ python3Packages.buildPythonApplication rec { tag = "v${version}"; hash = "sha256-eP/VEq7cPALi2oDKAZFQGQ3NExdmcBKyi6ddRZiYmbI="; }; - format = "other"; - buildInputs = with llvmPackages; [ - llvm - llvm.dev - libclang + patches = [ + # This is needed until we fix + # https://github.com/NixOS/nixpkgs/issues/40427 + ./fix-deadlock-detector-import.patch + # Quick & dirty fix for bashreadline + # https://github.com/NixOS/nixpkgs/issues/328743 + ./bashreadline.py-remove-dependency-on-elftools.patch + + (replaceVars ./absolute-ausyscall.patch { + ausyscall = lib.getExe' audit "ausyscall"; + }) + ]; + + build-system = [ python3Packages.setuptools ]; + + dependencies = [ python3Packages.netaddr ]; + + nativeBuildInputs = [ + bison + cmake + flex + llvmPackages.llvm + makeWrapper + zip + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang elfutils luajit netperf @@ -47,45 +70,18 @@ python3Packages.buildPythonApplication rec { libbpf ]; - patches = [ - # This is needed until we fix - # https://github.com/NixOS/nixpkgs/issues/40427 - ./fix-deadlock-detector-import.patch - # Quick & dirty fix for bashreadline - # https://github.com/NixOS/nixpkgs/issues/328743 - ./bashreadline.py-remove-dependency-on-elftools.patch - ]; - - propagatedBuildInputs = [ python3Packages.netaddr ]; - nativeBuildInputs = [ - bison - cmake - flex - llvmPackages.llvm.dev - makeWrapper - python3Packages.setuptools - zip - ]; - cmakeFlags = [ - "-DBCC_KERNEL_MODULES_DIR=/run/booted-system/kernel-modules/lib/modules" - "-DREVISION=${version}" - "-DENABLE_USDT=ON" - "-DENABLE_CPP_API=ON" - "-DCMAKE_USE_LIBBPF_PACKAGE=ON" - "-DENABLE_LIBDEBUGINFOD=OFF" + (lib.cmakeFeature "BCC_KERNEL_MODULES_DIR" "/run/booted-system/kernel-modules/lib/modules") + (lib.cmakeFeature "REVISION" version) + (lib.cmakeBool "ENABLE_USDT" true) + (lib.cmakeBool "ENABLE_CPP_API" true) + (lib.cmakeBool "CMAKE_USE_LIBBPF_PACKAGE" true) + (lib.cmakeBool "ENABLE_LIBDEBUGINFOD" false) ]; - # to replace this executable path: - # https://github.com/iovisor/bcc/blob/master/src/python/bcc/syscall.py#L384 - ausyscall = "${audit}/bin/ausyscall"; - postPatch = '' - substituteAll ${./libbcc-path.patch} ./libbcc-path.patch - patch -p1 < libbcc-path.patch - - substituteAll ${./absolute-ausyscall.patch} ./absolute-ausyscall.patch - patch -p1 < absolute-ausyscall.patch + substituteInPlace src/python/bcc/libbcc.py \ + --replace-fail "libbcc.so.0" "$out/lib/libbcc.so.0" # https://github.com/iovisor/bcc/issues/3996 substituteInPlace src/cc/libbcc.pc.in \ @@ -95,10 +91,6 @@ python3Packages.buildPythonApplication rec { --replace-fail '/bin/bash' '${readline}/lib/libreadline.so' ''; - preInstall = '' - # required for setuptool during install - export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH - ''; postInstall = '' mkdir -p $out/bin $out/share rm -r $out/share/bcc/tools/old From 2f35dd680a2d2432f37d2a847c613390a880b708 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Tue, 22 Jul 2025 14:38:09 +0200 Subject: [PATCH 08/29] komikku: 1.81.0 -> 1.82.0 --- pkgs/by-name/ko/komikku/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index bbfffa359945..30755a5ecfb2 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.81.0"; + version = "1.82.0"; pyproject = false; src = fetchFromGitea { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; tag = "v${version}"; - hash = "sha256-k64bcJLKFUMy60a5zj740Pk3lGZ6vKaAv5HOHfoW9p4="; + hash = "sha256-F+RlfnKnMqlPTk1iv79ah/UaEjd7Og+gV1YVsZqkIBk="; }; nativeBuildInputs = [ @@ -65,7 +65,6 @@ python3.pkgs.buildPythonApplication rec { natsort piexif pillow - pillow-heif curl-cffi pygobject3 python-magic From b397288f96d8abbe5cd46e8719c218fcf6b8e109 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 22 Jul 2025 18:31:40 +0200 Subject: [PATCH 09/29] hue-cli: move to by-name --- pkgs/{tools/networking => by-name/hu}/hue-cli/Gemfile | 0 .../{tools/networking => by-name/hu}/hue-cli/Gemfile.lock | 0 pkgs/{tools/networking => by-name/hu}/hue-cli/gemset.nix | 0 .../default.nix => by-name/hu/hue-cli/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{tools/networking => by-name/hu}/hue-cli/Gemfile (100%) rename pkgs/{tools/networking => by-name/hu}/hue-cli/Gemfile.lock (100%) rename pkgs/{tools/networking => by-name/hu}/hue-cli/gemset.nix (100%) rename pkgs/{tools/networking/hue-cli/default.nix => by-name/hu/hue-cli/package.nix} (76%) diff --git a/pkgs/tools/networking/hue-cli/Gemfile b/pkgs/by-name/hu/hue-cli/Gemfile similarity index 100% rename from pkgs/tools/networking/hue-cli/Gemfile rename to pkgs/by-name/hu/hue-cli/Gemfile diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/by-name/hu/hue-cli/Gemfile.lock similarity index 100% rename from pkgs/tools/networking/hue-cli/Gemfile.lock rename to pkgs/by-name/hu/hue-cli/Gemfile.lock diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/by-name/hu/hue-cli/gemset.nix similarity index 100% rename from pkgs/tools/networking/hue-cli/gemset.nix rename to pkgs/by-name/hu/hue-cli/gemset.nix diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/by-name/hu/hue-cli/package.nix similarity index 76% rename from pkgs/tools/networking/hue-cli/default.nix rename to pkgs/by-name/hu/hue-cli/package.nix index afb732a32e52..20c24f6178d6 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/by-name/hu/hue-cli/package.nix @@ -11,12 +11,12 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "hue-cli"; - meta = with lib; { + meta = { description = "Command line interface for controlling Philips Hue system's lights and bridge"; homepage = "https://github.com/birkirb/hue-cli"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ manveru nicknovitski ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdbc642c239a..428c489acb47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12508,8 +12508,6 @@ with pkgs; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; - hue-cli = callPackage ../tools/networking/hue-cli { }; - hugin = callPackage ../applications/graphics/hugin { wxGTK = wxGTK32; }; From 8e82f4fb9891c39178a1e37a98a0c22bb416376b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 23 Jul 2025 10:26:57 +0800 Subject: [PATCH 10/29] wechat: 4.0.6.19-29383 -> 4.0.6.25-29387 for darwin --- pkgs/by-name/we/wechat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index ca5db30472f3..d68959fcdf4a 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -30,14 +30,14 @@ let # https://dldir1.qq.com/weixin/mac/mac-release.xml any-darwin = let - version = "4.0.6.19-29383"; + version = "4.0.6.25-29387"; version' = lib.replaceString "-" "_" version; in { inherit version; src = fetchurl { url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-HloG++DGzsxM7C0AbN4PXkkzFdhUhBDcH5Vq+bTUuEE="; + hash = "sha256-vdeUUJdbIxT8tX5Xo9QIzbWTwRjtSXwrNoImMwt5xkY="; }; }; in From 73edf3b170d8919c1aa114bc70fd2ecb72d47a74 Mon Sep 17 00:00:00 2001 From: M0ustach3 <37956764+M0ustach3@users.noreply.github.com> Date: Sat, 19 Jul 2025 18:43:32 +0200 Subject: [PATCH 11/29] pulumi: 3.162.0 -> 3.185.0 --- pkgs/by-name/pu/pulumi/package.nix | 11 ++++++++--- pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix | 2 +- .../pu/pulumi/plugins/pulumi-nodejs/package.nix | 2 +- .../pu/pulumi/plugins/pulumi-python/package.nix | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index d1557c9dcfa3..5c87d0b63fbd 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -17,18 +17,18 @@ }: buildGoModule rec { pname = "pulumi"; - version = "3.162.0"; + version = "3.185.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi"; tag = "v${version}"; - hash = "sha256-avtqURmj3PL82j89kLmVsBWqJJHnOFqR1huoUESt4L4="; + hash = "sha256-/7VaFeEQXVqF7g+CR2oTSmOWgWjw/LS9s0+VZcSlFvU="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-fJFpwhbRkxSI2iQfNJ9qdL9oYM1SVVMJ30VIymoZBmg="; + vendorHash = "sha256-aAxBVMLL7JRSJSVIR9/gNTNj8sZHg39ftv+ZAO8PS54="; sourceRoot = "${src.name}/pkg"; @@ -81,6 +81,11 @@ buildGoModule rec { "TestPulumiNewWithOrgTemplates" "TestPulumiNewWithoutPulumiAccessToken" "TestPulumiNewWithoutTemplateSupport" + "TestGeneratingProjectWithAIPromptSucceeds" + "TestPulumiNewWithRegistryTemplates" + + # Connects to https://api.pulumi.com/… + "TestGetLatestPluginIncludedVersion" # Connects to https://pulumi-testing.vault.azure.net/… "TestAzureCloudManager" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix index 2d7c350626ad..687e0f23eb1d 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-3I9Kh3Zqpu0gT0pQNzg2mMwxQUdhEpjITZOrO7Yt50A="; + vendorHash = "sha256-FSkFZhuwbTxCQgES+rFoVeSJHtepZiHEtnfShZ+eSMU="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix index 0eae02fc2a21..219653344594 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-UvfSmHWRFRZkmcgzUrLkqktQAt8ZlVDEzP6y+pxUOGc="; + vendorHash = "sha256-q/NKPB5U7z3gPXIV2wCZXBN6QfJ4nMVdLUMcwXJ800Q="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix index 5930c1ffef81..cfa68ca5d945 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = "sha256-5tr3mQ5x6jMOa9meHK6gaoRjNgLoHkWiTiaYXXqmUDo="; + vendorHash = "sha256-oWEl/IeoMya40D62QaYoGiyKcKQZZ008RxR9m/pJ7VU="; ldflags = [ "-s" From cc75e606a3adc0b3135cd1bddcdb81ec0e9e71cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 23 Jul 2025 11:41:03 +0200 Subject: [PATCH 12/29] meshcentral: 1.1.47 -> 1.1.48 ChangeLog: https://github.com/Ylianst/MeshCentral/releases/tag/1.1.48 --- pkgs/tools/admin/meshcentral/default.nix | 8 +- pkgs/tools/admin/meshcentral/package.json | 12 +- pkgs/tools/admin/meshcentral/yarn.lock | 302 +++++++++++----------- 3 files changed, 164 insertions(+), 158 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 33fd196ea964..b648830321e0 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -8,11 +8,11 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.47"; + version = "1.1.48"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.47.tgz"; - sha256 = "196d2rzmy5caaw42d3az9m4yfwjsgia82g7ic71knamd28q9rab2"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.48.tgz"; + sha256 = "0ns4pp0gswvfpyjzklsh76ych9sv9qjcn50dhain7b6cy6dkrmga"; }; patches = [ @@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-2pU0XhkiDNjkZiXA2S4RMTY4IyVEnsV/vEDtYnPjOfk="; + hash = "sha256-oHY21OMLVyrdJOiV9MarXWnjcKNaKtvUz26xIvVNRsw="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 458ec1ed6b35..5e31c186fd18 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.47", + "version": "1.1.48", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -41,8 +41,8 @@ "archiver": "7.0.1", "body-parser": "1.20.3", "cbor": "5.2.0", - "compression": "1.7.5", - "cookie-session": "2.1.0", + "compression": "1.8.1", + "cookie-session": "2.1.1", "express": "4.21.2", "express-handlebars": "7.1.3", "express-ws": "5.0.2", @@ -50,8 +50,8 @@ "minimist": "1.2.8", "multiparty": "4.2.3", "node-forge": "1.3.1", - "ua-parser-js": "1.0.40", "ua-client-hints-js": "0.1.2", + "ua-parser-js": "1.0.40", "ws": "8.18.0", "yauzl": "2.10.0" }, @@ -77,8 +77,8 @@ "archiver": "7.0.1", "body-parser": "1.20.3", "cbor": "5.2.0", - "compression": "1.7.5", - "cookie-session": "2.1.0", + "compression": "1.8.1", + "cookie-session": "2.1.1", "express": "4.21.2", "express-handlebars": "7.1.3", "express-ws": "5.0.2", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index c63c14095127..9eb55196e096 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -48,24 +48,24 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-cognito-identity@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.846.0.tgz#f7bfecb0c731df961058b4f63029f7556cb7eda6" - integrity sha512-vlzQVq1TOOYHPppmON/+oNhCxprCPPqxlqAuUddf885JcT6Q9r7FeV7S2yHli/1XC6vBa7sAninNvOjzwDbwYw== +"@aws-sdk/client-cognito-identity@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.848.0.tgz#d7461128c39214a3d37c69eae6dceddfb7931f2a" + integrity sha512-Sin8aLnA81MgvUJrfQsBIQ1UJg4klWT3NuYYjExLiVQf3A0/F7Bfx1HTIyWXtSchY4QgGr7MMone0/0KZ4Dy9g== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" "@aws-sdk/core" "3.846.0" - "@aws-sdk/credential-provider-node" "3.846.0" + "@aws-sdk/credential-provider-node" "3.848.0" "@aws-sdk/middleware-host-header" "3.840.0" "@aws-sdk/middleware-logger" "3.840.0" "@aws-sdk/middleware-recursion-detection" "3.840.0" - "@aws-sdk/middleware-user-agent" "3.846.0" + "@aws-sdk/middleware-user-agent" "3.848.0" "@aws-sdk/region-config-resolver" "3.840.0" "@aws-sdk/types" "3.840.0" - "@aws-sdk/util-endpoints" "3.845.0" + "@aws-sdk/util-endpoints" "3.848.0" "@aws-sdk/util-user-agent-browser" "3.840.0" - "@aws-sdk/util-user-agent-node" "3.846.0" + "@aws-sdk/util-user-agent-node" "3.848.0" "@smithy/config-resolver" "^4.1.4" "@smithy/core" "^3.7.0" "@smithy/fetch-http-handler" "^5.1.0" @@ -93,10 +93,10 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.846.0.tgz#9905ccf216e371c94ca63b1df19dba923d286307" - integrity sha512-7MgMl3nlwf2ixad5Xe8pFHtcwFchkx37MEvGuB00tn5jyBp3AQQ4dK3iHtj2HjhXcXD0G67zVPvH4/QNOL7/gw== +"@aws-sdk/client-sso@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.848.0.tgz#84178a83af2a1ce5d0ddfcfc980f4fe71987c01a" + integrity sha512-mD+gOwoeZQvbecVLGoCmY6pS7kg02BHesbtIxUj+PeBqYoZV5uLvjUOmuGfw1SfoSobKvS11urxC9S7zxU/Maw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" @@ -104,12 +104,12 @@ "@aws-sdk/middleware-host-header" "3.840.0" "@aws-sdk/middleware-logger" "3.840.0" "@aws-sdk/middleware-recursion-detection" "3.840.0" - "@aws-sdk/middleware-user-agent" "3.846.0" + "@aws-sdk/middleware-user-agent" "3.848.0" "@aws-sdk/region-config-resolver" "3.840.0" "@aws-sdk/types" "3.840.0" - "@aws-sdk/util-endpoints" "3.845.0" + "@aws-sdk/util-endpoints" "3.848.0" "@aws-sdk/util-user-agent-browser" "3.840.0" - "@aws-sdk/util-user-agent-node" "3.846.0" + "@aws-sdk/util-user-agent-node" "3.848.0" "@smithy/config-resolver" "^4.1.4" "@smithy/core" "^3.7.0" "@smithy/fetch-http-handler" "^5.1.0" @@ -158,12 +158,12 @@ fast-xml-parser "5.2.5" tslib "^2.6.2" -"@aws-sdk/credential-provider-cognito-identity@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.846.0.tgz#61c09e6a3ccf325991f2e335378fd40d6018f44b" - integrity sha512-zfcNFUK0QC7czR/n3ATMp3ZWkMrGZzJ1mS/sTezjFg1IupFnogyF+8xKmnmqXiABJd1yE8FduYgw8yx0ZSWiCw== +"@aws-sdk/credential-provider-cognito-identity@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.848.0.tgz#c3d54f75a176aadddd3a6a7f6092987744ca32d1" + integrity sha512-2cm/Ye6ktagW1h7FmF4sgo8STZyBr2+0+L9lr/veuPKZVWoi/FyhJR3l0TtKrd8z78no9P5xbsGUmxoDLtsxiw== dependencies: - "@aws-sdk/client-cognito-identity" "3.846.0" + "@aws-sdk/client-cognito-identity" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/property-provider" "^4.0.4" "@smithy/types" "^4.3.1" @@ -196,18 +196,18 @@ "@smithy/util-stream" "^4.2.3" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.846.0.tgz#3d4df54131048d745a04ab3b4af95407f49f7514" - integrity sha512-GUxaBBKsYx1kOlRbcs77l6BVyG9K70zekJX+5hdwTEgJq7AoHl/XYoWiDxPf6zQ7J4euixPJoyRhpNbJjAXdFw== +"@aws-sdk/credential-provider-ini@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.848.0.tgz#aec6f9158b08b9842d4e9ee7671296a2a237b026" + integrity sha512-r6KWOG+En2xujuMhgZu7dzOZV3/M5U/5+PXrG8dLQ3rdPRB3vgp5tc56KMqLwm/EXKRzAOSuw/UE4HfNOAB8Hw== dependencies: "@aws-sdk/core" "3.846.0" "@aws-sdk/credential-provider-env" "3.846.0" "@aws-sdk/credential-provider-http" "3.846.0" "@aws-sdk/credential-provider-process" "3.846.0" - "@aws-sdk/credential-provider-sso" "3.846.0" - "@aws-sdk/credential-provider-web-identity" "3.846.0" - "@aws-sdk/nested-clients" "3.846.0" + "@aws-sdk/credential-provider-sso" "3.848.0" + "@aws-sdk/credential-provider-web-identity" "3.848.0" + "@aws-sdk/nested-clients" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/credential-provider-imds" "^4.0.6" "@smithy/property-provider" "^4.0.4" @@ -215,17 +215,17 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.846.0.tgz#576d302e7d5af1abc7e5b95695dd97afa03ad2f8" - integrity sha512-du2DsXYRfQ8VIt/gXGThhT8KdUEt2j9W91W87Bl9IA5DINt4nSZv+gzh8LqHBYsTSqoUpKb+qIfP1RjZM/8r0A== +"@aws-sdk/credential-provider-node@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.848.0.tgz#aeeccc9cadaae57fd2664298ecacea18648d6b9c" + integrity sha512-AblNesOqdzrfyASBCo1xW3uweiSro4Kft9/htdxLeCVU1KVOnFWA5P937MNahViRmIQm2sPBCqL8ZG0u9lnh5g== dependencies: "@aws-sdk/credential-provider-env" "3.846.0" "@aws-sdk/credential-provider-http" "3.846.0" - "@aws-sdk/credential-provider-ini" "3.846.0" + "@aws-sdk/credential-provider-ini" "3.848.0" "@aws-sdk/credential-provider-process" "3.846.0" - "@aws-sdk/credential-provider-sso" "3.846.0" - "@aws-sdk/credential-provider-web-identity" "3.846.0" + "@aws-sdk/credential-provider-sso" "3.848.0" + "@aws-sdk/credential-provider-web-identity" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/credential-provider-imds" "^4.0.6" "@smithy/property-provider" "^4.0.4" @@ -245,48 +245,48 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.846.0.tgz#6c1040a3476e877a769075682c3f7c105f16460b" - integrity sha512-Dxz9dpdjfxUsSfW92SAldu9wy8wgEbskn4BNWBFHslQHTmqurmR0ci4P1SMxJJKd498AUEoIAzZOtjGOC38irQ== +"@aws-sdk/credential-provider-sso@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.848.0.tgz#5921e154cde77f261e00da63431294ddde91d6f9" + integrity sha512-pozlDXOwJZL0e7w+dqXLgzVDB7oCx4WvtY0sk6l4i07uFliWF/exupb6pIehFWvTUcOvn5aFTTqcQaEzAD5Wsg== dependencies: - "@aws-sdk/client-sso" "3.846.0" + "@aws-sdk/client-sso" "3.848.0" "@aws-sdk/core" "3.846.0" - "@aws-sdk/token-providers" "3.846.0" + "@aws-sdk/token-providers" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/property-provider" "^4.0.4" "@smithy/shared-ini-file-loader" "^4.0.4" "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.846.0.tgz#939629e1cf2b778168f350ea79aaf278b357317e" - integrity sha512-j6zOd+kynPQJzmVwSKSUTpsLXAf7vKkr7hCPbQyqC8ZqkIuExsRqu2vRQjX2iH/MKhwZ+qEWMxPMhfDoyv7Gag== +"@aws-sdk/credential-provider-web-identity@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.848.0.tgz#86eaa04daf17ce41b9aab06a3c19a326fcbfaddf" + integrity sha512-D1fRpwPxtVDhcSc/D71exa2gYweV+ocp4D3brF0PgFd//JR3XahZ9W24rVnTQwYEcK9auiBZB89Ltv+WbWN8qw== dependencies: "@aws-sdk/core" "3.846.0" - "@aws-sdk/nested-clients" "3.846.0" + "@aws-sdk/nested-clients" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/property-provider" "^4.0.4" "@smithy/types" "^4.3.1" tslib "^2.6.2" "@aws-sdk/credential-providers@^3.186.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.846.0.tgz#98c348ec6551f7dc832bfc369fe221b2b71e4846" - integrity sha512-YpTJcV5PO0V+I1nRGAyNF/kCcOIgPgzihlAyOqicmq3vZ8UHZqUCOfzcS6qbEpPFeAB3domzBgsAJNsQXht4SA== + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.848.0.tgz#78ab8cb8114136130f2ccb357761c4936117a38a" + integrity sha512-lRDuU05YC+r/1JmRULngJQli7scP5hmq0/7D+xw1s8eRM0H2auaH7LQFlq/SLxQZLMkVNPCrmsug3b3KcLj1NA== dependencies: - "@aws-sdk/client-cognito-identity" "3.846.0" + "@aws-sdk/client-cognito-identity" "3.848.0" "@aws-sdk/core" "3.846.0" - "@aws-sdk/credential-provider-cognito-identity" "3.846.0" + "@aws-sdk/credential-provider-cognito-identity" "3.848.0" "@aws-sdk/credential-provider-env" "3.846.0" "@aws-sdk/credential-provider-http" "3.846.0" - "@aws-sdk/credential-provider-ini" "3.846.0" - "@aws-sdk/credential-provider-node" "3.846.0" + "@aws-sdk/credential-provider-ini" "3.848.0" + "@aws-sdk/credential-provider-node" "3.848.0" "@aws-sdk/credential-provider-process" "3.846.0" - "@aws-sdk/credential-provider-sso" "3.846.0" - "@aws-sdk/credential-provider-web-identity" "3.846.0" - "@aws-sdk/nested-clients" "3.846.0" + "@aws-sdk/credential-provider-sso" "3.848.0" + "@aws-sdk/credential-provider-web-identity" "3.848.0" + "@aws-sdk/nested-clients" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/config-resolver" "^4.1.4" "@smithy/core" "^3.7.0" @@ -325,23 +325,23 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.846.0.tgz#e038f60b1b12b2c44a41c831925f52347ca27540" - integrity sha512-85/oUc2jMXqQWo+HHH7WwrdqqArzhMmTmBCpXZwklBHG+ZMzTS5Wug2B0HhGDVWo9aYRMeikSq4lsrpHFVd2MQ== +"@aws-sdk/middleware-user-agent@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.848.0.tgz#d1bba79ba7f026ad7a6df55e47ccd0513f8fdada" + integrity sha512-rjMuqSWJEf169/ByxvBqfdei1iaduAnfolTshsZxwcmLIUtbYrFUmts0HrLQqsAG8feGPpDLHA272oPl+NTCCA== dependencies: "@aws-sdk/core" "3.846.0" "@aws-sdk/types" "3.840.0" - "@aws-sdk/util-endpoints" "3.845.0" + "@aws-sdk/util-endpoints" "3.848.0" "@smithy/core" "^3.7.0" "@smithy/protocol-http" "^5.1.2" "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@aws-sdk/nested-clients@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.846.0.tgz#c0389df04f04e6f4d124a605cc17b2b3f9a82faa" - integrity sha512-LCXPVtNQnkTuE8inPCtpfWN2raE/ndFBKf5OIbuHnC/0XYGOUl5q7VsJz471zJuN9FX3WMfopaFwmNc7cQNMpQ== +"@aws-sdk/nested-clients@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.848.0.tgz#69f8f57fb5df25262b8e60a3334e13dcded0309d" + integrity sha512-joLsyyo9u61jnZuyYzo1z7kmS7VgWRAkzSGESVzQHfOA1H2PYeUFek6vLT4+c9xMGrX/Z6B0tkRdzfdOPiatLg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" @@ -349,12 +349,12 @@ "@aws-sdk/middleware-host-header" "3.840.0" "@aws-sdk/middleware-logger" "3.840.0" "@aws-sdk/middleware-recursion-detection" "3.840.0" - "@aws-sdk/middleware-user-agent" "3.846.0" + "@aws-sdk/middleware-user-agent" "3.848.0" "@aws-sdk/region-config-resolver" "3.840.0" "@aws-sdk/types" "3.840.0" - "@aws-sdk/util-endpoints" "3.845.0" + "@aws-sdk/util-endpoints" "3.848.0" "@aws-sdk/util-user-agent-browser" "3.840.0" - "@aws-sdk/util-user-agent-node" "3.846.0" + "@aws-sdk/util-user-agent-node" "3.848.0" "@smithy/config-resolver" "^4.1.4" "@smithy/core" "^3.7.0" "@smithy/fetch-http-handler" "^5.1.0" @@ -394,13 +394,13 @@ "@smithy/util-middleware" "^4.0.4" tslib "^2.6.2" -"@aws-sdk/token-providers@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.846.0.tgz#36b499314c2ed754aa9372058a2a8c9e9054ad49" - integrity sha512-sGNk3xclK7xx+rIJZDJC4FNFqaSSqN0nSr+AdVdQ+/iKQKaUA6hixRbXaQ7I7M5mhqS6fMW1AsqVRywQq2BSMw== +"@aws-sdk/token-providers@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.848.0.tgz#a30431066b2fc2927169e3a958bb610cfb936406" + integrity sha512-oNPyM4+Di2Umu0JJRFSxDcKQ35+Chl/rAwD47/bS0cDPI8yrao83mLXLeDqpRPHyQW4sXlP763FZcuAibC0+mg== dependencies: "@aws-sdk/core" "3.846.0" - "@aws-sdk/nested-clients" "3.846.0" + "@aws-sdk/nested-clients" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/property-provider" "^4.0.4" "@smithy/shared-ini-file-loader" "^4.0.4" @@ -415,10 +415,10 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.845.0": - version "3.845.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.845.0.tgz#a4a303502b79a9868da2f6a17f81d24a34f10974" - integrity sha512-MBmOf0Pb4q6xs9V7jXT1+qciW2965yvaoZUlUUnxUEoX6zxWROeIu/gttASc4vSjOHr/+64hmFkxjeBUF37FJA== +"@aws-sdk/util-endpoints@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz#dea15ac0949fcbc518426fb4a86d1e9bd53433db" + integrity sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww== dependencies: "@aws-sdk/types" "3.840.0" "@smithy/types" "^4.3.1" @@ -443,12 +443,12 @@ bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.846.0": - version "3.846.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.846.0.tgz#05ab54d561bcbe3888d88b500ef62a7f41acac8c" - integrity sha512-MXYXCplw76xe8A9ejVaIru6Carum/2LQbVtNHsIa4h0TlafLdfulywsoMWL1F53Y9XxQSeOKyyqDKLNOgRVimw== +"@aws-sdk/util-user-agent-node@3.848.0": + version "3.848.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.848.0.tgz#992acf856aa8edd9d26b906c7c92fbdcd72f8bb1" + integrity sha512-Zz1ft9NiLqbzNj/M0jVNxaoxI2F4tGXN0ZbZIj+KJ+PbJo+w5+Jo6d0UDAtbj3AEd79pjcCaP4OA9NTVzItUdw== dependencies: - "@aws-sdk/middleware-user-agent" "3.846.0" + "@aws-sdk/middleware-user-agent" "3.848.0" "@aws-sdk/types" "3.840.0" "@smithy/node-config-provider" "^4.1.3" "@smithy/types" "^4.3.1" @@ -762,12 +762,12 @@ integrity sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g== "@duosecurity/duo_universal@*": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz#05312e7bf7557625145e7e243a7ece2385853dcf" - integrity sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g== + version "3.0.0" + resolved "https://registry.yarnpkg.com/@duosecurity/duo_universal/-/duo_universal-3.0.0.tgz#c2dae2976dc00dc734bc74d995dc23219dfafe7a" + integrity sha512-4amiQl9b/03kkDRZAWcvrow5PQfSO4zFpU4VjU+RLXNih5B/Frvrt4q+q2gE+QpSxNPCGE3wt8/tuuv0IGnMKw== dependencies: - axios "^1.2.2" - jsonwebtoken "^9.0.0" + axios "^1.10.0" + jose "^6.0.11" "@fastify/busboy@^2.0.0": version "2.1.1" @@ -1240,10 +1240,10 @@ "@smithy/util-middleware" "^4.0.4" tslib "^2.6.2" -"@smithy/core@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.0.tgz#b3a98ccc48b1c408dfdb986aaa22d6affffd7795" - integrity sha512-7ov8hu/4j0uPZv8b27oeOFtIBtlFmM3ibrPv/Omx1uUdoXvcpJ00U+H/OWWC/keAguLlcqwtyL2/jTlSnApgNQ== +"@smithy/core@^3.7.0", "@smithy/core@^3.7.1": + version "3.7.1" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.1.tgz#7f47fc1ec93f20b686d007a7d667a02de8b86219" + integrity sha512-ExRCsHnXFtBPnM7MkfKBPcBBdHw1h/QS/cbNw4ho95qnyNHvnpmGbR39MIAv9KggTr5qSPxRSEL+hRXlyGyGQw== dependencies: "@smithy/middleware-serde" "^4.0.8" "@smithy/protocol-http" "^5.1.2" @@ -1318,12 +1318,12 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@smithy/middleware-endpoint@^4.1.15": - version "4.1.15" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.15.tgz#31d93e6f33bbe2dbd120bda0833bce35cf960c39" - integrity sha512-L2M0oz+r6Wv0KZ90MgClXmWkV7G72519Hd5/+K5i3gQMu4WNQykh7ERr58WT3q60dd9NqHSMc3/bAK0FsFg3Fw== +"@smithy/middleware-endpoint@^4.1.15", "@smithy/middleware-endpoint@^4.1.16": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.16.tgz#d0fea3683659289974a87afb089e5f38575f96c0" + integrity sha512-plpa50PIGLqzMR2ANKAw2yOW5YKS626KYKqae3atwucbz4Ve4uQ9K9BEZxDLIFmCu7hKLcrq2zmj4a+PfmUV5w== dependencies: - "@smithy/core" "^3.7.0" + "@smithy/core" "^3.7.1" "@smithy/middleware-serde" "^4.0.8" "@smithy/node-config-provider" "^4.1.3" "@smithy/shared-ini-file-loader" "^4.0.4" @@ -1333,14 +1333,14 @@ tslib "^2.6.2" "@smithy/middleware-retry@^4.1.16": - version "4.1.16" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.16.tgz#0e044d0da18e7019052ac61ec02a2956437376fd" - integrity sha512-PpPhMpC6U1fLW0evKnC8gJtmobBYn0oi4RrIKGhN1a86t6XgVEK+Vb9C8dh5PPXb3YDr8lE6aYKh1hd3OikmWw== + version "4.1.17" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.17.tgz#5a7aa2547918422e3a8747520900c2fd26a43328" + integrity sha512-gsCimeG6BApj0SBecwa1Be+Z+JOJe46iy3B3m3A8jKJHf7eIihP76Is4LwLrbJ1ygoS7Vg73lfqzejmLOrazUA== dependencies: "@smithy/node-config-provider" "^4.1.3" "@smithy/protocol-http" "^5.1.2" "@smithy/service-error-classification" "^4.0.6" - "@smithy/smithy-client" "^4.4.7" + "@smithy/smithy-client" "^4.4.8" "@smithy/types" "^4.3.1" "@smithy/util-middleware" "^4.0.4" "@smithy/util-retry" "^4.0.6" @@ -1447,13 +1447,13 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@smithy/smithy-client@^4.4.7": - version "4.4.7" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.7.tgz#68e9f7785179060896ed51d52cd4f4cfc1cbffb5" - integrity sha512-x+MxBNOcG7rY9i5QsbdgvvRJngKKvUJrbU5R5bT66PTH3e6htSupJ4Q+kJ3E7t6q854jyl57acjpPi6qG1OY5g== +"@smithy/smithy-client@^4.4.7", "@smithy/smithy-client@^4.4.8": + version "4.4.8" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.8.tgz#91b562a4f60db92c2533a720a091e98557117ab6" + integrity sha512-pcW691/lx7V54gE+dDGC26nxz8nrvnvRSCJaIYD6XLPpOInEZeKdV/SpSux+wqeQ4Ine7LJQu8uxMvobTIBK0w== dependencies: - "@smithy/core" "^3.7.0" - "@smithy/middleware-endpoint" "^4.1.15" + "@smithy/core" "^3.7.1" + "@smithy/middleware-endpoint" "^4.1.16" "@smithy/middleware-stack" "^4.0.4" "@smithy/protocol-http" "^5.1.2" "@smithy/types" "^4.3.1" @@ -1523,26 +1523,26 @@ tslib "^2.6.2" "@smithy/util-defaults-mode-browser@^4.0.23": - version "4.0.23" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.23.tgz#74887922f87da4f4acbf523b5c0271f11af5997d" - integrity sha512-NqRi6VvEIwpJ+KSdqI85+HH46H7uVoNqVTs2QO7p1YKnS7k8VZnunJj8R5KdmmVnTojkaL1OMPyZC8uR5F7fSg== + version "4.0.24" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.24.tgz#36e2ebd191cffa4799c2474d1d4e793264067fa9" + integrity sha512-UkQNgaQ+bidw1MgdgPO1z1k95W/v8Ej/5o/T/Is8PiVUYPspl/ZxV6WO/8DrzZQu5ULnmpB9CDdMSRwgRc21AA== dependencies: "@smithy/property-provider" "^4.0.4" - "@smithy/smithy-client" "^4.4.7" + "@smithy/smithy-client" "^4.4.8" "@smithy/types" "^4.3.1" bowser "^2.11.0" tslib "^2.6.2" "@smithy/util-defaults-mode-node@^4.0.23": - version "4.0.23" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.23.tgz#dd22609289183fe3d722f9a1601b6cc618f9efa7" - integrity sha512-NE9NtEVigFa+HHJ5bBeQT7KF3KiltW880CLN9TnWWL55akeou3ziRAHO22QSUPgPZ/nqMfPXi/LGMQ6xQvXPNQ== + version "4.0.24" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.24.tgz#3b9382bbffcc5c211e582ea6164c630ad994816f" + integrity sha512-phvGi/15Z4MpuQibTLOYIumvLdXb+XIJu8TA55voGgboln85jytA3wiD7CkUE8SNcWqkkb+uptZKPiuFouX/7g== dependencies: "@smithy/config-resolver" "^4.1.4" "@smithy/credential-provider-imds" "^4.0.6" "@smithy/node-config-provider" "^4.1.3" "@smithy/property-provider" "^4.0.4" - "@smithy/smithy-client" "^4.4.7" + "@smithy/smithy-client" "^4.4.8" "@smithy/types" "^4.3.1" tslib "^2.6.2" @@ -1712,9 +1712,9 @@ integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA== "@types/node@*", "@types/node@>=13.7.0": - version "24.0.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-24.0.14.tgz#6e3d4fb6d858c48c69707394e1a0e08ce1ecc1bc" - integrity sha512-4zXMWD91vBLGRtHK3YbIoFMia+1nqEz72coM42C5ETjnNCa/heoj7NT1G67iAfOqMmcfhuCZ4uNpyz8EjlAejw== + version "24.1.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-24.1.0.tgz#0993f7dc31ab5cc402d112315b463e383d68a49c" + integrity sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w== dependencies: undici-types "~7.8.0" @@ -1724,9 +1724,9 @@ integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ== "@types/node@^22.0.1", "@types/node@^22.5.4": - version "22.16.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.4.tgz#00c763ad4d4e45f62d5a270c040ae1a799c7e38a" - integrity sha512-PYRhNtZdm2wH/NT2k/oAJ6/f2VD2N2Dag0lGlx2vWgMSJXGNmlce5MiTQzoWAiIJtso30mjnfQCOKVH+kAQC/g== + version "22.16.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.16.5.tgz#cc46ac3994cd957000d0c11095a0b1dae2ea2368" + integrity sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ== dependencies: undici-types "~6.21.0" @@ -2443,13 +2443,13 @@ axios@^0.21.1: dependencies: follow-redirects "^1.14.0" -axios@^1.2.2, axios@^1.8.2: - version "1.10.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.10.0.tgz#af320aee8632eaf2a400b6a1979fa75856f38d54" - integrity sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw== +axios@^1.10.0, axios@^1.8.2: + version "1.11.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6" + integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA== dependencies: follow-redirects "^1.15.6" - form-data "^4.0.0" + form-data "^4.0.4" proxy-from-env "^1.1.0" b4a@^1.6.4: @@ -3053,16 +3053,16 @@ compressible@~2.0.18: dependencies: mime-db ">= 1.43.0 < 2" -compression@1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93" - integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q== +compression@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.1.tgz#4a45d909ac16509195a9a28bd91094889c180d79" + integrity sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w== dependencies: bytes "3.1.2" compressible "~2.0.18" debug "2.6.9" negotiator "~0.6.4" - on-headers "~1.0.2" + on-headers "~1.1.0" safe-buffer "5.2.1" vary "~1.1.2" @@ -3108,14 +3108,14 @@ cookie-jar@~0.3.0: resolved "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz#bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc" integrity sha512-dX1400pzPULr+ZovkIsDEqe7XH8xCAYGT5Dege4Eot44Qs2mS2iJmnh45TxTO5MIsCfrV/JGZVloLhm46AHxNw== -cookie-session@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.0.tgz#ae30b566b2f9f2d8ca2c4936513e6bf181830558" - integrity sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ== +cookie-session@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.1.tgz#3e0bdd4a8386467a1d7cca5249690a0ebfb27842" + integrity sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg== dependencies: cookies "0.9.1" debug "3.2.7" - on-headers "~1.0.2" + on-headers "~1.1.0" safe-buffer "5.2.1" cookie-signature@1.0.6: @@ -3559,9 +3559,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.5.173: - version "1.5.185" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.185.tgz#b4f9189c4ef652ddf9f1bb37529e2b79f865e912" - integrity sha512-dYOZfUk57hSMPePoIQ1fZWl1Fkj+OshhEVuPacNKWzC1efe56OsHY3l/jCfiAgIICOU3VgOIdoq7ahg7r7n6MQ== + version "1.5.190" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz#f0ac8be182291a45e8154dbb12f18d2b2318e4ac" + integrity sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw== emoji-regex@^7.0.1: version "7.0.3" @@ -4124,20 +4124,21 @@ forever-agent@~0.6.1: integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== form-data@^2.5.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.3.tgz#f9bcf87418ce748513c0c3494bb48ec270c97acc" - integrity sha512-XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ== + version "2.5.5" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.5.tgz#a5f6364ad7e4e67e95b4a07e2d8c6f711c74f624" + integrity sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" es-set-tostringtag "^2.1.0" + hasown "^2.0.2" mime-types "^2.1.35" safe-buffer "^5.2.1" -form-data@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.3.tgz#608b1b3f3e28be0fccf5901fc85fb3641e5cf0ae" - integrity sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA== +form-data@^4.0.0, form-data@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4" + integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" @@ -5257,6 +5258,11 @@ jose@^4.15.4, jose@^4.15.9: resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100" integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA== +jose@^6.0.11: + version "6.0.12" + resolved "https://registry.yarnpkg.com/jose/-/jose-6.0.12.tgz#56253d94d46bd784addc4bde3691c323552fe7e4" + integrity sha512-T8xypXs8CpmiIi78k0E+Lk7T2zlK4zDyg+o1CZ4AkOHgDg98ogdP2BeZ61lTFKFyoEwJ9RgAgN+SdM3iPgNonQ== + js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -6408,10 +6414,10 @@ on-finished@2.4.1: dependencies: ee-first "1.1.1" -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== +on-headers@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65" + integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A== once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" From 7bdf5f17f1f43c93bbda917db80db97273b8afd4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 23 Jul 2025 12:50:25 +0200 Subject: [PATCH 13/29] evcxr: 0.20.0 -> 0.21.1 ChangeLogs: * https://github.com/evcxr/evcxr/releases/tag/v0.21.0 * https://github.com/evcxr/evcxr/releases/tag/v0.21.1 --- pkgs/by-name/ev/evcxr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix index d00b3728950c..431d5e154c59 100644 --- a/pkgs/by-name/ev/evcxr/package.nix +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -19,17 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "evcxr"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-vntXHKP3fk5+26fPHKUy3gqr1Bt9o/ypxyyvXOfdt3I="; + sha256 = "sha256-8dV+NNtU4HFerrgRyc1kO+MSsMTJJItTtJylEIN014g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bV83OvHG7lQN3juVsPRurINCzxVPZd0yZ2YNtXXFU8I="; + cargoHash = "sha256-HJrEXt6O7qCNJ/xOh4kjmqKJ22EVwBTzV1S+q98k0VQ="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From 773376f23694258d960110dca853e0d0f03a1471 Mon Sep 17 00:00:00 2001 From: thattemperature <2719023332@qq.com> Date: Fri, 11 Jul 2025 14:54:42 +0800 Subject: [PATCH 14/29] python3Package.python-tsp: init at 0.5.0 --- .../python-modules/python-tsp/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/python-tsp/default.nix diff --git a/pkgs/development/python-modules/python-tsp/default.nix b/pkgs/development/python-modules/python-tsp/default.nix new file mode 100644 index 000000000000..7751fdc448d5 --- /dev/null +++ b/pkgs/development/python-modules/python-tsp/default.nix @@ -0,0 +1,57 @@ +{ + # Basic + lib, + buildPythonPackage, + fetchFromGitHub, + # Build system + poetry-core, + # Dependencies + numpy, + requests, + tsplib95, + # Test + pytestCheckHook, + mock, +}: + +buildPythonPackage rec { + pname = "python-tsp"; + version = "0.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fillipe-gsm"; + repo = "python-tsp"; + tag = "v${version}"; + hash = "sha256-X4L0j6ZL8/Xj2YFcvwOl8voC2xHagMcdcj9F1f/6/5M="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + numpy + requests + tsplib95 + ]; + + # Rename some dependencies + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry>=0.12" "poetry-core>=0.12" \ + --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ "python_tsp" ]; + + meta = { + description = "Library for solving typical Traveling Salesperson Problems (TSP)"; + homepage = "https://github.com/fillipe-gsm/python-tsp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thattemperature ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d1c3b993c15..280a1b2cd0f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14766,6 +14766,8 @@ self: super: with self; { python-trovo = callPackage ../development/python-modules/python-trovo { }; + python-tsp = callPackage ../development/python-modules/python-tsp { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; python-twitter = callPackage ../development/python-modules/python-twitter { }; From a3fbf2c805b3f3ce6101dc37799eea91fd9909a2 Mon Sep 17 00:00:00 2001 From: Antonio Date: Tue, 22 Jul 2025 13:06:28 +0200 Subject: [PATCH 15/29] hayabusa-sec: init at 3.3.0-unstable-2025-07-17 --- pkgs/by-name/ha/hayabusa-sec/package.nix | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/ha/hayabusa-sec/package.nix diff --git a/pkgs/by-name/ha/hayabusa-sec/package.nix b/pkgs/by-name/ha/hayabusa-sec/package.nix new file mode 100644 index 000000000000..8dc4adb95493 --- /dev/null +++ b/pkgs/by-name/ha/hayabusa-sec/package.nix @@ -0,0 +1,52 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + rust-jemalloc-sys, +}: + +rustPlatform.buildRustPackage { + pname = "hayabusa-sec"; + version = "3.3.0-unstable-2025-07-17"; + + src = fetchFromGitHub { + owner = "Yamato-Security"; + repo = "hayabusa"; + rev = "feaa165b4c0af34919ad26f634cb684e23172359"; + hash = "sha256-h08InhNVW33IjPA228gv6Enlg6EKmj0yHb/UvJ/f7uw="; + # Include the hayabusa-rules + fetchSubmodules = true; + }; + + cargoHash = "sha256-wcH1Ron5Zx2ypWyaW0z7L9rCanAcosvpPQnP60qbvWQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + rust-jemalloc-sys # transitive dependency via the hayabusa-evtx crate + ]; + + env.OPENSSL_NO_VENDOR = true; + + # Several checks panic + # Skipping individual checks causes failure as `--skip` flags + # end up passed to executing `hayabusa` + # > error: unexpected argument '--skip' found + doCheck = false; + + meta = { + description = "Sigma-based threat hunting and fast forensics timeline generator for Windows event logs"; + homepage = "https://github.com/Yamato-Security/hayabusa"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + d3vil0p3r + jk + ]; + mainProgram = "hayabusa"; + }; +} From b051a144dc42449c723ca188e65f58d159ebb0ee Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 23 Jul 2025 13:00:55 -0400 Subject: [PATCH 16/29] elixir-ls: force local installation --- pkgs/development/beam-modules/default.nix | 2 +- .../beam-modules/elixir-ls/default.nix | 44 +++++++------------ .../beam-modules/elixir-ls/launch.sh.patch | 8 ++-- 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 486d91a5ab06..8b04fe8a07a7 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -89,7 +89,7 @@ let inherit fetchMixDeps mixRelease; }; - elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; }; + elixir-ls = callPackage ./elixir-ls { inherit elixir; }; lfe = lfe_2_1; lfe_2_1 = lib'.callLFE ../interpreters/lfe/2.1.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 237838bc337b..eda8502395ad 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -3,13 +3,12 @@ elixir, fetchpatch, fetchFromGitHub, - fetchMixDeps, makeWrapper, - mixRelease, + stdenv, nix-update-script, }: -mixRelease rec { +stdenv.mkDerivation rec { pname = "elixir-ls"; version = "0.28.1"; @@ -20,16 +19,6 @@ mixRelease rec { hash = "sha256-r4P+3MPniDNdF3SG2jfBbzHsoxn826eYd2tsv6bJBoI="; }; - inherit elixir; - - stripDebug = true; - - mixFodDeps = fetchMixDeps { - pname = "mix-deps-${pname}"; - inherit src version elixir; - hash = "sha256-8zs+99jwf+YX5SwD65FCPmfrYhTCx4AQGCGsDeCKxKc="; - }; - patches = [ # fix elixir deterministic support https://github.com/elixir-lsp/elixir-ls/pull/1216 # remove > 0.28.1 @@ -46,28 +35,25 @@ mixRelease rec { makeWrapper ]; - # elixir-ls require a special step for release - # compile and release need to be performed together because - # of the no-deps-check requirement - buildPhase = '' - runHook preBuild + # for substitution + env.elixir = elixir; - mix do compile --no-deps-check, elixir_ls.release${lib.optionalString (lib.versionAtLeast elixir.version "1.16.0") "2"} - - runHook postBuild - ''; + dontConfigure = true; + dontBuild = true; installPhase = '' + cp -R . $out + ln -s $out/VERSION $out/scripts/VERSION + + substituteAllInPlace $out/scripts/launch.sh + mkdir -p $out/bin - cp -Rv release $out/libexec - substituteAllInPlace $out/libexec/launch.sh + makeWrapper $out/scripts/language_server.sh $out/bin/elixir-ls \ + --set ELS_LOCAL "1" - makeWrapper $out/libexec/language_server.sh $out/bin/elixir-ls \ - --set ELS_INSTALL_PREFIX "$out/libexec" - - makeWrapper $out/libexec/debug_adapter.sh $out/bin/elixir-debug-adapter \ - --set ELS_INSTALL_PREFIX "$out/libexec" + makeWrapper $out/scripts/debug_adapter.sh $out/bin/elixir-debug-adapter \ + --set ELS_LOCAL "1" runHook postInstall ''; diff --git a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch index aabfd82a3d58..b497720e4bd9 100644 --- a/pkgs/development/beam-modules/elixir-ls/launch.sh.patch +++ b/pkgs/development/beam-modules/elixir-ls/launch.sh.patch @@ -1,6 +1,6 @@ -diff --git i/scripts/launch.sh w/scripts/launch.sh -index 21afbb1e..975cbdf0 100755 ---- i/scripts/launch.sh +diff --git c/scripts/launch.sh w/scripts/launch.sh +index 21afbb1e..6b61f0b4 100755 +--- c/scripts/launch.sh +++ w/scripts/launch.sh @@ -1,125 +1,4 @@ -#!/bin/sh @@ -140,7 +140,7 @@ index 21afbb1e..975cbdf0 100755 - SCRIPTPATH=${ELS_INSTALL_PREFIX} -fi +SCRIPT=$(readlink -f "$0") -+SCRIPTPATH=$(dirname "$SCRIPT")/../libexec ++SCRIPTPATH=$(dirname "$SCRIPT")/../scripts export MIX_ENV=prod # Mix.install prints to stdout and reads from stdin From 6259def6787eec979a14bb2603fac5414d653d74 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 21 Jul 2025 00:02:00 -0400 Subject: [PATCH 17/29] newsflash: 4.0.3 -> 4.1.2 --- pkgs/by-name/ne/newsflash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 6cfb80f6a20e..2ac8036c3957 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "4.0.3"; + version = "4.1.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; tag = "v.${finalAttrs.version}"; - hash = "sha256-TVQZq+Akb7EFUazAgUqvlwC7htVpUf7Hck8p7vY0o3M="; + hash = "sha256-yNO9ju5AQzMeZlQN1f3FRiFA6hq89mSuQClrJkoM+xE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-fjb/AVvWbSq+Mc+5D7wCncLQ8OPjnTqHMzFFYgmCCjY="; + hash = "sha256-gF1wHLM5t0jYm/nWQQeAbDlExsPYNV0/YYH0yfQuetM="; }; postPatch = '' From 6ebae03896ab2d330ba35d493d606b55f9ea1ac8 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 23 Jul 2025 20:19:10 -0400 Subject: [PATCH 18/29] newsflash: format with nixfmt v1.0.0 --- pkgs/by-name/ne/newsflash/package.nix | 41 +++++++++++++-------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 2ac8036c3957..9a3084cfca86 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -65,29 +65,28 @@ stdenv.mkDerivation (finalAttrs: { ]; - buildInputs = - [ - clapper-unwrapped - gtk4 - libadwaita - libxml2 - openssl - sqlite - webkitgtk_6_0 + buildInputs = [ + clapper-unwrapped + gtk4 + libadwaita + libxml2 + openssl + sqlite + webkitgtk_6_0 - # TLS support for loading external content in webkitgtk WebView - glib-networking + # TLS support for loading external content in webkitgtk WebView + glib-networking - # SVG support for gdk-pixbuf - librsvg - ] - ++ (with gst_all_1; [ - # Audio & video support for webkitgtk WebView - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]); + # SVG support for gdk-pixbuf + librsvg + ] + ++ (with gst_all_1; [ + # Audio & video support for webkitgtk WebView + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); passthru.updateScript = gitUpdater { rev-prefix = "v."; From bd184be2728c5ceb750e6b604b0c5452758fcce4 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Wed, 2 Apr 2025 15:45:14 +0200 Subject: [PATCH 19/29] qemu-vm: create erofs with hard-dereference flag This will ensure reproducibility between different nixos systems, where one system has store optimization enabled (which will hardling similar files in the nix store) and the other doesn't. Without the flag, the same image, built on the two different systems, will have a different number of inodes. The flag will dereference hardlinks and copy them into the image as different inodes. Signed-off-by: Paul Meyer --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0b0b2136ea03..21d82e09d927 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -194,6 +194,7 @@ let -L ${nixStoreFilesystemLabel} \ -U eb176051-bd15-49b7-9e6b-462e0b467019 \ -T 0 \ + --hard-dereference \ --tar=f \ "$TMPDIR"/store.img From 4fecaba89a6b30effd311155ebf13769086d3377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Jul 2025 07:58:17 +0000 Subject: [PATCH 20/29] pluto: 5.22.0 -> 5.22.1 --- pkgs/by-name/pl/pluto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix index ce3398e80c31..f8b578935218 100644 --- a/pkgs/by-name/pl/pluto/package.nix +++ b/pkgs/by-name/pl/pluto/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.22.0"; + version = "5.22.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-fqN6uj/YL/sch16mmB/smJtbzCFlUa9yvCLa8sXJ/u4="; + hash = "sha256-mq18PUyVFhi3ePju6EvYg4VowwAHJwhvpI67BX8BqRY="; }; vendorHash = "sha256-59mRVfQ2rduTvIJE1l/j3K+PY3OEMfNpjjYg3hqNUhs="; From 7286705111bd7e7d65e18a010ee78d34071665b5 Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 23 Jul 2025 18:35:38 +0100 Subject: [PATCH 21/29] catppuccinifier-gui: 9.0.0 -> 9.1.0; build from source --- .../ca/catppuccinifier-gui/package.nix | 82 +++++++++---------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 4388c11c6662..0e2317ab0265 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -3,79 +3,71 @@ gtk3, glib, dbus, - curl, - wget, + nodejs, cairo, - stdenv, - librsvg, - libsoup_2_4, - fetchzip, - openssl_3, + cargo-tauri, webkitgtk_4_1, + wrapGAppsHook3, gdk-pixbuf, pkg-config, - makeDesktopItem, - copyDesktopItems, - autoPatchelfHook, + rustPlatform, + fetchYarnDeps, + yarnConfigHook, + fetchFromGitHub, + desktop-file-utils, }: -let - version = "9.0.0"; -in -stdenv.mkDerivation { +rustPlatform.buildRustPackage (finalAttrs: { pname = "catppuccinifier-gui"; - inherit version; + version = "9.1.0"; - src = fetchzip { - url = "https://github.com/lighttigerXIV/catppuccinifier/releases/download/${version}/Catppuccinifier-Linux-${version}.tar.xz"; - hash = "sha256-wGj0mWxmGqG/z/jmQ5pw1LdxYKzHaf+eOUXhpMT3kgs="; + src = fetchFromGitHub { + owner = "lighttigerXIV"; + repo = "catppuccinifier"; + tag = "${finalAttrs.version}"; + hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE="; + }; + + sourceRoot = finalAttrs.src.name + "/src/catppuccinifier-gui"; + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + cargoHash = "sha256-BUXqPY3jNn4YB1avtCp6MFyN1KIYqT0b1H9drOmikj0="; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/src/catppuccinifier-gui/yarn.lock"; + hash = "sha256-UfQZf2raMrgPhUQVTAW+mA/nP1XjLKx0WBbYtdeD9kY="; }; nativeBuildInputs = [ - autoPatchelfHook + cargo-tauri.hook pkg-config - copyDesktopItems + nodejs + yarnConfigHook + wrapGAppsHook3 + desktop-file-utils ]; buildInputs = [ - curl - wget webkitgtk_4_1 gtk3 cairo gdk-pixbuf - libsoup_2_4 glib dbus - openssl_3 - librsvg ]; - installPhase = '' - runHook preInstall - - install -Dm555 installation-files/catppuccinifier-gui "$out/bin/catppuccinifier-gui" - install -Dm644 installation-files/catppuccinifier.png "$out/share/pixmaps/catppuccinifier.png" - - runHook postInstall + postInstall = '' + desktop-file-edit "$out/share/applications/catppuccinifier-gui.desktop" \ + --set-key "Categories" --set-value "Graphics" \ + --set-key "Comment" --set-value "Apply catppuccin flavors to your wallpapers" ''; - desktopItems = [ - (makeDesktopItem { - desktopName = "catppuccinifier"; - name = "catppuccinifier"; - exec = "catppuccinifier-gui"; - icon = "catppuccinifier"; - comment = "Apply catppuccin flavors to your wallpapers"; - }) - ]; - meta = { description = "Apply catppuccin flavors to your wallpapers"; homepage = "https://github.com/lighttigerXIV/catppuccinifier"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ isabelroses ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; mainProgram = "catppuccinifier-gui"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) From 91ce4ce6b250233dc810e506dbef2e8ee1fe10d0 Mon Sep 17 00:00:00 2001 From: Sebastian Rieger Date: Thu, 24 Jul 2025 09:55:38 +0200 Subject: [PATCH 22/29] containerlab: 0.68.0 -> 0.69.1 https://github.com/srl-labs/containerlab/releases/tag/v0.69.1 --- pkgs/by-name/co/containerlab/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index ea89c97789f3..3e4ee48340f4 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "containerlab"; - version = "0.68.0"; + version = "0.69.1"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; tag = "v${finalAttrs.version}"; - hash = "sha256-x6QDwduAMCD+Trj0awQXW0Tdleb2U6YBi/7mdMB6V/8="; + hash = "sha256-+KZrKOxn9M+iKtugH89bPc106NGLwErMgIyiaU2kcGE="; }; - vendorHash = "sha256-XRgKfRw6VGg+lkbtPWUVNfAk5a7ZdFwVmhjtM7uSwHs="; + vendorHash = "sha256-YmE2eR5UnXy2nXTQP2FdyPQLAQVYPzDTmLrWtbRknAs="; nativeBuildInputs = [ installShellFiles @@ -37,6 +37,11 @@ buildGoModule (finalAttrs: { export USER="runner" ''; + # TestVerifyLinks wants to use docker.sock, which is not available in the Nix build environment. + checkFlags = [ + "-skip=^TestVerifyLinks$" + ]; + postInstall = '' local INSTALL="$out/bin/containerlab" installShellCompletion --cmd containerlab \ From 65ba69b31ec792c8c572af5c3ff08f15ce5bf1e2 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Wed, 23 Jul 2025 21:39:43 +0200 Subject: [PATCH 23/29] octodns-providers.ovh: init at 1.1.0 https://github.com/octodns/octodns-ovh --- .../oc/octodns/providers/ovh/package.nix | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/oc/octodns/providers/ovh/package.nix diff --git a/pkgs/by-name/oc/octodns/providers/ovh/package.nix b/pkgs/by-name/oc/octodns/providers/ovh/package.nix new file mode 100644 index 000000000000..cd01f99c1ac2 --- /dev/null +++ b/pkgs/by-name/oc/octodns/providers/ovh/package.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + ovh, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "octodns-ovh"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-ovh"; + tag = "v${version}"; + hash = "sha256-UbxOdpG099G9oKyweIMH5JTP0W0MpLmsOWgQYEFD8sQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + ovh + ]; + + env.OCTODNS_RELEASE = 1; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "octodns_ovh" ]; + + meta = { + description = "OVHcloud DNS v6 API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-ovh"; + changelog = "https://github.com/octodns/octodns-ovh/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = [ lib.teams.octodns ]; + }; +} From e82cff6cb4966bd83bc6f2b35c44a8ae72cb5b7c Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 24 Jul 2025 16:07:53 +0300 Subject: [PATCH 24/29] linux_testing: 6.16-rc6 -> 6.16-rc7 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 67f49c6b22f0..57446d1642fe 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.16-rc6", - "hash": "sha256:03sz5gbnz1s763nlq2sbqk3bmjca24hq2n9wrpqhy6gyrd11s22f" + "version": "6.16-rc7", + "hash": "sha256:071xwskg7rpa6j09khdxzzccqp8a2fk68l0p2bn7ycr51pyywxz9" }, "6.1": { "version": "6.1.146", From b1b640337494c62c22dc765adc42971aa4732179 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 24 Jul 2025 16:07:57 +0300 Subject: [PATCH 25/29] linux_6_15: 6.15.7 -> 6.15.8 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 57446d1642fe..00dcfc727791 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:0iakbyipani7rcm37xb0bsl5zn7h1m7vfhwfangn64gxm012amkf" }, "6.15": { - "version": "6.15.7", - "hash": "sha256:1sgq32ivnrvlqskmz6i5k9157y6c5x3r9lj3pl0i23habc8ds1rm" + "version": "6.15.8", + "hash": "sha256:19i87zpq3zhpg09sdirnzys2s2yrv9xn8mpibl1a6qmr2sy94znk" } } From 7812de8ec7cb8d7a1e2befb17387ca135d4d52cf Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 24 Jul 2025 16:08:00 +0300 Subject: [PATCH 26/29] linux_6_12: 6.12.39 -> 6.12.40 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 00dcfc727791..733e246bf2fd 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0dmbi7g156gknglcgb47kl1i29fa6q4rkx99m2glpiqykxr7k1mh" }, "6.12": { - "version": "6.12.39", - "hash": "sha256:0iakbyipani7rcm37xb0bsl5zn7h1m7vfhwfangn64gxm012amkf" + "version": "6.12.40", + "hash": "sha256:0cr9hi0m7p9jf0rdblign1ya40rckab9axiwxb62r3gr2w9sy4a8" }, "6.15": { "version": "6.15.8", From 727a3d5720886e58f1100fed60a3dd1d256fa605 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 24 Jul 2025 16:08:03 +0300 Subject: [PATCH 27/29] linux_6_6: 6.6.99 -> 6.6.100 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 733e246bf2fd..ad213721dd9e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx" }, "6.6": { - "version": "6.6.99", - "hash": "sha256:0dmbi7g156gknglcgb47kl1i29fa6q4rkx99m2glpiqykxr7k1mh" + "version": "6.6.100", + "hash": "sha256:1flpvypy88rmp2sbz3z4fxlgdylm5lxb5832bgsi8j5iam6yrh6n" }, "6.12": { "version": "6.12.40", From 8d781a1dc3aeb92c1b692277e33db75e3112f910 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 24 Jul 2025 16:08:05 +0300 Subject: [PATCH 28/29] linux_6_1: 6.1.146 -> 6.1.147 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ad213721dd9e..2e159ff1e971 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:071xwskg7rpa6j09khdxzzccqp8a2fk68l0p2bn7ycr51pyywxz9" }, "6.1": { - "version": "6.1.146", - "hash": "sha256:117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv" + "version": "6.1.147", + "hash": "sha256:1xv6whvxjcdmvv0cil7nnac4hs2hxjnc98agx08xiqs179k2b3r1" }, "5.15": { "version": "5.15.189", From 6680f22c413fed6683795bf8f5448e0b138589bd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 17 Jul 2025 06:38:26 +0200 Subject: [PATCH 29/29] =?UTF-8?q?ocamlPackages.brisk-reconciler:=20unstabl?= =?UTF-8?q?e-2020-12-02=20=E2=86=92=201.0.0-=CE=B11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../brisk-reconciler/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index 91c9efc90e8f..d99e050d7642 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -4,23 +4,28 @@ lib, reason, ppxlib, + ocaml, }: +let + version = + if lib.versionAtLeast ocaml.version "5.3" then + throw "brisk-reconciler is not available for OCaml ${ocaml.version}" + else + "1.0.0-alpha1"; +in + buildDunePackage { pname = "brisk-reconciler"; - version = "unstable-2020-12-02"; - - duneVersion = "3"; + inherit version; src = fetchFromGitHub { owner = "briskml"; repo = "brisk-reconciler"; - rev = "c9d5c4cf5dd17ff2da994de2c3b0f34c72778f70"; - sha256 = "sha256-AAB4ZzBnwfwFXOAqX/sIT6imOl70F0YNMt96SWOOE9w="; + tag = "v${version}"; + hash = "sha256-Xj6GGsod3lnEEjrzPrlHwQAowq66uz8comlhpWK888k="; }; - nativeBuildInputs = [ reason ]; - buildInputs = [ ppxlib ];