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

This commit is contained in:
K900 2025-05-02 06:35:09 +03:00
commit 17cda7ed37
160 changed files with 2739 additions and 1538 deletions

View file

@ -179,6 +179,8 @@ let
xargs -I{} -P"$cores" \ xargs -I{} -P"$cores" \
${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir" ${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir"
cp -r "$chunkOutputDir"/stats $out/stats-by-chunk
if (( chunkSize * chunkCount != attrCount )); then if (( chunkSize * chunkCount != attrCount )); then
# A final incomplete chunk would mess up the stats, don't include it # A final incomplete chunk would mess up the stats, don't include it
rm "$chunkOutputDir"/stats/"$seq_end" rm "$chunkOutputDir"/stats/"$seq_end"
@ -253,6 +255,12 @@ let
done done
} | } |
jq -s from_entries > $out/stats.json jq -s from_entries > $out/stats.json
mkdir -p $out/stats
for d in ${resultsDir}/*; do
cp -r "$d"/stats-by-chunk $out/stats/$(basename "$d")
done
''; '';
compare = import ./compare { compare = import ./compare {

View file

@ -39,7 +39,7 @@ in
htpasswd-file = lib.mkOption { htpasswd-file = lib.mkOption {
default = null; default = null;
type = lib.types.nullOr lib.types.path; type = lib.types.nullOr lib.types.path;
description = "The path to the servers .htpasswd file. Defaults to {dataDir}/htpasswd."; description = "The path to the servers .htpasswd file. Defaults to `\${dataDir}/.htpasswd`.";
}; };
privateRepos = lib.mkOption { privateRepos = lib.mkOption {

View file

@ -68,6 +68,8 @@ in
options.services.mautrix-signal = { options.services.mautrix-signal = {
enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge"; enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge";
package = lib.mkPackageOption pkgs "mautrix-signal" { };
settings = lib.mkOption { settings = lib.mkOption {
apply = lib.recursiveUpdate defaultConfig; apply = lib.recursiveUpdate defaultConfig;
type = settingsFormat.type; type = settingsFormat.type;
@ -206,7 +208,7 @@ in
# generate the appservice's registration file if absent # generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then if [ ! -f '${registrationFile}' ]; then
${pkgs.mautrix-signal}/bin/mautrix-signal \ ${cfg.package}/bin/mautrix-signal \
--generate-registration \ --generate-registration \
--config='${settingsFile}' \ --config='${settingsFile}' \
--registration='${registrationFile}' --registration='${registrationFile}'
@ -234,7 +236,7 @@ in
StateDirectory = baseNameOf dataDir; StateDirectory = baseNameOf dataDir;
WorkingDirectory = dataDir; WorkingDirectory = dataDir;
ExecStart = '' ExecStart = ''
${pkgs.mautrix-signal}/bin/mautrix-signal \ ${cfg.package}/bin/mautrix-signal \
--config='${settingsFile}' \ --config='${settingsFile}' \
--registration='${registrationFile}' --registration='${registrationFile}'
''; '';

View file

@ -18,6 +18,8 @@ in
services.mautrix-telegram = { services.mautrix-telegram = {
enable = lib.mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge"; enable = lib.mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge";
package = lib.mkPackageOption pkgs "mautrix-telegram" { };
settings = lib.mkOption rec { settings = lib.mkOption rec {
apply = lib.recursiveUpdate default; apply = lib.recursiveUpdate default;
inherit (settingsFormat) type; inherit (settingsFormat) type;
@ -201,7 +203,7 @@ in
# generate the appservice's registration file if absent # generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then if [ ! -f '${registrationFile}' ]; then
${pkgs.mautrix-telegram}/bin/mautrix-telegram \ ${cfg.package}/bin/mautrix-telegram \
--generate-registration \ --generate-registration \
--config='${settingsFile}' \ --config='${settingsFile}' \
--registration='${registrationFile}' --registration='${registrationFile}'
@ -220,9 +222,9 @@ in
umask $old_umask umask $old_umask
'' ''
+ lib.optionalString (pkgs.mautrix-telegram ? alembic) '' + lib.optionalString (cfg.package ? alembic) ''
# run automatic database init and migration scripts # run automatic database init and migration scripts
${pkgs.mautrix-telegram.alembic}/bin/alembic -x config='${settingsFile}' upgrade head ${cfg.package.alembic}/bin/alembic -x config='${settingsFile}' upgrade head
''; '';
serviceConfig = { serviceConfig = {
@ -238,13 +240,13 @@ in
ProtectControlGroups = true; ProtectControlGroups = true;
PrivateTmp = true; PrivateTmp = true;
WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found WorkingDirectory = cfg.package; # necessary for the database migration scripts to be found
StateDirectory = baseNameOf dataDir; StateDirectory = baseNameOf dataDir;
UMask = "0027"; UMask = "0027";
EnvironmentFile = cfg.environmentFile; EnvironmentFile = cfg.environmentFile;
ExecStart = '' ExecStart = ''
${pkgs.mautrix-telegram}/bin/mautrix-telegram \ ${cfg.package}/bin/mautrix-telegram \
--config='${settingsFile}' --config='${settingsFile}'
''; '';
}; };

View file

@ -51,6 +51,8 @@ in
options.services.mautrix-whatsapp = { options.services.mautrix-whatsapp = {
enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp"; enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp";
package = lib.mkPackageOption pkgs "mautrix-whatsapp" { };
settings = lib.mkOption { settings = lib.mkOption {
type = settingsFormat.type; type = settingsFormat.type;
default = defaultConfig; default = defaultConfig;
@ -168,7 +170,7 @@ in
# generate the appservice's registration file if absent # generate the appservice's registration file if absent
if [ ! -f '${registrationFile}' ]; then if [ ! -f '${registrationFile}' ]; then
${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ ${cfg.package}/bin/mautrix-whatsapp \
--generate-registration \ --generate-registration \
--config='${settingsFile}' \ --config='${settingsFile}' \
--registration='${registrationFile}' --registration='${registrationFile}'
@ -196,7 +198,7 @@ in
StateDirectory = baseNameOf dataDir; StateDirectory = baseNameOf dataDir;
WorkingDirectory = dataDir; WorkingDirectory = dataDir;
ExecStart = '' ExecStart = ''
${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ ${cfg.package}/bin/mautrix-whatsapp \
--config='${settingsFile}' \ --config='${settingsFile}' \
--registration='${registrationFile}' --registration='${registrationFile}'
''; '';

View file

@ -206,11 +206,6 @@ in
assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null; assertion = cfg.cache.lru.schedule == null || cfg.cache.maxSize != null;
message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set"; message = "You must specify config.ncps.cache.lru.schedule when config.ncps.cache.maxSize is set";
} }
{
assertion = cfg.cache.secretKeyPath == null || (builtins.pathExists cfg.cache.secretKeyPath);
message = "config.ncps.cache.secresecretKeyPath=${cfg.cache.secretKeyPath} must exist but does not";
}
]; ];
users.users.ncps = { users.users.ncps = {
@ -245,7 +240,8 @@ in
systemd.services.ncps = { systemd.services.ncps = {
description = "ncps binary cache proxy service"; description = "ncps binary cache proxy service";
after = [ "network.target" ]; after = [ "network-online.target" ];
wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''

View file

@ -10,15 +10,16 @@
tk, tk,
fftw, fftw,
portaudio, portaudio,
portmidi,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "puredata"; pname = "puredata";
version = "0.54-1"; version = "0.55-2";
src = fetchurl { src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI="; hash = "sha256-EIKX+NHdGQ346LtKSsNIeSrM9wT5ogUtk8uoybi7Wls=";
}; };
patches = [ patches = [
@ -41,12 +42,12 @@ stdenv.mkDerivation rec {
alsa-lib alsa-lib
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
portmidi
portaudio portaudio
]; ];
configureFlags = configureFlags =
[ [
"--enable-universal"
"--enable-fftw" "--enable-fftw"
"--enable-jack" "--enable-jack"
] ]
@ -55,7 +56,9 @@ stdenv.mkDerivation rec {
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
"--enable-portaudio" "--enable-portaudio"
"--enable-portmidi"
"--without-local-portaudio" "--without-local-portaudio"
"--without-local-portmidi"
"--disable-jack-framework" "--disable-jack-framework"
"--with-wish=${tk}/bin/wish8.6" "--with-wish=${tk}/bin/wish8.6"
]; ];

View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitLab, fetchFromGitLab,
fetchpatch,
fftw, fftw,
liblo, liblo,
libsndfile, libsndfile,
@ -23,6 +24,14 @@ stdenv.mkDerivation rec {
hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4="; hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4=";
}; };
patches = [
# Fixes build with recent liblo, see https://gitlab.com/then-try-this/samplebrain/-/merge_requests/16
(fetchpatch {
url = "https://gitlab.com/then-try-this/samplebrain/-/commit/032fd7c03931d1ca2d5c3d5e29901569aa2b2a86.patch";
hash = "sha256-aaZJh/vx8fOqrJTuFzQ9+1mXvDQQXLy1k/2SwkMkVk4=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
qmake qmake
wrapQtAppsHook wrapQtAppsHook

View file

@ -28,13 +28,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tiled"; pname = "tiled";
version = "1.11.2"; version = "1.11.90";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mapeditor"; owner = "mapeditor";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -152,7 +152,10 @@ in
# Set to `!privacySupport` or `false`. # Set to `!privacySupport` or `false`.
crashreporterSupport ? crashreporterSupport ?
!privacySupport && !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isMusl, !privacySupport
&& !stdenv.hostPlatform.isLoongArch64
&& !stdenv.hostPlatform.isRiscV
&& !stdenv.hostPlatform.isMusl,
curl, curl,
geolocationSupport ? !privacySupport, geolocationSupport ? !privacySupport,
webrtcSupport ? !privacySupport, webrtcSupport ? !privacySupport,

View file

@ -21,13 +21,13 @@
mkDerivation rec { mkDerivation rec {
pname = "anilibria-winmaclinux"; pname = "anilibria-winmaclinux";
version = "2.2.26"; version = "2.2.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anilibria"; owner = "anilibria";
repo = "anilibria-winmaclinux"; repo = "anilibria-winmaclinux";
rev = version; rev = version;
hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4="; hash = "sha256-wu4kJCs1Bo6yVGLJuzXSCtv2nXhzlwX6jDTa0gTwPsw=";
}; };
sourceRoot = "${src.name}/src"; sourceRoot = "${src.name}/src";

View file

@ -7,14 +7,14 @@
}: }:
buildLua (finalAttrs: { buildLua (finalAttrs: {
pname = "modernz"; pname = "modernz";
version = "0.2.7"; version = "0.2.8";
scriptPath = "modernz.lua"; scriptPath = "modernz.lua";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Samillion"; owner = "Samillion";
repo = "ModernZ"; repo = "ModernZ";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-BMxwQa+G8FiTl3qpoFxz1czZH1UweTYPwN9tDluQFBo="; hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg=";
}; };
postInstall = '' postInstall = ''

View file

@ -74,9 +74,9 @@ let
buildType = "release"; buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or # Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually. # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
virtualboxVersion = "7.1.6"; virtualboxVersion = "7.1.8";
virtualboxSubVersion = "a"; virtualboxSubVersion = "";
virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
kvmPatchVersion = "20250207"; kvmPatchVersion = "20250207";
kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y="; kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y=";
@ -249,8 +249,8 @@ stdenv.mkDerivation (finalAttrs: {
++ optional enableKvm ( ++ optional enableKvm (
let let
patchVboxVersion = patchVboxVersion =
# There is no updated patch for 7.0.22 yet, but the older one still applies. # There is no updated patch for 7.1.8 yet, but the older one still applies.
if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion; if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion;
in in
fetchpatch { fetchpatch {
name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch";

View file

@ -4,7 +4,7 @@
virtualbox, virtualbox,
}: }:
let let
virtualboxExtPackVersion = "7.1.6"; virtualboxExtPackVersion = "7.1.8";
in in
fetchurl rec { fetchurl rec {
name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@ -14,7 +14,7 @@ fetchurl rec {
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let let
value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b"; value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37";
in in
assert (builtins.stringLength value) == 64; assert (builtins.stringLength value) == 64;
value; value;

View file

@ -5,7 +5,7 @@
}: }:
fetchurl { fetchurl {
url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc"; sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0";
meta = { meta = {
description = "Guest additions ISO for VirtualBox"; description = "Guest additions ISO for VirtualBox";
longDescription = '' longDescription = ''

View file

@ -12,9 +12,9 @@
libX11, libX11,
}: }:
let let
virtualboxVersion = "7.1.6"; virtualboxVersion = "7.1.8";
virtualboxSubVersion = "a"; virtualboxSubVersion = "";
virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d";
virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix {
inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; inherit virtualboxVersion virtualboxSubVersion virtualboxSha256;

View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
telegram-desktop, telegram-desktop,
withWebkit ? true, withWebkit ? true,
}: }:
@ -21,6 +22,16 @@ telegram-desktop.override {
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
(fetchpatch {
# https://github.com/desktop-app/lib_base/pull/268
url = "https://github.com/desktop-app/lib_base/commit/c952da37294b958e896b27528e7834f0892faa0a.patch";
extraPrefix = "Telegram/lib_base/";
stripLen = 1;
hash = "sha256-xiq8WLAiSZwpvdyK5JbRAdQ9us93+9oMmeMBqVb1TbI=";
})
];
cmakeFlags = (old.cmakeFlags or [ ]) ++ [ cmakeFlags = (old.cmakeFlags or [ ]) ++ [
(lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)
]; ];

View file

@ -71,9 +71,12 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AOMediaCodec"; owner = "AOMediaCodec";
repo = "libavif"; repo = "libavif";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs=";
}; };
patches = [ ];
doCheck = false;
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {

View file

@ -1,18 +0,0 @@
diff --git a/src/arma3-unix-launcher/main.cpp b/src/arma3-unix-launcher/main.cpp
index 10f6ed9..c706734 100644
--- a/src/arma3-unix-launcher/main.cpp
+++ b/src/arma3-unix-launcher/main.cpp
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])
- MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));
+ MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));
w.show();
diff --git a/src/dayz-linux-launcher/main.cpp b/src/dayz-linux-launcher/main.cpp
index f30bf8a..e0cef66 100644
--- a/src/dayz-linux-launcher/main.cpp
+++ b/src/dayz-linux-launcher/main.cpp
@@ -216,3 +216,3 @@ int main(int argc, char *argv[])
- MainWindow w(std::move(client), config_file, parser.get<bool>("--disable-steam-integration"));
+ MainWindow w(std::move(client), config_file, !parser.get<bool>("--disable-steam-integration"));
w.show();

View file

@ -1,8 +1,8 @@
diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake
index 2eb6ec5..9f1d67e 100644 index 76648b2..145e978 100644
--- a/cmake/external_dependencies.cmake --- a/cmake/external_dependencies.cmake
+++ b/cmake/external_dependencies.cmake +++ b/cmake/external_dependencies.cmake
@@ -4,7 +4,7 @@ include(FetchContent) @@ -3,7 +3,7 @@ include(FetchContent)
function(setup_library SOURCE_TO_TEST) function(setup_library SOURCE_TO_TEST)
set(boolArgs HEADER_ONLY) set(boolArgs HEADER_ONLY)
@ -11,7 +11,7 @@ index 2eb6ec5..9f1d67e 100644
set(multiValueArgs WHEN) set(multiValueArgs WHEN)
cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -27,12 +27,11 @@ function(setup_library SOURCE_TO_TEST) @@ -26,12 +26,11 @@ function(setup_library SOURCE_TO_TEST)
endif() endif()
FetchContent_Declare(${LIB_SETUP_NAME} FetchContent_Declare(${LIB_SETUP_NAME}
@ -26,7 +26,7 @@ index 2eb6ec5..9f1d67e 100644
FetchContent_Populate(${LIB_SETUP_NAME}) FetchContent_Populate(${LIB_SETUP_NAME})
set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_DIR") set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_DIR")
set(BINDIR "${LIB_SETUP_NAME}_BINARY_DIR") set(BINDIR "${LIB_SETUP_NAME}_BINARY_DIR")
@@ -51,8 +50,7 @@ function(setup_argparse) @@ -50,8 +49,7 @@ function(setup_argparse)
}") }")
setup_library("${CHECK_SOURCE}" setup_library("${CHECK_SOURCE}"
NAME argparse NAME argparse
@ -36,7 +36,7 @@ index 2eb6ec5..9f1d67e 100644
HEADER_ONLY HEADER_ONLY
) )
if (NOT TARGET argparse::argparse) if (NOT TARGET argparse::argparse)
@@ -64,7 +62,7 @@ function(setup_curlpp) @@ -63,7 +61,7 @@ function(setup_curlpp)
set(CHECK_SOURCE "#error unimplemented}") set(CHECK_SOURCE "#error unimplemented}")
setup_library("${CHECK_SOURCE}" setup_library("${CHECK_SOURCE}"
NAME curlpp NAME curlpp

View file

@ -11,18 +11,19 @@
nlohmann_json, nlohmann_json,
qt5, qt5,
spdlog, spdlog,
steam-run,
replaceVars, replaceVars,
buildDayZLauncher ? false, buildDayZLauncher ? false,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "arma3-unix-launcher"; pname = "arma3-unix-launcher";
version = "413-unstable-2025-02-10"; version = "420";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "muttleyxd"; owner = "muttleyxd";
repo = "arma3-unix-launcher"; repo = "arma3-unix-launcher";
rev = "7d4bcb166da3bb64ef10af421619d0b00136ebd5"; tag = "commit-${finalAttrs.version}";
hash = "sha256-so7fjxESUAkQfO4hO5aQTzU5lHpeJlOOfEGp0Pb89sQ="; hash = "sha256-QY3zDtfZt2ifF69Jzp0Ls1SpDCliKdkwLaGFXneT79o=";
}; };
patches = [ patches = [
@ -52,8 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
doctest_src = null; doctest_src = null;
trompeloeil_src = null; trompeloeil_src = null;
}) })
# game won't launch with steam integration anyways, disable it
./disable_steam_integration.patch # use steam-run when running the game directly
(replaceVars ./steam-run.patch {
steamRun = lib.getExe steam-run;
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,35 @@
diff --git a/src/arma3-unix-launcher-library/arma3client.cpp b/src/arma3-unix-launcher-library/arma3client.cpp
index dbb17d0..ee8853c 100644
--- a/src/arma3-unix-launcher-library/arma3client.cpp
+++ b/src/arma3-unix-launcher-library/arma3client.cpp
@@ -63,7 +63,7 @@ namespace
disable_esync);
if (!is_proton)
{
- StdUtils::StartBackgroundProcess(fmt::format("env {} {} {}", user_environment_variables, executable_path, arguments),
+ StdUtils::StartBackgroundProcess(fmt::format("@steamRun@ env {} {} {}", user_environment_variables, executable_path, arguments),
arma_path.string());
return;
}
@@ -83,7 +83,7 @@ namespace
auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env",
get_esync_prefix(disable_esync), arma3_id, ld_preload_path, steam_compat_data_path.string());
- auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
+ auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
optional_steam_runtime(steam_utils), compatibility_tool.first,
get_verb(compatibility_tool.second), executable_path.string(), arguments);
spdlog::info("Running Arma:\n{}\n", command);
diff --git a/src/dayz-linux-launcher-library/dayzclient.cpp b/src/dayz-linux-launcher-library/dayzclient.cpp
index 5fc9027..d2b9e92 100644
--- a/src/dayz-linux-launcher-library/dayzclient.cpp
+++ b/src/dayz-linux-launcher-library/dayzclient.cpp
@@ -76,7 +76,7 @@ namespace
auto const environment = fmt::format(R"env({} SteamGameId={} LD_PRELOAD={} STEAM_COMPAT_DATA_PATH="{}")env",
get_esync_prefix(disable_esync), dayz_id, ld_preload_path, steam_compat_data_path.string());
- auto const command = fmt::format(R"command(env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
+ auto const command = fmt::format(R"command(@steamRun@ env {} {} {} {} {} "{}" {})command", environment, user_environment_variables,
optional_steam_runtime(steam_utils), compatibility_tool.first,
get_verb(compatibility_tool.second), executable_path.string(), arguments);
spdlog::info("Running DayZ:\n{}\n", command);

View file

@ -2,27 +2,30 @@
lib, lib,
buildGoModule, buildGoModule,
fetchFromGitHub, fetchFromGitHub,
terraform,
}: }:
buildGoModule rec { buildGoModule (finalAttrs: {
pname = "atmos"; pname = "atmos";
version = "1.95.0"; version = "1.171.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cloudposse"; owner = "cloudposse";
repo = pname; repo = "atmos";
rev = "v${version}"; tag = "v${finalAttrs.version}";
sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas="; hash = "sha256-4A/sSJhF9syK1Z3HhBy8fXzdXBfAoofwQ+WLYeH1cvw=";
}; };
vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo="; vendorHash = "sha256-JN6S1ncElUnZ9XEKEsgfYKXWZQpxogf9imopLeXX3ao=";
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X github.com/cloudposse/atmos/cmd.Version=v${version}" "-X github.com/cloudposse/atmos/cmd.Version=v${finalAttrs.version}"
]; ];
nativeCheckInputs = [ terraform ];
preCheck = '' preCheck = ''
# Remove tests that depend on a network connection. # Remove tests that depend on a network connection.
rm -f \ rm -f \
@ -31,21 +34,26 @@ buildGoModule rec {
pkg/describe/describe_affected_test.go pkg/describe/describe_affected_test.go
''; '';
doCheck = true; # depend on a network connection.
doCheck = false;
# depend on a network connection.
doInstallCheck = false;
doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
runHook preInstallCheck runHook preInstallCheck
$out/bin/atmos version | grep "v${version}"
$out/bin/atmos version | grep "v${finalAttrs.version}"
runHook postInstallCheck runHook postInstallCheck
''; '';
meta = with lib; { meta = {
homepage = "https://atmos.tools"; homepage = "https://atmos.tools";
changelog = "https://github.com/cloudposse/atmos/releases/tag/v${version}"; changelog = "https://github.com/cloudposse/atmos/releases/tag/v${finalAttrs.version}";
description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)";
mainProgram = "atmos"; mainProgram = "atmos";
license = licenses.asl20; license = lib.licenses.asl20;
teams = [ teams.cloudposse ]; teams = [ lib.teams.cloudposse ];
}; };
} })

View file

@ -2,33 +2,29 @@
stdenv, stdenv,
lib, lib,
fetchFromGitHub, fetchFromGitHub,
cmake,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "backward"; pname = "backward";
version = "1.6"; version = "1.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bombela"; owner = "bombela";
repo = "backward-cpp"; repo = "backward-cpp";
rev = "v${version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw="; sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw=";
}; };
installPhase = '' nativeBuildInputs = [
runHook preInstall cmake
];
mkdir -p $out/include meta = {
cp backward.hpp $out/include
runHook postInstall
'';
meta = with lib; {
description = "Beautiful stack trace pretty printer for C++"; description = "Beautiful stack trace pretty printer for C++";
homepage = "https://github.com/bombela/backward-cpp"; homepage = "https://github.com/bombela/backward-cpp";
license = licenses.mit; license = lib.licenses.mit;
platforms = platforms.all; platforms = lib.platforms.all;
maintainers = [ ]; maintainers = with lib.maintainers; [ ];
}; };
} })

View file

@ -1,31 +1,33 @@
{ {
lib,
stdenv,
fetchurl,
autoPatchelfHook, autoPatchelfHook,
wrapGAppsHook3,
cairo, cairo,
e2fsprogs, e2fsprogs,
fetchurl,
gmp, gmp,
gtk3, gtk3,
libGL, libGL,
libX11, libX11,
lib,
stdenv,
libgcrypt, libgcrypt,
wrapGAppsHook3,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = "banana-accounting"; pname = "banana-accounting";
version = "10.0.12"; version = "10.1.24";
srcs = fetchurl { srcs = fetchurl {
url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; url = "https://web.archive.org/web/20250416013207/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz";
hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw="; hash = "sha256-5GewPGOCyeS6faL8aMUZ/JDUUn2PGuur0ws/7nlNX6M=";
}; };
sourceRoot = "."; sourceRoot = ".";
dontConfigure = true; nativeBuildInputs = [
dontBuild = true; autoPatchelfHook
wrapGAppsHook3
];
buildInputs = [ buildInputs = [
cairo cairo
@ -38,25 +40,28 @@ stdenv.mkDerivation {
libgcrypt libgcrypt
]; ];
nativeBuildInputs = [ dontConfigure = true;
autoPatchelfHook
wrapGAppsHook3 dontBuild = true;
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/bin
mv ./* $out mkdir -p $out/opt $out/bin $out/share
ln -s $out/usr/bin/bananaplus $out/bin/ cp -r . $out/opt/banana-accounting
ln -s $out/opt/banana-accounting/usr/bin/bananaplus $out/bin/bananaplus
ln -s $out/opt/banana-accounting/usr/share/applications $out/share/applications
ln -s $out/opt/banana-accounting/usr/share/icons $out/share/icons
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = {
description = "Accounting Software for small companies, associations and individuals"; description = "Accounting Software for small companies, associations and individuals";
homepage = "https://www.banana.ch/"; homepage = "https://www.banana.ch";
license = licenses.unfree; license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ jacg ]; maintainers = with lib.maintainers; [ jacg ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
}; };
} })

View file

@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "barman"; pname = "barman";
version = "3.11.1"; version = "3.13.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EnterpriseDB"; owner = "EnterpriseDB";
repo = "barman"; repo = "barman";
tag = "release/${version}"; tag = "release/${version}";
hash = "sha256-X39XOv8HJdSjMjMMnmB7Gxjseg5k/LuKICTxapcHVsU="; hash = "sha256-CfzDO4u6JL4cLHvs7f1oQqQPc+j1lKng4J9wIBswIpA=";
}; };
patches = [ ./unwrap-subprocess.patch ]; patches = [ ./unwrap-subprocess.patch ];
@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec {
mock mock
pytestCheckHook pytestCheckHook
versionCheckHook versionCheckHook
zstandard
lz4
]; ];
disabledTests = disabledTests =
@ -57,13 +59,13 @@ python3Packages.buildPythonApplication rec {
"test_get_file_mode" "test_get_file_mode"
]; ];
meta = with lib; { meta = {
description = "Backup and Recovery Manager for PostgreSQL"; description = "Backup and Recovery Manager for PostgreSQL";
homepage = "https://www.pgbarman.org/"; homepage = "https://www.pgbarman.org/";
changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS"; changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";
mainProgram = "barman"; mainProgram = "barman";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ freezeboy ]; maintainers = with lib.maintainers; [ freezeboy ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -34,13 +34,13 @@ let
in in
buildNpmPackage' rec { buildNpmPackage' rec {
pname = "bitwarden-desktop"; pname = "bitwarden-desktop";
version = "2025.2.0"; version = "2025.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitwarden"; owner = "bitwarden";
repo = "clients"; repo = "clients";
rev = "desktop-v${version}"; rev = "desktop-v${version}";
hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8="; hash = "sha256-nwm9ENTB1V+koUA3M8XR8DegmPHwYoszYlWbcxA6aXY=";
}; };
patches = [ patches = [
@ -76,7 +76,7 @@ buildNpmPackage' rec {
"--ignore-scripts" "--ignore-scripts"
]; ];
npmWorkspace = "apps/desktop"; npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs="; npmDepsHash = "sha256-PjlTGR+e8uDe9KKEvW7cq/wYHRBO16Cf3oHh37YcNFc=";
cargoDeps = rustPlatform.fetchCargoVendor { cargoDeps = rustPlatform.fetchCargoVendor {
inherit inherit
@ -86,7 +86,7 @@ buildNpmPackage' rec {
cargoRoot cargoRoot
patches patches
; ;
hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc="; hash = "sha256-zIzgVvtTUIPKeOG/v9/7ugIIAVhoMjQ8QJ0Cbj9uZsQ=";
}; };
cargoRoot = "apps/desktop/desktop_native"; cargoRoot = "apps/desktop/desktop_native";
@ -222,7 +222,6 @@ buildNpmPackage' rec {
passthru = { passthru = {
updateScript = nix-update-script { updateScript = nix-update-script {
extraArgs = [ extraArgs = [
"--commit"
"--version=stable" "--version=stable"
"--version-regex=^desktop-v(.*)$" "--version-regex=^desktop-v(.*)$"
]; ];

View file

@ -7,8 +7,10 @@
meson, meson,
ninja, ninja,
python3, python3,
runCommand,
stdenv, stdenv,
testers, testers,
wrapGAppsNoGuiHook,
xvfb-run, xvfb-run,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
wrapGAppsNoGuiHook
]; ];
buildInputs = [ buildInputs = [
@ -64,9 +67,18 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck runHook postCheck
''; '';
passthru.tests.version = testers.testVersion { passthru.tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage; package = finalAttrs.finalPackage;
}; };
# regression test that `blueprint-compiler` can be used in a standalone
# context outside of nix builds, and doesn't rely on the setup hooks of
# its propagated inputs for basic functionality.
# see https://github.com/NixOS/nixpkgs/pull/400415
standalone = runCommand "blueprint-compiler-test-standalone" { } ''
${lib.getExe finalAttrs.finalPackage} --help && touch $out
'';
};
meta = with lib; { meta = with lib; {
description = "Markup language for GTK user interface files"; description = "Markup language for GTK user interface files";

View file

@ -15,22 +15,28 @@
pkg-config, pkg-config,
readline, readline,
sbc, sbc,
python3,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bluez-alsa"; pname = "bluez-alsa";
version = "4.1.1"; version = "4.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Arkq"; owner = "Arkq";
repo = "bluez-alsa"; repo = "bluez-alsa";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; hash = "sha256-Vebxyku7xl/ReU025iThEbvfHsi4kCbvFqlBGDWrHxc=";
}; };
postPatch = ''
patchShebangs src/dbus-codegen.py
'';
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkg-config pkg-config
python3
]; ];
buildInputs = buildInputs =

View file

@ -2,7 +2,6 @@
lib, lib,
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
pkg-config, pkg-config,
bzip2, bzip2,
openssl, openssl,
@ -11,26 +10,18 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "boa"; pname = "boa";
version = "0.17.3"; version = "0.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boa-dev"; owner = "boa-dev";
repo = "boa"; repo = "boa";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg="; hash = "sha256-foCIzzFoEpcE6i0QrSbiob3YHIOeTpjwpAMtcPGL8Vg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
(fetchpatch {
name = "fix-rust-1.71-lints.patch";
url = "https://github.com/boa-dev/boa/commit/93d05bda6864aa6ee67682d84bd4fc2108093ef5.patch";
hash = "sha256-hMp4/UBN5moGBSqf8BJV2nBwgV3cry9uC2fJmdT5hkQ=";
})
];
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4="; cargoHash = "sha256-PphgRSVCj724eYAC04Orpz/klYuAhphiQ3v5TRChs+w=";
cargoBuildFlags = [ cargoBuildFlags = [
"--package" "--package"

View file

@ -1,287 +0,0 @@
From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 23 Sep 2024 15:11:09 +0800
Subject: [PATCH] update time
---
Cargo.lock | 87 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 56 insertions(+), 31 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index be4fbeb..42f29b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -809,6 +809,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
[[package]]
name = "derivative"
version = "2.2.0"
@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2002,6 +2011,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2308,7 +2323,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2389,6 +2404,12 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -2407,9 +2428,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.57"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -2425,9 +2446,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.27"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -2711,22 +2732,22 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.163"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.163"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -2981,9 +3002,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.16"
+version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -3061,11 +3082,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.21"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
+ "deranged",
"itoa",
+ "num-conv",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -3073,16 +3097,17 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.9"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]
@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
]
[[package]]
@@ -3443,7 +3468,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
"wasm-bindgen-shared",
]
@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.16",
+ "syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
--
2.46.0

View file

@ -7,6 +7,7 @@
gtk3, gtk3,
xorg, xorg,
perl, perl,
pkg-config,
openssl, openssl,
speechd-minimal, speechd-minimal,
libxkbcommon, libxkbcommon,
@ -34,23 +35,22 @@ let
in in
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
pname = "BoilR"; pname = "BoilR";
version = "1.9.4"; version = "1.9.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PhilipK"; owner = "PhilipK";
repo = "BoilR"; repo = "BoilR";
tag = "v.${version}"; tag = "v.${version}";
hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; hash = "sha256-qCY/I3ACrs5mWpgN+xmWi42rF9Mzqxxce2DIA+R1RNs=";
}; };
cargoPatches = [
./0001-update-time.patch
];
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-5FvlyJgYtqgJyxlfXWe9oBBkwIY+c8Fp/rHuNLJ1j7s="; cargoHash = "sha256-9B2NcFO/Bj553yaOMi7oBZJTFtCQmBnJkU9nK+vjThU=";
nativeBuildInputs = [ perl ]; nativeBuildInputs = [
perl
pkg-config
];
buildInputs = rpathLibs; buildInputs = rpathLibs;

View file

@ -17,14 +17,14 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "buffer"; pname = "buffer";
version = "0.9.7"; version = "0.9.10";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "cheywood"; owner = "cheywood";
repo = "buffer"; repo = "buffer";
rev = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-W6LTTQvIMAB99q2W11EBlBknJnOuv4ptgf5SSM422Cg="; hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -54,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
) )
''; '';
meta = with lib; { meta = {
description = "Minimal editing space for all those things that don't need keeping"; description = "Minimal editing space for all those things that don't need keeping";
homepage = "https://gitlab.gnome.org/cheywood/buffer"; homepage = "https://gitlab.gnome.org/cheywood/buffer";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
mainProgram = "buffer"; mainProgram = "buffer";
maintainers = with maintainers; [ michaelgrahamevans ]; maintainers = with lib.maintainers; [ michaelgrahamevans ];
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
}) })

View file

@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "buffrs"; pname = "buffrs";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "helsing-ai"; owner = "helsing-ai";
repo = "buffrs"; repo = "buffrs";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-c9GjSqVp2wEFgoy8j+Gy5FA3SG4JYEfeSwPWjW81w3Y="; hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-E7kskULt2eOY+mZjh6jAftj8ciExUF7d1z1pePTBzvQ="; cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y=";
# Disabling tests meant to work over the network, as they will fail # Disabling tests meant to work over the network, as they will fail
# inside the builder. # inside the builder.

View file

@ -19,13 +19,13 @@ in
llvmPackages.stdenv.mkDerivation (finalAttrs: { llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "c3c${optionalString debug "-debug"}"; pname = "c3c${optionalString debug "-debug"}";
version = "0.7.0"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "c3lang"; owner = "c3lang";
repo = "c3c"; repo = "c3c";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-SCUMyc8Gf7TAOXRppooNiyfbM84CUoIvokgvNgODqw8="; hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU=";
}; };
cmakeBuildType = if debug then "Debug" else "Release"; cmakeBuildType = if debug then "Debug" else "Release";

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cgif"; pname = "cgif";
version = "0.3.2"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dloebl"; owner = "dloebl";
repo = "cgif"; repo = "cgif";
rev = "V${finalAttrs.version}"; tag = "v${finalAttrs.version}";
sha256 = "sha256-FvqpToIVYblpuRWeEaUA8MA2Bnp9dpqGquylnXevhX4="; hash = "sha256-i8xngmVhRCGkczY3NzomLkXj+iqPb81lvLn6dXsByYs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,31 +8,33 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
version = "2.23.7";
pname = "checkbashisms"; pname = "checkbashisms";
version = "2.25.10";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz";
hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk="; hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = [ perl ]; buildInputs = [ perl ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
substituteInPlace ./scripts/checkbashisms.pl \ substituteInPlace ./scripts/checkbashisms.pl \
--replace '###VERSION###' "$version" --replace-fail '###VERSION###' "${finalAttrs.version}"
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
installManPage scripts/$pname.1 installManPage scripts/checkbashisms.1
installShellCompletion --bash --name $pname scripts/$pname.bash_completion installShellCompletion --bash --name checkbashisms scripts/checkbashisms.bash_completion
install -D -m755 scripts/$pname.pl $out/bin/$pname install -D -m755 scripts/checkbashisms.pl $out/bin/checkbashisms
runHook postInstall runHook postInstall
''; '';

View file

@ -1,13 +1,13 @@
{ {
stdenv,
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
pkg-config, pkg-config,
python3, python3,
wrapGAppsHook3, wrapGAppsHook3,
gtkmm3, gtkmm3,
gtksourceview, gtksourceview4,
gtksourceviewmm, gtksourceviewmm,
gspell, gspell,
libxmlxx, libxmlxx,
@ -19,15 +19,15 @@
vte, vte,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "cherrytree"; pname = "cherrytree";
version = "1.1.4"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "giuspen"; owner = "giuspen";
repo = "cherrytree"; repo = "cherrytree";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE="; hash = "sha256-X87L3oSidnXH/IIHtVbeIn0ehWkSgrAkX0+TUGQomV0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtkmm3 gtkmm3
gtksourceview gtksourceview4
gtksourceviewmm gtksourceviewmm
gspell gspell
libxmlxx libxmlxx
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
vte vte
]; ];
meta = with lib; { meta = {
description = "Hierarchical note taking application"; description = "Hierarchical note taking application";
mainProgram = "cherrytree"; mainProgram = "cherrytree";
longDescription = '' longDescription = ''
@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
a Cherrytree document where you can easily find it. a Cherrytree document where you can easily find it.
''; '';
homepage = "https://www.giuspen.com/cherrytree"; homepage = "https://www.giuspen.com/cherrytree";
changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${finalAttrs.version}/changelog.txt";
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = [ ]; maintainers = [ ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} })

View file

@ -4,25 +4,30 @@
rustPlatform, rustPlatform,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage (finalAttrs: {
pname = "chess-tui"; pname = "chess-tui";
version = "1.2.1"; version = "1.6.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thomas-mauran"; owner = "thomas-mauran";
repo = "chess-tui"; repo = "chess-tui";
rev = "${version}"; tag = finalAttrs.version;
hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4="; hash = "sha256-L7SaWNSS5tn8OyKTPixTtlMB+OmVd9I0VXtasQMI5GI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Ydn/y7HF8VppEjkRy3ayibgxpcLc1NiHlR5oLi3D11A="; cargoHash = "sha256-u3Di/vTKbyehmNbTlMZPNRejgK9jYROQv8qdz2XT4Bs=";
meta = with lib; { checkFlags = [
# assertion failed: result.is_ok()
"--skip=tests::test_config_create"
];
meta = {
description = "Chess TUI implementation in rust"; description = "Chess TUI implementation in rust";
homepage = "https://github.com/thomas-mauran/chess-tui"; homepage = "https://github.com/thomas-mauran/chess-tui";
maintainers = with maintainers; [ ByteSudoer ]; maintainers = with lib.maintainers; [ ByteSudoer ];
license = licenses.mit; license = lib.licenses.mit;
mainProgram = "chess-tui"; mainProgram = "chess-tui";
}; };
} })

View file

@ -1,14 +0,0 @@
diff --git a/Makefile b/Makefile
index 99065da..2415738 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@ endif
ifeq ($(CC), clang)
CFLAGS += $(CLANG_FLAGS)
endif
-ifeq ($(shell uname), Linux)
- CFLAGS += -static
-endif
Target = chsrc

View file

@ -1,33 +1,31 @@
{ {
lib, lib,
fetchFromGitHub,
stdenv, stdenv,
fetchFromGitHub,
texinfo, texinfo,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "chsrc"; pname = "chsrc";
version = "0.1.9"; version = "0.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RubyMetric"; owner = "RubyMetric";
repo = "chsrc"; repo = "chsrc";
rev = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; hash = "sha256-yZjza4BSgRCOwc719iNdG17WVuLPUBJjZb6Yz4FsTcA=";
}; };
nativeBuildInputs = [ texinfo ]; nativeBuildInputs = [ texinfo ];
patches = [
./disable-static-compiling.patch
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm755 chsrc $out/bin/chsrc install -Dm755 chsrc $out/bin/chsrc
install -Dm644 doc/chsrc.1 -t $out/share/man/man1/ install -Dm644 doc/chsrc.1 -t $out/share/man/man1/
makeinfo doc/chsrc.texi --output=chsrc.info makeinfo doc/chsrc.texi --output=chsrc.info
install -Dm644 chsrc.info -t $out/share/info/ install -Dm644 chsrc.info -t $out/share/info/
runHook postInstall runHook postInstall
''; '';

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2025-04-23"; version = "2025-05-01";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = "exploitdb"; repo = "exploitdb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-K5WQhYVO3z6gR2Jl5yJJW8vK8BA89iAwPzhq4jX27y0="; hash = "sha256-C1tNKyTuzn7A923Y3ExNYkFwYx2frPAiifzGmkDEBag=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -1,33 +1,24 @@
{ {
lib, lib,
fetchFromGitHub,
fetchpatch,
python3, python3,
fetchFromGitHub,
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "ffsubsync"; pname = "ffsubsync";
version = "0.4.25"; version = "0.4.29";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smacke"; owner = "smacke";
repo = "ffsubsync"; repo = "ffsubsync";
tag = version; tag = version;
hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; hash = "sha256-XMFobdr/nzr5pXjz/jWa/Pp14ITdbxAce0Iz+5qcBO4=";
}; };
patches = [ build-system = with python3.pkgs; [ setuptools ];
# updates for python 3.12 (not currently included in a release)
(fetchpatch {
url = "https://github.com/smacke/ffsubsync/commit/de75bdbfe846b3376f8c0bcfe2e5e5db82d7ff20.patch";
hash = "sha256-JN7F9H9G8HK2aLOlm/Ec+GsWnU+65f1P658nq8FbAjo=";
})
];
nativeBuildInputs = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
auditok auditok
charset-normalizer charset-normalizer
faust-cchardet faust-cchardet
@ -50,10 +41,10 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "ffsubsync" ]; pythonImportsCheck = [ "ffsubsync" ];
meta = with lib; { meta = {
homepage = "https://github.com/smacke/ffsubsync"; homepage = "https://github.com/smacke/ffsubsync";
description = "Automagically synchronize subtitles with video"; description = "Automagically synchronize subtitles with video";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ ]; maintainers = [ ];
mainProgram = "ffsubsync"; mainProgram = "ffsubsync";
}; };

View file

@ -1,23 +1,21 @@
{ {
lib, lib,
stdenv,
fetchFromGitHub, fetchFromGitHub,
buildGoModule, buildGoModule,
writableTmpDirAsHomeHook,
versionCheckHook, versionCheckHook,
}: }:
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "fleet"; pname = "fleet";
version = "4.67.1"; version = "4.67.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fleetdm"; owner = "fleetdm";
repo = "fleet"; repo = "fleet";
tag = "fleet-v${finalAttrs.version}"; tag = "fleet-v${finalAttrs.version}";
hash = "sha256-cZ0YTFcyPt7NMZUDZCdlVPTuhwRy7mTp7JCdINqiwOM="; hash = "sha256-iMLD9M4EzXHRxvc5px9UcXEdjRIO1jm+hYwhaYaFON8=";
}; };
vendorHash = "sha256-gFAotYho18Jn8MaFK6ShoMA1VLXVENcrASvHWZGFOFg="; vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";
subPackages = [ subPackages = [
"cmd/fleet" "cmd/fleet"
@ -28,11 +26,6 @@ buildGoModule (finalAttrs: {
"-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}" "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
]; ];
doCheck = true;
nativeCheckInputs = [
writableTmpDirAsHomeHook
];
doInstallCheck = true; doInstallCheck = true;
versionCheckProgramArg = "version"; versionCheckProgramArg = "version";
nativeInstallCheckInputs = [ nativeInstallCheckInputs = [
@ -46,6 +39,7 @@ buildGoModule (finalAttrs: {
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
asauzeau asauzeau
lesuisse
]; ];
mainProgram = "fleet"; mainProgram = "fleet";
}; };

View file

@ -1,44 +1,41 @@
{ {
lib, lib,
buildGoModule, buildGoModule,
fetchFromGitHub, fleet,
writableTmpDirAsHomeHook, writableTmpDirAsHomeHook,
versionCheckHook, versionCheckHook,
stdenv, stdenv,
}: }:
buildGoModule rec { buildGoModule (finalAttrs: {
pname = "fleectl"; pname = "fleetctl";
version = "4.67.1";
src = fetchFromGitHub { inherit (fleet) version src vendorHash;
owner = "fleetdm";
repo = "fleet";
tag = "fleet-v${version}";
hash = "sha256-shaOPK7BbIDARopzGehlIA6aPdRiFRP9hrFRNO3kfGA=";
};
vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60=";
subPackages = [ subPackages = [
"cmd/fleetctl" "cmd/fleetctl"
]; ];
ldflags = [ ldflags = [
"-X github.com/fleetdm/fleet/v4/server/version.appName=${pname}" "-X github.com/fleetdm/fleet/v4/server/version.appName=fleetctl"
"-X github.com/fleetdm/fleet/v4/server/version.version=${version}" "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}"
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
writableTmpDirAsHomeHook writableTmpDirAsHomeHook
versionCheckHook
]; ];
# Try to access /var/empty/.goquery/history subfolders # Try to access /var/empty/.goquery/history subfolders
doCheck = !stdenv.hostPlatform.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
doInstallCheck = !stdenv.hostPlatform.isDarwin;
nativeInstallCheckInputs = [
versionCheckHook
];
meta = { meta = {
homepage = "https://github.com/fleetdm/fleet"; homepage = "https://github.com/fleetdm/fleet";
changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${version}"; changelog = "https://github.com/fleetdm/fleet/releases/tag/fleet-v${finalAttrs.version}";
description = "CLI tool for managing Fleet"; description = "CLI tool for managing Fleet";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
@ -46,4 +43,4 @@ buildGoModule rec {
]; ];
mainProgram = "fleetctl"; mainProgram = "fleetctl";
}; };
} })

View file

@ -48,7 +48,6 @@ flutter327.buildFlutterApplication (
mainProgram = "fluffychat"; mainProgram = "fluffychat";
maintainers = with maintainers; [ maintainers = with maintainers; [
mkg20001 mkg20001
gilice
tebriel tebriel
]; ];
platforms = [ platforms = [

View file

@ -9,10 +9,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gatk"; pname = "gatk";
version = "4.6.1.0"; version = "4.6.2.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip";
sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708="; sha256 = "sha256-I2p7BLh4q0i8qn1fTbzsaKVnCkMrPIxEpBUjOxNxgxI=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "2.71.2"; version = "2.72.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-n1qGJ5/X7wp4kgQqgcUomNvln2WavDJOjwxjVokfbiU="; hash = "sha256-0t3xt37Ij2OvBOnZZKVFJnLFU+uMv/A5utnsY55MTRw=";
}; };
vendorHash = "sha256-69bGTUdVD/jebvmxYu0Mx7poSlbkXBAXUWLJ1CclXJU="; vendorHash = "sha256-dLHtq+CG3S5wHItF6+G3L4SYiPKo+2Hw5rYUIPQbN2A=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -6,7 +6,6 @@
pkg-config, pkg-config,
python3, python3,
gfortran, gfortran,
lesstif,
cfitsio, cfitsio,
getopt, getopt,
perl, perl,
@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk2-x11 gtk2-x11
lesstif
cfitsio cfitsio
python3Env python3Env
ncurses ncurses

View file

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "go-dnscollector"; pname = "go-dnscollector";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dmachard"; owner = "dmachard";
repo = "go-dnscollector"; repo = "go-dnscollector";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/jc9OEWxwcMFIdihlyxADHgZKumc/uOqkhjjN1mLw1U="; sha256 = "sha256-antLNQEOA20XxmmZHFQcs0VuLVfgM5V3wyXOYIX4hlk=";
}; };
vendorHash = "sha256-koWDlmlabDiwnlx+BTTtSQglu2lpccoTh17fRUC3pvg="; vendorHash = "sha256-9EQr4lhv6+PkAnMJ6iWnBsK/SzZaOyVkSpqSYsX07LY=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -6,18 +6,18 @@
buildGoModule rec { buildGoModule rec {
pname = "gqlgenc"; pname = "gqlgenc";
version = "0.32.0"; version = "0.32.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamashou"; owner = "yamashou";
repo = "gqlgenc"; repo = "gqlgenc";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-3Qz1o91IPKjhzIYzKcdl456AWn6nsrcQ04VglBlpe54="; sha256 = "sha256-AGbE+R3502Igl4/HaN8yvFVJBsKQ6iVff8IEvddJLEo=";
}; };
excludedPackages = [ "example" ]; excludedPackages = [ "example" ];
vendorHash = "sha256-Ax5MA4wqQdXSDEIkiG5TcvFIN6YtyXuiJOdQGPYIb+Y="; vendorHash = "sha256-kBv9Kit5KdPB48V/g1OaeB0ABFd1A1I/9F5LaQDWxUE=";
meta = with lib; { meta = with lib; {
description = "Go tool for building GraphQL client with gqlgen"; description = "Go tool for building GraphQL client with gqlgen";

View file

@ -2,35 +2,31 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
makeWrapper, makeBinaryWrapper,
wget, wget,
jq, jq,
curl, curl,
}: }:
let stdenv.mkDerivation (finalAttrs: {
version = "1.0";
in
stdenv.mkDerivation {
pname = "hedgedoc-cli"; pname = "hedgedoc-cli";
inherit version; version = "1.0-unstable-2025-05-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hedgedoc"; owner = "hedgedoc";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "defeac80ca97fedcb19bdcddc516fd8f6e55fe8c";
sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4="; hash = "sha256-7E5Ka6SEPRg2O4+bJ6g3gSDMLnPMzg5Lbslgvt6gNEg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeBinaryWrapper
]; ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/bin
cp $src/bin/codimd $out/bin makeWrapper $src/bin/codimd $out/bin/hedgedoc-cli \
wrapProgram $out/bin/codimd \
--prefix PATH : ${ --prefix PATH : ${
lib.makeBinPath [ lib.makeBinPath [
jq jq
@ -38,18 +34,23 @@ stdenv.mkDerivation {
curl curl
] ]
} }
ln -s $out/bin/codimd $out/bin/hedgedoc-cli
runHook postInstall runHook postInstall
''; '';
checkPhase = '' checkPhase = ''
runHook preCheck
hedgedoc-cli help hedgedoc-cli help
runHook postCheck
''; '';
meta = with lib; { meta = {
description = "Hedgedoc CLI"; description = "Hedgedoc CLI";
homepage = "https://github.com/hedgedoc/cli"; homepage = "https://github.com/hedgedoc/cli";
license = licenses.agpl3Only; license = lib.licenses.agpl3Only;
maintainers = with maintainers; [ drupol ]; mainProgram = "hedgedoc-cli";
maintainers = with lib.maintainers; [ drupol ];
}; };
} })

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "hermit"; pname = "hermit";
version = "0.44.6"; version = "0.44.8";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "cashapp"; owner = "cashapp";
repo = "hermit"; repo = "hermit";
hash = "sha256-PNzMR9bYR7Dv62kN6tYBdabGR01iXw537WRUtJXl1CE="; hash = "sha256-euSuOYHroTJTifUcthHr4oQktTmE62qf2y6p6fBy9fI=";
}; };
vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w="; vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w=";

View file

@ -4,6 +4,8 @@
fetchFromGitHub, fetchFromGitHub,
SDL, SDL,
SDL_mixer, SDL_mixer,
libGL,
libGLU,
autoreconfHook, autoreconfHook,
gitUpdater, gitUpdater,
}: }:
@ -27,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
SDL SDL
SDL_mixer SDL_mixer
libGL
libGLU
]; ];
strictDeps = true; strictDeps = true;

View file

@ -6,12 +6,12 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "JuliaMono-ttf"; pname = "JuliaMono-ttf";
version = "0.059"; version = "0.060";
src = fetchzip { src = fetchzip {
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz";
stripRoot = false; stripRoot = false;
hash = "sha256-b0h88rpylvMaRh9U/8oOhr4yOftzf7OvdwhpCuIeUjE="; hash = "sha256-PmMGro8K4OwtKBIBhe/RKpi+MveSfhpQsiJfF+iUBzI=";
}; };
installPhase = '' installPhase = ''

View file

@ -26,6 +26,11 @@
withPulseaudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, withPulseaudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
}: }:
let
uppercaseFirst =
x: (lib.toUpper (lib.substring 0 1 x)) + (lib.substring 1 ((lib.strings.stringLength x) - 1) x);
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "kew"; pname = "kew";
version = "3.2.0"; version = "3.2.0";
@ -37,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-nntbxDy1gfd4F/FvlilLeOAepqtxhnYE2XRjJSlFvgI="; hash = "sha256-nntbxDy1gfd4F/FvlilLeOAepqtxhnYE2XRjJSlFvgI=";
}; };
postPatch = ''
substituteInPlace Makefile \
--replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \
--replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}'
'';
nativeBuildInputs = nativeBuildInputs =
[ [
pkg-config pkg-config

View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
fetchpatch,
cfitsio, cfitsio,
cmake, cmake,
curl, curl,
@ -22,13 +23,20 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "kstars"; pname = "kstars";
version = "3.7.5"; version = "3.7.6";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz"; url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
hash = "sha256-L9hyVfdgFlFfM6MyjR4bUa86FHPbVg7xBWPY8YSHUXw="; hash = "sha256-6hwWMmAGKJmldL8eTLQzzBsumk5thFoqGvm2dWk0Jpo=";
}; };
patches = [
(fetchpatch {
url = "https://invent.kde.org/education/kstars/-/commit/92eb37bdb3e24bd06e6da9977f3bf76218c95339.diff";
hash = "sha256-f2m15op48FiPYsKJ7WudlejVwoiGYWGnX2QiCnBINU8=";
})
];
nativeBuildInputs = with kdePackages; [ nativeBuildInputs = with kdePackages; [
extra-cmake-modules extra-cmake-modules
kdoctools kdoctools

View file

@ -6,6 +6,7 @@
SDL, SDL,
libGLU, libGLU,
libGL, libGL,
libX11,
upx, upx,
zlib, zlib,
}: }:
@ -36,10 +37,16 @@ stdenv.mkDerivation {
SDL SDL
libGLU libGLU
libGL libGL
libX11
upx upx
zlib zlib
]; ];
env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
"-Wno-error=implicit-int"
"-Wno-error=incompatible-pointer-types"
];
meta = { meta = {
description = "API for roguelike games"; description = "API for roguelike games";
homepage = "http://roguecentral.org/doryen/libtcod/"; homepage = "http://roguecentral.org/doryen/libtcod/";

View file

@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-waQcxdVXZZ09wuLWUNL4nRUHF1rIDI8lAfYc/1bxMl0="; cargoHash = "sha256-waQcxdVXZZ09wuLWUNL4nRUHF1rIDI8lAfYc/1bxMl0=";
buildFeatures = [ "mpris" ]; buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -1,21 +1,23 @@
{ {
lib, lib,
buildGoModule, buildGo123Module,
fetchFromGitHub, fetchFromGitHub,
}: }:
buildGoModule rec { # Tests with go 1.24 do not work. For now
# https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996
buildGo123Module rec {
pname = "mark"; pname = "mark";
version = "12.1.2"; version = "12.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kovetskiy"; owner = "kovetskiy";
repo = "mark"; repo = "mark";
rev = version; rev = "${version}";
sha256 = "sha256-t70Od27w/ZT/EHKAgjPBx39Oo4dS1aWL3up7TVlNAuI="; sha256 = "sha256-0w6rIOSnOS7EfTBA/mRNWm8KOtdviTxWdukl4reb4zE=";
}; };
vendorHash = "sha256-XPTnsV0JVSatfHzI4ajq8nnN2HTKc8FeKwmOIuXo2GU="; vendorHash = "sha256-CqFCjSXw7/jLe1OYosUl6mKSPEsdHl8p3zb/LVNqnxM=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -6,15 +6,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mdbook-katex"; pname = "mdbook-katex";
version = "0.9.3"; version = "0.9.4";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-5EYskcYEDZENK7ehws36+5MrTY2rNTXoFnWYOC+LuiQ="; hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-j0BdEnPP7/0i1hg7GNgc+F4EeElVm6AZIWZNelYZLIU="; cargoHash = "sha256-ULcjcY+CaVSohSzlm4KbSgG27IZyxX8zp8ifZNj5c54=";
meta = { meta = {
description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time";

View file

@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://mega.nz/"; homepage = "https://mega.nz/";
downloadPage = "https://github.com/meganz/MEGAsync"; downloadPage = "https://github.com/meganz/MEGAsync";
changelog = "https://github.com/meganz/MEGAsync/releases/tag/v${finalAttrs.version}_Linux"; changelog = "https://github.com/meganz/MEGAsync/releases/tag/v${finalAttrs.version}_Linux";
license = lib.licenses.unfree; license = lib.licenses.unfreeRedistributable;
platforms = [ platforms = [
"i686-linux" "i686-linux"
"x86_64-linux" "x86_64-linux"

View file

@ -1,21 +1,21 @@
{ {
"version": "3.139.1", "version": "3.141.0",
"assets": { "assets": {
"x86_64-linux": { "x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_linux_x86_64", "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_linux_x86_64",
"hash": "sha256-VBmPo94DPWh/fvA8ZZfxcqCab9ZNqCVXKLwNcBMZm4E=" "hash": "sha256-fiwtZM1gyJZ2HOiDAhAu8f6jHl6hxmHcqyMTSMOCcFo="
}, },
"aarch64-linux": { "aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_linux_aarch64", "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_linux_aarch64",
"hash": "sha256-ct/NyfVXI/GlR4HKAKX2vKrzU95+u2tO7ltw2aEbji0=" "hash": "sha256-HD93OHo+vkgkZYxgKMXd/L43o0loA1jAPc8JfwOfZPw="
}, },
"aarch64-darwin": { "aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_mac_universal", "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_mac_universal",
"hash": "sha256-selcbXCfkvKVzNClhYkssVY3CvZFH8uXzYGKhA6N63w=" "hash": "sha256-vLrUSgYQjPNk5WGEsBKR3E2222n8oP6xVAHf2ZPBIDk="
}, },
"x86_64-darwin": { "x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_mac_universal", "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_mac_universal",
"hash": "sha256-selcbXCfkvKVzNClhYkssVY3CvZFH8uXzYGKhA6N63w=" "hash": "sha256-vLrUSgYQjPNk5WGEsBKR3E2222n8oP6xVAHf2ZPBIDk="
} }
} }
} }

View file

@ -0,0 +1,63 @@
{
stdenvNoCC,
fetchurl,
unzip,
runtimeShell,
pname,
version,
meta,
}:
let
appName = "MongoDB Compass.app";
dist =
{
aarch64-darwin = {
arch = "arm64";
sha256 = "sha256-naSOCYxdDLt/zDtR4MhTE96gJypfbk98CWKx2i8kiTk=";
};
x86_64-darwin = {
arch = "x64";
sha256 = "sha256-TnoXaiSNYiblgJS5nygTHOe9HBgVCTfffX37wrwtxZ8=";
};
}
.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation {
inherit pname version meta;
src = fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass-${version}-darwin-${dist.arch}.zip";
inherit (dist) sha256;
name = "${pname}-${version}.zip";
};
nativeBuildInputs = [ unzip ];
# The archive will be automatically unzipped; tell Nix where the source root is.
dontFixup = true;
sourceRoot = appName;
installPhase = ''
runHook preInstall
# Create directories for the application bundle and the launcher script.
mkdir -p "$out/Applications/${appName}" "$out/bin"
# Copy the unzipped app bundle into the Applications folder.
cp -R . "$out/Applications/${appName}"
# Create a launcher script that opens the app.
cat > "$out/bin/${pname}" << EOF
#!${runtimeShell}
open -na "$out/Applications/${appName}" --args "\$@"
EOF
chmod +x "$out/bin/${pname}"
runHook postInstall
'';
}

View file

@ -0,0 +1,132 @@
{
alsa-lib,
at-spi2-atk,
at-spi2-core,
atk,
cairo,
cups,
curl,
dbus,
dpkg,
expat,
fetchurl,
fontconfig,
freetype,
gdk-pixbuf,
glib,
gtk3,
lib,
libdrm,
libGL,
libnotify,
libsecret,
libuuid,
libxcb,
libxkbcommon,
libgbm,
nspr,
nss,
pango,
stdenv,
systemd,
wrapGAppsHook3,
xorg,
pname,
version,
meta,
}:
let
rpath = lib.makeLibraryPath [
alsa-lib
at-spi2-atk
at-spi2-core
atk
cairo
cups
curl
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libdrm
libGL
libnotify
libsecret
libuuid
libxcb
libxkbcommon
libgbm
nspr
nss
pango
stdenv.cc.cc
systemd
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxkbfile
xorg.libxshmfence
(lib.getLib stdenv.cc.cc)
];
in
stdenv.mkDerivation {
inherit pname version meta;
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
hash = "sha256-cwhYiV5G8GRBT7MST20MPUxEMQM1mzxlLUfzGO6jv10=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
buildInputs = [
dpkg
wrapGAppsHook3
gtk3
];
dontUnpack = true;
buildCommand = ''
IFS=$'\n'
# The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
dpkg --fsys-tarfile $src | tar --extract
mkdir -p $out
mv usr/* $out
# cp -av $out/usr/* $out
rm -rf $out/share/lintian
# The node_modules are bringing in non-linux files/dependencies
find $out -name "*.app" -exec rm -rf {} \; || true
find $out -name "*.dll" -delete
find $out -name "*.exe" -delete
# Otherwise it looks "suspicious"
chmod -R g-w $out
for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do
echo "Manipulating file: $file"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true
done
wrapGAppsHook $out/bin/mongodb-compass
'';
}

View file

@ -1,149 +1,32 @@
{ {
alsa-lib,
at-spi2-atk,
at-spi2-core,
atk,
cairo,
cups,
curl,
dbus,
dpkg,
expat,
fetchurl,
fontconfig,
freetype,
gdk-pixbuf,
glib,
gtk3,
lib,
libdrm,
libGL,
libnotify,
libsecret,
libuuid,
libxcb,
libxkbcommon,
libgbm,
nspr,
nss,
pango,
stdenv, stdenv,
systemd, callPackage,
wrapGAppsHook3, lib,
xorg, ...
}: }:
let let
version = "1.46.0";
rpath = lib.makeLibraryPath [
alsa-lib
at-spi2-atk
at-spi2-core
atk
cairo
cups
curl
dbus
expat
fontconfig
freetype
gdk-pixbuf
glib
gtk3
libdrm
libGL
libnotify
libsecret
libuuid
libxcb
libxkbcommon
libgbm
nspr
nss
pango
stdenv.cc.cc
systemd
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxkbfile
xorg.libxshmfence
(lib.getLib stdenv.cc.cc)
];
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
hash = "sha256-cwhYiV5G8GRBT7MST20MPUxEMQM1mzxlLUfzGO6jv10=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
# NOTE While MongoDB Compass is available to darwin, I do not have resources to test it
# Feel free to make a PR adding support if desired
in
stdenv.mkDerivation {
pname = "mongodb-compass"; pname = "mongodb-compass";
inherit version; version = "1.46.0";
inherit src;
buildInputs = [
dpkg
wrapGAppsHook3
gtk3
];
dontUnpack = true;
buildCommand = ''
IFS=$'\n'
# The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
dpkg --fsys-tarfile $src | tar --extract
mkdir -p $out
mv usr/* $out
# cp -av $out/usr/* $out
rm -rf $out/share/lintian
# The node_modules are bringing in non-linux files/dependencies
find $out -name "*.app" -exec rm -rf {} \; || true
find $out -name "*.dll" -delete
find $out -name "*.exe" -delete
# Otherwise it looks "suspicious"
chmod -R g-w $out
for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do
echo "Manipulating file: $file"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true
done
wrapGAppsHook $out/bin/mongodb-compass
'';
meta = { meta = {
description = "GUI for MongoDB"; description = "GUI for MongoDB";
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
bryanasdev000 bryanasdev000
friedow friedow
iamanaws
]; ];
homepage = "https://github.com/mongodb-js/compass"; homepage = "https://github.com/mongodb-js/compass";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
license = lib.licenses.sspl; license = lib.licenses.sspl;
platforms = [ "x86_64-linux" ]; platforms = [
"x86_64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
mainProgram = "mongodb-compass"; mainProgram = "mongodb-compass";
}; };
} in
if stdenv.hostPlatform.isDarwin then
callPackage ./darwin.nix { inherit pname version meta; }
else
callPackage ./linux.nix { inherit pname version meta; }

View file

@ -1,46 +0,0 @@
{
lib,
stdenv,
alsa-lib,
fetchFromGitHub,
pkg-config,
protobuf,
rustPlatform,
}:
rustPlatform.buildRustPackage rec {
pname = "music-player";
version = "0.2.0-alpha.14-unstable-2024-10-02";
src = fetchFromGitHub {
owner = "tsirysndr";
repo = "music-player";
rev = "cbf03c3f2f0f9baca831b08ec27d9b31438faa3d";
hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-gWLlsXFrovApYCSlo/jBxPZ7nlBCuGVeh28/Ir12MDo=";
nativeBuildInputs =
[
protobuf
rustPlatform.bindgenHook
]
++ lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
];
meta = {
description = "Extensible music player daemon written in Rust";
homepage = "https://github.com/tsirysndr/music-player";
changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sigmasquadron ];
mainProgram = "music-player";
};
}

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "orchard"; pname = "orchard";
version = "0.32.2"; version = "0.33.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cirruslabs"; owner = "cirruslabs";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-XI2MoAaipQvfG5rgRC4Mcxcrvy/wD3GnyNJvCTHwZhY="; hash = "sha256-cOg7wwcwmpDNqnu15j5aYxLNpBxrhliK6w3sw2JQlCg=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -24,7 +24,7 @@ buildGoModule rec {
''; '';
}; };
vendorHash = "sha256-lLixmw4nnIjU61gXCPZhX/d2fBA57VPMrf7vsn+KrrE="; vendorHash = "sha256-60GjN9jeYjGdkVxm+lNBS0OYt523c/HrfBPrvdET0hQ=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "osv-scanner"; pname = "osv-scanner";
version = "2.0.1"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "osv-scanner"; repo = "osv-scanner";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-jE1nzpUpt2WbaG6MQfji8k5qML7bi9mGSVFzQM3+DKQ="; hash = "sha256-x2lQqBjNbX+EhtnK6r3YpZX5yAadLMUKfypxsGTB5s4=";
}; };
vendorHash = "sha256-E5u4BmsB/jSsGehtNFJEMja9T5YYKDqgwT7askcaAjA="; vendorHash = "sha256-eN5KJWubE+NptdncfVPyglb5SS76Eh7jlrajcjBU8YI=";
subPackages = [ subPackages = [
"cmd/osv-scanner" "cmd/osv-scanner"

View file

@ -17,11 +17,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "photoqt"; pname = "photoqt";
version = "4.8.1"; version = "4.9";
src = fetchurl { src = fetchurl {
url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
hash = "sha256-Iq5Fc0v+EYFe1YG3ZhZKl8leXD+TpGGhaQjr800vz7Y="; hash = "sha256-Kd8h6JFJ02JH+IKMltvKT/mgnhz9jOJAFXMnNmI1BYA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -8,16 +8,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "repomix"; pname = "repomix";
version = "0.3.2"; version = "0.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yamadashy"; owner = "yamadashy";
repo = "repomix"; repo = "repomix";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-Dmp+PtQ5qnj5MYS1jFUvLRhrxTp94WDaR8z7Ayv0lhU="; hash = "sha256-VVTI9dmSHVsXttDPoxRkPYVC8VU/678spLlyoyZGvpI=";
}; };
npmDepsHash = "sha256-5DIZMb1dKkgWmEzjNOthXY6weOyLDQVjJKPdsHj+pb8="; npmDepsHash = "sha256-VY2YjpOKimgX90ieu4jjZ6YVJYQqq3l3k/iDfsTMZmI=";
nativeInstallCheckInputs = [ versionCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true; doInstallCheck = true;

View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
# nativeBuildInputs # nativeBuildInputs
cmake, cmake,
@ -15,6 +16,9 @@
liblapack, liblapack,
xorg, xorg,
libusb1, libusb1,
yaml-cpp,
libnabo,
libpointmatcher,
eigen, eigen,
g2o, g2o,
ceres-solver, ceres-solver,
@ -23,6 +27,7 @@
libdc1394, libdc1394,
libGL, libGL,
libGLU, libGLU,
librealsense,
vtkWithQt5, vtkWithQt5,
zed-open-capture, zed-open-capture,
hidapi, hidapi,
@ -33,22 +38,29 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rtabmap"; pname = "rtabmap";
version = "0.21.4.1"; version = "0.21.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "introlab"; owner = "introlab";
repo = "rtabmap"; repo = "rtabmap";
tag = finalAttrs.version; tag = "${finalAttrs.version}-noetic";
hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; hash = "sha256-W4yjHKb2BprPYkL8rLwLQcZDGgmMZ8279ntR+Eqj7R0=";
}; };
patches = [
(fetchpatch {
# Fix the ctor and dtor warning
url = "https://github.com/introlab/rtabmap/pull/1496/commits/84c59a452b40a26edf1ba7ec8798700a2f9c3959.patch";
hash = "sha256-kto02qcL2dW8Frt81GA+OCldPgCF5bAs/28w9amcf0o=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
libsForQt5.wrapQtAppsHook libsForQt5.wrapQtAppsHook
pkg-config pkg-config
wrapGAppsHook3 wrapGAppsHook3
]; ];
buildInputs = [ buildInputs = [
## Required ## Required
opencv opencv
@ -58,16 +70,19 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libSM xorg.libSM
xorg.libICE xorg.libICE
xorg.libXt xorg.libXt
## Optional ## Optional
libusb1 libusb1
eigen eigen
g2o g2o
ceres-solver ceres-solver
# libpointmatcher - ABI mismatch yaml-cpp
libnabo
libpointmatcher
octomap octomap
freenect freenect
libdc1394 libdc1394
# librealsense - missing includedir librealsense
libsForQt5.qtbase libsForQt5.qtbase
libGL libGL
libGLU libGLU
@ -76,8 +91,14 @@ stdenv.mkDerivation (finalAttrs: {
hidapi hidapi
]; ];
# Disable warnings that are irrelevant to us as packagers # Configure environment variables
cmakeFlags = [ "-Wno-dev" ]; NIX_CFLAGS_COMPILE = "-Wno-c++20-extensions -I${vtkWithQt5}/include/vtk";
cmakeFlags = [
(lib.cmakeFeature "VTK_QT_VERSION" "5")
(lib.cmakeFeature "VTK_DIR" "${vtkWithQt5}/lib/cmake/vtk-${lib.versions.majorMinor vtkWithQt5.version}")
(lib.cmakeFeature "CMAKE_INCLUDE_PATH" "${vtkWithQt5}/include/vtk:${pcl}/include/pcl-${lib.versions.majorMinor pcl.version}")
];
passthru = { passthru = {
updateScript = gitUpdater { }; updateScript = gitUpdater { };
@ -90,7 +111,5 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ marius851000 ]; maintainers = with lib.maintainers; [ marius851000 ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
# pcl/io/io.h: No such file or directory
broken = true;
}; };
}) })

View file

@ -16,17 +16,17 @@
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "ruff"; pname = "ruff";
version = "0.11.7"; version = "0.11.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "ruff"; repo = "ruff";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-DXu9/DRwcffZtsql/Qk+6GyzhiYXUyW6R9FCAvLhn6o="; hash = "sha256-HVZADn9xpwywubEbaMJgOs3yCXa4pNWnnrfSICF2+DE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-4TK7HEdSCvUGqsAH+dnPgMBYmT/0mOnvQXHr/PtcsT0="; cargoHash = "sha256-TB7ARPTwYTNqbrcfwl9RCYmAw+y0uudaBp1YyDg52/w=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -6,11 +6,12 @@
libadwaita, libadwaita,
modemmanager, modemmanager,
wrapGAppsHook4, wrapGAppsHook4,
nix-update-script,
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "satellite"; pname = "satellite";
version = "0.9.0"; version = "0.9.1";
pyproject = true; pyproject = true;
@ -19,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "tpikonen"; owner = "tpikonen";
repo = "satellite"; repo = "satellite";
tag = version; tag = version;
hash = "sha256-w0ZpH1joFoV7W7PH74//LGLUJQLCpAGcC6GlyTbdsTE="; hash = "sha256-E/OKdVB+JDP/01ydEgA/B6+GMiVYB4jlPI70TW8HBDU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -42,6 +43,10 @@ python3.pkgs.buildPythonApplication rec {
strictDeps = true; strictDeps = true;
passthru = {
updateScript = nix-update-script { };
};
meta = { meta = {
description = "Program for showing navigation satellite data"; description = "Program for showing navigation satellite data";
longDescription = '' longDescription = ''

View file

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "scalr-cli"; pname = "scalr-cli";
version = "0.17.0"; version = "0.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Scalr"; owner = "Scalr";
repo = "scalr-cli"; repo = "scalr-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mDcirYhqpfeS2Wt9MnYPmTn/QZa85vlrN2uUkA1+7A4="; hash = "sha256-+ZwENhZF19VpJPGOVHnT4vMiWi8fzuJa3AhyOQ/S6w0=";
}; };
vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI="; vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI=";

View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust"; pname = "shadowsocks-rust";
version = "1.23.1"; version = "1.23.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shadowsocks"; owner = "shadowsocks";
repo = "shadowsocks-rust"; repo = "shadowsocks-rust";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-lCm/Y0R4/Ti4Eq06/za4D2YanwQ79IkhCBK2TO9/Yfs="; hash = "sha256-Yt2Zc+b7QpN/yO6MTg9a+7xTw9pHkYFHdq3Sz3Agdi4=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-//cEAeYSpsB429YaWBu+6T4dorV5OZFZuNxLgvqXxR8="; cargoHash = "sha256-eJFXFkevSS/N4A1+tCcwWUQsklA9HUQgLHw40fW5oxM=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];

View file

@ -22,11 +22,14 @@ python3.pkgs.buildPythonApplication rec {
"distro" "distro"
"typer" "typer"
"instructor" "instructor"
"jinja2"
]; ];
build-system = with python3.pkgs; [ hatchling ]; build-system = with python3.pkgs; [ hatchling ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
jinja2
requests
click click
distro distro
instructor instructor
@ -43,7 +46,7 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/TheR1D/shell_gpt"; homepage = "https://github.com/TheR1D/shell_gpt";
changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ mglolenstine ]; maintainers = with maintainers; [ SohamG ];
mainProgram = "sgpt"; mainProgram = "sgpt";
}; };
} }

View file

@ -22,13 +22,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sirikali"; pname = "sirikali";
version = "1.8.1"; version = "1.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mhogomchungu"; owner = "mhogomchungu";
repo = "sirikali"; repo = "sirikali";
rev = version; rev = version;
hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho="; hash = "sha256-rfmWtbPYtkaGemeStMWwA6JllOkDiHMftSfmirtAOEQ=";
}; };
buildInputs = buildInputs =

View file

@ -19,6 +19,75 @@
"jmdns#jmdns/0e40954468": { "jmdns#jmdns/0e40954468": {
"jar": "sha256-At4T7JOk5Ary/jGDErygVFkglIQ37CdG98idweqySAQ=", "jar": "sha256-At4T7JOk5Ary/jGDErygVFkglIQ37CdG98idweqySAQ=",
"pom": "sha256-aEgGw0Vfw3gG0B4RCADfpb1wmQBtXY4c0jwryNaS3yY=" "pom": "sha256-aEgGw0Vfw3gG0B4RCADfpb1wmQBtXY4c0jwryNaS3yY="
},
"loucass003#EspflashKotlin/v0.10.0": {
"jar": "sha256-ORIPUdeqSAhXBuXmPkmyZ6gS8EFnwYkvUtgXFttKIwU=",
"module": "sha256-6IMNElGmZLIg/qqVYFdFoHxZIK+YYsT4rBTzyM86FW8=",
"pom": "sha256-4ni1oElb85tIe9C0diwh20pgxVUA0c8PX1JZhgomdgo="
}
},
"https://oss.sonatype.org/content/repositories/snapshots": {
"com/fazecast#jSerialComm/2.11.1-20240515.234541-3/SNAPSHOT": {
"jar": "sha256-n4A3U5elHQhq9b0YVgvWCuXAHqt0RzxL5e4Fe4iGTkM=",
"module": "sha256-xeVUO5f2Imx43EgYUI5vbLXyyEmJh/jT106eLUWtUYg=",
"pom": "sha256-y+ZXr7k89vlAHOMZmlTNYl8D0Nki+6CDame/QNX/e2M="
},
"com/fazecast/jSerialComm/2.11.1-SNAPSHOT/maven-metadata": {
"xml": {
"groupId": "com.fazecast",
"lastUpdated": "20241221185706"
}
},
"net/java/dev/jna#jna-platform/5.1.1-20181118.214522-1/SNAPSHOT": {
"pom": "sha256-STVISbMwC8BymYDxq6UJhC3ZWqO+p7iA7lRW34ZcX6g="
},
"net/java/dev/jna#jna/5.1.1-20181118.214402-1/SNAPSHOT": {
"pom": "sha256-ABsaEoX+E319CyWjlyv5FnEy2ppq0u0rUQpNTfmFCe4="
},
"net/java/dev/jna/jna-platform/5.1.1-SNAPSHOT/maven-metadata": {
"xml": {
"groupId": "net.java.dev.jna",
"lastUpdated": "20181118232423"
}
},
"net/java/dev/jna/jna-platform/maven-metadata": {
"xml": {
"groupId": "net.java.dev.jna",
"lastUpdated": "20241017191337",
"latest": "5.1.1-SNAPSHOT",
"release": ""
}
},
"net/java/dev/jna/jna/5.1.1-SNAPSHOT/maven-metadata": {
"xml": {
"groupId": "net.java.dev.jna",
"lastUpdated": "20181118232424"
}
},
"net/java/dev/jna/jna/maven-metadata": {
"xml": {
"groupId": "net.java.dev.jna",
"lastUpdated": "20241028084608",
"latest": "5.1.1-SNAPSHOT",
"release": ""
}
},
"org/java-websocket#Java-WebSocket/1.3.10-20180805.200518-2/SNAPSHOT": {
"pom": "sha256-Te1UpdvGwDYnEjQPXY1m9V61JI9+4gyW5vsXY/v5B0g="
},
"org/java-websocket/Java-WebSocket/1.3.10-SNAPSHOT/maven-metadata": {
"xml": {
"groupId": "org.java-websocket",
"lastUpdated": "20180806172916"
}
},
"org/java-websocket/Java-WebSocket/maven-metadata": {
"xml": {
"groupId": "org.java-websocket",
"lastUpdated": "20240929162703",
"latest": "1.3.10-SNAPSHOT",
"release": ""
}
} }
}, },
"https://plugins.gradle.org/m2": { "https://plugins.gradle.org/m2": {
@ -34,28 +103,28 @@
"jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
"pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
}, },
"com/diffplug/durian#durian-swt.os/4.2.2": { "com/diffplug/durian#durian-swt.os/4.3.0": {
"jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=",
"module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
"pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
}, },
"com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.0.2": {
"pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" "pom": "sha256-7R3td6KWpv4hpQJ5ySbAe+FK98CMJDfTaFxw/Pa7oC0="
}, },
"com/diffplug/spotless#spotless-lib-extra/2.45.0": { "com/diffplug/spotless#spotless-lib-extra/3.0.2": {
"jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", "jar": "sha256-sOd3RtYz1EXnhImsPQitLqGzU3xNBk5KvkbMQtYjA+s=",
"module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", "module": "sha256-vSVeQkQbWRehU8U9z5fP08IEevN2zF3Yu1Z/aEAWtFk=",
"pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" "pom": "sha256-IVesGayscKzQRQH8WbvJZNsZD1tx5O1e/s6o5c9o7Os="
}, },
"com/diffplug/spotless#spotless-lib/2.45.0": { "com/diffplug/spotless#spotless-lib/3.0.2": {
"jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", "jar": "sha256-P5p/38WwOsIIlINBcJEMFcTyuE7UzjZ3iYowetWJg3w=",
"module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", "module": "sha256-E1WLrsCR6gDxYmXNNSOBePT+ejv61zXel214XUF/ss0=",
"pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" "pom": "sha256-jxtFo4m6Jeel8DvZ8KS9BKp+dHXgku6C1VUJYrLPdV8="
}, },
"com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { "com/diffplug/spotless#spotless-plugin-gradle/7.0.2": {
"jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", "jar": "sha256-WaNMT4SkjUyNkp4viZBjaeZUduwEmaQ96Hw+QSeXfNU=",
"module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", "module": "sha256-rxC8mydsNqlNcRh+kVhwJ1yyRVZTntzqGYpYL30Tsws=",
"pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" "pom": "sha256-JyVoPfbvTNSIr+sgANqJIpQcqQ513D49uFIupxWKaMQ="
}, },
"com/fasterxml#oss-parent/38": { "com/fasterxml#oss-parent/38": {
"pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug="
@ -134,18 +203,18 @@
"module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
"pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
}, },
"commons-codec#commons-codec/1.16.0": { "commons-codec#commons-codec/1.17.0": {
"jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=",
"pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw="
}, },
"commons-io#commons-io/2.16.1": { "commons-io#commons-io/2.16.1": {
"jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=",
"pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
}, },
"dev/equo/ide#solstice/1.7.5": { "dev/equo/ide#solstice/1.8.1": {
"jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=",
"module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=",
"pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY="
}, },
"jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
"pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
@ -153,9 +222,6 @@
"jakarta/platform#jakartaee-api-parent/9.1.0": { "jakarta/platform#jakartaee-api-parent/9.1.0": {
"pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
}, },
"org/apache#apache/29": {
"pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
},
"org/apache#apache/31": { "org/apache#apache/31": {
"pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
}, },
@ -173,9 +239,6 @@
"jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
"pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
}, },
"org/apache/commons#commons-parent/58": {
"pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
},
"org/apache/commons#commons-parent/69": { "org/apache/commons#commons-parent/69": {
"pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
}, },
@ -247,16 +310,16 @@
"org/eclipse/jetty#jetty-bom/9.4.55.v20240627": { "org/eclipse/jetty#jetty-bom/9.4.55.v20240627": {
"pom": "sha256-plq2UZjcP22y/2kBBlc31UgL52e+wyDgFzqJB68LGdg=" "pom": "sha256-plq2UZjcP22y/2kBBlc31UgL52e+wyDgFzqJB68LGdg="
}, },
"org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { "org/eclipse/jgit#org.eclipse.jgit-parent/6.10.0.202406032230-r": {
"pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" "pom": "sha256-8tNTmgp5Iv15RwgsGQHSCQ2uB0mGsi2r2XO0OYzR6i4="
}, },
"org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { "org/eclipse/jgit#org.eclipse.jgit/6.10.0.202406032230-r": {
"jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", "jar": "sha256-Q/kvOttoGl8wBrl56NNBwSqM/YAp8ofEK88KgDd1Za4=",
"pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" "pom": "sha256-BVlUQr62ogYQi2c6qcZpLIPkHfGDF33GcROxzD9Sgd0="
}, },
"org/eclipse/platform#org.eclipse.osgi/3.18.300": { "org/eclipse/platform#org.eclipse.osgi/3.18.500": {
"jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "jar": "sha256-gLJ11YN5cjspHqZQJJzDgJyPELNPeKr5iBMs1tQ0q04=",
"pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" "pom": "sha256-4o9b4Azk7Sx+SAnsrQW5UwfzWhflhWAHhri97juk2Wg="
}, },
"org/jdom#jdom2/2.0.6.1": { "org/jdom#jdom2/2.0.6.1": {
"jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
@ -414,10 +477,6 @@
"module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
"pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
}, },
"org/junit#junit-bom/5.9.3": {
"module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
"pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
},
"org/mockito#mockito-bom/4.11.0": { "org/mockito#mockito-bom/4.11.0": {
"pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
}, },
@ -501,11 +560,6 @@
"com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": {
"pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU=" "pom": "sha256-xLCopnocY3IgeJlhd5bYafE/UerrGsN/wHqcpxPaQjU="
}, },
"com/fazecast#jSerialComm/2.11.0": {
"jar": "sha256-xh5rVnw5XV412UKAaZjkWylmWMwU0kwau0EO0Hhbps0=",
"module": "sha256-/5bM5oSOSihGIHxYz+12sMRGhSpgyjs7cn5KkJ1/eVg=",
"pom": "sha256-CIOmOwJEY1v4RtSWaC+7dLzXKe6uMmyDP9eQ1B1ZuXs="
},
"com/github/jonpeterson#jackson-module-model-versioning/1.2.2": { "com/github/jonpeterson#jackson-module-model-versioning/1.2.2": {
"jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=", "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=",
"pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic=" "pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic="
@ -531,15 +585,25 @@
"com/illposed/osc#javaosc-parent/0.8": { "com/illposed/osc#javaosc-parent/0.8": {
"pom": "sha256-nEUgmNlVT1AifJfkGt0/t6mvSSUGgHK/3YywUtl8x3U=" "pom": "sha256-nEUgmNlVT1AifJfkGt0/t6mvSSUGgHK/3YywUtl8x3U="
}, },
"com/melloware#jintellitype/1.4.1": { "com/mayakapps/kache#kache-jvm/2.1.0": {
"jar": "sha256-6mQRTP+BCiat4vxz1LnB/jggDmP2dhUQ11ZrXtNOPCM=", "jar": "sha256-QnYuXTmGGeE6JZj1EcXc2UuW4dD6T+t2+e+YteFh14c=",
"pom": "sha256-wej58h+rEtprQQg+8i7wpFZBpjcmjw8pOryo9v0yoj4=" "module": "sha256-99wJdUE6GDuSUtUmB0PcdcXOuPVCPTwOPv+X2Gvb55Y=",
"pom": "sha256-bcKY6cIqgE35qSXwt0MI2XOcaO/Y16YTdndiry99LoI="
},
"com/mayakapps/kache#kache/2.1.0": {
"jar": "sha256-MKRjEaZRESk51De/E/5FJAgMsYuJqrmbkqIu0GUGSUc=",
"module": "sha256-tJZEwfTNkvRk844MXEwqFJp7s+0VsyrJCO5XypCHfqg=",
"pom": "sha256-qRWJAaDp8uNB+jtHPwK7mOIC+gkY1Fxo3/n602z+X2Y="
},
"com/melloware#jintellitype/1.5.0": {
"jar": "sha256-jf+mMUTxKiDf70/Zm9OeyQSxS0TPR8CeGOy3G4Hze1g=",
"pom": "sha256-e1E2mFo87oyeK/FQR1K/++7WyQwTCLsrX5//sNwBvao="
}, },
"com/melloware/jintellitype/maven-metadata": { "com/melloware/jintellitype/maven-metadata": {
"xml": { "xml": {
"groupId": "com.melloware", "groupId": "com.melloware",
"lastUpdated": "20220814121249", "lastUpdated": "20250413134243",
"release": "1.4.1" "release": "1.5.0"
} }
}, },
"com/typesafe#config/1.4.3": { "com/typesafe#config/1.4.3": {
@ -717,26 +781,26 @@
"jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=",
"pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4="
}, },
"net/java/dev/jna#jna-platform/5.16.0": { "net/java/dev/jna#jna-platform/5.17.0": {
"jar": "sha256-5aeVI5ZFCXV1VXgrtgKD5JAmEQE/EH5GANyTKY9z84I=", "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=",
"pom": "sha256-R3eT3wLGgn3+Ab2wjwBqVXdeb6BS3ErN7aNMmTYopJY=" "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ="
}, },
"net/java/dev/jna#jna/5.16.0": { "net/java/dev/jna#jna/5.17.0": {
"jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
"pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
}, },
"net/java/dev/jna/jna-platform/maven-metadata": { "net/java/dev/jna/jna-platform/maven-metadata": {
"xml": { "xml": {
"groupId": "net.java.dev.jna", "groupId": "net.java.dev.jna",
"lastUpdated": "20241222102859", "lastUpdated": "20250316114732",
"release": "5.16.0" "release": "5.17.0"
} }
}, },
"net/java/dev/jna/jna/maven-metadata": { "net/java/dev/jna/jna/maven-metadata": {
"xml": { "xml": {
"groupId": "net.java.dev.jna", "groupId": "net.java.dev.jna",
"lastUpdated": "20241222102857", "lastUpdated": "20250316114729",
"release": "5.16.0" "release": "5.17.0"
} }
}, },
"org/apache#apache/16": { "org/apache#apache/16": {
@ -857,9 +921,9 @@
"jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
"pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
}, },
"org/jetbrains/kotlin#kotlin-reflect/1.8.22": { "org/jetbrains/kotlin#kotlin-reflect/2.0.20": {
"jar": "sha256-ZVgl+mURIg/tDK5arU3+oqv5j9EPCud+uNr2q/zQ8Cc=", "jar": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA=",
"pom": "sha256-KeHqCKPTq0gtH9/UH76TRZEt9Gbbr6+0sS0YN8cr4yg=" "pom": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s="
}, },
"org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": {
"jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=",
@ -892,13 +956,13 @@
"module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=",
"pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18="
}, },
"org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.22": { "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": {
"jar": "sha256-BV9cskKH+hBhAJlae0erkhJrgegy6HX1+izwvVVpPQs=", "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=",
"pom": "sha256-T5WKqZPVmE+PXr7UFGVipfOp9pW2BJyfKHOBN5ytqzM=" "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o="
}, },
"org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.22": { "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": {
"jar": "sha256-QZiw6vCQpPJbb35aWVgfQxS6jJ9s0dE+6dNI5l7Y9wc=", "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=",
"pom": "sha256-ko8hhyF0djE8uBbUgHC8dlSqO5pa6B0/xfjCecyPjZ4=" "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I="
}, },
"org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": {
"jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=",
@ -1037,6 +1101,9 @@
"org/slf4j#slf4j-api/1.7.25": { "org/slf4j#slf4j-api/1.7.25": {
"pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
}, },
"org/slf4j#slf4j-api/1.7.36": {
"pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
},
"org/slf4j#slf4j-api/2.0.13": { "org/slf4j#slf4j-api/2.0.13": {
"jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=",
"pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE="
@ -1055,6 +1122,9 @@
"org/slf4j#slf4j-parent/1.7.25": { "org/slf4j#slf4j-parent/1.7.25": {
"pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
}, },
"org/slf4j#slf4j-parent/1.7.36": {
"pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
},
"org/slf4j#slf4j-parent/2.0.13": { "org/slf4j#slf4j-parent/2.0.13": {
"pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo="
}, },

View file

@ -1,8 +1,8 @@
diff --git a/gui/vite.config.ts b/gui/vite.config.ts diff --git a/gui/vite.config.ts b/gui/vite.config.ts
index c9eb27be..4b3757f0 100644 index 2171bccd..b4db20b9 100644
--- a/gui/vite.config.ts --- a/gui/vite.config.ts
+++ b/gui/vite.config.ts +++ b/gui/vite.config.ts
@@ -4,13 +4,10 @@ import { execSync } from 'child_process'; @@ -5,14 +5,10 @@ import { execSync } from 'child_process';
import path from 'path'; import path from 'path';
import { visualizer } from 'rollup-plugin-visualizer'; import { visualizer } from 'rollup-plugin-visualizer';
@ -14,8 +14,9 @@ index c9eb27be..4b3757f0 100644
+const commitHash = ""; +const commitHash = "";
+const versionTag = "@version@"; +const versionTag = "@version@";
// If not empty then it's not clean // If not empty then it's not clean
-const gitClean = execSync('git status --porcelain').toString() ? false : true; -const gitCleanString = execSync('git status --porcelain').toString();
-const gitClean = gitCleanString ? false : true;
+const gitClean = true; +const gitClean = true;
if (!gitClean) console.log('Git is dirty because of:\n' + gitCleanString);
console.log(`version is ${versionTag || commitHash}${gitClean ? '' : '-dirty'}`); console.log(`version is ${versionTag || commitHash}${gitClean ? '' : '-dirty'}`);

View file

@ -0,0 +1,13 @@
diff --git a/gui/src-tauri/src/main.rs b/gui/src-tauri/src/main.rs
index 8191f0ed..01e764d8 100644
--- a/gui/src-tauri/src/main.rs
+++ b/gui/src-tauri/src/main.rs
@@ -188,7 +188,7 @@ fn setup_webview2() -> Result<()> {
fn check_environment_variables() {
use itertools::Itertools;
- const ENVS_TO_CHECK: &[&str] = &["_JAVA_OPTIONS", "JAVA_TOOL_OPTIONS"];
+ const ENVS_TO_CHECK: &[&str] = &["_JAVA_OPTIONS"];
let checked_envs = ENVS_TO_CHECK
.into_iter()
.filter_map(|e| {

View file

@ -21,26 +21,25 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "slimevr"; pname = "slimevr";
version = "0.13.2"; version = "0.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SlimeVR"; owner = "SlimeVR";
repo = "SlimeVR-Server"; repo = "SlimeVR-Server";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs="; hash = "sha256-7b2IlMYpOVvthOUNr63PUsZyr2JH37O2DVWH9N6M8Xg=";
# solarxr # solarxr
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildAndTestSubdir = "gui/src-tauri"; buildAndTestSubdir = "gui/src-tauri";
useFetchCargoVendor = true; cargoHash = "sha256-+WrBVL4/XslJSOwuxs4IzqXG9l1/lMSbKil/8OHc9Xw=";
cargoHash = "sha256-93aOM6iJguTdC5RAUDuoSr05ar+iKilmddgKBOG2fDE=";
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm_9.fetchDeps {
pname = "${pname}-pnpm-deps"; pname = "${pname}-pnpm-deps";
inherit version src; inherit version src;
hash = "sha256-5IqIUwVvufrws6/xpCAilmgRNG4mUGX8NXajZcVZypM="; hash = "sha256-IoLY3ByDQGfbkWjxlEHHTiKiE3+tpwCrYLUDE8zPkeQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -69,18 +68,10 @@ rustPlatform.buildRustPackage rec {
patches = [ patches = [
# Upstream code uses Git to find the program version. # Upstream code uses Git to find the program version.
(replaceVars ./gui-no-git.patch { (replaceVars ./gui-no-git.patch {
inherit version; version = src.rev;
})
];
cargoPatches = [
# Fix Tauri dependencies issue.
# FIXME: Remove with next package update.
(fetchpatch {
name = "enable-rustls-feature.patch";
url = "https://github.com/SlimeVR/SlimeVR-Server/commit/2708b5a15b7c1b8af3e86d942c5e842d83cf078f.patch";
hash = "sha256-UDVztPGPaKp2Hld3bMDuPMAu5s1OhvKEsTiXoDRK7cU=";
}) })
# By default, SlimeVR will give a big warning about our `JAVA_TOOL_OPTIONS` changes.
./no-java-tool-options-warning.patch
]; ];
postPatch = postPatch =
@ -91,22 +82,27 @@ rustPlatform.buildRustPackage rec {
'' ''
+ lib.optionalString stdenv.hostPlatform.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux ''
# Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is. # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is.
pushd $cargoDepsCopy/libappindicator-sys-* substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1)
substituteInPlace src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
# Cargo doesn't like it when vendored dependencies are edited.
substituteInPlace .cargo-checksum.json \
--replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1)
popd
substituteInPlace gui/src-tauri/src/tray.rs \ substituteInPlace gui/src-tauri/src/tray.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
# tao < version 0.31 has a GTK crash. Manually apply the fix.
pushd $cargoDepsCopy/tao-0.30.*
patch -p1 < ${
fetchpatch {
name = "fix-gtk-crash.patch";
url = "https://github.com/tauri-apps/tao/commit/83e35e961f4893790b913ee2efc15ae33fd16fb2.diff";
hash = "sha256-FNXWzsg4lO6VbLsqS6NevX8kVj26YtcYdKbbFejq9hM=";
}
}
popd
''; '';
# solarxr needs to be installed after compiling its Typescript files. This isn't # solarxr needs to be installed after compiling its Typescript files. This isn't
# done the first time, because `pnpm_9.configHook` ignores `package.json` scripts. # done the first time, because `pnpm_9.configHook` ignores `package.json` scripts.
preBuild = '' preBuild = ''
pnpm --filter solarxr-protocol install pnpm --filter solarxr-protocol build
''; '';
doCheck = false; # No tests doCheck = false; # No tests
@ -129,8 +125,26 @@ rustPlatform.buildRustPackage rec {
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;
meta = { meta = {
homepage = "https://docs.slimevr.dev/"; homepage = "https://slimevr.dev";
description = "App for facilitating full-body tracking in virtual reality"; description = "App for facilitating full-body tracking in virtual reality";
longDescription = ''
App for SlimeVR ecosystem. It orchestrates communication between multiple sensors and integrations, like SteamVR.
Sensors implementations:
- [SlimeVR Tracker for ESP](https://github.com/SlimeVR/SlimeVR-Tracker-ESP) - ESP microcontrollers and multiple IMUs are supported
- [owoTrack Mobile App](https://github.com/abb128/owoTrackVRSyncMobile) - use phones as trackers (limited functionality and compatibility)
- [SlimeVR Wrangler](https://github.com/carl-anders/slimevr-wrangler) - use Nintendo Switch Joycon controllers as trackers
Integrations:
- Use [SlimeVR OpenVR Driver](https://github.com/SlimeVR/SlimeVR-OpenVR-Driver) as a driver for SteamVR.
- Use built-in OSC Trackers support for FBT integration with VRChat, PCVR or Standalone.
- Use built-in VMC support for sending and receiving tracking data to and from other apps such as VSeeFace.
- Export recordings as .BVH files to integrate motion capture data into 3d applications such as Blender.
More at https://docs.slimevr.dev/tools/index.html.
'';
license = with lib.licenses; [ license = with lib.licenses; [
mit mit
asl20 asl20

View file

@ -1,8 +1,8 @@
[ [
{ {
"pname": "Ardalis.GuardClauses", "pname": "Ardalis.GuardClauses",
"version": "4.5.0", "version": "5.0.0",
"hash": "sha256-YqVmWM9f57Lof1e1dUWoIig7D2M9G/c2slUNicCX6Hg=" "hash": "sha256-jQOXJzEIRzPVEFTcbdCNj450hbpSTrIbYSi5m2Q5MEo="
}, },
{ {
"pname": "AspNetCore.Authentication.Basic", "pname": "AspNetCore.Authentication.Basic",
@ -11,8 +11,8 @@
}, },
{ {
"pname": "BouncyCastle.Cryptography", "pname": "BouncyCastle.Cryptography",
"version": "2.3.0", "version": "2.5.1",
"hash": "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0=" "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
}, },
{ {
"pname": "CommandLiners", "pname": "CommandLiners",
@ -26,13 +26,13 @@
}, },
{ {
"pname": "DeepEqual", "pname": "DeepEqual",
"version": "5.0.0", "version": "5.1.0",
"hash": "sha256-tkmNXgjD+wS65uIqTqDQgRupq9EwW1JZwpobChwTjYM=" "hash": "sha256-AGPZXr7FJdEEVYtQ9I2BOHG/x8cU7s0euy+XvovOHpA="
}, },
{ {
"pname": "dotnet-ef", "pname": "dotnet-ef",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-9mxOR/6SU5sqBiWYNNMM8aah81XnfahEAg24/5Skn4A=" "hash": "sha256-a/Wb9PIfyBLs0d8VOUQdEvxk73i8nlvd1kCCqOpEHs8="
}, },
{ {
"pname": "DotNet.Glob", "pname": "DotNet.Glob",
@ -41,18 +41,23 @@
}, },
{ {
"pname": "EntityFramework", "pname": "EntityFramework",
"version": "6.3.0", "version": "6.5.0",
"hash": "sha256-rh9cBlFA5NlFoppMMULpM0SSRQtKeDr10Caa/+GGTSY=" "hash": "sha256-WZ4AI6XjyMMIDw6y3ggz5lym4ihmFTndInt35ij9E0k="
}, },
{ {
"pname": "Esprima", "pname": "Esprima",
"version": "3.0.4", "version": "3.0.4",
"hash": "sha256-KyZHjy7QTh3WRdY/fUrqrcaoZOa0RnUAUFLTzSOBVYA=" "hash": "sha256-KyZHjy7QTh3WRdY/fUrqrcaoZOa0RnUAUFLTzSOBVYA="
}, },
{
"pname": "FSharp.Core",
"version": "8.0.200",
"hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw="
},
{ {
"pname": "HtmlAgilityPack", "pname": "HtmlAgilityPack",
"version": "1.11.61", "version": "1.12.1",
"hash": "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY=" "hash": "sha256-qravAvCdB/KjWujRk2GL/kGre/B9XVAP+jewICxiKKo="
}, },
{ {
"pname": "Humanizer.Core", "pname": "Humanizer.Core",
@ -64,25 +69,30 @@
"version": "3.0.1", "version": "3.0.1",
"hash": "sha256-oOq7ze1QFYHK/9zNDF7ClbWZaW4A/478M4yQ/LQnUJ8=" "hash": "sha256-oOq7ze1QFYHK/9zNDF7ClbWZaW4A/478M4yQ/LQnUJ8="
}, },
{
"pname": "Linq.Expression.Optimizer",
"version": "1.0.29",
"hash": "sha256-F0ZvZ6hbdnjkuNuSoFzSjYUgG/hEHuG7o8wExDS1LLo="
},
{ {
"pname": "LinqKit", "pname": "LinqKit",
"version": "1.2.5", "version": "1.3.8",
"hash": "sha256-rF1/FIR41PrwZX4N6bkhXNG2BQsXbjZmx8/qfVdKiAI=" "hash": "sha256-kX82JIKz2mNK11na8M84ChWgrdBhhB0Zd+JhL4FmR1U="
}, },
{ {
"pname": "LinqKit.Core", "pname": "LinqKit.Core",
"version": "1.2.5", "version": "1.2.8",
"hash": "sha256-0z4RpAt+WvydeCN0GJu4vsMfCxzxmoi+LTE6fQ51NZY=" "hash": "sha256-7PTxzw8n3vpmNKJlumOwL5eWGM7nmdC4oomPTKlm7LE="
}, },
{ {
"pname": "MailKit", "pname": "MailKit",
"version": "4.5.0", "version": "4.11.0",
"hash": "sha256-quU88XNBF+tzb1yr7+lSfx90kmvZpbX43+YJtdYgPzk=" "hash": "sha256-T41OHePMaYkd7rRP2ytMfEjaD+bpJ65yWBJJuvs7y18="
}, },
{ {
"pname": "Microsoft.AspNetCore.Hosting.WindowsServices", "pname": "Microsoft.AspNetCore.Hosting.WindowsServices",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-sK7ZOyoQv/bwmaJLK0Dk7kGDJAFlIwUxVhru8kwvea0=" "hash": "sha256-HqNCXJfBZxbtCf94EirLczAl8bsHhmIAzFIFsEjBspE="
}, },
{ {
"pname": "Microsoft.AspNetCore.SpaServices.Extensions", "pname": "Microsoft.AspNetCore.SpaServices.Extensions",
@ -94,11 +104,6 @@
"version": "6.0.0", "version": "6.0.0",
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
}, },
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "8.0.0",
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
},
{ {
"pname": "Microsoft.Build", "pname": "Microsoft.Build",
"version": "15.7.0-preview-000011-1378327", "version": "15.7.0-preview-000011-1378327",
@ -126,18 +131,18 @@
}, },
{ {
"pname": "Microsoft.CodeAnalysis.Analyzers", "pname": "Microsoft.CodeAnalysis.Analyzers",
"version": "3.3.4", "version": "3.3.3",
"hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
}, },
{ {
"pname": "Microsoft.CodeAnalysis.Common", "pname": "Microsoft.CodeAnalysis.Common",
"version": "4.9.2", "version": "4.5.0",
"hash": "sha256-QU/nyiJWpdPQGHBdaOEVc+AghnGHcKBFBX0oyhRZ9CQ=" "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="
}, },
{ {
"pname": "Microsoft.CodeAnalysis.CSharp", "pname": "Microsoft.CodeAnalysis.CSharp",
"version": "4.9.2", "version": "4.5.0",
"hash": "sha256-j06Q4A9E65075SBXdXVCMRgeLxA63Rv1vxarydmmVAA=" "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="
}, },
{ {
"pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
@ -156,53 +161,53 @@
}, },
{ {
"pname": "Microsoft.CSharp", "pname": "Microsoft.CSharp",
"version": "4.6.0", "version": "4.7.0",
"hash": "sha256-16OdEKbPLxh+jLYS4cOiGRX/oU6nv3KMF4h5WnZAsHs=" "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
}, },
{ {
"pname": "Microsoft.Data.Sqlite.Core", "pname": "Microsoft.Data.Sqlite.Core",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-bbKpSaEHKYezjxSZECmDQr0gv9zYTN042dpuYQtZKQ4=" "hash": "sha256-JWnPERvxWL+5n0dQh+s9zhkWL1gnGexq8LpBszAIaco="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore", "pname": "Microsoft.EntityFrameworkCore",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-nkrtoqGn43RdVjSlwa/jzLaixnZ1CNDDTvvSubUmR5E=" "hash": "sha256-C5TRzSpdH11L+slXG3Gxmhtjl76DGlaKl3G9k9G6giQ="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.Abstractions", "pname": "Microsoft.EntityFrameworkCore.Abstractions",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-ywVWOje6duVcJ8gSSC5HER2UO0mAzfg6VMtqloRmQfc=" "hash": "sha256-QM0bhIyoBR8j9epa8eoFhtf/fA7u2dW3vU1tfneNsr0="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.Analyzers", "pname": "Microsoft.EntityFrameworkCore.Analyzers",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-Kqv9ZFl1nMJ1hRmT3kQbN5vSvMrRSZ5XOF9wzw5sS8A=" "hash": "sha256-SVQd3sX0TjNz1kXN4PVWdThyyWpzE8JC0ch5vKVSDKE="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.Design", "pname": "Microsoft.EntityFrameworkCore.Design",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-TjDkQOUSFIM5OOFcm4+yNiXmAiKgs8Q3XpJl9eTEJdo=" "hash": "sha256-G+A43Fv8cqdbg3SKewEKs2NTItBCjELdhVQCtYwEu3U="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.InMemory", "pname": "Microsoft.EntityFrameworkCore.InMemory",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-m0zvYVaD72UVHnOc7Ea0/FwoVw/FhqKVladnacHkQlc=" "hash": "sha256-iQwlHSclsftdgYnlYODBbeP1I9mWiVM8f3whPtWYrtk="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.Relational", "pname": "Microsoft.EntityFrameworkCore.Relational",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-TRP/Ior708EQjD03GGxKom2eLOxcUYN1MoFqzk3lYp8=" "hash": "sha256-U+pLbWgYmi+2JhGUkYa/ZdU89IutJewGRNA3TrP4vjk="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.Sqlite", "pname": "Microsoft.EntityFrameworkCore.Sqlite",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-/IOzElVUh6k2eiTiMHhsdTSsBx4j3whX1lWSMgFYMUE=" "hash": "sha256-Pc7/YnigKXfAZQE1Rb2awo1YHYz48knv7WMeaKP9QjY="
}, },
{ {
"pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
"version": "8.0.4", "version": "8.0.15",
"hash": "sha256-gC8yod0XV1/xZAk1PDqTf+QlzJAOjj6kT8mJZ9LvQF0=" "hash": "sha256-MwbVFf22PLUZvMxAm5+ooAoYP7UsPvnX6mYkU4C9RLU="
}, },
{ {
"pname": "Microsoft.Extensions.ApiDescription.Server", "pname": "Microsoft.Extensions.ApiDescription.Server",
@ -216,8 +221,8 @@
}, },
{ {
"pname": "Microsoft.Extensions.Caching.Memory", "pname": "Microsoft.Extensions.Caching.Memory",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8=" "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration", "pname": "Microsoft.Extensions.Configuration",
@ -239,10 +244,20 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
}, },
{
"pname": "Microsoft.Extensions.Configuration.Abstractions",
"version": "9.0.0",
"hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
},
{ {
"pname": "Microsoft.Extensions.Configuration.Binder", "pname": "Microsoft.Extensions.Configuration.Binder",
"version": "8.0.0", "version": "8.0.2",
"hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
},
{
"pname": "Microsoft.Extensions.Configuration.Binder",
"version": "9.0.0",
"hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.CommandLine", "pname": "Microsoft.Extensions.Configuration.CommandLine",
@ -256,18 +271,18 @@
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.FileExtensions", "pname": "Microsoft.Extensions.Configuration.FileExtensions",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs=" "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.Json", "pname": "Microsoft.Extensions.Configuration.Json",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg=" "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
}, },
{ {
"pname": "Microsoft.Extensions.Configuration.UserSecrets", "pname": "Microsoft.Extensions.Configuration.UserSecrets",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8=" "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0="
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection", "pname": "Microsoft.Extensions.DependencyInjection",
@ -279,6 +294,11 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
}, },
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "8.0.1",
"hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
},
{ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "6.0.0", "version": "6.0.0",
@ -291,24 +311,34 @@
}, },
{ {
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "8.0.1", "version": "8.0.2",
"hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
}, },
{ {
"pname": "Microsoft.Extensions.DependencyModel", "pname": "Microsoft.Extensions.DependencyModel",
"version": "8.0.0", "version": "8.0.2",
"hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "9.0.0",
"hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
}, },
{ {
"pname": "Microsoft.Extensions.Diagnostics", "pname": "Microsoft.Extensions.Diagnostics",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4=" "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
}, },
{ {
"pname": "Microsoft.Extensions.Diagnostics.Abstractions", "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="
}, },
{
"pname": "Microsoft.Extensions.Diagnostics.Abstractions",
"version": "8.0.1",
"hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
},
{ {
"pname": "Microsoft.Extensions.FileProviders.Abstractions", "pname": "Microsoft.Extensions.FileProviders.Abstractions",
"version": "2.1.0-preview1-final", "version": "2.1.0-preview1-final",
@ -361,18 +391,23 @@
}, },
{ {
"pname": "Microsoft.Extensions.Hosting", "pname": "Microsoft.Extensions.Hosting",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg=" "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4="
}, },
{ {
"pname": "Microsoft.Extensions.Hosting.Abstractions", "pname": "Microsoft.Extensions.Hosting.Abstractions",
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="
}, },
{
"pname": "Microsoft.Extensions.Hosting.Abstractions",
"version": "8.0.1",
"hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
},
{ {
"pname": "Microsoft.Extensions.Hosting.WindowsServices", "pname": "Microsoft.Extensions.Hosting.WindowsServices",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-+uYKf6LT/wN7UrHSgJ3diIqVKCi214yJQgh5oXqYi/c=" "hash": "sha256-JBrZuv1RxpJf5wR81g91bE1/JQgBeOtnJDvA98rlYKE="
}, },
{ {
"pname": "Microsoft.Extensions.Logging", "pname": "Microsoft.Extensions.Logging",
@ -384,6 +419,11 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
}, },
{
"pname": "Microsoft.Extensions.Logging",
"version": "8.0.1",
"hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
},
{ {
"pname": "Microsoft.Extensions.Logging.Abstractions", "pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "6.0.0", "version": "6.0.0",
@ -396,33 +436,38 @@
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Abstractions", "pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.1", "version": "8.0.2",
"hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.3",
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Configuration", "pname": "Microsoft.Extensions.Logging.Configuration",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Console", "pname": "Microsoft.Extensions.Logging.Console",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=" "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.Debug", "pname": "Microsoft.Extensions.Logging.Debug",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA=" "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.EventLog", "pname": "Microsoft.Extensions.Logging.EventLog",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc=" "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8="
}, },
{ {
"pname": "Microsoft.Extensions.Logging.EventSource", "pname": "Microsoft.Extensions.Logging.EventSource",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0=" "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA="
}, },
{ {
"pname": "Microsoft.Extensions.Options", "pname": "Microsoft.Extensions.Options",
@ -434,6 +479,11 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
}, },
{
"pname": "Microsoft.Extensions.Options",
"version": "8.0.2",
"hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
},
{ {
"pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
"version": "8.0.0", "version": "8.0.0",
@ -459,6 +509,11 @@
"version": "8.0.0", "version": "8.0.0",
"hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
}, },
{
"pname": "Microsoft.Extensions.Primitives",
"version": "9.0.0",
"hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
},
{ {
"pname": "Microsoft.NETCore.App", "pname": "Microsoft.NETCore.App",
"version": "2.0.0", "version": "2.0.0",
@ -496,8 +551,8 @@
}, },
{ {
"pname": "Microsoft.NETCore.Platforms", "pname": "Microsoft.NETCore.Platforms",
"version": "3.0.0", "version": "3.1.0",
"hash": "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4=" "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="
}, },
{ {
"pname": "Microsoft.NETCore.Targets", "pname": "Microsoft.NETCore.Targets",
@ -509,10 +564,25 @@
"version": "1.1.0", "version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
}, },
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies",
"version": "1.0.3",
"hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net45",
"version": "1.0.3",
"hash": "sha256-I6n5TqPiy4jNg0GvdbgRxvtcuCUW/Glule1GICeRKOM="
},
{
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net46",
"version": "1.0.3",
"hash": "sha256-3Lt5uzho2/u2TGQxFvqmPYiO6ezLoMTpZemZLtfE410="
},
{ {
"pname": "Microsoft.TypeScript.MSBuild", "pname": "Microsoft.TypeScript.MSBuild",
"version": "5.4.4", "version": "5.8.1",
"hash": "sha256-bE1F3XgGxF0g+zX8TLx0glAVK57k8ITRe/NI4Tf8mxw=" "hash": "sha256-5x81TEhXaEEYnBeosK8zmBwPLKPifMf4JUFrGsk/IxA="
}, },
{ {
"pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts", "pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts",
@ -541,23 +611,18 @@
}, },
{ {
"pname": "Microsoft.Win32.Registry", "pname": "Microsoft.Win32.Registry",
"version": "4.5.0", "version": "4.7.0",
"hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "4.6.0",
"hash": "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ="
}, },
{ {
"pname": "Microsoft.Win32.SystemEvents", "pname": "Microsoft.Win32.SystemEvents",
"version": "4.6.0", "version": "6.0.0",
"hash": "sha256-7BRoIg1Hm/OVHZBPGD+eugyyMTZHhmv0yLTV3HWOFd4=" "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
}, },
{ {
"pname": "MimeKit", "pname": "MimeKit",
"version": "4.5.0", "version": "4.11.0",
"hash": "sha256-Nsk3Br9yLOC5wDLtRQyw04Kq205y5QCISpyiB13mwLU=" "hash": "sha256-UTP+pfP3q4X65/KNGBTkHo4KZjeHZ10dQbr58Qf42iQ="
}, },
{ {
"pname": "Mono.Options", "pname": "Mono.Options",
@ -571,8 +636,8 @@
}, },
{ {
"pname": "Namotion.Reflection", "pname": "Namotion.Reflection",
"version": "3.1.1", "version": "3.3.0",
"hash": "sha256-WXHT/prJSLS7yRoepu5pls5xe58pCbR6S8VjuR5uJR0=" "hash": "sha256-YBYWLYmnCZrKfiJWQo7tofiz2A7ROpxFfAYdYLa5cgI="
}, },
{ {
"pname": "NETStandard.Library", "pname": "NETStandard.Library",
@ -586,8 +651,8 @@
}, },
{ {
"pname": "NETStandard.Library", "pname": "NETStandard.Library",
"version": "2.0.1", "version": "2.0.3",
"hash": "sha256-s4UiH848a+p2yWwMH+8PaYGnQL2qnY0GmixoeLvkhDQ=" "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
}, },
{ {
"pname": "Newtonsoft.Json", "pname": "Newtonsoft.Json",
@ -601,64 +666,59 @@
}, },
{ {
"pname": "NJsonSchema", "pname": "NJsonSchema",
"version": "11.0.0", "version": "11.2.0",
"hash": "sha256-MK/i30Y6lXotOKNDBZA7koeOVlcI5V9AQ5ZzxjHWxwo=" "hash": "sha256-Y1FggfzRf54+ioMKvyyzMW30psrHF7hmAwnYom/Ud8s="
}, },
{ {
"pname": "NJsonSchema.Annotations", "pname": "NJsonSchema.Annotations",
"version": "11.0.0", "version": "11.2.0",
"hash": "sha256-AVOWOj94Zw9DzpT07YebJa79/fCvRWa7E7zYG5e+/6w=" "hash": "sha256-uQYU/NuAbz+HlImemuv1Yi4ODKoaQ38BSrWONOR9jFs="
}, },
{ {
"pname": "NJsonSchema.NewtonsoftJson", "pname": "NJsonSchema.NewtonsoftJson",
"version": "11.0.0", "version": "11.2.0",
"hash": "sha256-ddnWplAPnLE9rDMm10f7FceY8bE/T8MpbOuiVPo3wsU=" "hash": "sha256-NyXB3rcdPpjaZq0CAZy5xMmvLqqzPGyddeTVtowqaBU="
}, },
{ {
"pname": "NJsonSchema.Yaml", "pname": "NJsonSchema.Yaml",
"version": "11.0.0", "version": "11.2.0",
"hash": "sha256-MkUdfh/erCTFO0mgkKj1kWEKgie6rJtiwV1emsvYJzc=" "hash": "sha256-NtlUldW5D0VSj10XqfMvxDMVULdw99owTS1zGYg4aKg="
}, },
{ {
"pname": "NSwag.Annotations", "pname": "NSwag.Annotations",
"version": "14.0.7", "version": "14.3.0",
"hash": "sha256-fQIIREC86xdjGvjPyV/vvHnZmcgtmFSG9SilgSO78ek=" "hash": "sha256-kz+fEwUlEjsPsOiFCTcXYHAAYCJa2cepDRIY4mkye4U="
}, },
{ {
"pname": "NSwag.AspNetCore", "pname": "NSwag.AspNetCore",
"version": "14.0.7", "version": "14.3.0",
"hash": "sha256-EOJrEUq1kgx0JvmTmcR6oRWk3Ci68kYhByVrZlBLtwA=" "hash": "sha256-lGeH27yzj5fXPpBMqtoFOTRiu+gve8oSgugW2u4tMAk="
}, },
{ {
"pname": "NSwag.Core", "pname": "NSwag.Core",
"version": "14.0.7", "version": "14.3.0",
"hash": "sha256-t42U+Zl2QcfsvEWJGg6A3f+OWbenu/itjrnS8loszH4=" "hash": "sha256-FjWms/V5+j4ut1TShKWDsTr1LuBsHxRQIFs1fwD0jGw="
}, },
{ {
"pname": "NSwag.Core.Yaml", "pname": "NSwag.Core.Yaml",
"version": "14.0.7", "version": "14.3.0",
"hash": "sha256-hGCff58hTcv9y4b8Dx3P7GhC5r8A5SyJaxACtS4yTK0=" "hash": "sha256-CcGXuyNUvF/e3f9K3wZY+h0RIbzoLOLLguUcj+VVFXI="
}, },
{ {
"pname": "NSwag.Generation", "pname": "NSwag.Generation",
"version": "14.0.7", "version": "14.3.0",
"hash": "sha256-nmYwfjwvkkozItdoNqIuNS/9BI2i6dPpVCxu16m0T8w=" "hash": "sha256-M487C7OsnZnURcAN90DGIhZTnxlToaIskkztCKkXzQc="
}, },
{ {
"pname": "NSwag.Generation.AspNetCore", "pname": "NSwag.Generation.AspNetCore",
"version": "14.0.7", "version": "14.3.0",
"hash": "sha256-Jsa5MT9LjY7GVMIi/QTyP2de7BW+tu809dm1RPA2mdA=" "hash": "sha256-DvjSjbM2ug0AvjAE8CwVUej2hZbLWopmZMbOx4Oy2IU="
}, },
{ {
"pname": "NuGet.Frameworks", "pname": "NuGet.Frameworks",
"version": "4.7.0-preview1-4986", "version": "4.7.0-preview1-4986",
"hash": "sha256-B8Fax4r73AjdTbcV3mF9dPGAV4P++UMUh2cbItNk0JE=" "hash": "sha256-B8Fax4r73AjdTbcV3mF9dPGAV4P++UMUh2cbItNk0JE="
}, },
{
"pname": "Rnwood.LumiSoft.Net",
"version": "1.0.2",
"hash": "sha256-Ud4K6lN2QMQXUUZn157HaPd2MtHTrKNmGBZn8N2hwxo="
},
{ {
"pname": "runtime.any.System.Collections", "pname": "runtime.any.System.Collections",
"version": "4.3.0", "version": "4.3.0",
@ -689,11 +749,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
}, },
{
"pname": "runtime.any.System.Reflection.Extensions",
"version": "4.3.0",
"hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
},
{ {
"pname": "runtime.any.System.Reflection.Primitives", "pname": "runtime.any.System.Reflection.Primitives",
"version": "4.3.0", "version": "4.3.0",
@ -776,8 +831,8 @@
}, },
{ {
"pname": "runtime.native.System.Data.SqlClient.sni", "pname": "runtime.native.System.Data.SqlClient.sni",
"version": "4.6.0", "version": "4.7.0",
"hash": "sha256-TenFWtugim8xFtilE3Z9br0FPnLCosdLQ5DV1uW3448=" "hash": "sha256-cj0+BpmoibwOWj2wNXwONJeTGosmFwhD349zPjNaBK0="
}, },
{ {
"pname": "runtime.native.System.IO.Compression", "pname": "runtime.native.System.IO.Compression",
@ -941,13 +996,13 @@
}, },
{ {
"pname": "Serilog", "pname": "Serilog",
"version": "3.1.1", "version": "4.2.0",
"hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
}, },
{ {
"pname": "Serilog.AspNetCore", "pname": "Serilog.AspNetCore",
"version": "8.0.1", "version": "8.0.3",
"hash": "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4=" "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I="
}, },
{ {
"pname": "Serilog.Extensions.Hosting", "pname": "Serilog.Extensions.Hosting",
@ -966,13 +1021,13 @@
}, },
{ {
"pname": "Serilog.Settings.Configuration", "pname": "Serilog.Settings.Configuration",
"version": "8.0.0", "version": "9.0.0",
"hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg=" "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
}, },
{ {
"pname": "Serilog.Sinks.Console", "pname": "Serilog.Sinks.Console",
"version": "5.0.1", "version": "6.0.0",
"hash": "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI=" "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
}, },
{ {
"pname": "Serilog.Sinks.Debug", "pname": "Serilog.Sinks.Debug",
@ -981,8 +1036,8 @@
}, },
{ {
"pname": "Serilog.Sinks.EventLog", "pname": "Serilog.Sinks.EventLog",
"version": "3.1.0", "version": "4.0.0",
"hash": "sha256-oAzpAdcF9Hdf99JjpbWvgYa5BkN+Ec4gc7SPHFVH7As=" "hash": "sha256-ccSnzL/I4gZoL2xH5Y9Q9zoP7iV8+n95wNQ/JOP3vOg="
}, },
{ {
"pname": "Serilog.Sinks.File", "pname": "Serilog.Sinks.File",
@ -1009,6 +1064,11 @@
"version": "2.1.6", "version": "2.1.6",
"hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
}, },
{
"pname": "StreamLib",
"version": "0.12.0",
"hash": "sha256-oAsRU/n575cgAms0AngignhSYPWfVvWvnThYLFz+cNU="
},
{ {
"pname": "System.AppContext", "pname": "System.AppContext",
"version": "4.1.0", "version": "4.1.0",
@ -1024,11 +1084,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
}, },
{
"pname": "System.Buffers",
"version": "4.5.1",
"hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
},
{ {
"pname": "System.CodeDom", "pname": "System.CodeDom",
"version": "4.4.0", "version": "4.4.0",
@ -1036,8 +1091,8 @@
}, },
{ {
"pname": "System.CodeDom", "pname": "System.CodeDom",
"version": "4.6.0", "version": "6.0.0",
"hash": "sha256-nKJQMD3qFkNX+J+aXOjsSVloB1CbZ3QNLb96Xiz7wK0=" "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="
}, },
{ {
"pname": "System.Collections", "pname": "System.Collections",
@ -1066,8 +1121,8 @@
}, },
{ {
"pname": "System.Collections.Immutable", "pname": "System.Collections.Immutable",
"version": "8.0.0", "version": "6.0.0",
"hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
}, },
{ {
"pname": "System.Collections.NonGeneric", "pname": "System.Collections.NonGeneric",
@ -1089,11 +1144,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="
}, },
{
"pname": "System.ComponentModel.Annotations",
"version": "4.6.0",
"hash": "sha256-dn91soWaR30tghqyv3oIjc0UgMAnuErwG0oXRKFdl0w="
},
{ {
"pname": "System.ComponentModel.Annotations", "pname": "System.ComponentModel.Annotations",
"version": "5.0.0", "version": "5.0.0",
@ -1141,8 +1191,8 @@
}, },
{ {
"pname": "System.Configuration.ConfigurationManager", "pname": "System.Configuration.ConfigurationManager",
"version": "4.6.0", "version": "6.0.1",
"hash": "sha256-x54SBQYZLkU5AcCMOqx5VR6jM/43E2JFL894UtPAxE4=" "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ="
}, },
{ {
"pname": "System.Console", "pname": "System.Console",
@ -1151,8 +1201,8 @@
}, },
{ {
"pname": "System.Data.SqlClient", "pname": "System.Data.SqlClient",
"version": "4.7.0", "version": "4.8.6",
"hash": "sha256-fckcu7RCKtndbfbIvBKnOb2xgr8bZKZ5B2mx0pBRwZw=" "hash": "sha256-Qc/yco3e0+6jP8UiMA0ERlfSEKdINv0BmHixh9Z8fJQ="
}, },
{ {
"pname": "System.Diagnostics.Contracts", "pname": "System.Diagnostics.Contracts",
@ -1186,13 +1236,13 @@
}, },
{ {
"pname": "System.Diagnostics.EventLog", "pname": "System.Diagnostics.EventLog",
"version": "4.5.0", "version": "8.0.0",
"hash": "sha256-tKBKgUhEM6D7XJlzmHc/F8ekqJx8rHO4QYUMjzbIs9I=" "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
}, },
{ {
"pname": "System.Diagnostics.EventLog", "pname": "System.Diagnostics.EventLog",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
}, },
{ {
"pname": "System.Diagnostics.FileVersionInfo", "pname": "System.Diagnostics.FileVersionInfo",
@ -1231,8 +1281,8 @@
}, },
{ {
"pname": "System.Drawing.Common", "pname": "System.Drawing.Common",
"version": "4.6.0", "version": "6.0.0",
"hash": "sha256-D6PMDq8M2aSrnDeBYfFftaX7hFLcxrOYFLrtxbERMAM=" "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
}, },
{ {
"pname": "System.Dynamic.Runtime", "pname": "System.Dynamic.Runtime",
@ -1246,8 +1296,8 @@
}, },
{ {
"pname": "System.Formats.Asn1", "pname": "System.Formats.Asn1",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=" "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
}, },
{ {
"pname": "System.Globalization", "pname": "System.Globalization",
@ -1324,6 +1374,11 @@
"version": "6.0.3", "version": "6.0.3",
"hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="
}, },
{
"pname": "System.IO.Pipelines",
"version": "9.0.0",
"hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0="
},
{ {
"pname": "System.IO.Pipes", "pname": "System.IO.Pipes",
"version": "4.0.0", "version": "4.0.0",
@ -1341,8 +1396,8 @@
}, },
{ {
"pname": "System.Linq.Dynamic.Core", "pname": "System.Linq.Dynamic.Core",
"version": "1.3.14", "version": "1.6.0.2",
"hash": "sha256-tT9V1Y9vKfrzEmmBTYmGmzLPBfCHCXMZ8Jvluf3mliA=" "hash": "sha256-5qzEVm+33ATR+SQljwe/LcP5o0MNjv49nHfXIVG27dw="
}, },
{ {
"pname": "System.Linq.Expressions", "pname": "System.Linq.Expressions",
@ -1364,11 +1419,6 @@
"version": "4.5.3", "version": "4.5.3",
"hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
}, },
{
"pname": "System.Memory",
"version": "4.5.5",
"hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
},
{ {
"pname": "System.Net.Http", "pname": "System.Net.Http",
"version": "4.1.0", "version": "4.1.0",
@ -1394,11 +1444,6 @@
"version": "4.1.0", "version": "4.1.0",
"hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0="
}, },
{
"pname": "System.Numerics.Vectors",
"version": "4.4.0",
"hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
},
{ {
"pname": "System.ObjectModel", "pname": "System.ObjectModel",
"version": "4.0.12", "version": "4.0.12",
@ -1421,8 +1466,8 @@
}, },
{ {
"pname": "System.Reactive", "pname": "System.Reactive",
"version": "6.0.0", "version": "6.0.1",
"hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
}, },
{ {
"pname": "System.Reflection", "pname": "System.Reflection",
@ -1481,8 +1526,8 @@
}, },
{ {
"pname": "System.Reflection.Metadata", "pname": "System.Reflection.Metadata",
"version": "8.0.0", "version": "6.0.1",
"hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="
}, },
{ {
"pname": "System.Reflection.Primitives", "pname": "System.Reflection.Primitives",
@ -1539,11 +1584,6 @@
"version": "4.5.0-preview1-26216-02", "version": "4.5.0-preview1-26216-02",
"hash": "sha256-xE1bUh7w/hZrknJ2kn1ZKIQO/vW2js9SJxaGXkGq3TI=" "hash": "sha256-xE1bUh7w/hZrknJ2kn1ZKIQO/vW2js9SJxaGXkGq3TI="
}, },
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.5.3",
"hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
},
{ {
"pname": "System.Runtime.CompilerServices.Unsafe", "pname": "System.Runtime.CompilerServices.Unsafe",
"version": "6.0.0", "version": "6.0.0",
@ -1621,13 +1661,13 @@
}, },
{ {
"pname": "System.Security.AccessControl", "pname": "System.Security.AccessControl",
"version": "4.5.0", "version": "4.7.0",
"hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="
}, },
{ {
"pname": "System.Security.AccessControl", "pname": "System.Security.AccessControl",
"version": "4.6.0", "version": "6.0.0",
"hash": "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI=" "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
}, },
{ {
"pname": "System.Security.Claims", "pname": "System.Security.Claims",
@ -1686,8 +1726,8 @@
}, },
{ {
"pname": "System.Security.Cryptography.Pkcs", "pname": "System.Security.Cryptography.Pkcs",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU="
}, },
{ {
"pname": "System.Security.Cryptography.Primitives", "pname": "System.Security.Cryptography.Primitives",
@ -1701,8 +1741,8 @@
}, },
{ {
"pname": "System.Security.Cryptography.ProtectedData", "pname": "System.Security.Cryptography.ProtectedData",
"version": "4.6.0", "version": "6.0.0",
"hash": "sha256-vmZTCnDlFMzMpsJX5SE4fVJTZh6jKN7AbHjKMftYg7s=" "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
}, },
{ {
"pname": "System.Security.Cryptography.X509Certificates", "pname": "System.Security.Cryptography.X509Certificates",
@ -1716,13 +1756,8 @@
}, },
{ {
"pname": "System.Security.Permissions", "pname": "System.Security.Permissions",
"version": "4.5.0", "version": "6.0.0",
"hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
},
{
"pname": "System.Security.Permissions",
"version": "4.6.0",
"hash": "sha256-AByObHSxKL0vJvhTWuv4QPN01WnXDKKbnxfzG2tWrCA="
}, },
{ {
"pname": "System.Security.Principal", "pname": "System.Security.Principal",
@ -1736,18 +1771,13 @@
}, },
{ {
"pname": "System.Security.Principal.Windows", "pname": "System.Security.Principal.Windows",
"version": "4.5.0", "version": "4.7.0",
"hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
},
{
"pname": "System.Security.Principal.Windows",
"version": "4.6.0",
"hash": "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso="
}, },
{ {
"pname": "System.ServiceProcess.ServiceController", "pname": "System.ServiceProcess.ServiceController",
"version": "8.0.0", "version": "8.0.1",
"hash": "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI=" "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8="
}, },
{ {
"pname": "System.Text.Encoding", "pname": "System.Text.Encoding",
@ -1766,8 +1796,8 @@
}, },
{ {
"pname": "System.Text.Encoding.CodePages", "pname": "System.Text.Encoding.CodePages",
"version": "8.0.0", "version": "6.0.0",
"hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
}, },
{ {
"pname": "System.Text.Encoding.Extensions", "pname": "System.Text.Encoding.Extensions",
@ -1781,13 +1811,13 @@
}, },
{ {
"pname": "System.Text.Encodings.Web", "pname": "System.Text.Encodings.Web",
"version": "8.0.0", "version": "9.0.0",
"hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0="
}, },
{ {
"pname": "System.Text.Json", "pname": "System.Text.Json",
"version": "8.0.0", "version": "9.0.0",
"hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk="
}, },
{ {
"pname": "System.Text.RegularExpressions", "pname": "System.Text.RegularExpressions",
@ -1809,11 +1839,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
}, },
{
"pname": "System.Threading.AccessControl",
"version": "4.5.0",
"hash": "sha256-x3Na5DscrtkFGnZycNeZd3vc8zDsIWKnINL/1JGzcOI="
},
{ {
"pname": "System.Threading.Channels", "pname": "System.Threading.Channels",
"version": "6.0.0", "version": "6.0.0",
@ -1849,11 +1874,6 @@
"version": "4.3.0", "version": "4.3.0",
"hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
}, },
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{ {
"pname": "System.Threading.Tasks.Parallel", "pname": "System.Threading.Tasks.Parallel",
"version": "4.0.1", "version": "4.0.1",
@ -1881,8 +1901,8 @@
}, },
{ {
"pname": "System.Windows.Extensions", "pname": "System.Windows.Extensions",
"version": "4.6.0", "version": "6.0.0",
"hash": "sha256-08W7PEiGAJJIMIKXieRgesIvtj4+/bUnBaFGypdXRcU=" "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
}, },
{ {
"pname": "System.Xml.ReaderWriter", "pname": "System.Xml.ReaderWriter",
@ -1936,7 +1956,7 @@
}, },
{ {
"pname": "YamlDotNet", "pname": "YamlDotNet",
"version": "13.7.1", "version": "16.3.0",
"hash": "sha256-v8w1hh8FCxJQMEPq+YUh9Oi4LE/ndi+vE2igLJazVNQ=" "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q="
} }
] ]

View file

@ -7,19 +7,26 @@
npmHooks, npmHooks,
fetchNpmDeps, fetchNpmDeps,
dotnetCorePackages, dotnetCorePackages,
nix-update-script,
}: }:
let let
version = "3.6.1"; version = "3.8.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rnwood"; owner = "rnwood";
repo = "smtp4dev"; repo = "smtp4dev";
tag = version; tag = version;
hash = "sha256-T6ci7+xbzpOrNr8hpDCwk5qe01L2Ho5V1oM7Hhd8bgg="; hash = "sha256-k4nerh4cVVcFQF7a4Wvcfhefa3SstEOASk+0soN0n9k=";
}; };
npmRoot = "Rnwood.Smtp4dev/ClientApp"; npmRoot = "Rnwood.Smtp4dev/ClientApp";
patches = [ ./smtp4dev-npm-packages.patch ];
in in
buildDotnetModule { buildDotnetModule {
inherit version src npmRoot; inherit
version
src
npmRoot
patches
;
pname = "smtp4dev"; pname = "smtp4dev";
nativeBuildInputs = [ nativeBuildInputs = [
@ -30,8 +37,9 @@ buildDotnetModule {
]; ];
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
src = "${src}/${npmRoot}"; inherit src patches;
hash = "sha256-/Z6sBxA2ReHlEbz0zJjlpn6IwzHDQiXN5ixEV1/iCJI="; hash = "sha256-Uj0EnnsA+QHq5KHF2B93OG8rwxYrV6sEgMTbd43ttCA=";
postPatch = "cd ${npmRoot}";
}; };
dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0;
@ -44,6 +52,10 @@ buildDotnetModule {
mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev
''; '';
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ];
};
meta = { meta = {
description = "Fake smtp email server for development and testing"; description = "Fake smtp email server for development and testing";
homepage = "https://github.com/rnwood/smtp4dev"; homepage = "https://github.com/rnwood/smtp4dev";

View file

@ -0,0 +1,699 @@
diff --git a/Rnwood.Smtp4dev/ClientApp/package-lock.json b/Rnwood.Smtp4dev/ClientApp/package-lock.json
index be143b7..6e8b0b4 100644
--- a/Rnwood.Smtp4dev/ClientApp/package-lock.json
+++ b/Rnwood.Smtp4dev/ClientApp/package-lock.json
@@ -20,7 +20,8 @@
"@microsoft/signalr": "^8.0.0",
"@types/jest": "^29.5.12",
"@types/sanitize-html": "^2.11.0",
- "@typescript-eslint/parser": "^8.0.0",
+ "@typescript-eslint/eslint-plugin": "^8.31.1",
+ "@typescript-eslint/parser": "^8.31.1",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/vue3-jest": "^29.2.6",
@@ -2937,7 +2938,8 @@
"version": "7.0.15",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
- "dev": true
+ "dev": true,
+ "peer": true
},
"node_modules/@types/lodash": {
"version": "4.17.0",
@@ -2993,12 +2995,6 @@
"entities": "^4.4.0"
}
},
- "node_modules/@types/semver": {
- "version": "7.5.8",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
- "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
- "dev": true
- },
"node_modules/@types/stack-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
@@ -3039,84 +3035,59 @@
"dev": true
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.6.0.tgz",
- "integrity": "sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==",
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.1.tgz",
+ "integrity": "sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
- "@typescript-eslint/scope-manager": "7.6.0",
- "@typescript-eslint/type-utils": "7.6.0",
- "@typescript-eslint/utils": "7.6.0",
- "@typescript-eslint/visitor-keys": "7.6.0",
- "debug": "^4.3.4",
+ "@typescript-eslint/scope-manager": "8.31.1",
+ "@typescript-eslint/type-utils": "8.31.1",
+ "@typescript-eslint/utils": "8.31.1",
+ "@typescript-eslint/visitor-keys": "8.31.1",
"graphemer": "^1.4.0",
"ignore": "^5.3.1",
"natural-compare": "^1.4.0",
- "semver": "^7.6.0",
- "ts-api-utils": "^1.3.0"
+ "ts-api-utils": "^2.0.1"
},
"engines": {
- "node": "^18.18.0 || >=20.0.0"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "@typescript-eslint/parser": "^7.0.0",
- "eslint": "^8.56.0"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
+ "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+ "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
"dev": true,
- "dependencies": {
- "yallist": "^4.0.0"
- },
+ "license": "MIT",
"engines": {
- "node": ">=10"
- }
- },
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
+ "node": ">=18.12"
},
- "engines": {
- "node": ">=10"
+ "peerDependencies": {
+ "typescript": ">=4.8.4"
}
},
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true
- },
"node_modules/@typescript-eslint/parser": {
- "version": "8.31.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz",
- "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==",
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.1.tgz",
+ "integrity": "sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/scope-manager": "8.31.0",
- "@typescript-eslint/types": "8.31.0",
- "@typescript-eslint/typescript-estree": "8.31.0",
- "@typescript-eslint/visitor-keys": "8.31.0",
+ "@typescript-eslint/scope-manager": "8.31.1",
+ "@typescript-eslint/types": "8.31.1",
+ "@typescript-eslint/typescript-estree": "8.31.1",
+ "@typescript-eslint/visitor-keys": "8.31.1",
"debug": "^4.3.4"
},
"engines": {
@@ -3131,15 +3102,15 @@
"typescript": ">=4.8.4 <5.9.0"
}
},
- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
- "version": "8.31.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz",
- "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==",
+ "node_modules/@typescript-eslint/scope-manager": {
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.1.tgz",
+ "integrity": "sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.31.0",
- "@typescript-eslint/visitor-keys": "8.31.0"
+ "@typescript-eslint/types": "8.31.1",
+ "@typescript-eslint/visitor-keys": "8.31.1"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3149,34 +3120,16 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
- "version": "8.31.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz",
- "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
- "version": "8.31.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz",
- "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==",
+ "node_modules/@typescript-eslint/type-utils": {
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.1.tgz",
+ "integrity": "sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "8.31.0",
- "@typescript-eslint/visitor-keys": "8.31.0",
+ "@typescript-eslint/typescript-estree": "8.31.1",
+ "@typescript-eslint/utils": "8.31.1",
"debug": "^4.3.4",
- "fast-glob": "^3.3.2",
- "is-glob": "^4.0.3",
- "minimatch": "^9.0.4",
- "semver": "^7.6.0",
"ts-api-utils": "^2.0.1"
},
"engines": {
@@ -3187,80 +3140,11 @@
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
+ "eslint": "^8.57.0 || ^9.0.0",
"typescript": ">=4.8.4 <5.9.0"
}
},
- "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
- "version": "8.31.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz",
- "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@typescript-eslint/types": "8.31.0",
- "eslint-visitor-keys": "^4.2.0"
- },
- "engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
- "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "balanced-match": "^1.0.0"
- }
- },
- "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
- "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
- "dev": true,
- "license": "Apache-2.0",
- "engines": {
- "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
- },
- "funding": {
- "url": "https://opencollective.com/eslint"
- }
- },
- "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
- "version": "9.0.5",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
- "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
- "dev": true,
- "license": "ISC",
- "dependencies": {
- "brace-expansion": "^2.0.1"
- },
- "engines": {
- "node": ">=16 || 14 >=14.17"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/@typescript-eslint/parser/node_modules/semver": {
- "version": "7.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
- "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "semver": "bin/semver.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
- "node_modules/@typescript-eslint/parser/node_modules/ts-api-utils": {
+ "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
"integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
@@ -3273,57 +3157,14 @@
"typescript": ">=4.8.4"
}
},
- "node_modules/@typescript-eslint/scope-manager": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.6.0.tgz",
- "integrity": "sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==",
- "dev": true,
- "dependencies": {
- "@typescript-eslint/types": "7.6.0",
- "@typescript-eslint/visitor-keys": "7.6.0"
- },
- "engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- }
- },
- "node_modules/@typescript-eslint/type-utils": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.6.0.tgz",
- "integrity": "sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==",
- "dev": true,
- "dependencies": {
- "@typescript-eslint/typescript-estree": "7.6.0",
- "@typescript-eslint/utils": "7.6.0",
- "debug": "^4.3.4",
- "ts-api-utils": "^1.3.0"
- },
- "engines": {
- "node": "^18.18.0 || >=20.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^8.56.0"
- },
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
- }
- },
"node_modules/@typescript-eslint/types": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.6.0.tgz",
- "integrity": "sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==",
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.1.tgz",
+ "integrity": "sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==",
"dev": true,
+ "license": "MIT",
"engines": {
- "node": "^18.18.0 || >=20.0.0"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
@@ -3331,31 +3172,30 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.6.0.tgz",
- "integrity": "sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==",
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.1.tgz",
+ "integrity": "sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "7.6.0",
- "@typescript-eslint/visitor-keys": "7.6.0",
+ "@typescript-eslint/types": "8.31.1",
+ "@typescript-eslint/visitor-keys": "8.31.1",
"debug": "^4.3.4",
- "globby": "^11.1.0",
+ "fast-glob": "^3.3.2",
"is-glob": "^4.0.3",
"minimatch": "^9.0.4",
"semver": "^7.6.0",
- "ts-api-utils": "^1.3.0"
+ "ts-api-utils": "^2.0.1"
},
"engines": {
- "node": "^18.18.0 || >=20.0.0"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
- "peerDependenciesMeta": {
- "typescript": {
- "optional": true
- }
+ "peerDependencies": {
+ "typescript": ">=4.8.4 <5.9.0"
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -3363,27 +3203,17 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0"
}
},
- "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
- "dependencies": {
- "yallist": "^4.0.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
- "version": "9.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
- "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
"dev": true,
+ "license": "ISC",
"dependencies": {
"brace-expansion": "^2.0.1"
},
@@ -3395,13 +3225,11 @@
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+ "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
"dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
+ "license": "ISC",
"bin": {
"semver": "bin/semver.js"
},
@@ -3409,85 +3237,72 @@
"node": ">=10"
}
},
- "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true
+ "node_modules/@typescript-eslint/typescript-estree/node_modules/ts-api-utils": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+ "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18.12"
+ },
+ "peerDependencies": {
+ "typescript": ">=4.8.4"
+ }
},
"node_modules/@typescript-eslint/utils": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.6.0.tgz",
- "integrity": "sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==",
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.1.tgz",
+ "integrity": "sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
- "@types/json-schema": "^7.0.15",
- "@types/semver": "^7.5.8",
- "@typescript-eslint/scope-manager": "7.6.0",
- "@typescript-eslint/types": "7.6.0",
- "@typescript-eslint/typescript-estree": "7.6.0",
- "semver": "^7.6.0"
+ "@typescript-eslint/scope-manager": "8.31.1",
+ "@typescript-eslint/types": "8.31.1",
+ "@typescript-eslint/typescript-estree": "8.31.1"
},
"engines": {
- "node": "^18.18.0 || >=20.0.0"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
- "eslint": "^8.56.0"
+ "eslint": "^8.57.0 || ^9.0.0",
+ "typescript": ">=4.8.4 <5.9.0"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "node_modules/@typescript-eslint/visitor-keys": {
+ "version": "8.31.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.1.tgz",
+ "integrity": "sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "yallist": "^4.0.0"
+ "@typescript-eslint/types": "8.31.1",
+ "eslint-visitor-keys": "^4.2.0"
},
"engines": {
- "node": ">=10"
- }
- },
- "node_modules/@typescript-eslint/utils/node_modules/semver": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
- "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
- "dev": true,
- "dependencies": {
- "lru-cache": "^6.0.0"
- },
- "bin": {
- "semver": "bin/semver.js"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
- "engines": {
- "node": ">=10"
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true
- },
- "node_modules/@typescript-eslint/visitor-keys": {
- "version": "7.6.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.6.0.tgz",
- "integrity": "sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==",
+ "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+ "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
"dev": true,
- "dependencies": {
- "@typescript-eslint/types": "7.6.0",
- "eslint-visitor-keys": "^3.4.3"
- },
+ "license": "Apache-2.0",
"engines": {
- "node": "^18.18.0 || >=20.0.0"
+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
+ "url": "https://opencollective.com/eslint"
}
},
"node_modules/@ungap/structured-clone": {
@@ -3591,6 +3406,40 @@
}
}
},
+ "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/eslint-plugin": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+ "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/regexpp": "^4.10.0",
+ "@typescript-eslint/scope-manager": "7.18.0",
+ "@typescript-eslint/type-utils": "7.18.0",
+ "@typescript-eslint/utils": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0",
+ "graphemer": "^1.4.0",
+ "ignore": "^5.3.1",
+ "natural-compare": "^1.4.0",
+ "ts-api-utils": "^1.3.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/parser": "^7.0.0",
+ "eslint": "^8.56.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": {
"version": "7.18.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
@@ -3638,6 +3487,34 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
+ "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+ "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@typescript-eslint/typescript-estree": "7.18.0",
+ "@typescript-eslint/utils": "7.18.0",
+ "debug": "^4.3.4",
+ "ts-api-utils": "^1.3.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.56.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": {
"version": "7.18.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
@@ -3681,6 +3558,29 @@
}
}
},
+ "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": {
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+ "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.4.0",
+ "@typescript-eslint/scope-manager": "7.18.0",
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/typescript-estree": "7.18.0"
+ },
+ "engines": {
+ "node": "^18.18.0 || >=20.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^8.56.0"
+ }
+ },
"node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": {
"version": "7.18.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
diff --git a/Rnwood.Smtp4dev/ClientApp/package.json b/Rnwood.Smtp4dev/ClientApp/package.json
index a9e301a..619e55b 100644
--- a/Rnwood.Smtp4dev/ClientApp/package.json
+++ b/Rnwood.Smtp4dev/ClientApp/package.json
@@ -19,7 +19,8 @@
"@microsoft/signalr": "^8.0.0",
"@types/jest": "^29.5.12",
"@types/sanitize-html": "^2.11.0",
- "@typescript-eslint/parser": "^8.0.0",
+ "@typescript-eslint/eslint-plugin": "^8.31.1",
+ "@typescript-eslint/parser": "^8.31.1",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/vue3-jest": "^29.2.6",

View file

@ -11,17 +11,17 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "surrealdb"; pname = "surrealdb";
version = "2.2.2"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "surrealdb"; owner = "surrealdb";
repo = "surrealdb"; repo = "surrealdb";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-NUmv/Ue14xrmBCxOkVXvcPmOwAA8L6LLPRu5E5Zkxw0="; hash = "sha256-7/R3iYAkpCyAiHGp4EyvWU4kIO//5+0LUpO92KmQ9uE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-NkAove8RlLkNI1KnMfJPnoqUswJ22Z2FOcpl05lqpKM="; cargoHash = "sha256-zG1BdGyvGL7qEPg+a6fAP3Yn1X0lc6+wDpOqObmL7PQ=";
# error: linker `aarch64-linux-gnu-gcc` not found # error: linker `aarch64-linux-gnu-gcc` not found
postPatch = '' postPatch = ''

View file

@ -1 +1,7 @@
[] [
{
"pname": "BouncyCastle.Cryptography",
"version": "2.5.1",
"hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
}
]

View file

@ -7,13 +7,13 @@
}: }:
buildDotnetModule rec { buildDotnetModule rec {
pname = "technitium-dns-server-library"; pname = "technitium-dns-server-library";
version = "dns-server-v13.2"; version = "dns-server-v13.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TechnitiumSoftware"; owner = "TechnitiumSoftware";
repo = "TechnitiumLibrary"; repo = "TechnitiumLibrary";
tag = version; tag = version;
hash = "sha256-stfxYe0flE1daPuXw/GAgY52ZD7pkqnBIBvmSVPWWjI="; hash = "sha256-P1LVn//4xL/MZoy7thw+zYlAZVTfjSivyAiuhixAoHs=";
name = "${pname}-${version}"; name = "${pname}-${version}";
}; };

View file

@ -1 +1,7 @@
[] [
{
"pname": "BouncyCastle.Cryptography",
"version": "2.5.1",
"hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
}
]

View file

@ -9,13 +9,13 @@
}: }:
buildDotnetModule rec { buildDotnetModule rec {
pname = "technitium-dns-server"; pname = "technitium-dns-server";
version = "13.2"; version = "13.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TechnitiumSoftware"; owner = "TechnitiumSoftware";
repo = "DnsServer"; repo = "DnsServer";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8="; hash = "sha256-2OSuLGWdaiiPxyW0Uvq736wHKa7S3CHv79cmZZ86GRE=";
name = "${pname}-${version}"; name = "${pname}-${version}";
}; };

View file

@ -3,25 +3,29 @@
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
installShellFiles, installShellFiles,
pkg-config,
libheif, libheif,
nix-update-script, nix-update-script,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "timewall"; pname = "timewall";
version = "1.5.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bcyran"; owner = "bcyran";
repo = "timewall"; repo = "timewall";
rev = version; rev = version;
hash = "sha256-ohJDaN29FG/WqkcvpbukWS37RiX2pXdkKMzNh+3NqAU="; hash = "sha256-KUPy/mv6cV0BmvBcom+cCXk0s4Erz0hf5dg1i5QB0OE=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-Wg9bxzm5EJUazRUvFuPboQhZlqwWPuJ8UB9plgWUOO4="; cargoHash = "sha256-JOsCGHHbHx2yoFYdFWIYPHfgCfQjEtZA869+2OQ4jKA=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [ libheif ]; buildInputs = [ libheif ];

View file

@ -0,0 +1,388 @@
diff --git a/src/hackerlab/machine/endian.sh b/src/hackerlab/machine/endian.sh
index 2a1c562..92bc81e 100644
--- a/src/hackerlab/machine/endian.sh
+++ b/src/hackerlab/machine/endian.sh
@@ -5,8 +5,9 @@
CC="$1"
cat > endian-test.c << EOF
-
-main()
+#include <stdlib.h>
+
+int main()
{
unsigned int x = 1;
diff --git a/src/hackerlab/tests/rx-posix-tests/test-dbug.c b/src/hackerlab/tests/rx-posix-tests/test-dbug.c
index 4620c31..3b7d35c 100644
--- a/src/hackerlab/tests/rx-posix-tests/test-dbug.c
+++ b/src/hackerlab/tests/rx-posix-tests/test-dbug.c
@@ -124,7 +124,7 @@ main (int argc, char * argv[])
{
subexps = 0;
nsub = 1;
- rx_analyze_rexp (&subexps, &nsub, exp);
+ rx_analyze_rexp (&subexps, (size_t *)&nsub, exp);
rx_print_rexp (1, 256, 0, exp);
if (nfa)
{
diff --git a/src/hackerlab/vu/vu-pathcompress.c b/src/hackerlab/vu/vu-pathcompress.c
index 711acbe..3ea10d5 100644
--- a/src/hackerlab/vu/vu-pathcompress.c
+++ b/src/hackerlab/vu/vu-pathcompress.c
@@ -86,7 +86,7 @@ void pathcompress_free_closure(void * closure)
vu_sys_free_closure(closure);
}
-int pathcompress_access(int* errn, char* path, int mode, void* closure)
+int pathcompress_access(int* errn, const char* path, int mode, void* closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -97,7 +97,7 @@ int pathcompress_access(int* errn, char* path, int mode, void* closure)
return rvl;
}
-int pathcompress_chdir(int * errn, char * path, void * closure)
+int pathcompress_chdir(int * errn, const char * path, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -108,7 +108,7 @@ int pathcompress_chdir(int * errn, char * path, void * closure)
return rvl;
}
-int pathcompress_chmod(int * errn, char * path, int mode, void * closure)
+int pathcompress_chmod(int * errn, const char * path, int mode, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -119,7 +119,7 @@ int pathcompress_chmod(int * errn, char * path, int mode, void * closure)
return rvl;
}
-int pathcompress_chown(int * errn, char * path, int owner, int group, void * closure)
+int pathcompress_chown(int * errn, const char * path, int owner, int group, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -130,7 +130,7 @@ int pathcompress_chown(int * errn, char * path, int owner, int group, void * clo
return rvl;
}
-int pathcompress_chroot(int * errn, char * path, void * closure)
+int pathcompress_chroot(int * errn, const char * path, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -254,7 +254,7 @@ int pathcompress_getcwd(char* cwd, size_t size)
return rvl;
}
-int pathcompress_link(int * errn, char * from, char * to, void * closure)
+int pathcompress_link(int * errn, const char * from, const char * to, void * closure)
{
int rvl;
char compressed_from[PATH_LEN]="";
@@ -276,7 +276,7 @@ off_t pathcompress_lseek(int * errn, int fd, off_t offset, int whence, void * cl
return rvl;
}
-int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closure)
+int pathcompress_lstat(int * errn, const char * path, struct stat * buf, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -293,7 +293,7 @@ int pathcompress_lstat(int * errn, char * path, struct stat * buf, void * closur
return rvl;
}
-int pathcompress_mkdir(int * errn, char * path, int mode, void * closure)
+int pathcompress_mkdir(int * errn, const char * path, int mode, void * closure)
{
int rvl;
char abspath[PATH_LEN]="";
@@ -315,7 +315,7 @@ int pathcompress_mkdir(int * errn, char * path, int mode, void * closure)
return rvl;
}
-int pathcompress_open(int * errn, char * path, int flags, int mode, void * closure)
+int pathcompress_open(int * errn, const char * path, int flags, int mode, void * closure)
{
int rvl;
char* p;
@@ -368,7 +368,7 @@ int pathcompress_open(int * errn, char * path, int flags, int mode, void * closu
return 0;
}
-int pathcompress_opendir(int * errn, DIR ** retv, char * path, void * closure)
+int pathcompress_opendir(int * errn, DIR ** retv, const char * path, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -453,7 +453,7 @@ int pathcompress_readdir(int * errn, struct alloc_limits * limits, char ** file_
return rvl;
}
-int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void * closure)
+int pathcompress_readlink(int * errn, const char * path, char * buf, int bufsize, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -467,7 +467,7 @@ int pathcompress_readlink(int * errn, char * path, char * buf, int bufsize, void
return rvl;
}
-int pathcompress_rename(int * errn, char * from, char * to, void * closure)
+int pathcompress_rename(int * errn, const char * from, const char * to, void * closure)
{
struct stat stat;
int err;
@@ -502,7 +502,7 @@ int pathcompress_rename(int * errn, char * from, char * to, void * closure)
return rvl;
}
-int pathcompress_rmdir(int * errn, char * path, void * closure)
+int pathcompress_rmdir(int * errn, const char * path, void * closure)
{
int rvl;
char dirnames[PATH_LEN]="";
@@ -517,7 +517,7 @@ int pathcompress_rmdir(int * errn, char * path, void * closure)
return rvl;
}
-int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure)
+int pathcompress_stat(int * errn, const char * path, struct stat * buf, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -537,7 +537,7 @@ int pathcompress_stat(int * errn, char * path, struct stat * buf, void * closure
return rvl;
}
-int pathcompress_symlink(int * errn, char * from, char * to, void * closure)
+int pathcompress_symlink(int * errn, const char * from, const char * to, void * closure)
{
int rvl;
char compressed_from[PATH_LEN]="";
@@ -553,7 +553,7 @@ int pathcompress_symlink(int * errn, char * from, char * to, void * closure)
return rvl;
}
-int pathcompress_truncate(int * errn, char * path, off_t where, void * closure)
+int pathcompress_truncate(int * errn, const char * path, off_t where, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -566,7 +566,7 @@ int pathcompress_truncate(int * errn, char * path, off_t where, void * closure)
return rvl;
}
-int pathcompress_unlink(int * errn, char * path, void * closure)
+int pathcompress_unlink(int * errn, const char * path, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -578,7 +578,7 @@ int pathcompress_unlink(int * errn, char * path, void * closure)
return rvl;
}
-int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * closure)
+int pathcompress_utime(int * errn, const char * path, struct utimbuf * times, void * closure)
{
int rvl;
char compressed_path[PATH_LEN]="";
@@ -590,7 +590,7 @@ int pathcompress_utime(int * errn, char * path, struct utimbuf * times, void * c
return rvl;
}
-ssize_t pathcompress_write(int * errn, int fd, char * buf, size_t count, void * closure)
+ssize_t pathcompress_write(int * errn, int fd, const char * buf, size_t count, void * closure)
{
int rvl;
Dprintf("pathcompress_write(%d,%p,%d)", fd, buf, count);
diff --git a/src/tla/libarch/changeset-report.c b/src/tla/libarch/changeset-report.c
index d3539b3..1672c2f 100644
--- a/src/tla/libarch/changeset-report.c
+++ b/src/tla/libarch/changeset-report.c
@@ -630,7 +630,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar *
orig_path = file_name_in_vicinity(0, orig_dir, orig_part_path);
mod_path = file_name_in_vicinity(0, mod_dir, id2 /*report->patched_regular_files[x][0]*/);
- arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (char **)opts);
+ arch_really_invoke_diff ( out_fd, orig_path, orig_part_path, mod_path, id2 /*report->patched_regular_files[x][0]*/, (const char **)opts);
rel_field_unref(key);
lim_free(0, mod_path);
@@ -650,7 +650,7 @@ print_custom_diffs (int out_fd, struct arch_changeset_report * report, t_uchar *
{
t_uchar *id = str_save(0, rel_peek_str(report->added_files, x, 2));
t_uchar *id2 = str_save(0, rel_peek_str(report->added_files, x, 0));
- arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (char**)opts);
+ arch_really_invoke_diff ( out_fd, "/dev/null", NULL, id /*report->added_files[x][2]*/, id2 /*report->added_files[x][0]*/, (const char**)opts);
lim_free(0, id);
lim_free(0, id2);
}
@@ -680,7 +680,7 @@ print_removed_file_diffs (int out_fd, struct arch_changeset_report * report, t_u
{
t_uchar *id = str_save(0, rel_peek_str(report->removed_files, x, 2));
t_uchar *id2 = str_save(0, rel_peek_str(report->removed_files, x, 0));
- arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (char**)opts);
+ arch_really_invoke_diff ( out_fd, id /*report->removed_files[x][2]*/, id2 /*report->removed_files[x][0]*/, "/dev/null", NULL, (const char**)opts);
lim_free(0, id);
lim_free(0, id2);
}
diff --git a/src/tla/libarch/cmd-apply-delta.c b/src/tla/libarch/cmd-apply-delta.c
index 8aebd8b..5a8615e 100644
--- a/src/tla/libarch/cmd-apply-delta.c
+++ b/src/tla/libarch/cmd-apply-delta.c
@@ -31,6 +31,8 @@
#include "tla/libarch/cmd-get.h"
#include "tla/libarch/cmd-delta.h"
#include "tla/libarch/cmd-apply-delta.h"
+#include "tla/libarch/cmdutils.h"
+#include "tla/libarch/star-merge.h"
/* __STDC__ prototypes for static functions */
diff --git a/src/tla/libarch/cmd-branch.c b/src/tla/libarch/cmd-branch.c
index 6308fef..d63c75c 100644
--- a/src/tla/libarch/cmd-branch.c
+++ b/src/tla/libarch/cmd-branch.c
@@ -26,6 +26,7 @@
#include "tla/libarch/cmd-switch.h"
#include "tla/libarch/cmdutils.h"
#include "tla/libarch/archive-setup.h"
+#include "tla/libarch/cmd.h"
diff --git a/src/tla/libarch/cmd-diff.c b/src/tla/libarch/cmd-diff.c
index 98dbe19..4b678b0 100644
--- a/src/tla/libarch/cmd-diff.c
+++ b/src/tla/libarch/cmd-diff.c
@@ -30,6 +30,7 @@
#include "tla/libarch/cmd-diff.h"
#include "tla/libarch/cmd-versions.h"
#include "tla/libarch/invent.h"
+#include "tla/libarch/make-changeset-files.h"
/* gettext support not yet incorporated into tla, reserve the gettext notation for later */
@@ -38,7 +39,7 @@
/* __STDC__ prototypes for static functions */
-static void make_changeset_callback (void * ign, char * fmt, va_list ap);
+static void make_changeset_callback (void * ign, const char * fmt, va_list ap);
@@ -527,7 +528,7 @@ arch_cmd_diff (t_uchar * program_name, int argc, char * argv[])
static void
-make_changeset_callback (void * ign, char * fmt, va_list ap)
+make_changeset_callback (void * ign, const char * fmt, va_list ap)
{
safe_printfmt_va_list (1, fmt, ap);
safe_flush (1);
diff --git a/src/tla/libarch/cmd-export.c b/src/tla/libarch/cmd-export.c
index bfed694..24e5d6a 100644
--- a/src/tla/libarch/cmd-export.c
+++ b/src/tla/libarch/cmd-export.c
@@ -35,6 +35,7 @@
#include "tla/libarch/cmd.h"
#include "tla/libarch/cmdutils.h"
#include "tla/libarch/cmd-export.h"
+#include "tla/libarch/chatter.h"
diff --git a/src/tla/libarch/cmdutils.c b/src/tla/libarch/cmdutils.c
index 3aafd13..195d636 100644
--- a/src/tla/libarch/cmdutils.c
+++ b/src/tla/libarch/cmdutils.c
@@ -20,6 +20,7 @@
#include "tla/libarch/patch-logs.h"
#include "tla/libarch/pfs.h"
#include "tla/libfsutils/dir-as-cwd.h"
+#include "tla/libarch/local-cache.h"
/* __STDC__ prototypes for static functions */
diff --git a/src/tla/libarch/diffs.c b/src/tla/libarch/diffs.c
index dcae932..5f935ae 100644
--- a/src/tla/libarch/diffs.c
+++ b/src/tla/libarch/diffs.c
@@ -230,7 +230,7 @@ arch_really_invoke_diff (int output_fd,
if (extraopts != NULL)
{
t_uchar ** opt;
- for (opt = extraopts; *opt != NULL; ++opt)
+ for (opt = (t_uchar**)extraopts; *opt != NULL; ++opt)
{
*(t_uchar **) ar_push ((void*) &argv, 0, sizeof(t_uchar*)) = *opt;
diff --git a/src/tla/libarch/invent.c b/src/tla/libarch/invent.c
index 077d776..defd2da 100644
--- a/src/tla/libarch/invent.c
+++ b/src/tla/libarch/invent.c
@@ -19,6 +19,7 @@
#include "tla/libarch/inode-sig.h"
#include "tla/libarch/inv-ids.h"
#include "tla/libarch/invent.h"
+#include "cmdutils.h"
diff --git a/src/tla/libarch/local-cache.c b/src/tla/libarch/local-cache.c
index 0cade1b..945cd8b 100644
--- a/src/tla/libarch/local-cache.c
+++ b/src/tla/libarch/local-cache.c
@@ -24,6 +24,7 @@
#include "tla/libarch/library-txn.h"
#include "tla/libarch/local-cache.h"
#include "tla/libarch/namespace.h"
+#include "project-tree.h"
diff --git a/src/tla/libarch/pfs-ftp.c b/src/tla/libarch/pfs-ftp.c
index 546c702..c457837 100644
--- a/src/tla/libarch/pfs-ftp.c
+++ b/src/tla/libarch/pfs-ftp.c
@@ -12,6 +12,7 @@
#include <string.h>
#include <stdio.h>
#include <errno.h>
+#include <ctype.h>
#include "config-options.h"
#include "hackerlab/bugs/panic.h"
#include "hackerlab/os/errno-to-string.h"
diff --git a/src/tla/libarch/undo.c b/src/tla/libarch/undo.c
index abc40e9..dc8e6ed 100644
--- a/src/tla/libarch/undo.c
+++ b/src/tla/libarch/undo.c
@@ -19,6 +19,7 @@
#include "tla/libarch/apply-changeset.h"
#include "tla/libarch/chatter.h"
#include "tla/libarch/undo.h"
+#include "tla/libarch/make-changeset-files.h"
/* __STDC__ prototypes for static functions */
diff --git a/src/tla/libfsutils/tmp-files.c b/src/tla/libfsutils/tmp-files.c
index 164acdb..1188627 100644
--- a/src/tla/libfsutils/tmp-files.c
+++ b/src/tla/libfsutils/tmp-files.c
@@ -18,6 +18,8 @@
#include "hackerlab/fs/file-names.h"
#include "hackerlab/vu/safe.h"
#include "tla/libfsutils/tmp-files.h"
+#include "hackerlab/fs/tmp-files.h"
+#include "tla/libarch/cmdutils.h"

View file

@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
}; };
patches = [ ./configure-tmpdir.patch ]; patches = [
./configure-tmpdir.patch
./fix-gcc14.patch
];
buildInputs = [ which ]; buildInputs = [ which ];

View file

@ -1,19 +1,21 @@
{ {
fetchFromGitHub, fetchFromGitHub,
gitUpdater,
lib, lib,
python3, python3,
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "ubi_reader"; pname = "ubi_reader";
version = "0.8.9"; version = "0.8.10";
pyproject = true; pyproject = true;
disabled = python3.pkgs.pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "onekey-sec"; owner = "onekey-sec";
repo = "ubi_reader"; repo = "ubi_reader";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-04HwzkonPzzWfX8VE//fMoVv5ggAS+61zx2W8VEUIy4="; hash = "sha256-fXJiQZ1QWUmkRM+WI8DSIsay9s1w3hKloRuCcUNwZjM=";
}; };
build-system = [ python3.pkgs.poetry-core ]; build-system = [ python3.pkgs.poetry-core ];
@ -23,6 +25,13 @@ python3.pkgs.buildPythonApplication rec {
# There are no tests in the source # There are no tests in the source
doCheck = false; doCheck = false;
passthru = {
updateScript = gitUpdater {
rev-prefix = "v";
ignoredVersions = "_[a-z]+$";
};
};
meta = { meta = {
description = "Python scripts capable of extracting and analyzing the contents of UBI and UBIFS images"; description = "Python scripts capable of extracting and analyzing the contents of UBI and UBIFS images";
homepage = "https://github.com/onekey-sec/ubi_reader"; homepage = "https://github.com/onekey-sec/ubi_reader";

View file

@ -2,19 +2,22 @@
fetchFromGitHub, fetchFromGitHub,
lib, lib,
rustPlatform, rustPlatform,
unstableGitUpdater,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
name = "uefisettings"; name = "uefisettings";
version = "0-unstable-2024-03-26"; version = "0-unstable-2024-11-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxboot"; owner = "linuxboot";
repo = "uefisettings"; repo = "uefisettings";
rev = "f90aed759b9c2217bea336e37ab5282616ece390"; rev = "f4d12fbdb32d1bc355dd37d5077add0a0a049be4";
hash = "sha256-Cik8uVdzhMmgXfx23axkUJBg8zd5afMgYvluN0BJsdo="; hash = "sha256-f6CTmnY/BzIP/nfHa3Q4HWd1Ee+b7C767FB/8A4DUUM=";
}; };
passthru.updateScript = unstableGitUpdater { };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w="; cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w=";

View file

@ -106,11 +106,24 @@ python3.pkgs.buildPythonApplication rec {
versionCheckProgramArg = "--version"; versionCheckProgramArg = "--version";
pytestFlagsArray = [ pytestFlagsArray =
"--no-cov" let
# `disabledTests` swallows the parameters between square brackets # `disabledTests` swallows the parameters between square brackets
disabled = [
# https://github.com/tytso/e2fsprogs/issues/152 # https://github.com/tytso/e2fsprogs/issues/152
"-k 'not test_all_handlers[filesystem.extfs]'" "test_all_handlers[filesystem.extfs]"
# Should be dropped after upgrading to next version
# Needs https://github.com/onekey-sec/unblob/pull/1128/commits/c6af67f0c6f32fa01d7abbf495eb0293e9184438
# Unfortunately patches touching LFS stored assets cannot be applied
"test_all_handlers[filesystem.ubi.ubi]"
"test_all_handlers[archive.dlink.encrpted_img]"
"test_all_handlers[archive.dlink.shrs]"
];
in
[
"--no-cov"
"-k 'not ${lib.concatStringsSep " and not " disabled}'"
]; ];
passthru = { passthru = {

View file

@ -11,7 +11,7 @@
libXxf86vm, libXxf86vm,
}: }:
let let
version = "4.15.16"; version = "4.16.5";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "unciv"; name = "unciv";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-dqnQJzA2OkIlcM7TORqnFyaA5CvQ+MmFOO5iH6My+Jo="; hash = "sha256-CMyZlQ5zXHxUExH7aMIJ4nreEPz8Y0eeJ5nnt267SqU=";
}; };
dontUnpack = true; dontUnpack = true;

View file

@ -14,13 +14,13 @@
flutter329.buildFlutterApplication rec { flutter329.buildFlutterApplication rec {
pname = "venera"; pname = "venera";
version = "1.4.0"; version = "1.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "venera-app"; owner = "venera-app";
repo = "venera"; repo = "venera";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-kjSjXIeQh+XT9J3qmmwNw75462VGfdykUZ4XeWphVH8="; hash = "sha256-YiiR4CvOOzsFiSZ2VDVwibhimVwUJDkEu+TXWmf3/S0=";
}; };
pubspecLock = lib.importJSON ./pubspec.lock.json; pubspecLock = lib.importJSON ./pubspec.lock.json;

View file

@ -54,11 +54,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "async", "name": "async",
"sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "2.13.0" "version": "2.12.0"
}, },
"battery_plus": { "battery_plus": {
"dependency": "direct main", "dependency": "direct main",
@ -225,11 +225,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "fake_async", "name": "fake_async",
"sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "1.3.3" "version": "1.3.2"
}, },
"ffi": { "ffi": {
"dependency": "transitive", "dependency": "transitive",
@ -382,9 +382,9 @@
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"path": "flutter_inappwebview", "path": "flutter_inappwebview",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "6.2.0-beta.3" "version": "6.2.0-beta.3"
@ -393,9 +393,9 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"path": "flutter_inappwebview_android", "path": "flutter_inappwebview_android",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "1.2.0-beta.3" "version": "1.2.0-beta.3"
@ -414,9 +414,9 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"path": "flutter_inappwebview_ios", "path": "flutter_inappwebview_ios",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "1.2.0-beta.3" "version": "1.2.0-beta.3"
@ -425,9 +425,9 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"path": "flutter_inappwebview_macos", "path": "flutter_inappwebview_macos",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "1.2.0-beta.3" "version": "1.2.0-beta.3"
@ -436,9 +436,9 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"path": "flutter_inappwebview_platform_interface", "path": "flutter_inappwebview_platform_interface",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "1.4.0-beta.3" "version": "1.4.0-beta.3"
@ -447,9 +447,9 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"path": "flutter_inappwebview_web", "path": "flutter_inappwebview_web",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "1.2.0-beta.3" "version": "1.2.0-beta.3"
@ -458,9 +458,9 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"path": "flutter_inappwebview_windows", "path": "flutter_inappwebview_windows",
"ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab",
"url": "https://github.com/pichillilorenzo/flutter_inappwebview" "url": "https://github.com/venera-app/flutter_inappwebview"
}, },
"source": "git", "source": "git",
"version": "0.7.0-beta.3" "version": "0.7.0-beta.3"
@ -639,11 +639,11 @@
"dependency": "direct main", "dependency": "direct main",
"description": { "description": {
"name": "intl", "name": "intl",
"sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "0.20.2" "version": "0.19.0"
}, },
"io": { "io": {
"dependency": "transitive", "dependency": "transitive",
@ -669,11 +669,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "leak_tracker", "name": "leak_tracker",
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "10.0.9" "version": "10.0.8"
}, },
"leak_tracker_flutter_testing": { "leak_tracker_flutter_testing": {
"dependency": "transitive", "dependency": "transitive",
@ -1279,11 +1279,11 @@
"dependency": "transitive", "dependency": "transitive",
"description": { "description": {
"name": "vm_service", "name": "vm_service",
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
"url": "https://pub.dev" "url": "https://pub.dev"
}, },
"source": "hosted", "source": "hosted",
"version": "15.0.0" "version": "14.3.1"
}, },
"web": { "web": {
"dependency": "transitive", "dependency": "transitive",
@ -1369,6 +1369,6 @@
}, },
"sdks": { "sdks": {
"dart": ">=3.7.0 <4.0.0", "dart": ">=3.7.0 <4.0.0",
"flutter": ">=3.29.2" "flutter": ">=3.29.3"
} }
} }

View file

@ -1,32 +1,43 @@
{ {
lib, lib,
fetchFromGitHub, fetchFromGitHub,
python3, python3Packages,
fetchpatch,
versionCheckHook,
writableTmpDirAsHomeHook,
nix-update-script,
}: }:
python3.pkgs.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "wapiti"; pname = "wapiti";
version = "3.2.2"; version = "3.2.4";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wapiti-scanner"; owner = "wapiti-scanner";
repo = "wapiti"; repo = "wapiti";
tag = version; tag = version;
hash = "sha256-sa4bXZiY5yd0wynUjdLnuuX7Ee0w4APd1G/oGy5AUDk="; hash = "sha256-97RYJKCk3oY715mgkFNstrrhWc1Q7jZqktqt7l8uzGs=";
}; };
patches = [
# Fixes:
# TypeError: AsyncClient.__init__() got an unexpected keyword argument 'proxies'
(fetchpatch {
name = "fix-wappalyzer-warnings";
url = "https://github.com/wapiti-scanner/wapiti/commit/77fe140f8ad4d2fb266f1b49285479f6af25d6b7.patch";
hash = "sha256-Htkpr+67V0bp4u8HbMP+yTZ4rlIWDadLZxLDSruDbZY=";
})
];
pythonRelaxDeps = true; pythonRelaxDeps = true;
build-system = with python3.pkgs; [ setuptools ]; build-system = with python3Packages; [ setuptools ];
dependencies = dependencies = with python3Packages; [
with python3.pkgs;
[
aiocache aiocache
aiohttp aiohttp
aiosqlite aiosqlite
arsenic
beautifulsoup4 beautifulsoup4
browser-cookie3 browser-cookie3
dnspython dnspython
@ -39,29 +50,33 @@ python3.pkgs.buildPythonApplication rec {
mako mako
markupsafe markupsafe
mitmproxy mitmproxy
prance msgpack
packaging
pyasn1 pyasn1
six
sqlalchemy sqlalchemy
tld tld
typing-extensions
urwid
yaswfp yaswfp
] wapiti-arsenic
++ httpx.optional-dependencies.brotli wapiti-swagger
++ httpx.optional-dependencies.socks ];
++ prance.optional-dependencies.osv;
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;
nativeCheckInputs = with python3.pkgs; [ nativeCheckInputs =
with python3Packages;
[
respx respx
pytest-asyncio pytest-asyncio
pytest-cov-stub pytest-cov-stub
pytestCheckHook pytestCheckHook
]
++ [
versionCheckHook
writableTmpDirAsHomeHook
]; ];
versionCheckProgramArg = "--version";
preCheck = ''
export HOME=$(mktemp -d);
'';
disabledTests = [ disabledTests = [
# Tests requires network access # Tests requires network access
@ -140,7 +155,11 @@ python3.pkgs.buildPythonApplication rec {
pythonImportsCheck = [ "wapitiCore" ]; pythonImportsCheck = [ "wapitiCore" ];
meta = with lib; { passthru = {
updateScript = nix-update-script { };
};
meta = {
description = "Web application vulnerability scanner"; description = "Web application vulnerability scanner";
longDescription = '' longDescription = ''
Wapiti allows you to audit the security of your websites or web applications. Wapiti allows you to audit the security of your websites or web applications.
@ -152,7 +171,8 @@ python3.pkgs.buildPythonApplication rec {
''; '';
homepage = "https://wapiti-scanner.github.io/"; homepage = "https://wapiti-scanner.github.io/";
changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = with maintainers; [ fab ]; maintainers = with lib.maintainers; [ fab ];
mainProgram = "wapiti";
}; };
} }

Some files were not shown because too many files have changed in this diff Show more