insulator2: 2.13.2 -> 2.14.0; modernize (#499616)

This commit is contained in:
Michael Daniels
2026-04-04 03:06:49 +00:00
committed by GitHub
4 changed files with 94 additions and 6020 deletions
File diff suppressed because it is too large Load Diff
@@ -1,51 +0,0 @@
From 7dbff0777c4364eec68cf90488d99f06b11dfa98 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 8 Oct 2024 23:49:40 +0200
Subject: [PATCH] build: Bump time from 0.3.34 to 0.3.36 in /backend
---
backend/Cargo.lock | 8 ++++----
backend/Cargo.toml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index dc3ac0d4..571bd845 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -4771,9 +4771,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.34"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa 1.0.10",
@@ -4792,9 +4792,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
"num-conv",
"time-core",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 2a689961..3d198dff 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -49,7 +49,7 @@ r2d2 = "0.8.10"
r2d2_sqlite = "0.21.0"
toml = "0.7"
rand = "0.8.5"
-time = "0.3.34"
+time = "0.3.36"
sys-locale = "0.3.0"
uuid = "1.4.1"
rlimit = "0.10.1"
@@ -0,0 +1,64 @@
{
"@esbuild/aix-ppc64@npm:0.27.4": "ba2c14b9cd901d9e7ea99b7de8ac259b146bf978c69866328d1765f277b11105cd16ed4df82107593b5c9b667bba5fbcde73cb7a9f511d98caca9e26778f64a5",
"@esbuild/android-arm64@npm:0.27.4": "d5a06758f91f0cf795d3a77198fc26fefbd78c3ddfce682df8d8ddb96b31ee65549ead1f6040a496dad2a1fc0fa345fab90692eff3410663bd0f39ed670ac727",
"@esbuild/android-arm@npm:0.27.4": "faeac957ba9eaff1c79871151dea2101d03691cb3772ffd5b4475551f54bf7962e1313346b6c06527e5dce09c63391b6b987b06070a544c4b8aaf91652ffbb84",
"@esbuild/android-x64@npm:0.27.4": "7e294ba0331704c4c455763a7132efff4484066b1a522d64c3068c9017749b9b2c59dbb04bfa6491d78fb65da826109af0ea6a7517b06c8a7d7a64e706390e59",
"@esbuild/darwin-arm64@npm:0.27.4": "57f495c8302bfb58852915195e3066166239de00ea84f91f4cc84b7f46dcd126bdbef0ceb22581e643d0c3a2ca34936dd72a96b40291362c2716d3edb6e051ee",
"@esbuild/darwin-x64@npm:0.27.4": "8b0af048b1b03a2145484fa02283b5c0c9b528fb857d510d9a02150854a2df3a08ee93a4ed269b7e1da54c9009273dac2ce75a419c32fd2f516550bfc534fe11",
"@esbuild/freebsd-arm64@npm:0.27.4": "67a551695f67acdbe7ada9dfa0d97d30ba9065cf79fa96d4e8b75c892200ea25ad8187fb108811b0af1e1ba559fb2b7d4ec572a002916bed70bca654e2888c14",
"@esbuild/freebsd-x64@npm:0.27.4": "a3b0ce4ce0f6e3614b49fded87a7c5989e34a4b81876450650f372cb119d835e627c325039c9ec93cb5fbb098a14dd0e8cfda8a24e8be670ec7900a27e9b90f3",
"@esbuild/linux-arm64@npm:0.27.4": "f3467a2e4f7db00b73df8e074d6c4d7b685d90965d7db8bf1a041460027b61cd9e9f258cca66dc26e0a1b5d8cb84263cd7bec81d7513e27f0ea9dc86253e69da",
"@esbuild/linux-arm@npm:0.27.4": "b30c834aca19a68de625214e912e3e5e2b040a32c82acba0c66a70af741b43f5a02ab07fd1e2f42f2bd7d336e0cf25333993dd070e23c70ea6470170a3ad90a1",
"@esbuild/linux-ia32@npm:0.27.4": "51d5d31a222490225f78802cda61d4ba618a3b5b35f3ea57675725f2cf7af32740c8be078fd5bb42952719b81de4e5b692ea1961d0618d827cbd5bc3b8298a94",
"@esbuild/linux-loong64@npm:0.27.4": "225d208ce874ec7bac4b9028933872aacc1b3d7be886f90741efa1cdf853ad51a064c176bd76ff24f0ce1b21946865b72c69a68bbabdf0653873d0f95398a4c8",
"@esbuild/linux-mips64el@npm:0.27.4": "ca438a7ada46810bc1b24ebfcccf0e2c2cc3098e0690b6d2f4dd031bf33160fb5dde07d5644d5a60bdf3768d89667da7c0df30debee684efc47f0ed5b876c6da",
"@esbuild/linux-ppc64@npm:0.27.4": "da0bb5332234921f746da98765b9a20421a5334bbca2abf8fa0f149929a94c5e1a42319b62aaf9711918d42bc0e397e7dbdbda7389ff64c63f843d451378eb0c",
"@esbuild/linux-riscv64@npm:0.27.4": "b6942603508353c956f804e8c037d9d7092b7885f78c88882753e21e978f5aace82c0aaa42a4100edf2fce3be76ce582ff4e550a7a87079446a4b6228918100c",
"@esbuild/linux-s390x@npm:0.27.4": "719d52323400ce16ee69314886ca17a97d7ed6a9886387b7e4e70fae7133721eecb65a44b521d79d9b6a4f9a3c5fd78bfe65a3b0c5315f11e68847d012344d97",
"@esbuild/linux-x64@npm:0.27.4": "2281d03477bd82fecd14fbbe2c6ee385bc196fef87a2dee9be9eae69429af9972b53f869741db3fdfd404d936f38f3aaf237194f506f8113b79aa9978c26ffba",
"@esbuild/netbsd-arm64@npm:0.27.4": "ca68d9ba6054eb15e7de67283073a82b6492871bec6d9b67cee0785c6d4b9a3391f7c286dfe093206a659a05bf27dc2b58c1e730c0d7ddcb997b7643684cd734",
"@esbuild/netbsd-x64@npm:0.27.4": "9ca4d720a2b681d1a01b50005bd00eb6ac182055585adc845fee4312ff87c55a678d19bbcbaad9f4211e9d409c7d03121748524978aa5404143e375e22d2f900",
"@esbuild/openbsd-arm64@npm:0.27.4": "1459bc44aabc838255cae80e33b32eb22fd375d924ca3eed9e0987e33a1ddae6e59ac61e529564ed9ab7ce9ad108db0f9eb4c5558eb8bc63b952d4ff3692f4a6",
"@esbuild/openbsd-x64@npm:0.27.4": "809917a83bb809d51d11d59ebc1bf9f44b6a94fb1f82bd5d52ac642a7dfaf55c90a71351d263d2c164b2d38700aa0dca69afec4840f929ce56daf90a696eadc9",
"@esbuild/openharmony-arm64@npm:0.27.4": "0f9f7dd181d505e0bedae25a73ac26ad9acd099f7b7c49e2ecf12998b59e49c64331616f22cba6b0da9bd7ea6f5b7fc59f7860014dda5e6673d25661042f4237",
"@esbuild/sunos-x64@npm:0.27.4": "16c38ba94b9b2ed6a2ce17e6b5071459f24e7f1df51e4b6555de7310ff1696743089462585c8c49103ea468b8b1b4ee47913d759c5b44b45c15963795c731150",
"@esbuild/win32-arm64@npm:0.27.4": "6e7361fc9a6d12896443f5b59897e5539d642514b9ba440a2d245f84d82b4589744905b6144d6d345a25cb5b1d80dcbc8a87109f4c9d9e88533919587d76c8bf",
"@esbuild/win32-ia32@npm:0.27.4": "36b0fdfeed7263f87a86c93a47d45c07b5e5502dd31c4a3244f058a0ccfa08c206c8d450eac1cc1e0ab98dc1edeb601b60d3b673cec28015d4ed2fd3a0592da5",
"@esbuild/win32-x64@npm:0.27.4": "70e6d04df925717d37f64cf9945a2ce9d5265169df6a9f5d75e60079023d8f0de7ca9f6ac8826a947c313116990562fc6f92c635f0a185bdb6d02e94e967fe77",
"@rollup/rollup-android-arm-eabi@npm:4.59.0": "2826ff51b8b07599cd7c2e7d2fe2e7c2e3af86fcfeadf632ca9d3f27d016b7dad5942644affabde024d1b27c279b94dcf9a6ae4c45863c7305bd58471dc1a94e",
"@rollup/rollup-android-arm64@npm:4.59.0": "b2a578f38602c9db45e262a9d5aacd19816e141dcb6d710e6353b70a02f5e933c4e4e46da9ecfcadb8bfc1daf4fe231f441f4c4fa069a8eaf38a5ac6f3a0462d",
"@rollup/rollup-darwin-arm64@npm:4.59.0": "3cc95b3da303d2a7a57a98fe560e257cd145fc94a89db4a98af89ac1fa84b6885af940433b3d32269c261da6bd11e083f0388048e8b9724606e6e3515538cfb3",
"@rollup/rollup-darwin-x64@npm:4.59.0": "0f77763272fe9cbd8962d8a3231aee1b3d86c61b9550f1820159e5201d3faef3cc2d7f0863d55be5495b92a39faf5063637227698388773d1584c6034934edbd",
"@rollup/rollup-freebsd-arm64@npm:4.59.0": "51775730151716411b33649e556a74a2a46a5ca727ad1d31e8b5df7fbf7d791268061ca0a495b36c8f89860250d7593e3fbcf3a2a67c4cdac19fc49250b3f59c",
"@rollup/rollup-freebsd-x64@npm:4.59.0": "d4cb336a08634b2107217e276423a95fde1b7bfee45fe8963cf366f6f6db991484a4a4f01efae7bfd86de416f21f967c2252ea79f780e52bfaa4a63263cede63",
"@rollup/rollup-linux-arm-gnueabihf@npm:4.59.0": "f69c727132578aa389e8726521e29e8ebf0ff52c6a64b9a1963d50990bce3f8ff90a452d69fd3c27c86bd5afe7281c011118a538108e9e62578c13223896abbf",
"@rollup/rollup-linux-arm-musleabihf@npm:4.59.0": "35f8eb802ffc4a29bdf62d8b862d67058db8f9514ea5c511679c5cf2e2d7b1d27b120784873862a6b131cac50df660f1c8e9c72f5b7d1f10550672315e0a24b9",
"@rollup/rollup-linux-arm64-gnu@npm:4.59.0": "028f9caabc51ee7256c6f6ba1af54eef0cb7360bc845d49bea12fd59ca0dedc357aa847922f190b9c3be268373703e808d5135c50293b45f04dd912bc5a862da",
"@rollup/rollup-linux-arm64-musl@npm:4.59.0": "776dd1c831b89e87f6f0a0286d8ca8f78e9f2a5f3181f9b1b4faba3be5a6e5670533dd54d960c48cb1014edee443ff27f347eb602e69d95983d957e197f8f92c",
"@rollup/rollup-linux-loong64-gnu@npm:4.59.0": "0a5f62209161ed05d730a9a4e8d9d705dec17aefe1d69050f4158ed41377cb2554e9a2b6765e48352739c7212b920fd803db00836222a618184ce930afa85256",
"@rollup/rollup-linux-loong64-musl@npm:4.59.0": "f09230ee8be94149ee57380f2e968d622601c18b922bf40470c296d04b5c161caa8e9cf84e14f72a4d253447d916ef7ae2d9b6b81f48d105117cc6430d6a357d",
"@rollup/rollup-linux-ppc64-gnu@npm:4.59.0": "447c223d4abcafe628546ad41fe28c676d9d06604cb41f3cbb1082113a79c46489117a52a0c8070519c6e62e463e41ee5b23f276576537164f2b85413730d6db",
"@rollup/rollup-linux-ppc64-musl@npm:4.59.0": "58d5e4fa5f84a19529e454e23dde39436ae73f025c69de454b5cb5e0b4a66c327e86e69a5812e9dc629c17cb5f4e218a57514170f12ac70beed1db7785e98273",
"@rollup/rollup-linux-riscv64-gnu@npm:4.59.0": "4604f76606c4b86ae01f92adddea6cb993bbd819ae4a5a4efdb1aa4eea2bfae25290bdd35bbb1683f87666d99122c62fb41a217a09b19ba8acc28e901cdda20e",
"@rollup/rollup-linux-riscv64-musl@npm:4.59.0": "e76794d08db7938f40521ce44e1e4da38bcf516da6a0b9c2c5fc7b08cddb36372103d854af4eef9d8529401aa814eb143f8d69b10cfa4b633bb69edbe39a5a34",
"@rollup/rollup-linux-s390x-gnu@npm:4.59.0": "64a101f176a7b29c352d2c51fae1331f457fbc7cc4181151a9d57498ee230c29d444a9c3e470169082a209c9d63366f808c911a0afd8e06dd83e8164214bd875",
"@rollup/rollup-linux-x64-gnu@npm:4.59.0": "9933d8f44c8b873ff2a1c03c35ea00abc924ec7a1e232bb37e023bb4f245dfd8050d1ad452efe5addc00f15900bcd04fab4f62cab47d3a6a3123224bd3d49879",
"@rollup/rollup-linux-x64-musl@npm:4.59.0": "328a20267480eeb8dd724f2356f79fa400e1383f90827b7c64c5121a53ccc93c228ee9a3646f7510616fba9cb5d34a1b7ce18999ee50602399947770a40cb3e0",
"@rollup/rollup-openbsd-x64@npm:4.59.0": "f54636cc4745ce1c0ad31ccdd6201187518252d05d4f0b173c54511925ddf2e7bc6ceb0265e668bc881f44f45061638f3a84183f0787ade03bdd4437595af03e",
"@rollup/rollup-openharmony-arm64@npm:4.59.0": "60aceb22385cfc660ae4b0f746d6f2b336438f3c4e784f8714883e10ec3d7a94adff151df9dbd1fdb255576f06530435038cd2538877ed684ca2856e5569132b",
"@rollup/rollup-win32-arm64-msvc@npm:4.59.0": "ff8862260fce025b2a8be2c7f19ae82a4dd29e3787f221672b21c699df7bbe3c63b8372647852df9dda2f3fa1a553c3a5fdccb17ddaf3a84566e59f8d3295118",
"@rollup/rollup-win32-ia32-msvc@npm:4.59.0": "e63244f7566e663de6b6e9d2e3bbcb23bb46b3aacbd4965d3798e709f039e99035577fa0af30d075f43139a8f83738ebcbb91faae534570fcdc4fb3776c87955",
"@rollup/rollup-win32-x64-gnu@npm:4.59.0": "5a2728d880c990bf1c6ba2821deae0bab40471fa5e6a5c2dad192a3810137b76fffe24e1b4aabad67aabfdc1e510fd141f43c00cf9a87dab8b1da4f521606148",
"@rollup/rollup-win32-x64-msvc@npm:4.59.0": "e7da947539bb2a0c6c9061f9c62ec67a928fe579563e17f302dc2035a0c38439c7b835b894143a278114298ab636241b6f1b23d61d95c7d1a6488439b68454b7",
"@tauri-apps/cli-darwin-arm64@npm:2.10.1": "1a65173ed084df4c346146db2b0f35ef48bd5f808c08c4f07ae180798bcb8a561e0d980204686b58856841789e589f3bf24c638404b167ccb758f88ab971347f",
"@tauri-apps/cli-darwin-x64@npm:2.10.1": "fd9ab35b96156be977a7eb15a7ff7722e05e22c43c6a22b590180953e0efa47008cab9ae52a1a6c1a20082c668bd41af23ec7515bd2134937cb6676faa0c6a47",
"@tauri-apps/cli-linux-arm-gnueabihf@npm:2.10.1": "3fd77920905de754f74afad803105bd3c31a32dee7ff1ac91248aba11bc233c6bdc8e2b2b65d1113b74c5d379889d8dee4646d6471ff508e8cee8afc1c1d298a",
"@tauri-apps/cli-linux-arm64-gnu@npm:2.10.1": "3cede1e8e068f0c0f36a6b3d29c0346506e7ebf6c3ccaaeb9104f37338cd3ceeecee66969e11090e3a89b08ea82a166409135efceee882900b55d9f62342d16b",
"@tauri-apps/cli-linux-arm64-musl@npm:2.10.1": "73b2d41bdb5bb8b3259e213a80f1879907cb008c040bb30b90852372fd0585f438178955f324640b91a1006180a539b5d06065f45475af69294d2732edfb1234",
"@tauri-apps/cli-linux-riscv64-gnu@npm:2.10.1": "002bdeb8fddbe7406d1b7e46c325a4e5bde6e4e0c5cc471e8e12e72fec2e66c992166d2a1a59ff9b0c111c99f3b5c7b66635cf55f85daa43c96d644b394834db",
"@tauri-apps/cli-linux-x64-gnu@npm:2.10.1": "9203b880f26651242a0403796e1e93b1bdaffec0653628438b18634f90709990fc48ffcb47602e9b976caf94debb69cf9c8e87d11270b182651a7e45740855d6",
"@tauri-apps/cli-linux-x64-musl@npm:2.10.1": "21783cb130c1625740b9247d1c49db65ba9948b959864bba677e1036821c71006a25d691fecb30362c45c08ae422567c65311158dd56e24bda515f90cb1b0c98",
"@tauri-apps/cli-win32-arm64-msvc@npm:2.10.1": "874e2a314178a6d785ef733686e99d3de2deab49354782dc846accfe53422a8016f81d523179091d81a00b32152df1705d66cd3108a9aa596aa98758aaca1841",
"@tauri-apps/cli-win32-ia32-msvc@npm:2.10.1": "565c4a94127d7e47cfea481337230f4e98f9b42ba548046a9ebe464f4cd6ac6083a20a619011e31aa70508c1bce9cd31cebc8f477a696cc6c3db346b8bad06f6",
"@tauri-apps/cli-win32-x64-msvc@npm:2.10.1": "eb80c16f1672cc404d9217943047f1d26790d393c51de3002674657afdf96c4d34f75e7d9ba9e74a1492b31bccbf051c67d0ddf7a3277b5a317abf71474725e6"
}
+30 -40
View File
@@ -3,61 +3,51 @@
stdenv,
fetchFromGitHub,
fetchYarnDeps,
yarn-berry_4,
cargo,
cargo-tauri_1,
cargo-tauri,
cmake,
jq,
moreutils,
nodejs-slim,
pkg-config,
rustc,
rustPlatform,
yarnConfigHook,
webkitgtk_4_1,
cyrus_sasl,
freetype,
libsoup_2_4,
libsoup_3,
openssl,
curl,
nix-update-script,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "insulator2";
version = "2.13.2";
version = "2.14.0";
src = fetchFromGitHub {
owner = "andrewinci";
repo = "insulator2";
rev = "v${version}";
hash = "sha256-34JRIB7/x7miReWOxR/m+atjfUiE3XGyh9OBSbMg3m4=";
rev = "v${finalAttrs.version}";
hash = "sha256-3eDA+pwchnwWtweGeSDlf+Vt0Hoylmanf4hnvJ2YOGU=";
};
patches = [
# see: https://github.com/andrewinci/insulator2/pull/733
./fix-rust-1.80.0.patch
];
# Yarn *really* wants us to use corepack if this is set
postPatch = ''
jq 'del(.packageManager)' package.json | sponge package.json
'';
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-5wOgVrcHJVF07QpnN52d4VWEM3FKw3NdLrZ1goAP2oI=";
missingHashes = ./missing-hashes.json;
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
inherit (finalAttrs) src missingHashes;
hash = "sha256-3BgvOoGMY86xzSHf6S0265PYOPEgLv77nT6CO9IGdwc=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"apache-avro-0.16.0" = "sha256-v4TeJEhLEqQUgj+EHgFRVUGoLC+SpOUhAXngMP7R7nM=";
"rust-keystore-0.1.1" = "sha256-Cj64uJFZNxnrplhRuqf9/HK/RAaawzfYHo/J9snZ+TU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
sourceRoot = finalAttrs.src.name + "/backend";
hash = "sha256-u5WFV7luvqSQQtEJFlN//GH6iNcQpH/o01ME1dPtOB4=";
};
cargoRoot = "backend/";
buildAndTestSubdir = cargoRoot;
buildAndTestSubdir = finalAttrs.cargoRoot;
strictDeps = true;
@@ -65,34 +55,34 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cargo
cargo-tauri_1.hook
cargo-tauri.hook
cmake
jq
moreutils # for sponge
nodejs-slim
pkg-config
rustc
rustPlatform.cargoSetupHook
yarnConfigHook
yarn-berry_4
yarn-berry_4.yarnBerryConfigHook
];
buildInputs = [
cyrus_sasl
freetype
libsoup_2_4
libsoup_3
openssl
# webkitgtk_4_0
webkitgtk_4_1
curl
];
env.OPENSSL_NO_VENDOR = 1;
passthru.updateScript = nix-update-script { };
meta = {
# webkitgtk_4_0 was removed
broken = true;
description = "Client UI to inspect Kafka topics, consume, produce and much more";
homepage = "https://github.com/andrewinci/insulator2";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ tc-kaluza ];
mainProgram = "insulator-2";
mainProgram = "insulator2";
};
}
})