diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 6115feddfba8..8537084b1bd5 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -179,6 +179,8 @@ let xargs -I{} -P"$cores" \ ${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir" + cp -r "$chunkOutputDir"/stats $out/stats-by-chunk + if (( chunkSize * chunkCount != attrCount )); then # A final incomplete chunk would mess up the stats, don't include it rm "$chunkOutputDir"/stats/"$seq_end" @@ -253,6 +255,12 @@ let done } | 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 { diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index f1b81d451a73..e8d34e879dc5 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -39,7 +39,7 @@ in htpasswd-file = lib.mkOption { default = null; 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 { diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix index 4695d7c7423c..c7ef540b4f59 100644 --- a/nixos/modules/services/matrix/mautrix-signal.nix +++ b/nixos/modules/services/matrix/mautrix-signal.nix @@ -68,6 +68,8 @@ in options.services.mautrix-signal = { enable = lib.mkEnableOption "mautrix-signal, a Matrix-Signal puppeting bridge"; + package = lib.mkPackageOption pkgs "mautrix-signal" { }; + settings = lib.mkOption { apply = lib.recursiveUpdate defaultConfig; type = settingsFormat.type; @@ -206,7 +208,7 @@ in # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then - ${pkgs.mautrix-signal}/bin/mautrix-signal \ + ${cfg.package}/bin/mautrix-signal \ --generate-registration \ --config='${settingsFile}' \ --registration='${registrationFile}' @@ -234,7 +236,7 @@ in StateDirectory = baseNameOf dataDir; WorkingDirectory = dataDir; ExecStart = '' - ${pkgs.mautrix-signal}/bin/mautrix-signal \ + ${cfg.package}/bin/mautrix-signal \ --config='${settingsFile}' \ --registration='${registrationFile}' ''; diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix index f3adbc26ab58..74f18923d790 100644 --- a/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/nixos/modules/services/matrix/mautrix-telegram.nix @@ -18,6 +18,8 @@ in services.mautrix-telegram = { enable = lib.mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge"; + package = lib.mkPackageOption pkgs "mautrix-telegram" { }; + settings = lib.mkOption rec { apply = lib.recursiveUpdate default; inherit (settingsFormat) type; @@ -201,7 +203,7 @@ in # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then - ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ + ${cfg.package}/bin/mautrix-telegram \ --generate-registration \ --config='${settingsFile}' \ --registration='${registrationFile}' @@ -220,9 +222,9 @@ in umask $old_umask '' - + lib.optionalString (pkgs.mautrix-telegram ? alembic) '' + + lib.optionalString (cfg.package ? alembic) '' # 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 = { @@ -238,13 +240,13 @@ in ProtectControlGroups = 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; UMask = "0027"; EnvironmentFile = cfg.environmentFile; ExecStart = '' - ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ + ${cfg.package}/bin/mautrix-telegram \ --config='${settingsFile}' ''; }; diff --git a/nixos/modules/services/matrix/mautrix-whatsapp.nix b/nixos/modules/services/matrix/mautrix-whatsapp.nix index 165e614fec48..d43032f9a31d 100644 --- a/nixos/modules/services/matrix/mautrix-whatsapp.nix +++ b/nixos/modules/services/matrix/mautrix-whatsapp.nix @@ -51,6 +51,8 @@ in options.services.mautrix-whatsapp = { enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp"; + package = lib.mkPackageOption pkgs "mautrix-whatsapp" { }; + settings = lib.mkOption { type = settingsFormat.type; default = defaultConfig; @@ -168,7 +170,7 @@ in # generate the appservice's registration file if absent if [ ! -f '${registrationFile}' ]; then - ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ + ${cfg.package}/bin/mautrix-whatsapp \ --generate-registration \ --config='${settingsFile}' \ --registration='${registrationFile}' @@ -196,7 +198,7 @@ in StateDirectory = baseNameOf dataDir; WorkingDirectory = dataDir; ExecStart = '' - ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ + ${cfg.package}/bin/mautrix-whatsapp \ --config='${settingsFile}' \ --registration='${registrationFile}' ''; diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix index 12b51bf05217..d29a24445ae7 100644 --- a/nixos/modules/services/networking/ncps.nix +++ b/nixos/modules/services/networking/ncps.nix @@ -206,11 +206,6 @@ in 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"; } - - { - 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 = { @@ -245,7 +240,8 @@ in systemd.services.ncps = { description = "ncps binary cache proxy service"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 9f48ef0cb7df..7df504767cdb 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -10,15 +10,16 @@ tk, fftw, portaudio, + portmidi, }: stdenv.mkDerivation rec { pname = "puredata"; - version = "0.54-1"; + version = "0.55-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI="; + hash = "sha256-EIKX+NHdGQ346LtKSsNIeSrM9wT5ogUtk8uoybi7Wls="; }; patches = [ @@ -41,12 +42,12 @@ stdenv.mkDerivation rec { alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + portmidi portaudio ]; configureFlags = [ - "--enable-universal" "--enable-fftw" "--enable-jack" ] @@ -55,7 +56,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-portaudio" + "--enable-portmidi" "--without-local-portaudio" + "--without-local-portmidi" "--disable-jack-framework" "--with-wish=${tk}/bin/wish8.6" ]; diff --git a/pkgs/applications/audio/samplebrain/default.nix b/pkgs/applications/audio/samplebrain/default.nix index 253aa2b34352..07daf0300c67 100644 --- a/pkgs/applications/audio/samplebrain/default.nix +++ b/pkgs/applications/audio/samplebrain/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, fftw, liblo, libsndfile, @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { 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 = [ qmake wrapQtAppsHook diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 95ff14a96bd5..773b149a0b6f 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.11.2"; + version = "1.11.90"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; + sha256 = "sha256-gGsozdFEE5c315DF+EsIY9wGv50wwrOBycejTkVwEHA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 56b13edbbee3..ef269b46dbae 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -152,7 +152,10 @@ in # Set to `!privacySupport` or `false`. crashreporterSupport ? - !privacySupport && !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isMusl, + !privacySupport + && !stdenv.hostPlatform.isLoongArch64 + && !stdenv.hostPlatform.isRiscV + && !stdenv.hostPlatform.isMusl, curl, geolocationSupport ? !privacySupport, webrtcSupport ? !privacySupport, diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 4b7f152ab5c3..7b53783e3058 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "2.2.26"; + version = "2.2.27"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-F+5R1nSmZuHKUe9bAEVwOru07SVs8tIQlbDC6Ip+zy4="; + hash = "sha256-wu4kJCs1Bo6yVGLJuzXSCtv2nXhzlwX6jDTa0gTwPsw="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/mpv/scripts/modernz.nix b/pkgs/applications/video/mpv/scripts/modernz.nix index 16d9da36e4f7..357736724488 100644 --- a/pkgs/applications/video/mpv/scripts/modernz.nix +++ b/pkgs/applications/video/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernz"; - version = "0.2.7"; + version = "0.2.8"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-BMxwQa+G8FiTl3qpoFxz1czZH1UweTYPwN9tDluQFBo="; + hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg="; }; postInstall = '' diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9decf2ef6165..3c9ba2e744cb 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -74,9 +74,9 @@ let buildType = "release"; # 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. - virtualboxVersion = "7.1.6"; - virtualboxSubVersion = "a"; - virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; + virtualboxVersion = "7.1.8"; + virtualboxSubVersion = ""; + virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"; kvmPatchVersion = "20250207"; kvmPatchHash = "sha256-GzRLIXhzWL1NLvaGKcWVBCdvay1IxgJUE4koLX1ze7Y="; @@ -249,8 +249,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional enableKvm ( let patchVboxVersion = - # There is no updated patch for 7.0.22 yet, but the older one still applies. - if finalAttrs.virtualboxVersion == "7.0.22" then "7.0.20" else finalAttrs.virtualboxVersion; + # There is no updated patch for 7.1.8 yet, but the older one still applies. + if finalAttrs.virtualboxVersion == "7.1.8" then "7.1.6" else finalAttrs.virtualboxVersion; in fetchpatch { name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 7b9eb812064f..a26f3a0cac3f 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -4,7 +4,7 @@ virtualbox, }: let - virtualboxExtPackVersion = "7.1.6"; + virtualboxExtPackVersion = "7.1.8"; in fetchurl rec { 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`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS let - value = "c13e47d3fb2c849019accb03353c7d04ffb9c264920075972ed2e2befe3cdd8b"; + value = "912586a3a1e9285f9df264f7999e6fffc0b8a42f2e013dd898a86f7ed3975d37"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 61e577ebd95f..008a41353afe 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ }: fetchurl { url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; - sha256 = "dbbda1645bc05c9260adfe9efc4949cb590ec5ec02680aff936375670cffcafc"; + sha256 = "0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 0a2ffad20fe2..6de71ef33067 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,9 +12,9 @@ libX11, }: let - virtualboxVersion = "7.1.6"; - virtualboxSubVersion = "a"; - virtualboxSha256 = "5a7b13066ec71990af0cc00a5eea9c7ec3c71ca5ed99bb549c85494ce2ea395d"; + virtualboxVersion = "7.1.8"; + virtualboxSubVersion = ""; + virtualboxSha256 = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"; virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { inherit virtualboxVersion virtualboxSubVersion virtualboxSha256; diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index fdb973da8264..b9dca41b39ae 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, telegram-desktop, withWebkit ? true, }: @@ -21,6 +22,16 @@ telegram-desktop.override { 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 [ ]) ++ [ (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) ]; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 8e7d7dc50645..d6abffa3745e 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -71,9 +71,12 @@ let src = fetchFromGitHub { owner = "AOMediaCodec"; repo = "libavif"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; }; + + patches = [ ]; + doCheck = false; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch b/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch deleted file mode 100644 index d07244e71526..000000000000 --- a/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch +++ /dev/null @@ -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("--disable-steam-integration")); -+ MainWindow w(std::move(client), config_file, !parser.get("--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("--disable-steam-integration")); -+ MainWindow w(std::move(client), config_file, !parser.get("--disable-steam-integration")); - w.show(); diff --git a/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch b/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch index 947a790c38df..4d40190c38ea 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch +++ b/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch @@ -1,19 +1,19 @@ 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 +++ b/cmake/external_dependencies.cmake -@@ -4,7 +4,7 @@ include(FetchContent) - +@@ -3,7 +3,7 @@ include(FetchContent) + function(setup_library SOURCE_TO_TEST) set(boolArgs HEADER_ONLY) - set(oneValueArgs NAME CXX_FLAGS GIT_REPOSITORY GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS) + set(oneValueArgs NAME CXX_FLAGS URL GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS) set(multiValueArgs WHEN) 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() - + FetchContent_Declare(${LIB_SETUP_NAME} - GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY} - GIT_TAG ${LIB_SETUP_GIT_TAG}) @@ -26,7 +26,7 @@ index 2eb6ec5..9f1d67e 100644 FetchContent_Populate(${LIB_SETUP_NAME}) set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_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}" NAME argparse @@ -36,7 +36,7 @@ index 2eb6ec5..9f1d67e 100644 HEADER_ONLY ) if (NOT TARGET argparse::argparse) -@@ -64,7 +62,7 @@ function(setup_curlpp) +@@ -63,7 +61,7 @@ function(setup_curlpp) set(CHECK_SOURCE "#error unimplemented}") setup_library("${CHECK_SOURCE}" NAME curlpp @@ -63,7 +63,7 @@ index 2eb6ec5..9f1d67e 100644 + URL @fmt_src@ TEST_LINK_LIBS fmt ) - + @@ -126,7 +123,7 @@ function(setup_nlohmann_json) add_library(nlohmann_json INTERFACE) else() @@ -84,7 +84,7 @@ index 2eb6ec5..9f1d67e 100644 ) get_target_property(TARGET_TYPE pugixml TYPE) @@ -188,8 +184,7 @@ function(setup_spdlog) - + setup_library("${CHECK_SOURCE}" NAME spdlog - GIT_REPOSITORY https://github.com/gabime/spdlog.git @@ -94,7 +94,7 @@ index 2eb6ec5..9f1d67e 100644 TEST_LINK_LIBS ${FMT_TARGET_NAME} CXX_FLAGS "-Wno-attributes -Wno-reorder -Wno-redundant-move" @@ -198,8 +193,7 @@ endfunction() - + function(setup_steamworkssdk) FetchContent_Declare(steamworkssdk - URL https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix index 93b0cdd0bb9e..9529c24486b7 100644 --- a/pkgs/by-name/ar/arma3-unix-launcher/package.nix +++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix @@ -11,18 +11,19 @@ nlohmann_json, qt5, spdlog, + steam-run, replaceVars, buildDayZLauncher ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "arma3-unix-launcher"; - version = "413-unstable-2025-02-10"; + version = "420"; src = fetchFromGitHub { owner = "muttleyxd"; repo = "arma3-unix-launcher"; - rev = "7d4bcb166da3bb64ef10af421619d0b00136ebd5"; - hash = "sha256-so7fjxESUAkQfO4hO5aQTzU5lHpeJlOOfEGp0Pb89sQ="; + tag = "commit-${finalAttrs.version}"; + hash = "sha256-QY3zDtfZt2ifF69Jzp0Ls1SpDCliKdkwLaGFXneT79o="; }; patches = [ @@ -52,8 +53,11 @@ stdenv.mkDerivation (finalAttrs: { doctest_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 = [ diff --git a/pkgs/by-name/ar/arma3-unix-launcher/steam-run.patch b/pkgs/by-name/ar/arma3-unix-launcher/steam-run.patch new file mode 100644 index 000000000000..6c6651766df1 --- /dev/null +++ b/pkgs/by-name/ar/arma3-unix-launcher/steam-run.patch @@ -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); diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix index 7a05f4b768cb..6edaab6a9b3f 100644 --- a/pkgs/by-name/at/atmos/package.nix +++ b/pkgs/by-name/at/atmos/package.nix @@ -2,27 +2,30 @@ lib, buildGoModule, fetchFromGitHub, + terraform, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "atmos"; - version = "1.95.0"; + version = "1.171.0"; src = fetchFromGitHub { owner = "cloudposse"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-shhkaPYU1N3Q7eu8CyZXYrR11kxb+r9II4lpfRWTOas="; + repo = "atmos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4A/sSJhF9syK1Z3HhBy8fXzdXBfAoofwQ+WLYeH1cvw="; }; - vendorHash = "sha256-4pUx8qzptzuGeIrT7m67iidMSUNbDSGV8p+KkHqX3lo="; + vendorHash = "sha256-JN6S1ncElUnZ9XEKEsgfYKXWZQpxogf9imopLeXX3ao="; ldflags = [ "-s" "-w" - "-X github.com/cloudposse/atmos/cmd.Version=v${version}" + "-X github.com/cloudposse/atmos/cmd.Version=v${finalAttrs.version}" ]; + nativeCheckInputs = [ terraform ]; + preCheck = '' # Remove tests that depend on a network connection. rm -f \ @@ -31,21 +34,26 @@ buildGoModule rec { 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 = '' runHook preInstallCheck - $out/bin/atmos version | grep "v${version}" + + $out/bin/atmos version | grep "v${finalAttrs.version}" + runHook postInstallCheck ''; - meta = with lib; { + meta = { 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)"; mainProgram = "atmos"; - license = licenses.asl20; - teams = [ teams.cloudposse ]; + license = lib.licenses.asl20; + teams = [ lib.teams.cloudposse ]; }; -} +}) diff --git a/pkgs/by-name/ba/backward-cpp/package.nix b/pkgs/by-name/ba/backward-cpp/package.nix index 84e877ec9642..c7acd08002f5 100644 --- a/pkgs/by-name/ba/backward-cpp/package.nix +++ b/pkgs/by-name/ba/backward-cpp/package.nix @@ -2,33 +2,29 @@ stdenv, lib, fetchFromGitHub, + cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "backward"; version = "1.6"; src = fetchFromGitHub { owner = "bombela"; repo = "backward-cpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-2k5PjwFxgA/2XPqJrPHxgSInM61FBEcieppBx+MAUKw="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ + cmake + ]; - mkdir -p $out/include - cp backward.hpp $out/include - - runHook postInstall - ''; - - meta = with lib; { + meta = { description = "Beautiful stack trace pretty printer for C++"; homepage = "https://github.com/bombela/backward-cpp"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; }; -} +}) diff --git a/pkgs/by-name/ba/banana-accounting/package.nix b/pkgs/by-name/ba/banana-accounting/package.nix index b1e455bbf6c3..2be9b632bf7c 100644 --- a/pkgs/by-name/ba/banana-accounting/package.nix +++ b/pkgs/by-name/ba/banana-accounting/package.nix @@ -1,31 +1,33 @@ { + lib, + stdenv, + fetchurl, autoPatchelfHook, + wrapGAppsHook3, cairo, e2fsprogs, - fetchurl, gmp, gtk3, libGL, libX11, - lib, - stdenv, libgcrypt, - wrapGAppsHook3, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "banana-accounting"; - version = "10.0.12"; + version = "10.1.24"; srcs = fetchurl { - url = "https://web.archive.org/web/20220821013214/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; - hash = "sha256-Xs7K/Z6qM1fKKfYMkwAGznNR0Kt/gY7qTr8ZOriIdYw="; + url = "https://web.archive.org/web/20250416013207/https://www.banana.ch/accounting/files/bananaplus/exe/bananaplus.tgz"; + hash = "sha256-5GewPGOCyeS6faL8aMUZ/JDUUn2PGuur0ws/7nlNX6M="; }; sourceRoot = "."; - dontConfigure = true; - dontBuild = true; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + ]; buildInputs = [ cairo @@ -38,25 +40,28 @@ stdenv.mkDerivation { libgcrypt ]; - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - ]; + dontConfigure = true; + + dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/bin - mv ./* $out - ln -s $out/usr/bin/bananaplus $out/bin/ + + mkdir -p $out/opt $out/bin $out/share + 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 ''; - meta = with lib; { + meta = { description = "Accounting Software for small companies, associations and individuals"; - homepage = "https://www.banana.ch/"; - license = licenses.unfree; + homepage = "https://www.banana.ch"; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jacg ]; + maintainers = with lib.maintainers; [ jacg ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index 291ad440a3ee..bbc41c1c0c5e 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.11.1"; + version = "3.13.2"; pyproject = true; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "barman"; tag = "release/${version}"; - hash = "sha256-X39XOv8HJdSjMjMMnmB7Gxjseg5k/LuKICTxapcHVsU="; + hash = "sha256-CfzDO4u6JL4cLHvs7f1oQqQPc+j1lKng4J9wIBswIpA="; }; patches = [ ./unwrap-subprocess.patch ]; @@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec { mock pytestCheckHook versionCheckHook + zstandard + lz4 ]; disabledTests = @@ -57,13 +59,13 @@ python3Packages.buildPythonApplication rec { "test_get_file_mode" ]; - meta = with lib; { + meta = { description = "Backup and Recovery Manager for PostgreSQL"; homepage = "https://www.pgbarman.org/"; changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS"; mainProgram = "barman"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ freezeboy ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ freezeboy ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 44f33663d5cd..06fc2ca2ab42 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -34,13 +34,13 @@ let in buildNpmPackage' rec { pname = "bitwarden-desktop"; - version = "2025.2.0"; + version = "2025.3.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8="; + hash = "sha256-nwm9ENTB1V+koUA3M8XR8DegmPHwYoszYlWbcxA6aXY="; }; patches = [ @@ -76,7 +76,7 @@ buildNpmPackage' rec { "--ignore-scripts" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs="; + npmDepsHash = "sha256-PjlTGR+e8uDe9KKEvW7cq/wYHRBO16Cf3oHh37YcNFc="; cargoDeps = rustPlatform.fetchCargoVendor { inherit @@ -86,7 +86,7 @@ buildNpmPackage' rec { cargoRoot patches ; - hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc="; + hash = "sha256-zIzgVvtTUIPKeOG/v9/7ugIIAVhoMjQ8QJ0Cbj9uZsQ="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -222,7 +222,6 @@ buildNpmPackage' rec { passthru = { updateScript = nix-update-script { extraArgs = [ - "--commit" "--version=stable" "--version-regex=^desktop-v(.*)$" ]; diff --git a/pkgs/by-name/bl/blueprint-compiler/package.nix b/pkgs/by-name/bl/blueprint-compiler/package.nix index 6ffd8a7337f6..b66748db09c9 100644 --- a/pkgs/by-name/bl/blueprint-compiler/package.nix +++ b/pkgs/by-name/bl/blueprint-compiler/package.nix @@ -7,8 +7,10 @@ meson, ninja, python3, + runCommand, stdenv, testers, + wrapGAppsNoGuiHook, xvfb-run, }: stdenv.mkDerivation (finalAttrs: { @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -64,8 +67,17 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru.tests = { + version = testers.testVersion { + 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; { diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index 8b144b85c781..24fbbc765b66 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -15,22 +15,28 @@ pkg-config, readline, sbc, + python3, }: stdenv.mkDerivation (finalAttrs: { pname = "bluez-alsa"; - version = "4.1.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; - rev = "v${finalAttrs.version}"; - hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Vebxyku7xl/ReU025iThEbvfHsi4kCbvFqlBGDWrHxc="; }; + postPatch = '' + patchShebangs src/dbus-codegen.py + ''; + nativeBuildInputs = [ autoreconfHook pkg-config + python3 ]; buildInputs = diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix index d6ddad303494..d1dc13fc8991 100644 --- a/pkgs/by-name/bo/boa/package.nix +++ b/pkgs/by-name/bo/boa/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - fetchpatch, pkg-config, bzip2, openssl, @@ -11,26 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "boa"; - version = "0.17.3"; + version = "0.20"; src = fetchFromGitHub { owner = "boa-dev"; repo = "boa"; rev = "v${version}"; - hash = "sha256-ROzdOanfHNPwHXA0SzU2fpuBonbDbgDqH+ZgOjwK/tg="; + hash = "sha256-foCIzzFoEpcE6i0QrSbiob3YHIOeTpjwpAMtcPGL8Vg="; 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; - cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4="; + cargoHash = "sha256-PphgRSVCj724eYAC04Orpz/klYuAhphiQ3v5TRChs+w="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/bo/boilr/0001-update-time.patch b/pkgs/by-name/bo/boilr/0001-update-time.patch deleted file mode 100644 index 334d0fe1e9b3..000000000000 --- a/pkgs/by-name/bo/boilr/0001-update-time.patch +++ /dev/null @@ -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 - diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 5cd51c8c4e45..b0a50817b5fd 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -7,6 +7,7 @@ gtk3, xorg, perl, + pkg-config, openssl, speechd-minimal, libxkbcommon, @@ -34,23 +35,22 @@ let in rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "BoilR"; - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; tag = "v.${version}"; - hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; + hash = "sha256-qCY/I3ACrs5mWpgN+xmWi42rF9Mzqxxce2DIA+R1RNs="; }; - cargoPatches = [ - ./0001-update-time.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-5FvlyJgYtqgJyxlfXWe9oBBkwIY+c8Fp/rHuNLJ1j7s="; + cargoHash = "sha256-9B2NcFO/Bj553yaOMi7oBZJTFtCQmBnJkU9nK+vjThU="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ + perl + pkg-config + ]; buildInputs = rpathLibs; diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index 1482119defbf..c3c04a12a985 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.9.7"; + version = "0.9.10"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; - rev = finalAttrs.version; - hash = "sha256-W6LTTQvIMAB99q2W11EBlBknJnOuv4ptgf5SSM422Cg="; + tag = finalAttrs.version; + hash = "sha256-amWfrZX1b1OmLhL7w8j/+iEwYRnO1DVR580pLkjtS/g="; }; 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"; homepage = "https://gitlab.gnome.org/cheywood/buffer"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; mainProgram = "buffer"; - maintainers = with maintainers; [ michaelgrahamevans ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ michaelgrahamevans ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix index 0b17c5e9d2cd..f72a9c357b16 100644 --- a/pkgs/by-name/bu/buffrs/package.nix +++ b/pkgs/by-name/bu/buffrs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "buffrs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "helsing-ai"; repo = "buffrs"; tag = "v${version}"; - hash = "sha256-c9GjSqVp2wEFgoy8j+Gy5FA3SG4JYEfeSwPWjW81w3Y="; + hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-E7kskULt2eOY+mZjh6jAftj8ciExUF7d1z1pePTBzvQ="; + cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y="; # Disabling tests meant to work over the network, as they will fail # inside the builder. diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 75dc31527bd7..b83261e0a277 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -19,13 +19,13 @@ in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c${optionalString debug "-debug"}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-SCUMyc8Gf7TAOXRppooNiyfbM84CUoIvokgvNgODqw8="; + hash = "sha256-2nTFQNoSAdD12BiwWMtrD9SeelTUOM3DYUdjBSjWnVU="; }; cmakeBuildType = if debug then "Debug" else "Release"; diff --git a/pkgs/by-name/cg/cgif/package.nix b/pkgs/by-name/cg/cgif/package.nix index dc6fb3dcf885..dddd1d67a1a2 100644 --- a/pkgs/by-name/cg/cgif/package.nix +++ b/pkgs/by-name/cg/cgif/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgif"; - version = "0.3.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dloebl"; repo = "cgif"; - rev = "V${finalAttrs.version}"; - sha256 = "sha256-FvqpToIVYblpuRWeEaUA8MA2Bnp9dpqGquylnXevhX4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-i8xngmVhRCGkczY3NzomLkXj+iqPb81lvLn6dXsByYs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/checkbashisms/package.nix b/pkgs/by-name/ch/checkbashisms/package.nix index 1890b21d7cf1..d0f6f3e1ff69 100644 --- a/pkgs/by-name/ch/checkbashisms/package.nix +++ b/pkgs/by-name/ch/checkbashisms/package.nix @@ -8,31 +8,33 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "2.23.7"; pname = "checkbashisms"; + version = "2.25.10"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; - hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk="; + hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus="; }; nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ perl ]; buildPhase = '' runHook preBuild substituteInPlace ./scripts/checkbashisms.pl \ - --replace '###VERSION###' "$version" + --replace-fail '###VERSION###' "${finalAttrs.version}" runHook postBuild ''; + installPhase = '' runHook preInstall - installManPage scripts/$pname.1 - installShellCompletion --bash --name $pname scripts/$pname.bash_completion - install -D -m755 scripts/$pname.pl $out/bin/$pname + installManPage scripts/checkbashisms.1 + installShellCompletion --bash --name checkbashisms scripts/checkbashisms.bash_completion + install -D -m755 scripts/checkbashisms.pl $out/bin/checkbashisms runHook postInstall ''; diff --git a/pkgs/by-name/ch/cherrytree/package.nix b/pkgs/by-name/ch/cherrytree/package.nix index 08aa96f13bae..3004d14356a2 100644 --- a/pkgs/by-name/ch/cherrytree/package.nix +++ b/pkgs/by-name/ch/cherrytree/package.nix @@ -1,13 +1,13 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, cmake, pkg-config, python3, wrapGAppsHook3, gtkmm3, - gtksourceview, + gtksourceview4, gtksourceviewmm, gspell, libxmlxx, @@ -19,15 +19,15 @@ vte, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cherrytree"; - version = "1.1.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; - tag = "v${version}"; - hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-X87L3oSidnXH/IIHtVbeIn0ehWkSgrAkX0+TUGQomV0="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 - gtksourceview + gtksourceview4 gtksourceviewmm gspell libxmlxx @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { vte ]; - meta = with lib; { + meta = { description = "Hierarchical note taking application"; mainProgram = "cherrytree"; longDescription = '' @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { a Cherrytree document where you can easily find it. ''; homepage = "https://www.giuspen.com/cherrytree"; - changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; - license = licenses.gpl3Plus; + changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${finalAttrs.version}/changelog.txt"; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix index e914e3c88cbc..fba36ad6acdd 100644 --- a/pkgs/by-name/ch/chess-tui/package.nix +++ b/pkgs/by-name/ch/chess-tui/package.nix @@ -4,25 +4,30 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "chess-tui"; - version = "1.2.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "thomas-mauran"; repo = "chess-tui"; - rev = "${version}"; - hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4="; + tag = finalAttrs.version; + hash = "sha256-L7SaWNSS5tn8OyKTPixTtlMB+OmVd9I0VXtasQMI5GI="; }; 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"; homepage = "https://github.com/thomas-mauran/chess-tui"; - maintainers = with maintainers; [ ByteSudoer ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ByteSudoer ]; + license = lib.licenses.mit; mainProgram = "chess-tui"; }; -} +}) diff --git a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch b/pkgs/by-name/ch/chsrc/disable-static-compiling.patch deleted file mode 100644 index 470deb32e9c9..000000000000 --- a/pkgs/by-name/ch/chsrc/disable-static-compiling.patch +++ /dev/null @@ -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 - diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix index 571e6302d03a..d8c58669355f 100644 --- a/pkgs/by-name/ch/chsrc/package.nix +++ b/pkgs/by-name/ch/chsrc/package.nix @@ -1,33 +1,31 @@ { lib, - fetchFromGitHub, stdenv, + fetchFromGitHub, texinfo, }: stdenv.mkDerivation (finalAttrs: { pname = "chsrc"; - version = "0.1.9"; + version = "0.2.1"; src = fetchFromGitHub { owner = "RubyMetric"; repo = "chsrc"; - rev = "v${finalAttrs.version}"; - hash = "sha256-MwT6SuDisJ2ynxlOqAUA8WjhrTeUcyoAMArehnby8Yw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yZjza4BSgRCOwc719iNdG17WVuLPUBJjZb6Yz4FsTcA="; }; nativeBuildInputs = [ texinfo ]; - patches = [ - ./disable-static-compiling.patch - ]; - installPhase = '' runHook preInstall + install -Dm755 chsrc $out/bin/chsrc install -Dm644 doc/chsrc.1 -t $out/share/man/man1/ makeinfo doc/chsrc.texi --output=chsrc.info - install -Dm 644 chsrc.info -t $out/share/info/ + install -Dm644 chsrc.info -t $out/share/info/ + runHook postInstall ''; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 32e5258cc5d7..eb76bf1e796f 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-04-23"; + version = "2025-05-01"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-K5WQhYVO3z6gR2Jl5yJJW8vK8BA89iAwPzhq4jX27y0="; + hash = "sha256-C1tNKyTuzn7A923Y3ExNYkFwYx2frPAiifzGmkDEBag="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index fdf791d6b3aa..5e7e1dea7679 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -1,33 +1,24 @@ { lib, - fetchFromGitHub, - fetchpatch, python3, + fetchFromGitHub, }: python3.pkgs.buildPythonApplication rec { pname = "ffsubsync"; - version = "0.4.25"; + version = "0.4.29"; pyproject = true; src = fetchFromGitHub { owner = "smacke"; repo = "ffsubsync"; tag = version; - hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; + hash = "sha256-XMFobdr/nzr5pXjz/jWa/Pp14ITdbxAce0Iz+5qcBO4="; }; - patches = [ - # 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="; - }) - ]; + build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ setuptools ]; - - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ auditok charset-normalizer faust-cchardet @@ -50,10 +41,10 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "ffsubsync" ]; - meta = with lib; { + meta = { homepage = "https://github.com/smacke/ffsubsync"; description = "Automagically synchronize subtitles with video"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "ffsubsync"; }; diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index 0b2c945d6801..71338621fefd 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -1,23 +1,21 @@ { lib, - stdenv, fetchFromGitHub, buildGoModule, - writableTmpDirAsHomeHook, versionCheckHook, }: buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.67.1"; + version = "4.67.2"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-cZ0YTFcyPt7NMZUDZCdlVPTuhwRy7mTp7JCdINqiwOM="; + hash = "sha256-iMLD9M4EzXHRxvc5px9UcXEdjRIO1jm+hYwhaYaFON8="; }; - vendorHash = "sha256-gFAotYho18Jn8MaFK6ShoMA1VLXVENcrASvHWZGFOFg="; + vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60="; subPackages = [ "cmd/fleet" @@ -28,11 +26,6 @@ buildGoModule (finalAttrs: { "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}" ]; - doCheck = true; - nativeCheckInputs = [ - writableTmpDirAsHomeHook - ]; - doInstallCheck = true; versionCheckProgramArg = "version"; nativeInstallCheckInputs = [ @@ -46,6 +39,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ asauzeau + lesuisse ]; mainProgram = "fleet"; }; diff --git a/pkgs/by-name/fl/fleetctl/package.nix b/pkgs/by-name/fl/fleetctl/package.nix index 8cb6bd248b26..e518e12f8047 100644 --- a/pkgs/by-name/fl/fleetctl/package.nix +++ b/pkgs/by-name/fl/fleetctl/package.nix @@ -1,44 +1,41 @@ { lib, buildGoModule, - fetchFromGitHub, + fleet, writableTmpDirAsHomeHook, versionCheckHook, stdenv, }: -buildGoModule rec { - pname = "fleectl"; - version = "4.67.1"; +buildGoModule (finalAttrs: { + pname = "fleetctl"; - src = fetchFromGitHub { - owner = "fleetdm"; - repo = "fleet"; - tag = "fleet-v${version}"; - hash = "sha256-shaOPK7BbIDARopzGehlIA6aPdRiFRP9hrFRNO3kfGA="; - }; - vendorHash = "sha256-UkdHwjCcxNX7maI4QClLm5WWaLXwGlEu80eZXVoYy60="; + inherit (fleet) version src vendorHash; subPackages = [ "cmd/fleetctl" ]; ldflags = [ - "-X github.com/fleetdm/fleet/v4/server/version.appName=${pname}" - "-X github.com/fleetdm/fleet/v4/server/version.version=${version}" + "-X github.com/fleetdm/fleet/v4/server/version.appName=fleetctl" + "-X github.com/fleetdm/fleet/v4/server/version.version=${finalAttrs.version}" ]; nativeCheckInputs = [ writableTmpDirAsHomeHook - versionCheckHook ]; # Try to access /var/empty/.goquery/history subfolders doCheck = !stdenv.hostPlatform.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { 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"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -46,4 +43,4 @@ buildGoModule rec { ]; mainProgram = "fleetctl"; }; -} +}) diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix index 0686fb8fb4a5..7973f138768a 100644 --- a/pkgs/by-name/fl/fluffychat/package.nix +++ b/pkgs/by-name/fl/fluffychat/package.nix @@ -48,7 +48,6 @@ flutter327.buildFlutterApplication ( mainProgram = "fluffychat"; maintainers = with maintainers; [ mkg20001 - gilice tebriel ]; platforms = [ diff --git a/pkgs/by-name/ga/gatk/package.nix b/pkgs/by-name/ga/gatk/package.nix index b130f3c84a39..d66c9c8739dd 100644 --- a/pkgs/by-name/ga/gatk/package.nix +++ b/pkgs/by-name/ga/gatk/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.6.1.0"; + version = "4.6.2.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-jVrFhLgHPIcWFCP3FU+LxR+UE+lVRzE6WZuLfwdL708="; + sha256 = "sha256-I2p7BLh4q0i8qn1fTbzsaKVnCkMrPIxEpBUjOxNxgxI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 85639d4984e2..3b3de01c10c9 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.71.2"; + version = "2.72.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-n1qGJ5/X7wp4kgQqgcUomNvln2WavDJOjwxjVokfbiU="; + hash = "sha256-0t3xt37Ij2OvBOnZZKVFJnLFU+uMv/A5utnsY55MTRw="; }; - vendorHash = "sha256-69bGTUdVD/jebvmxYu0Mx7poSlbkXBAXUWLJ1CclXJU="; + vendorHash = "sha256-dLHtq+CG3S5wHItF6+G3L4SYiPKo+2Hw5rYUIPQbN2A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index 00411e48f4a3..1c0399a995b9 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -6,7 +6,6 @@ pkg-config, python3, gfortran, - lesstif, cfitsio, getopt, perl, @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 - lesstif cfitsio python3Env ncurses diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix index 1d602c6e24fd..9c5a7f9add01 100644 --- a/pkgs/by-name/go/go-dnscollector/package.nix +++ b/pkgs/by-name/go/go-dnscollector/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "go-dnscollector"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "go-dnscollector"; rev = "v${version}"; - sha256 = "sha256-/jc9OEWxwcMFIdihlyxADHgZKumc/uOqkhjjN1mLw1U="; + sha256 = "sha256-antLNQEOA20XxmmZHFQcs0VuLVfgM5V3wyXOYIX4hlk="; }; - vendorHash = "sha256-koWDlmlabDiwnlx+BTTtSQglu2lpccoTh17fRUC3pvg="; + vendorHash = "sha256-9EQr4lhv6+PkAnMJ6iWnBsK/SzZaOyVkSpqSYsX07LY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix index 76a829dd2fd6..36b886bd49b4 100644 --- a/pkgs/by-name/gq/gqlgenc/package.nix +++ b/pkgs/by-name/gq/gqlgenc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-3Qz1o91IPKjhzIYzKcdl456AWn6nsrcQ04VglBlpe54="; + sha256 = "sha256-AGbE+R3502Igl4/HaN8yvFVJBsKQ6iVff8IEvddJLEo="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-Ax5MA4wqQdXSDEIkiG5TcvFIN6YtyXuiJOdQGPYIb+Y="; + vendorHash = "sha256-kBv9Kit5KdPB48V/g1OaeB0ABFd1A1I/9F5LaQDWxUE="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; diff --git a/pkgs/by-name/he/hedgedoc-cli/package.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix index 78eb00563a88..8585407a45d3 100644 --- a/pkgs/by-name/he/hedgedoc-cli/package.nix +++ b/pkgs/by-name/he/hedgedoc-cli/package.nix @@ -2,35 +2,31 @@ lib, stdenv, fetchFromGitHub, - makeWrapper, + makeBinaryWrapper, wget, jq, curl, }: -let - version = "1.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "hedgedoc-cli"; - inherit version; + version = "1.0-unstable-2025-05-01"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "cli"; - rev = "v${version}"; - sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4="; + rev = "defeac80ca97fedcb19bdcddc516fd8f6e55fe8c"; + hash = "sha256-7E5Ka6SEPRg2O4+bJ6g3gSDMLnPMzg5Lbslgvt6gNEg="; }; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - cp $src/bin/codimd $out/bin - wrapProgram $out/bin/codimd \ + + makeWrapper $src/bin/codimd $out/bin/hedgedoc-cli \ --prefix PATH : ${ lib.makeBinPath [ jq @@ -38,18 +34,23 @@ stdenv.mkDerivation { curl ] } - ln -s $out/bin/codimd $out/bin/hedgedoc-cli + runHook postInstall ''; checkPhase = '' + runHook preCheck + hedgedoc-cli help + + runHook postCheck ''; - meta = with lib; { + meta = { description = "Hedgedoc CLI"; homepage = "https://github.com/hedgedoc/cli"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ drupol ]; + license = lib.licenses.agpl3Only; + mainProgram = "hedgedoc-cli"; + maintainers = with lib.maintainers; [ drupol ]; }; -} +}) diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index a4c29ca51752..bafde8c09fb0 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "hermit"; - version = "0.44.6"; + version = "0.44.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-PNzMR9bYR7Dv62kN6tYBdabGR01iXw537WRUtJXl1CE="; + hash = "sha256-euSuOYHroTJTifUcthHr4oQktTmE62qf2y6p6fBy9fI="; }; vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w="; diff --git a/pkgs/by-name/hh/hheretic/package.nix b/pkgs/by-name/hh/hheretic/package.nix index 64a3fa9d82ac..2b886b6b8522 100644 --- a/pkgs/by-name/hh/hheretic/package.nix +++ b/pkgs/by-name/hh/hheretic/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, SDL, SDL_mixer, + libGL, + libGLU, autoreconfHook, gitUpdater, }: @@ -27,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL SDL_mixer + libGL + libGLU ]; strictDeps = true; diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix index 36a92c0527b7..6e82bfcf4944 100644 --- a/pkgs/by-name/ju/julia-mono/package.nix +++ b/pkgs/by-name/ju/julia-mono/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.059"; + version = "0.060"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-b0h88rpylvMaRh9U/8oOhr4yOftzf7OvdwhpCuIeUjE="; + hash = "sha256-PmMGro8K4OwtKBIBhe/RKpi+MveSfhpQsiJfF+iUBzI="; }; installPhase = '' diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 5bcd51ad9ead..c7fb310dd0ea 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -26,6 +26,11 @@ 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: { pname = "kew"; version = "3.2.0"; @@ -37,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: { 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 = [ pkg-config diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix index 4f48e54fedcc..57f39ef79967 100644 --- a/pkgs/by-name/ks/kstars/package.nix +++ b/pkgs/by-name/ks/kstars/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cfitsio, cmake, curl, @@ -22,13 +23,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "kstars"; - version = "3.7.5"; + version = "3.7.6"; src = fetchurl { 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; [ extra-cmake-modules kdoctools diff --git a/pkgs/by-name/li/libtcod/package.nix b/pkgs/by-name/li/libtcod/package.nix index 78128320f587..75969c606f62 100644 --- a/pkgs/by-name/li/libtcod/package.nix +++ b/pkgs/by-name/li/libtcod/package.nix @@ -6,6 +6,7 @@ SDL, libGLU, libGL, + libX11, upx, zlib, }: @@ -36,10 +37,16 @@ stdenv.mkDerivation { SDL libGLU libGL + libX11 upx zlib ]; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=implicit-int" + "-Wno-error=incompatible-pointer-types" + ]; + meta = { description = "API for roguelike games"; homepage = "http://roguecentral.org/doryen/libtcod/"; diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index c5f21c02f946..365f87477ab6 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-waQcxdVXZZ09wuLWUNL4nRUHF1rIDI8lAfYc/1bxMl0="; - buildFeatures = [ "mpris" ]; + buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index ebf3adf13240..71ec2cc03056 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -1,21 +1,23 @@ { lib, - buildGoModule, + buildGo123Module, 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"; - version = "12.1.2"; + version = "12.2.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; - rev = version; - sha256 = "sha256-t70Od27w/ZT/EHKAgjPBx39Oo4dS1aWL3up7TVlNAuI="; + rev = "${version}"; + sha256 = "sha256-0w6rIOSnOS7EfTBA/mRNWm8KOtdviTxWdukl4reb4zE="; }; - vendorHash = "sha256-XPTnsV0JVSatfHzI4ajq8nnN2HTKc8FeKwmOIuXo2GU="; + vendorHash = "sha256-CqFCjSXw7/jLe1OYosUl6mKSPEsdHl8p3zb/LVNqnxM="; ldflags = [ "-s" diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix index 42378e78607a..122002573213 100644 --- a/pkgs/by-name/md/mdbook-katex/package.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.9.3"; + version = "0.9.4"; src = fetchCrate { inherit pname version; - hash = "sha256-5EYskcYEDZENK7ehws36+5MrTY2rNTXoFnWYOC+LuiQ="; + hash = "sha256-xwIW8igfxO9vsck8ktDBc7XFLuYzwqI3I4nLDTYC8JI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-j0BdEnPP7/0i1hg7GNgc+F4EeElVm6AZIWZNelYZLIU="; + cargoHash = "sha256-ULcjcY+CaVSohSzlm4KbSgG27IZyxX8zp8ifZNj5c54="; meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix index 54f7c64d1b6a..1f28e9484b20 100644 --- a/pkgs/by-name/me/megasync/package.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://mega.nz/"; downloadPage = "https://github.com/meganz/MEGAsync"; changelog = "https://github.com/meganz/MEGAsync/releases/tag/v${finalAttrs.version}_Linux"; - license = lib.licenses.unfree; + license = lib.licenses.unfreeRedistributable; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index e3e5fa4a71e6..dc9315ffdb49 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.139.1", + "version": "3.141.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_linux_x86_64", - "hash": "sha256-VBmPo94DPWh/fvA8ZZfxcqCab9ZNqCVXKLwNcBMZm4E=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_linux_x86_64", + "hash": "sha256-fiwtZM1gyJZ2HOiDAhAu8f6jHl6hxmHcqyMTSMOCcFo=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_linux_aarch64", - "hash": "sha256-ct/NyfVXI/GlR4HKAKX2vKrzU95+u2tO7ltw2aEbji0=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_linux_aarch64", + "hash": "sha256-HD93OHo+vkgkZYxgKMXd/L43o0loA1jAPc8JfwOfZPw=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_mac_universal", - "hash": "sha256-selcbXCfkvKVzNClhYkssVY3CvZFH8uXzYGKhA6N63w=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_mac_universal", + "hash": "sha256-vLrUSgYQjPNk5WGEsBKR3E2222n8oP6xVAHf2ZPBIDk=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_mac_universal", - "hash": "sha256-selcbXCfkvKVzNClhYkssVY3CvZFH8uXzYGKhA6N63w=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_mac_universal", + "hash": "sha256-vLrUSgYQjPNk5WGEsBKR3E2222n8oP6xVAHf2ZPBIDk=" } } } diff --git a/pkgs/by-name/mo/mongodb-compass/darwin.nix b/pkgs/by-name/mo/mongodb-compass/darwin.nix new file mode 100644 index 000000000000..b2036833d536 --- /dev/null +++ b/pkgs/by-name/mo/mongodb-compass/darwin.nix @@ -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 + ''; +} diff --git a/pkgs/by-name/mo/mongodb-compass/linux.nix b/pkgs/by-name/mo/mongodb-compass/linux.nix new file mode 100644 index 000000000000..c3c4797bc501 --- /dev/null +++ b/pkgs/by-name/mo/mongodb-compass/linux.nix @@ -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 + ''; +} diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 890ac0aca6b9..b18ca42c7b66 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -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, - systemd, - wrapGAppsHook3, - xorg, + callPackage, + lib, + ... }: 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"; - inherit version; - - 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 - ''; - + version = "1.46.0"; meta = { description = "GUI for MongoDB"; maintainers = with lib.maintainers; [ bryanasdev000 friedow + iamanaws ]; homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.sspl; - platforms = [ "x86_64-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; mainProgram = "mongodb-compass"; }; -} +in +if stdenv.hostPlatform.isDarwin then + callPackage ./darwin.nix { inherit pname version meta; } +else + callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix deleted file mode 100644 index da3a462c2790..000000000000 --- a/pkgs/by-name/mu/music-player/package.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index bc76ac391f49..4485b0cf914b 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.32.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-XI2MoAaipQvfG5rgRC4Mcxcrvy/wD3GnyNJvCTHwZhY="; + hash = "sha256-cOg7wwcwmpDNqnu15j5aYxLNpBxrhliK6w3sw2JQlCg="; # 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. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-lLixmw4nnIjU61gXCPZhX/d2fBA57VPMrf7vsn+KrrE="; + vendorHash = "sha256-60GjN9jeYjGdkVxm+lNBS0OYt523c/HrfBPrvdET0hQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index df28d244f0fc..761c89ca810b 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; tag = "v${version}"; - hash = "sha256-jE1nzpUpt2WbaG6MQfji8k5qML7bi9mGSVFzQM3+DKQ="; + hash = "sha256-x2lQqBjNbX+EhtnK6r3YpZX5yAadLMUKfypxsGTB5s4="; }; - vendorHash = "sha256-E5u4BmsB/jSsGehtNFJEMja9T5YYKDqgwT7askcaAjA="; + vendorHash = "sha256-eN5KJWubE+NptdncfVPyglb5SS76Eh7jlrajcjBU8YI="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/by-name/ph/photoqt/package.nix b/pkgs/by-name/ph/photoqt/package.nix index 776914930af4..7230ffc83cd3 100644 --- a/pkgs/by-name/ph/photoqt/package.nix +++ b/pkgs/by-name/ph/photoqt/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.8.1"; + version = "4.9"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-Iq5Fc0v+EYFe1YG3ZhZKl8leXD+TpGGhaQjr800vz7Y="; + hash = "sha256-Kd8h6JFJ02JH+IKMltvKT/mgnhz9jOJAFXMnNmI1BYA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index 10be21e9ecf4..9233d4cb2428 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-Dmp+PtQ5qnj5MYS1jFUvLRhrxTp94WDaR8z7Ayv0lhU="; + hash = "sha256-VVTI9dmSHVsXttDPoxRkPYVC8VU/678spLlyoyZGvpI="; }; - npmDepsHash = "sha256-5DIZMb1dKkgWmEzjNOthXY6weOyLDQVjJKPdsHj+pb8="; + npmDepsHash = "sha256-VY2YjpOKimgX90ieu4jjZ6YVJYQqq3l3k/iDfsTMZmI="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index bfa968d43e2e..b30f319eeea8 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, # nativeBuildInputs cmake, @@ -15,6 +16,9 @@ liblapack, xorg, libusb1, + yaml-cpp, + libnabo, + libpointmatcher, eigen, g2o, ceres-solver, @@ -23,6 +27,7 @@ libdc1394, libGL, libGLU, + librealsense, vtkWithQt5, zed-open-capture, hidapi, @@ -33,22 +38,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtabmap"; - version = "0.21.4.1"; + version = "0.21.13"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - tag = finalAttrs.version; - hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk="; + tag = "${finalAttrs.version}-noetic"; + 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 = [ cmake libsForQt5.wrapQtAppsHook pkg-config wrapGAppsHook3 ]; - buildInputs = [ ## Required opencv @@ -58,16 +70,19 @@ stdenv.mkDerivation (finalAttrs: { xorg.libSM xorg.libICE xorg.libXt + ## Optional libusb1 eigen g2o ceres-solver - # libpointmatcher - ABI mismatch + yaml-cpp + libnabo + libpointmatcher octomap freenect libdc1394 - # librealsense - missing includedir + librealsense libsForQt5.qtbase libGL libGLU @@ -76,8 +91,14 @@ stdenv.mkDerivation (finalAttrs: { hidapi ]; - # Disable warnings that are irrelevant to us as packagers - cmakeFlags = [ "-Wno-dev" ]; + # Configure environment variables + 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 = { updateScript = gitUpdater { }; @@ -90,7 +111,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ marius851000 ]; platforms = with lib.platforms; linux; - # pcl/io/io.h: No such file or directory - broken = true; }; }) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 90614ca17229..7fd7da08b991 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-DXu9/DRwcffZtsql/Qk+6GyzhiYXUyW6R9FCAvLhn6o="; + hash = "sha256-HVZADn9xpwywubEbaMJgOs3yCXa4pNWnnrfSICF2+DE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4TK7HEdSCvUGqsAH+dnPgMBYmT/0mOnvQXHr/PtcsT0="; + cargoHash = "sha256-TB7ARPTwYTNqbrcfwl9RCYmAw+y0uudaBp1YyDg52/w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index 6411512c8a69..ace84e0a9681 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -6,11 +6,12 @@ libadwaita, modemmanager, wrapGAppsHook4, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "satellite"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; @@ -19,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tpikonen"; repo = "satellite"; tag = version; - hash = "sha256-w0ZpH1joFoV7W7PH74//LGLUJQLCpAGcC6GlyTbdsTE="; + hash = "sha256-E/OKdVB+JDP/01ydEgA/B6+GMiVYB4jlPI70TW8HBDU="; }; nativeBuildInputs = [ @@ -42,6 +43,10 @@ python3.pkgs.buildPythonApplication rec { strictDeps = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Program for showing navigation satellite data"; longDescription = '' diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index 4eaef65d6cb9..3f1b52894ee0 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-mDcirYhqpfeS2Wt9MnYPmTn/QZa85vlrN2uUkA1+7A4="; + hash = "sha256-+ZwENhZF19VpJPGOVHnT4vMiWi8fzuJa3AhyOQ/S6w0="; }; vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI="; diff --git a/pkgs/by-name/sh/shadowsocks-rust/package.nix b/pkgs/by-name/sh/shadowsocks-rust/package.nix index ee5c48b1a856..6fcbe25efa2c 100644 --- a/pkgs/by-name/sh/shadowsocks-rust/package.nix +++ b/pkgs/by-name/sh/shadowsocks-rust/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "shadowsocks-rust"; tag = "v${version}"; - hash = "sha256-lCm/Y0R4/Ti4Eq06/za4D2YanwQ79IkhCBK2TO9/Yfs="; + hash = "sha256-Yt2Zc+b7QpN/yO6MTg9a+7xTw9pHkYFHdq3Sz3Agdi4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-//cEAeYSpsB429YaWBu+6T4dorV5OZFZuNxLgvqXxR8="; + cargoHash = "sha256-eJFXFkevSS/N4A1+tCcwWUQsklA9HUQgLHw40fW5oxM="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 87442def7299..3c52c2e43011 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -22,11 +22,14 @@ python3.pkgs.buildPythonApplication rec { "distro" "typer" "instructor" + "jinja2" ]; build-system = with python3.pkgs; [ hatchling ]; propagatedBuildInputs = with python3.pkgs; [ + jinja2 + requests click distro instructor @@ -43,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/TheR1D/shell_gpt"; changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ mglolenstine ]; + maintainers = with maintainers; [ SohamG ]; mainProgram = "sgpt"; }; } diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index 76ebeae80949..53bd8d93395c 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "sirikali"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "sirikali"; rev = version; - hash = "sha256-YGMmDatTKjhORTisX9kTVrpIWo6j0YkxZsDLJXga6ho="; + hash = "sha256-rfmWtbPYtkaGemeStMWwA6JllOkDiHMftSfmirtAOEQ="; }; buildInputs = diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json index da1e488c6884..b1ba523df9b6 100644 --- a/pkgs/by-name/sl/slimevr-server/deps.json +++ b/pkgs/by-name/sl/slimevr-server/deps.json @@ -19,6 +19,75 @@ "jmdns#jmdns/0e40954468": { "jar": "sha256-At4T7JOk5Ary/jGDErygVFkglIQ37CdG98idweqySAQ=", "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": { @@ -34,28 +103,28 @@ "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" }, - "com/diffplug/durian#durian-swt.os/4.2.2": { - "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", - "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", - "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + "com/diffplug/durian#durian-swt.os/4.3.0": { + "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=", + "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=", + "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs=" }, - "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { - "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/7.0.2": { + "pom": "sha256-7R3td6KWpv4hpQJ5ySbAe+FK98CMJDfTaFxw/Pa7oC0=" }, - "com/diffplug/spotless#spotless-lib-extra/2.45.0": { - "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", - "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", - "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + "com/diffplug/spotless#spotless-lib-extra/3.0.2": { + "jar": "sha256-sOd3RtYz1EXnhImsPQitLqGzU3xNBk5KvkbMQtYjA+s=", + "module": "sha256-vSVeQkQbWRehU8U9z5fP08IEevN2zF3Yu1Z/aEAWtFk=", + "pom": "sha256-IVesGayscKzQRQH8WbvJZNsZD1tx5O1e/s6o5c9o7Os=" }, - "com/diffplug/spotless#spotless-lib/2.45.0": { - "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", - "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", - "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + "com/diffplug/spotless#spotless-lib/3.0.2": { + "jar": "sha256-P5p/38WwOsIIlINBcJEMFcTyuE7UzjZ3iYowetWJg3w=", + "module": "sha256-E1WLrsCR6gDxYmXNNSOBePT+ejv61zXel214XUF/ss0=", + "pom": "sha256-jxtFo4m6Jeel8DvZ8KS9BKp+dHXgku6C1VUJYrLPdV8=" }, - "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { - "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", - "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", - "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + "com/diffplug/spotless#spotless-plugin-gradle/7.0.2": { + "jar": "sha256-WaNMT4SkjUyNkp4viZBjaeZUduwEmaQ96Hw+QSeXfNU=", + "module": "sha256-rxC8mydsNqlNcRh+kVhwJ1yyRVZTntzqGYpYL30Tsws=", + "pom": "sha256-JyVoPfbvTNSIr+sgANqJIpQcqQ513D49uFIupxWKaMQ=" }, "com/fasterxml#oss-parent/38": { "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" @@ -134,18 +203,18 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "commons-codec#commons-codec/1.16.0": { - "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", - "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + "commons-codec#commons-codec/1.17.0": { + "jar": "sha256-9wDegKwnDQNE/ep0aCAdi5yAXlxkgzHDYZ8u4GfM/Fk=", + "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" }, "commons-io#commons-io/2.16.1": { "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" }, - "dev/equo/ide#solstice/1.7.5": { - "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", - "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", - "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + "dev/equo/ide#solstice/1.8.1": { + "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=", + "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=", + "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -153,9 +222,6 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, - "org/apache#apache/29": { - "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" - }, "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, @@ -173,9 +239,6 @@ "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" }, - "org/apache/commons#commons-parent/58": { - "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" - }, "org/apache/commons#commons-parent/69": { "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" }, @@ -247,16 +310,16 @@ "org/eclipse/jetty#jetty-bom/9.4.55.v20240627": { "pom": "sha256-plq2UZjcP22y/2kBBlc31UgL52e+wyDgFzqJB68LGdg=" }, - "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { - "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + "org/eclipse/jgit#org.eclipse.jgit-parent/6.10.0.202406032230-r": { + "pom": "sha256-8tNTmgp5Iv15RwgsGQHSCQ2uB0mGsi2r2XO0OYzR6i4=" }, - "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { - "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", - "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + "org/eclipse/jgit#org.eclipse.jgit/6.10.0.202406032230-r": { + "jar": "sha256-Q/kvOttoGl8wBrl56NNBwSqM/YAp8ofEK88KgDd1Za4=", + "pom": "sha256-BVlUQr62ogYQi2c6qcZpLIPkHfGDF33GcROxzD9Sgd0=" }, - "org/eclipse/platform#org.eclipse.osgi/3.18.300": { - "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", - "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + "org/eclipse/platform#org.eclipse.osgi/3.18.500": { + "jar": "sha256-gLJ11YN5cjspHqZQJJzDgJyPELNPeKr5iBMs1tQ0q04=", + "pom": "sha256-4o9b4Azk7Sx+SAnsrQW5UwfzWhflhWAHhri97juk2Wg=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", @@ -414,10 +477,6 @@ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "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": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, @@ -501,11 +560,6 @@ "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.1": { "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": { "jar": "sha256-FcepndfH5cTcOLXkhn1TZw1YDYqAXvQ4A7qT8IN2Uc0=", "pom": "sha256-eN9L1tMAM6b3JUkuBewt0shfbc7EYm6wWT6KpO9f0ic=" @@ -531,15 +585,25 @@ "com/illposed/osc#javaosc-parent/0.8": { "pom": "sha256-nEUgmNlVT1AifJfkGt0/t6mvSSUGgHK/3YywUtl8x3U=" }, - "com/melloware#jintellitype/1.4.1": { - "jar": "sha256-6mQRTP+BCiat4vxz1LnB/jggDmP2dhUQ11ZrXtNOPCM=", - "pom": "sha256-wej58h+rEtprQQg+8i7wpFZBpjcmjw8pOryo9v0yoj4=" + "com/mayakapps/kache#kache-jvm/2.1.0": { + "jar": "sha256-QnYuXTmGGeE6JZj1EcXc2UuW4dD6T+t2+e+YteFh14c=", + "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": { "xml": { "groupId": "com.melloware", - "lastUpdated": "20220814121249", - "release": "1.4.1" + "lastUpdated": "20250413134243", + "release": "1.5.0" } }, "com/typesafe#config/1.4.3": { @@ -717,26 +781,26 @@ "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" }, - "net/java/dev/jna#jna-platform/5.16.0": { - "jar": "sha256-5aeVI5ZFCXV1VXgrtgKD5JAmEQE/EH5GANyTKY9z84I=", - "pom": "sha256-R3eT3wLGgn3+Ab2wjwBqVXdeb6BS3ErN7aNMmTYopJY=" + "net/java/dev/jna#jna-platform/5.17.0": { + "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=", + "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ=" }, - "net/java/dev/jna#jna/5.16.0": { - "jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", - "pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" + "net/java/dev/jna#jna/5.17.0": { + "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=", + "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" }, "net/java/dev/jna/jna-platform/maven-metadata": { "xml": { "groupId": "net.java.dev.jna", - "lastUpdated": "20241222102859", - "release": "5.16.0" + "lastUpdated": "20250316114732", + "release": "5.17.0" } }, "net/java/dev/jna/jna/maven-metadata": { "xml": { "groupId": "net.java.dev.jna", - "lastUpdated": "20241222102857", - "release": "5.16.0" + "lastUpdated": "20250316114729", + "release": "5.17.0" } }, "org/apache#apache/16": { @@ -857,9 +921,9 @@ "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.8.22": { - "jar": "sha256-ZVgl+mURIg/tDK5arU3+oqv5j9EPCud+uNr2q/zQ8Cc=", - "pom": "sha256-KeHqCKPTq0gtH9/UH76TRZEt9Gbbr6+0sS0YN8cr4yg=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.20": { + "jar": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA=", + "pom": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s=" }, "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", @@ -892,13 +956,13 @@ "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.22": { - "jar": "sha256-BV9cskKH+hBhAJlae0erkhJrgegy6HX1+izwvVVpPQs=", - "pom": "sha256-T5WKqZPVmE+PXr7UFGVipfOp9pW2BJyfKHOBN5ytqzM=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": { + "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", + "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.22": { - "jar": "sha256-QZiw6vCQpPJbb35aWVgfQxS6jJ9s0dE+6dNI5l7Y9wc=", - "pom": "sha256-ko8hhyF0djE8uBbUgHC8dlSqO5pa6B0/xfjCecyPjZ4=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": { + "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", + "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", @@ -1037,6 +1101,9 @@ "org/slf4j#slf4j-api/1.7.25": { "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" }, + "org/slf4j#slf4j-api/1.7.36": { + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, "org/slf4j#slf4j-api/2.0.13": { "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" @@ -1055,6 +1122,9 @@ "org/slf4j#slf4j-parent/1.7.25": { "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, "org/slf4j#slf4j-parent/2.0.13": { "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" }, diff --git a/pkgs/by-name/sl/slimevr/gui-no-git.patch b/pkgs/by-name/sl/slimevr/gui-no-git.patch index 6e259a4fbefb..f6d9ee12764f 100644 --- a/pkgs/by-name/sl/slimevr/gui-no-git.patch +++ b/pkgs/by-name/sl/slimevr/gui-no-git.patch @@ -1,8 +1,8 @@ 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 +++ 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 { visualizer } from 'rollup-plugin-visualizer'; @@ -14,8 +14,9 @@ index c9eb27be..4b3757f0 100644 +const commitHash = ""; +const versionTag = "@version@"; // 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; + if (!gitClean) console.log('Git is dirty because of:\n' + gitCleanString); console.log(`version is ${versionTag || commitHash}${gitClean ? '' : '-dirty'}`); - diff --git a/pkgs/by-name/sl/slimevr/no-java-tool-options-warning.patch b/pkgs/by-name/sl/slimevr/no-java-tool-options-warning.patch new file mode 100644 index 000000000000..87feddb9cb88 --- /dev/null +++ b/pkgs/by-name/sl/slimevr/no-java-tool-options-warning.patch @@ -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| { diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 083938fb1756..a9e94ebf6d51 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -21,26 +21,25 @@ rustPlatform.buildRustPackage rec { pname = "slimevr"; - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { owner = "SlimeVR"; repo = "SlimeVR-Server"; rev = "v${version}"; - hash = "sha256-XQDbP+LO/brpl7viSxuV3H4ALN0yIkj9lwr5eS1txNs="; + hash = "sha256-7b2IlMYpOVvthOUNr63PUsZyr2JH37O2DVWH9N6M8Xg="; # solarxr fetchSubmodules = true; }; buildAndTestSubdir = "gui/src-tauri"; - useFetchCargoVendor = true; - cargoHash = "sha256-93aOM6iJguTdC5RAUDuoSr05ar+iKilmddgKBOG2fDE="; + cargoHash = "sha256-+WrBVL4/XslJSOwuxs4IzqXG9l1/lMSbKil/8OHc9Xw="; pnpmDeps = pnpm_9.fetchDeps { pname = "${pname}-pnpm-deps"; inherit version src; - hash = "sha256-5IqIUwVvufrws6/xpCAilmgRNG4mUGX8NXajZcVZypM="; + hash = "sha256-IoLY3ByDQGfbkWjxlEHHTiKiE3+tpwCrYLUDE8zPkeQ="; }; nativeBuildInputs = [ @@ -69,18 +68,10 @@ rustPlatform.buildRustPackage rec { patches = [ # Upstream code uses Git to find the program version. (replaceVars ./gui-no-git.patch { - inherit version; - }) - ]; - - 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="; + version = src.rev; }) + # By default, SlimeVR will give a big warning about our `JAVA_TOOL_OPTIONS` changes. + ./no-java-tool-options-warning.patch ]; postPatch = @@ -91,22 +82,27 @@ rustPlatform.buildRustPackage rec { '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is. - pushd $cargoDepsCopy/libappindicator-sys-* - oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - substituteInPlace src/lib.rs \ + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --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 \ --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 # done the first time, because `pnpm_9.configHook` ignores `package.json` scripts. preBuild = '' - pnpm --filter solarxr-protocol install + pnpm --filter solarxr-protocol build ''; doCheck = false; # No tests @@ -129,8 +125,26 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = ./update.sh; meta = { - homepage = "https://docs.slimevr.dev/"; + homepage = "https://slimevr.dev"; 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; [ mit asl20 diff --git a/pkgs/by-name/sm/smtp4dev/deps.json b/pkgs/by-name/sm/smtp4dev/deps.json index 3ef4f7e70fd6..a3e7e8fa90f8 100644 --- a/pkgs/by-name/sm/smtp4dev/deps.json +++ b/pkgs/by-name/sm/smtp4dev/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Ardalis.GuardClauses", - "version": "4.5.0", - "hash": "sha256-YqVmWM9f57Lof1e1dUWoIig7D2M9G/c2slUNicCX6Hg=" + "version": "5.0.0", + "hash": "sha256-jQOXJzEIRzPVEFTcbdCNj450hbpSTrIbYSi5m2Q5MEo=" }, { "pname": "AspNetCore.Authentication.Basic", @@ -11,8 +11,8 @@ }, { "pname": "BouncyCastle.Cryptography", - "version": "2.3.0", - "hash": "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0=" + "version": "2.5.1", + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" }, { "pname": "CommandLiners", @@ -26,13 +26,13 @@ }, { "pname": "DeepEqual", - "version": "5.0.0", - "hash": "sha256-tkmNXgjD+wS65uIqTqDQgRupq9EwW1JZwpobChwTjYM=" + "version": "5.1.0", + "hash": "sha256-AGPZXr7FJdEEVYtQ9I2BOHG/x8cU7s0euy+XvovOHpA=" }, { "pname": "dotnet-ef", - "version": "8.0.4", - "hash": "sha256-9mxOR/6SU5sqBiWYNNMM8aah81XnfahEAg24/5Skn4A=" + "version": "8.0.15", + "hash": "sha256-a/Wb9PIfyBLs0d8VOUQdEvxk73i8nlvd1kCCqOpEHs8=" }, { "pname": "DotNet.Glob", @@ -41,18 +41,23 @@ }, { "pname": "EntityFramework", - "version": "6.3.0", - "hash": "sha256-rh9cBlFA5NlFoppMMULpM0SSRQtKeDr10Caa/+GGTSY=" + "version": "6.5.0", + "hash": "sha256-WZ4AI6XjyMMIDw6y3ggz5lym4ihmFTndInt35ij9E0k=" }, { "pname": "Esprima", "version": "3.0.4", "hash": "sha256-KyZHjy7QTh3WRdY/fUrqrcaoZOa0RnUAUFLTzSOBVYA=" }, + { + "pname": "FSharp.Core", + "version": "8.0.200", + "hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw=" + }, { "pname": "HtmlAgilityPack", - "version": "1.11.61", - "hash": "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY=" + "version": "1.12.1", + "hash": "sha256-qravAvCdB/KjWujRk2GL/kGre/B9XVAP+jewICxiKKo=" }, { "pname": "Humanizer.Core", @@ -64,25 +69,30 @@ "version": "3.0.1", "hash": "sha256-oOq7ze1QFYHK/9zNDF7ClbWZaW4A/478M4yQ/LQnUJ8=" }, + { + "pname": "Linq.Expression.Optimizer", + "version": "1.0.29", + "hash": "sha256-F0ZvZ6hbdnjkuNuSoFzSjYUgG/hEHuG7o8wExDS1LLo=" + }, { "pname": "LinqKit", - "version": "1.2.5", - "hash": "sha256-rF1/FIR41PrwZX4N6bkhXNG2BQsXbjZmx8/qfVdKiAI=" + "version": "1.3.8", + "hash": "sha256-kX82JIKz2mNK11na8M84ChWgrdBhhB0Zd+JhL4FmR1U=" }, { "pname": "LinqKit.Core", - "version": "1.2.5", - "hash": "sha256-0z4RpAt+WvydeCN0GJu4vsMfCxzxmoi+LTE6fQ51NZY=" + "version": "1.2.8", + "hash": "sha256-7PTxzw8n3vpmNKJlumOwL5eWGM7nmdC4oomPTKlm7LE=" }, { "pname": "MailKit", - "version": "4.5.0", - "hash": "sha256-quU88XNBF+tzb1yr7+lSfx90kmvZpbX43+YJtdYgPzk=" + "version": "4.11.0", + "hash": "sha256-T41OHePMaYkd7rRP2ytMfEjaD+bpJ65yWBJJuvs7y18=" }, { "pname": "Microsoft.AspNetCore.Hosting.WindowsServices", - "version": "8.0.4", - "hash": "sha256-sK7ZOyoQv/bwmaJLK0Dk7kGDJAFlIwUxVhru8kwvea0=" + "version": "8.0.15", + "hash": "sha256-HqNCXJfBZxbtCf94EirLczAl8bsHhmIAzFIFsEjBspE=" }, { "pname": "Microsoft.AspNetCore.SpaServices.Extensions", @@ -94,11 +104,6 @@ "version": "6.0.0", "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "8.0.0", - "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" - }, { "pname": "Microsoft.Build", "version": "15.7.0-preview-000011-1378327", @@ -126,18 +131,18 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.4", - "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + "version": "3.3.3", + "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.9.2", - "hash": "sha256-QU/nyiJWpdPQGHBdaOEVc+AghnGHcKBFBX0oyhRZ9CQ=" + "version": "4.5.0", + "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.9.2", - "hash": "sha256-j06Q4A9E65075SBXdXVCMRgeLxA63Rv1vxarydmmVAA=" + "version": "4.5.0", + "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces", @@ -156,53 +161,53 @@ }, { "pname": "Microsoft.CSharp", - "version": "4.6.0", - "hash": "sha256-16OdEKbPLxh+jLYS4cOiGRX/oU6nv3KMF4h5WnZAsHs=" + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "8.0.4", - "hash": "sha256-bbKpSaEHKYezjxSZECmDQr0gv9zYTN042dpuYQtZKQ4=" + "version": "8.0.15", + "hash": "sha256-JWnPERvxWL+5n0dQh+s9zhkWL1gnGexq8LpBszAIaco=" }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "8.0.4", - "hash": "sha256-nkrtoqGn43RdVjSlwa/jzLaixnZ1CNDDTvvSubUmR5E=" + "version": "8.0.15", + "hash": "sha256-C5TRzSpdH11L+slXG3Gxmhtjl76DGlaKl3G9k9G6giQ=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "8.0.4", - "hash": "sha256-ywVWOje6duVcJ8gSSC5HER2UO0mAzfg6VMtqloRmQfc=" + "version": "8.0.15", + "hash": "sha256-QM0bhIyoBR8j9epa8eoFhtf/fA7u2dW3vU1tfneNsr0=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "8.0.4", - "hash": "sha256-Kqv9ZFl1nMJ1hRmT3kQbN5vSvMrRSZ5XOF9wzw5sS8A=" + "version": "8.0.15", + "hash": "sha256-SVQd3sX0TjNz1kXN4PVWdThyyWpzE8JC0ch5vKVSDKE=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "8.0.4", - "hash": "sha256-TjDkQOUSFIM5OOFcm4+yNiXmAiKgs8Q3XpJl9eTEJdo=" + "version": "8.0.15", + "hash": "sha256-G+A43Fv8cqdbg3SKewEKs2NTItBCjELdhVQCtYwEu3U=" }, { "pname": "Microsoft.EntityFrameworkCore.InMemory", - "version": "8.0.4", - "hash": "sha256-m0zvYVaD72UVHnOc7Ea0/FwoVw/FhqKVladnacHkQlc=" + "version": "8.0.15", + "hash": "sha256-iQwlHSclsftdgYnlYODBbeP1I9mWiVM8f3whPtWYrtk=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "8.0.4", - "hash": "sha256-TRP/Ior708EQjD03GGxKom2eLOxcUYN1MoFqzk3lYp8=" + "version": "8.0.15", + "hash": "sha256-U+pLbWgYmi+2JhGUkYa/ZdU89IutJewGRNA3TrP4vjk=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "8.0.4", - "hash": "sha256-/IOzElVUh6k2eiTiMHhsdTSsBx4j3whX1lWSMgFYMUE=" + "version": "8.0.15", + "hash": "sha256-Pc7/YnigKXfAZQE1Rb2awo1YHYz48knv7WMeaKP9QjY=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "8.0.4", - "hash": "sha256-gC8yod0XV1/xZAk1PDqTf+QlzJAOjj6kT8mJZ9LvQF0=" + "version": "8.0.15", + "hash": "sha256-MwbVFf22PLUZvMxAm5+ooAoYP7UsPvnX6mYkU4C9RLU=" }, { "pname": "Microsoft.Extensions.ApiDescription.Server", @@ -216,8 +221,8 @@ }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "8.0.0", - "hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8=" + "version": "8.0.1", + "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps=" }, { "pname": "Microsoft.Extensions.Configuration", @@ -239,10 +244,20 @@ "version": "8.0.0", "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.0", + "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "8.0.0", - "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + "version": "8.0.2", + "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.0", + "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" }, { "pname": "Microsoft.Extensions.Configuration.CommandLine", @@ -256,18 +271,18 @@ }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "8.0.0", - "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs=" + "version": "8.0.1", + "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "8.0.0", - "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg=" + "version": "8.0.1", + "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" }, { "pname": "Microsoft.Extensions.Configuration.UserSecrets", - "version": "8.0.0", - "hash": "sha256-/yj5QaEzeRStvOFoBpPRPXlEehGtr2E6/rJb+OEPIK8=" + "version": "8.0.1", + "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -279,6 +294,11 @@ "version": "8.0.0", "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" + }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "6.0.0", @@ -291,24 +311,34 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.1", - "hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "8.0.0", - "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo=" + "version": "8.0.2", + "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.0", + "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "8.0.0", - "hash": "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4=" + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", "version": "8.0.0", "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY=" }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", "version": "2.1.0-preview1-final", @@ -361,18 +391,23 @@ }, { "pname": "Microsoft.Extensions.Hosting", - "version": "8.0.0", - "hash": "sha256-sKHa+w4/pMeQb5RRFqLtMTUJy5H6hSIGWchbH2pxSrg=" + "version": "8.0.1", + "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", "version": "8.0.0", "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE=" }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "8.0.1", + "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" + }, { "pname": "Microsoft.Extensions.Hosting.WindowsServices", - "version": "8.0.0", - "hash": "sha256-+uYKf6LT/wN7UrHSgJ3diIqVKCi214yJQgh5oXqYi/c=" + "version": "8.0.1", + "hash": "sha256-JBrZuv1RxpJf5wR81g91bE1/JQgBeOtnJDvA98rlYKE=" }, { "pname": "Microsoft.Extensions.Logging", @@ -384,6 +419,11 @@ "version": "8.0.0", "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "6.0.0", @@ -396,33 +436,38 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "8.0.1", - "hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.3", + "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "8.0.0", - "hash": "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U=" + "version": "8.0.1", + "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "8.0.0", - "hash": "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c=" + "version": "8.0.1", + "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU=" }, { "pname": "Microsoft.Extensions.Logging.Debug", - "version": "8.0.0", - "hash": "sha256-AJunzYBZM2wCg86hnPnMrBuWIIyW/4PnIVoDSU969cA=" + "version": "8.0.1", + "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg=" }, { "pname": "Microsoft.Extensions.Logging.EventLog", - "version": "8.0.0", - "hash": "sha256-vXBm4yhWGP4uow0CqstuqOkxO8yeZEM15JTTenjPbhc=" + "version": "8.0.1", + "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8=" }, { "pname": "Microsoft.Extensions.Logging.EventSource", - "version": "8.0.0", - "hash": "sha256-kaR7YOlq5s8W9nZDtH/lKtnfGbrgOuQY4DUPcA2lcj0=" + "version": "8.0.1", + "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" }, { "pname": "Microsoft.Extensions.Options", @@ -434,6 +479,11 @@ "version": "8.0.0", "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "8.0.0", @@ -459,6 +509,11 @@ "version": "8.0.0", "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.0", + "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" + }, { "pname": "Microsoft.NETCore.App", "version": "2.0.0", @@ -496,8 +551,8 @@ }, { "pname": "Microsoft.NETCore.Platforms", - "version": "3.0.0", - "hash": "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4=" + "version": "3.1.0", + "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" }, { "pname": "Microsoft.NETCore.Targets", @@ -509,10 +564,25 @@ "version": "1.1.0", "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", - "version": "5.4.4", - "hash": "sha256-bE1F3XgGxF0g+zX8TLx0glAVK57k8ITRe/NI4Tf8mxw=" + "version": "5.8.1", + "hash": "sha256-5x81TEhXaEEYnBeosK8zmBwPLKPifMf4JUFrGsk/IxA=" }, { "pname": "Microsoft.VisualStudio.Web.CodeGeneration.Contracts", @@ -541,23 +611,18 @@ }, { "pname": "Microsoft.Win32.Registry", - "version": "4.5.0", - "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "4.6.0", - "hash": "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ=" + "version": "4.7.0", + "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8=" }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "4.6.0", - "hash": "sha256-7BRoIg1Hm/OVHZBPGD+eugyyMTZHhmv0yLTV3HWOFd4=" + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, { "pname": "MimeKit", - "version": "4.5.0", - "hash": "sha256-Nsk3Br9yLOC5wDLtRQyw04Kq205y5QCISpyiB13mwLU=" + "version": "4.11.0", + "hash": "sha256-UTP+pfP3q4X65/KNGBTkHo4KZjeHZ10dQbr58Qf42iQ=" }, { "pname": "Mono.Options", @@ -571,8 +636,8 @@ }, { "pname": "Namotion.Reflection", - "version": "3.1.1", - "hash": "sha256-WXHT/prJSLS7yRoepu5pls5xe58pCbR6S8VjuR5uJR0=" + "version": "3.3.0", + "hash": "sha256-YBYWLYmnCZrKfiJWQo7tofiz2A7ROpxFfAYdYLa5cgI=" }, { "pname": "NETStandard.Library", @@ -586,8 +651,8 @@ }, { "pname": "NETStandard.Library", - "version": "2.0.1", - "hash": "sha256-s4UiH848a+p2yWwMH+8PaYGnQL2qnY0GmixoeLvkhDQ=" + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { "pname": "Newtonsoft.Json", @@ -601,64 +666,59 @@ }, { "pname": "NJsonSchema", - "version": "11.0.0", - "hash": "sha256-MK/i30Y6lXotOKNDBZA7koeOVlcI5V9AQ5ZzxjHWxwo=" + "version": "11.2.0", + "hash": "sha256-Y1FggfzRf54+ioMKvyyzMW30psrHF7hmAwnYom/Ud8s=" }, { "pname": "NJsonSchema.Annotations", - "version": "11.0.0", - "hash": "sha256-AVOWOj94Zw9DzpT07YebJa79/fCvRWa7E7zYG5e+/6w=" + "version": "11.2.0", + "hash": "sha256-uQYU/NuAbz+HlImemuv1Yi4ODKoaQ38BSrWONOR9jFs=" }, { "pname": "NJsonSchema.NewtonsoftJson", - "version": "11.0.0", - "hash": "sha256-ddnWplAPnLE9rDMm10f7FceY8bE/T8MpbOuiVPo3wsU=" + "version": "11.2.0", + "hash": "sha256-NyXB3rcdPpjaZq0CAZy5xMmvLqqzPGyddeTVtowqaBU=" }, { "pname": "NJsonSchema.Yaml", - "version": "11.0.0", - "hash": "sha256-MkUdfh/erCTFO0mgkKj1kWEKgie6rJtiwV1emsvYJzc=" + "version": "11.2.0", + "hash": "sha256-NtlUldW5D0VSj10XqfMvxDMVULdw99owTS1zGYg4aKg=" }, { "pname": "NSwag.Annotations", - "version": "14.0.7", - "hash": "sha256-fQIIREC86xdjGvjPyV/vvHnZmcgtmFSG9SilgSO78ek=" + "version": "14.3.0", + "hash": "sha256-kz+fEwUlEjsPsOiFCTcXYHAAYCJa2cepDRIY4mkye4U=" }, { "pname": "NSwag.AspNetCore", - "version": "14.0.7", - "hash": "sha256-EOJrEUq1kgx0JvmTmcR6oRWk3Ci68kYhByVrZlBLtwA=" + "version": "14.3.0", + "hash": "sha256-lGeH27yzj5fXPpBMqtoFOTRiu+gve8oSgugW2u4tMAk=" }, { "pname": "NSwag.Core", - "version": "14.0.7", - "hash": "sha256-t42U+Zl2QcfsvEWJGg6A3f+OWbenu/itjrnS8loszH4=" + "version": "14.3.0", + "hash": "sha256-FjWms/V5+j4ut1TShKWDsTr1LuBsHxRQIFs1fwD0jGw=" }, { "pname": "NSwag.Core.Yaml", - "version": "14.0.7", - "hash": "sha256-hGCff58hTcv9y4b8Dx3P7GhC5r8A5SyJaxACtS4yTK0=" + "version": "14.3.0", + "hash": "sha256-CcGXuyNUvF/e3f9K3wZY+h0RIbzoLOLLguUcj+VVFXI=" }, { "pname": "NSwag.Generation", - "version": "14.0.7", - "hash": "sha256-nmYwfjwvkkozItdoNqIuNS/9BI2i6dPpVCxu16m0T8w=" + "version": "14.3.0", + "hash": "sha256-M487C7OsnZnURcAN90DGIhZTnxlToaIskkztCKkXzQc=" }, { "pname": "NSwag.Generation.AspNetCore", - "version": "14.0.7", - "hash": "sha256-Jsa5MT9LjY7GVMIi/QTyP2de7BW+tu809dm1RPA2mdA=" + "version": "14.3.0", + "hash": "sha256-DvjSjbM2ug0AvjAE8CwVUej2hZbLWopmZMbOx4Oy2IU=" }, { "pname": "NuGet.Frameworks", "version": "4.7.0-preview1-4986", "hash": "sha256-B8Fax4r73AjdTbcV3mF9dPGAV4P++UMUh2cbItNk0JE=" }, - { - "pname": "Rnwood.LumiSoft.Net", - "version": "1.0.2", - "hash": "sha256-Ud4K6lN2QMQXUUZn157HaPd2MtHTrKNmGBZn8N2hwxo=" - }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", @@ -689,11 +749,6 @@ "version": "4.3.0", "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", "version": "4.3.0", @@ -776,8 +831,8 @@ }, { "pname": "runtime.native.System.Data.SqlClient.sni", - "version": "4.6.0", - "hash": "sha256-TenFWtugim8xFtilE3Z9br0FPnLCosdLQ5DV1uW3448=" + "version": "4.7.0", + "hash": "sha256-cj0+BpmoibwOWj2wNXwONJeTGosmFwhD349zPjNaBK0=" }, { "pname": "runtime.native.System.IO.Compression", @@ -941,13 +996,13 @@ }, { "pname": "Serilog", - "version": "3.1.1", - "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" + "version": "4.2.0", + "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs=" }, { "pname": "Serilog.AspNetCore", - "version": "8.0.1", - "hash": "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4=" + "version": "8.0.3", + "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I=" }, { "pname": "Serilog.Extensions.Hosting", @@ -966,13 +1021,13 @@ }, { "pname": "Serilog.Settings.Configuration", - "version": "8.0.0", - "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg=" + "version": "9.0.0", + "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I=" }, { "pname": "Serilog.Sinks.Console", - "version": "5.0.1", - "hash": "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI=" + "version": "6.0.0", + "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=" }, { "pname": "Serilog.Sinks.Debug", @@ -981,8 +1036,8 @@ }, { "pname": "Serilog.Sinks.EventLog", - "version": "3.1.0", - "hash": "sha256-oAzpAdcF9Hdf99JjpbWvgYa5BkN+Ec4gc7SPHFVH7As=" + "version": "4.0.0", + "hash": "sha256-ccSnzL/I4gZoL2xH5Y9Q9zoP7iV8+n95wNQ/JOP3vOg=" }, { "pname": "Serilog.Sinks.File", @@ -1009,6 +1064,11 @@ "version": "2.1.6", "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" }, + { + "pname": "StreamLib", + "version": "0.12.0", + "hash": "sha256-oAsRU/n575cgAms0AngignhSYPWfVvWvnThYLFz+cNU=" + }, { "pname": "System.AppContext", "version": "4.1.0", @@ -1024,11 +1084,6 @@ "version": "4.3.0", "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.CodeDom", "version": "4.4.0", @@ -1036,8 +1091,8 @@ }, { "pname": "System.CodeDom", - "version": "4.6.0", - "hash": "sha256-nKJQMD3qFkNX+J+aXOjsSVloB1CbZ3QNLb96Xiz7wK0=" + "version": "6.0.0", + "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" }, { "pname": "System.Collections", @@ -1066,8 +1121,8 @@ }, { "pname": "System.Collections.Immutable", - "version": "8.0.0", - "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" }, { "pname": "System.Collections.NonGeneric", @@ -1089,11 +1144,6 @@ "version": "4.3.0", "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" }, - { - "pname": "System.ComponentModel.Annotations", - "version": "4.6.0", - "hash": "sha256-dn91soWaR30tghqyv3oIjc0UgMAnuErwG0oXRKFdl0w=" - }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", @@ -1141,8 +1191,8 @@ }, { "pname": "System.Configuration.ConfigurationManager", - "version": "4.6.0", - "hash": "sha256-x54SBQYZLkU5AcCMOqx5VR6jM/43E2JFL894UtPAxE4=" + "version": "6.0.1", + "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ=" }, { "pname": "System.Console", @@ -1151,8 +1201,8 @@ }, { "pname": "System.Data.SqlClient", - "version": "4.7.0", - "hash": "sha256-fckcu7RCKtndbfbIvBKnOb2xgr8bZKZ5B2mx0pBRwZw=" + "version": "4.8.6", + "hash": "sha256-Qc/yco3e0+6jP8UiMA0ERlfSEKdINv0BmHixh9Z8fJQ=" }, { "pname": "System.Diagnostics.Contracts", @@ -1186,13 +1236,13 @@ }, { "pname": "System.Diagnostics.EventLog", - "version": "4.5.0", - "hash": "sha256-tKBKgUhEM6D7XJlzmHc/F8ekqJx8rHO4QYUMjzbIs9I=" + "version": "8.0.0", + "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" }, { "pname": "System.Diagnostics.EventLog", - "version": "8.0.0", - "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" + "version": "8.0.1", + "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" }, { "pname": "System.Diagnostics.FileVersionInfo", @@ -1231,8 +1281,8 @@ }, { "pname": "System.Drawing.Common", - "version": "4.6.0", - "hash": "sha256-D6PMDq8M2aSrnDeBYfFftaX7hFLcxrOYFLrtxbERMAM=" + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" }, { "pname": "System.Dynamic.Runtime", @@ -1246,8 +1296,8 @@ }, { "pname": "System.Formats.Asn1", - "version": "8.0.0", - "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=" + "version": "8.0.1", + "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" }, { "pname": "System.Globalization", @@ -1324,6 +1374,11 @@ "version": "6.0.3", "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, { "pname": "System.IO.Pipes", "version": "4.0.0", @@ -1341,8 +1396,8 @@ }, { "pname": "System.Linq.Dynamic.Core", - "version": "1.3.14", - "hash": "sha256-tT9V1Y9vKfrzEmmBTYmGmzLPBfCHCXMZ8Jvluf3mliA=" + "version": "1.6.0.2", + "hash": "sha256-5qzEVm+33ATR+SQljwe/LcP5o0MNjv49nHfXIVG27dw=" }, { "pname": "System.Linq.Expressions", @@ -1364,11 +1419,6 @@ "version": "4.5.3", "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, - { - "pname": "System.Memory", - "version": "4.5.5", - "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" - }, { "pname": "System.Net.Http", "version": "4.1.0", @@ -1394,11 +1444,6 @@ "version": "4.1.0", "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.ObjectModel", "version": "4.0.12", @@ -1421,8 +1466,8 @@ }, { "pname": "System.Reactive", - "version": "6.0.0", - "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, { "pname": "System.Reflection", @@ -1481,8 +1526,8 @@ }, { "pname": "System.Reflection.Metadata", - "version": "8.0.0", - "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=" + "version": "6.0.1", + "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo=" }, { "pname": "System.Reflection.Primitives", @@ -1539,11 +1584,6 @@ "version": "4.5.0-preview1-26216-02", "hash": "sha256-xE1bUh7w/hZrknJ2kn1ZKIQO/vW2js9SJxaGXkGq3TI=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -1621,13 +1661,13 @@ }, { "pname": "System.Security.AccessControl", - "version": "4.5.0", - "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" + "version": "4.7.0", + "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, { "pname": "System.Security.AccessControl", - "version": "4.6.0", - "hash": "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI=" + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, { "pname": "System.Security.Claims", @@ -1686,8 +1726,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=" + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -1701,8 +1741,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "4.6.0", - "hash": "sha256-vmZTCnDlFMzMpsJX5SE4fVJTZh6jKN7AbHjKMftYg7s=" + "version": "6.0.0", + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" }, { "pname": "System.Security.Cryptography.X509Certificates", @@ -1716,13 +1756,8 @@ }, { "pname": "System.Security.Permissions", - "version": "4.5.0", - "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" - }, - { - "pname": "System.Security.Permissions", - "version": "4.6.0", - "hash": "sha256-AByObHSxKL0vJvhTWuv4QPN01WnXDKKbnxfzG2tWrCA=" + "version": "6.0.0", + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" }, { "pname": "System.Security.Principal", @@ -1736,18 +1771,13 @@ }, { "pname": "System.Security.Principal.Windows", - "version": "4.5.0", - "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.6.0", - "hash": "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso=" + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, { "pname": "System.ServiceProcess.ServiceController", - "version": "8.0.0", - "hash": "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI=" + "version": "8.0.1", + "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" }, { "pname": "System.Text.Encoding", @@ -1766,8 +1796,8 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" + "version": "6.0.0", + "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" }, { "pname": "System.Text.Encoding.Extensions", @@ -1781,13 +1811,13 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" }, { "pname": "System.Text.Json", - "version": "8.0.0", - "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" }, { "pname": "System.Text.RegularExpressions", @@ -1809,11 +1839,6 @@ "version": "4.3.0", "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, - { - "pname": "System.Threading.AccessControl", - "version": "4.5.0", - "hash": "sha256-x3Na5DscrtkFGnZycNeZd3vc8zDsIWKnINL/1JGzcOI=" - }, { "pname": "System.Threading.Channels", "version": "6.0.0", @@ -1849,11 +1874,6 @@ "version": "4.3.0", "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" - }, { "pname": "System.Threading.Tasks.Parallel", "version": "4.0.1", @@ -1881,8 +1901,8 @@ }, { "pname": "System.Windows.Extensions", - "version": "4.6.0", - "hash": "sha256-08W7PEiGAJJIMIKXieRgesIvtj4+/bUnBaFGypdXRcU=" + "version": "6.0.0", + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" }, { "pname": "System.Xml.ReaderWriter", @@ -1936,7 +1956,7 @@ }, { "pname": "YamlDotNet", - "version": "13.7.1", - "hash": "sha256-v8w1hh8FCxJQMEPq+YUh9Oi4LE/ndi+vE2igLJazVNQ=" + "version": "16.3.0", + "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" } ] diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index a06d57f026de..6b646d67af72 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -7,19 +7,26 @@ npmHooks, fetchNpmDeps, dotnetCorePackages, + nix-update-script, }: let - version = "3.6.1"; + version = "3.8.6"; src = fetchFromGitHub { owner = "rnwood"; repo = "smtp4dev"; tag = version; - hash = "sha256-T6ci7+xbzpOrNr8hpDCwk5qe01L2Ho5V1oM7Hhd8bgg="; + hash = "sha256-k4nerh4cVVcFQF7a4Wvcfhefa3SstEOASk+0soN0n9k="; }; npmRoot = "Rnwood.Smtp4dev/ClientApp"; + patches = [ ./smtp4dev-npm-packages.patch ]; in buildDotnetModule { - inherit version src npmRoot; + inherit + version + src + npmRoot + patches + ; pname = "smtp4dev"; nativeBuildInputs = [ @@ -30,8 +37,9 @@ buildDotnetModule { ]; npmDeps = fetchNpmDeps { - src = "${src}/${npmRoot}"; - hash = "sha256-/Z6sBxA2ReHlEbz0zJjlpn6IwzHDQiXN5ixEV1/iCJI="; + inherit src patches; + hash = "sha256-Uj0EnnsA+QHq5KHF2B93OG8rwxYrV6sEgMTbd43ttCA="; + postPatch = "cd ${npmRoot}"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -44,6 +52,10 @@ buildDotnetModule { mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^(\\d+\\.\\d+\\.\\d+)$" ]; + }; + meta = { description = "Fake smtp email server for development and testing"; homepage = "https://github.com/rnwood/smtp4dev"; diff --git a/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch b/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch new file mode 100644 index 000000000000..6889e774cad2 --- /dev/null +++ b/pkgs/by-name/sm/smtp4dev/smtp4dev-npm-packages.patch @@ -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", diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 1f766445a6bc..dbcf1e5d5248 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${version}"; - hash = "sha256-NUmv/Ue14xrmBCxOkVXvcPmOwAA8L6LLPRu5E5Zkxw0="; + hash = "sha256-7/R3iYAkpCyAiHGp4EyvWU4kIO//5+0LUpO92KmQ9uE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NkAove8RlLkNI1KnMfJPnoqUswJ22Z2FOcpl05lqpKM="; + cargoHash = "sha256-zG1BdGyvGL7qEPg+a6fAP3Yn1X0lc6+wDpOqObmL7PQ="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json index fe51488c7066..9291a64bd73b 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json @@ -1 +1,7 @@ -[] +[ + { + "pname": "BouncyCastle.Cryptography", + "version": "2.5.1", + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + } +] diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 5645de4321b5..5a66e52496fe 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server-library"; - version = "dns-server-v13.2"; + version = "dns-server-v13.6.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = version; - hash = "sha256-stfxYe0flE1daPuXw/GAgY52ZD7pkqnBIBvmSVPWWjI="; + hash = "sha256-P1LVn//4xL/MZoy7thw+zYlAZVTfjSivyAiuhixAoHs="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json index fe51488c7066..9291a64bd73b 100644 --- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json @@ -1 +1,7 @@ -[] +[ + { + "pname": "BouncyCastle.Cryptography", + "version": "2.5.1", + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + } +] diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index 60b6090621e4..cc4e589eb38e 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -9,13 +9,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server"; - version = "13.2"; + version = "13.6.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${version}"; - hash = "sha256-oxLMBs+XkzvlfSst6ZD56ZIgiXwm0Px8Tn3Trdd/6H8="; + hash = "sha256-2OSuLGWdaiiPxyW0Uvq736wHKa7S3CHv79cmZZ86GRE="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix index 6e735cd46c6f..9df87522e09b 100644 --- a/pkgs/by-name/ti/timewall/package.nix +++ b/pkgs/by-name/ti/timewall/package.nix @@ -3,25 +3,29 @@ fetchFromGitHub, rustPlatform, installShellFiles, + pkg-config, libheif, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "timewall"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bcyran"; repo = "timewall"; rev = version; - hash = "sha256-ohJDaN29FG/WqkcvpbukWS37RiX2pXdkKMzNh+3NqAU="; + hash = "sha256-KUPy/mv6cV0BmvBcom+cCXk0s4Erz0hf5dg1i5QB0OE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Wg9bxzm5EJUazRUvFuPboQhZlqwWPuJ8UB9plgWUOO4="; + cargoHash = "sha256-JOsCGHHbHx2yoFYdFWIYPHfgCfQjEtZA869+2OQ4jKA="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; buildInputs = [ libheif ]; diff --git a/pkgs/by-name/tl/tla/fix-gcc14.patch b/pkgs/by-name/tl/tla/fix-gcc14.patch new file mode 100644 index 000000000000..9519498bda26 --- /dev/null +++ b/pkgs/by-name/tl/tla/fix-gcc14.patch @@ -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 ++ ++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 + #include + #include ++#include + #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" + + + diff --git a/pkgs/by-name/tl/tla/package.nix b/pkgs/by-name/tl/tla/package.nix index d7d9185cd747..9554be300e46 100644 --- a/pkgs/by-name/tl/tla/package.nix +++ b/pkgs/by-name/tl/tla/package.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; - patches = [ ./configure-tmpdir.patch ]; + patches = [ + ./configure-tmpdir.patch + ./fix-gcc14.patch + ]; buildInputs = [ which ]; diff --git a/pkgs/by-name/ub/ubi_reader/package.nix b/pkgs/by-name/ub/ubi_reader/package.nix index 20c3782e9062..469d09422700 100644 --- a/pkgs/by-name/ub/ubi_reader/package.nix +++ b/pkgs/by-name/ub/ubi_reader/package.nix @@ -1,19 +1,21 @@ { fetchFromGitHub, + gitUpdater, lib, python3, }: python3.pkgs.buildPythonApplication rec { pname = "ubi_reader"; - version = "0.8.9"; + version = "0.8.10"; pyproject = true; + disabled = python3.pkgs.pythonOlder "3.9"; src = fetchFromGitHub { owner = "onekey-sec"; repo = "ubi_reader"; rev = "v${version}"; - hash = "sha256-04HwzkonPzzWfX8VE//fMoVv5ggAS+61zx2W8VEUIy4="; + hash = "sha256-fXJiQZ1QWUmkRM+WI8DSIsay9s1w3hKloRuCcUNwZjM="; }; build-system = [ python3.pkgs.poetry-core ]; @@ -23,6 +25,13 @@ python3.pkgs.buildPythonApplication rec { # There are no tests in the source doCheck = false; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "_[a-z]+$"; + }; + }; + meta = { description = "Python scripts capable of extracting and analyzing the contents of UBI and UBIFS images"; homepage = "https://github.com/onekey-sec/ubi_reader"; diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix index 3177263e2471..4cee70ea5e8b 100644 --- a/pkgs/by-name/ue/uefisettings/package.nix +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -2,19 +2,22 @@ fetchFromGitHub, lib, rustPlatform, + unstableGitUpdater, }: rustPlatform.buildRustPackage { name = "uefisettings"; - version = "0-unstable-2024-03-26"; + version = "0-unstable-2024-11-28"; src = fetchFromGitHub { owner = "linuxboot"; repo = "uefisettings"; - rev = "f90aed759b9c2217bea336e37ab5282616ece390"; - hash = "sha256-Cik8uVdzhMmgXfx23axkUJBg8zd5afMgYvluN0BJsdo="; + rev = "f4d12fbdb32d1bc355dd37d5077add0a0a049be4"; + hash = "sha256-f6CTmnY/BzIP/nfHa3Q4HWd1Ee+b7C767FB/8A4DUUM="; }; + passthru.updateScript = unstableGitUpdater { }; + useFetchCargoVendor = true; cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w="; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 741d548a97f7..fd682ee27366 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -106,12 +106,25 @@ python3.pkgs.buildPythonApplication rec { versionCheckProgramArg = "--version"; - pytestFlagsArray = [ - "--no-cov" - # `disabledTests` swallows the parameters between square brackets - # https://github.com/tytso/e2fsprogs/issues/152 - "-k 'not test_all_handlers[filesystem.extfs]'" - ]; + pytestFlagsArray = + let + # `disabledTests` swallows the parameters between square brackets + disabled = [ + # https://github.com/tytso/e2fsprogs/issues/152 + "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 = { updateScript = gitUpdater { }; diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 32d7e159c3bf..2ff29641356a 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -11,7 +11,7 @@ libXxf86vm, }: let - version = "4.15.16"; + version = "4.16.5"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-dqnQJzA2OkIlcM7TORqnFyaA5CvQ+MmFOO5iH6My+Jo="; + hash = "sha256-CMyZlQ5zXHxUExH7aMIJ4nreEPz8Y0eeJ5nnt267SqU="; }; dontUnpack = true; diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index 8f2fa7bc72c9..8977b4aaf74e 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -14,13 +14,13 @@ flutter329.buildFlutterApplication rec { pname = "venera"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-kjSjXIeQh+XT9J3qmmwNw75462VGfdykUZ4XeWphVH8="; + hash = "sha256-YiiR4CvOOzsFiSZ2VDVwibhimVwUJDkEu+TXWmf3/S0="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index b822fa939f77..dc982097da9b 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -54,11 +54,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.13.0" + "version": "2.12.0" }, "battery_plus": { "dependency": "direct main", @@ -225,11 +225,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.3" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", @@ -382,9 +382,9 @@ "dependency": "direct main", "description": { "path": "flutter_inappwebview", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "6.2.0-beta.3" @@ -393,9 +393,9 @@ "dependency": "transitive", "description": { "path": "flutter_inappwebview_android", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "1.2.0-beta.3" @@ -414,9 +414,9 @@ "dependency": "transitive", "description": { "path": "flutter_inappwebview_ios", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "1.2.0-beta.3" @@ -425,9 +425,9 @@ "dependency": "transitive", "description": { "path": "flutter_inappwebview_macos", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "1.2.0-beta.3" @@ -436,9 +436,9 @@ "dependency": "transitive", "description": { "path": "flutter_inappwebview_platform_interface", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "1.4.0-beta.3" @@ -447,9 +447,9 @@ "dependency": "transitive", "description": { "path": "flutter_inappwebview_web", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "1.2.0-beta.3" @@ -458,9 +458,9 @@ "dependency": "transitive", "description": { "path": "flutter_inappwebview_windows", - "ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "resolved-ref": "0aaf7a0bfc01d61a4d1453cefb57fb6783b6e676", - "url": "https://github.com/pichillilorenzo/flutter_inappwebview" + "ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "resolved-ref": "3ef899b3db57c911b080979f1392253b835f98ab", + "url": "https://github.com/venera-app/flutter_inappwebview" }, "source": "git", "version": "0.7.0-beta.3" @@ -639,11 +639,11 @@ "dependency": "direct main", "description": { "name": "intl", - "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.20.2" + "version": "0.19.0" }, "io": { "dependency": "transitive", @@ -669,11 +669,11 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.9" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", @@ -1279,11 +1279,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "14.3.1" }, "web": { "dependency": "transitive", @@ -1369,6 +1369,6 @@ }, "sdks": { "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.29.2" + "flutter": ">=3.29.3" } } diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index 9955e422423d..ca2abf9ab6fe 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -1,67 +1,82 @@ { lib, fetchFromGitHub, - python3, + python3Packages, + fetchpatch, + versionCheckHook, + writableTmpDirAsHomeHook, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wapiti"; - version = "3.2.2"; + version = "3.2.4"; pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = "wapiti"; 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; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = - with python3.pkgs; - [ - aiocache - aiohttp - aiosqlite - arsenic - beautifulsoup4 - browser-cookie3 - dnspython - h11 - httpcore - httpx - httpx-ntlm - humanize - loguru - mako - markupsafe - mitmproxy - prance - pyasn1 - six - sqlalchemy - tld - yaswfp - ] - ++ httpx.optional-dependencies.brotli - ++ httpx.optional-dependencies.socks - ++ prance.optional-dependencies.osv; + dependencies = with python3Packages; [ + aiocache + aiohttp + aiosqlite + beautifulsoup4 + browser-cookie3 + dnspython + h11 + httpcore + httpx + httpx-ntlm + humanize + loguru + mako + markupsafe + mitmproxy + msgpack + packaging + pyasn1 + sqlalchemy + tld + typing-extensions + urwid + yaswfp + wapiti-arsenic + wapiti-swagger + ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ - respx - pytest-asyncio - pytest-cov-stub - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d); - ''; + nativeCheckInputs = + with python3Packages; + [ + respx + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ] + ++ [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; disabledTests = [ # Tests requires network access @@ -140,7 +155,11 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "wapitiCore" ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Web application vulnerability scanner"; longDescription = '' 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/"; changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "wapiti"; }; } diff --git a/pkgs/by-name/wh/whisper-cpp/download-models.patch b/pkgs/by-name/wh/whisper-cpp/download-models.patch index 7589c2ef36f8..2633be324ed6 100644 --- a/pkgs/by-name/wh/whisper-cpp/download-models.patch +++ b/pkgs/by-name/wh/whisper-cpp/download-models.patch @@ -1,8 +1,8 @@ diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh -index 1f1075b..7476c8e 100755 +index ef9c90da..a7e2a17c 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh -@@ -12,18 +12,6 @@ pfx="resolve/main/ggml" +@@ -12,15 +12,6 @@ pfx="resolve/main/ggml" BOLD="\033[1m" RESET='\033[0m' @@ -15,39 +15,43 @@ index 1f1075b..7476c8e 100755 - echo "$_ret" - fi -} -- --models_path="${2:-$(get_script_path)}" -- + + script_path="$(get_script_path)" + +@@ -30,7 +21,6 @@ case "$script_path" in + *) default_download_path="$script_path" ;; # Otherwise, use script directory + esac + +-models_path="${2:-$default_download_path}" + # Whisper models models="tiny - tiny.en -@@ -64,8 +52,8 @@ list_models() { +@@ -80,8 +70,8 @@ list_models() { printf "\n\n" } -if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then - printf "Usage: %s [models_path]\n" "$0" -+if [ "$#" -ne 1 ]; then ++if [ "$#" -lt 1 ]; then + printf "Usage: %s \n" "$0" list_models printf "___________________________________________________________\n" printf "${BOLD}.en${RESET} = english-only ${BOLD}-q5_[01]${RESET} = quantized ${BOLD}-tdrz${RESET} = tinydiarize\n" -@@ -94,8 +82,6 @@ echo "$model" | grep -q '^"tdrz"*$' +@@ -110,7 +100,6 @@ echo "$model" | grep -q '^"tdrz"*$' printf "Downloading ggml model %s from '%s' ...\n" "$model" "$src" -cd "$models_path" || exit -- + if [ -f "ggml-$model.bin" ]; then printf "Model %s already exists. Skipping download.\n" "$model" - exit 0 -@@ -116,7 +102,7 @@ if [ $? -ne 0 ]; then - exit 1 +@@ -143,7 +132,7 @@ else + whisper_cmd="./build/bin/whisper-cli" fi -printf "Done! Model '%s' saved in '%s/ggml-%s.bin'\n" "$model" "$models_path" "$model" +printf "Done! Model '%s' saved in 'ggml-%s.bin'\n" "$model" "$model" printf "You can now use it like this:\n\n" --printf " $ ./main -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$models_path" "$model" -+printf " $ whisper-cpp -m ggml-%s.bin -f samples/jfk.wav\n" "$model" +-printf " $ %s -m %s/ggml-%s.bin -f samples/jfk.wav\n" "$whisper_cmd" "$models_path" "$model" ++printf " $ %s -m /ggml-%s.bin -f samples/jfk.wav\n" "$whisper_cmd" "$model" printf "\n" diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix index e8ddeb672a19..55c0d357e5d8 100644 --- a/pkgs/by-name/wh/whisper-cpp/package.nix +++ b/pkgs/by-name/wh/whisper-cpp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, cmake, + git, apple-sdk_11, ninja, fetchFromGitHub, @@ -43,8 +44,6 @@ let cmakeFeature optional optionals - optionalString - forEach ; darwinBuildInputs = [ apple-sdk_11 ]; @@ -73,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.7.2"; + version = "1.7.5"; src = fetchFromGitHub { - owner = "ggerganov"; + owner = "ggml-org"; repo = "whisper.cpp"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tvCT0QRdmRGsjtQZcEZMgSe2/47tSkfdaPqS/2MuQTs="; }; # The upstream download script tries to download the models to the @@ -89,7 +88,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { patches = [ ./download-models.patch ]; postPatch = '' - for target in examples/{bench,command,main,quantize,server,stream,talk}/CMakeLists.txt; do + for target in examples/{bench,command,cli,quantize,server,stream,talk-llama}/CMakeLists.txt; do if ! grep -q -F 'install('; then echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target fi @@ -99,6 +98,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + git ninja which makeWrapper @@ -154,17 +154,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { postInstall = '' # Add "whisper-cpp" prefix before every command - mv -v $out/bin/{main,whisper-cpp} + mv -v "$out/bin/"{quantize,whisper-quantize} - for file in $out/bin/*; do - if [[ -x "$file" && -f "$file" && "$(basename $file)" != "whisper-cpp" ]]; then - mv -v "$file" "$out/bin/whisper-cpp-$(basename $file)" - fi - done + install -v -D -m755 "$src/models/download-ggml-model.sh" "$out/bin/whisper-cpp-download-ggml-model" - install -v -D -m755 $src/models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model - - wrapProgram $out/bin/whisper-cpp-download-ggml-model \ + wrapProgram "$out/bin/whisper-cpp-download-ggml-model" \ --prefix PATH : ${lib.makeBinPath [ wget ]} ''; @@ -174,7 +168,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - $out/bin/whisper-cpp --help >/dev/null + "$out/bin/whisper-cli" --help >/dev/null runHook postInstallCheck ''; @@ -186,7 +180,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/ggerganov/whisper.cpp"; license = lib.licenses.mit; - mainProgram = "whisper-cpp"; + mainProgram = "whisper-cli"; platforms = lib.platforms.all; broken = coreMLSupport; badPlatforms = optionals cudaSupport lib.platforms.darwin; diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index c2e80fb7cd95..03dc478adc34 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -22,13 +22,13 @@ }: let - version = "2.0.0-beta.1"; + version = "2.0.0-beta.2"; src = fetchFromGitHub { owner = "Wox-launcher"; repo = "Wox"; tag = "v${version}"; - hash = "sha256-ghrvBOTR2v7i50OrwfwbwwFFF4uBQuEPxhXimdcFUJI="; + hash = "sha256-PPB9eRXit89lwkLCN86+Un/msMqnFAulJxEGi+7Fa/c="; }; metaCommon = { @@ -46,8 +46,6 @@ let pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes.window_manager = "sha256-OGVrby09QsCvXnkLdEcCoZBO2z/LXY4xFBVdRHnvKEQ="; - nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ keybinder3 ]; @@ -155,7 +153,7 @@ buildGoModule { --replace-fail "Exec=%s" "Exec=wox" ''; - vendorHash = "sha256-n3lTx1od4EvWdTSe3sIsUStp2qcuSWMqztJZoNLrzQg="; + vendorHash = "sha256-MKxMHABeKotErM+PEhWxeQmPcHH4jJSGWa8wzj42hoE="; proxyVendor = true; diff --git a/pkgs/by-name/wo/wox/pubspec.lock.json b/pkgs/by-name/wo/wox/pubspec.lock.json index de1d048e0ff6..4c973a9c2a0f 100644 --- a/pkgs/by-name/wo/wox/pubspec.lock.json +++ b/pkgs/by-name/wo/wox/pubspec.lock.json @@ -844,16 +844,6 @@ "source": "hosted", "version": "4.1.0" }, - "screen_retriever": { - "dependency": "transitive", - "description": { - "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.9" - }, "scroll_pos": { "dependency": "transitive", "description": { @@ -1250,17 +1240,6 @@ "source": "hosted", "version": "1.1.5" }, - "window_manager": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "db8b4c7f348311dbd5ce4cec8635f0c2cf048775", - "resolved-ref": "db8b4c7f348311dbd5ce4cec8635f0c2cf048775", - "url": "https://github.com/qianlifeng/window_manager.git" - }, - "source": "git", - "version": "0.3.7" - }, "xdg_directories": { "dependency": "transitive", "description": { diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix index 2e20a3a4e0b2..8773875099d4 100644 --- a/pkgs/by-name/xr/xrootd/package.nix +++ b/pkgs/by-name/xr/xrootd/package.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xrootd"; - version = "5.8.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "xrootd"; repo = "xrootd"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-i0gVKk2nFQQGxvUI2zqPWL82SFJdNglAuZ5gNdNhg2M="; + hash = "sha256-zeyg/VdzcWbMXuCE1RELiyGg9mytfpNfIa911BwqqIA="; }; postPatch = @@ -46,17 +46,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/XRootDConfig.cmake.in \ --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_" '' - # Upstream started using an absolute path in an install's DESTINATION directive. - # This causes our build to fail in `fixupPhase` with: - # Moving /nix/store/jbh4667k5zm74h9wv8y1j11x89cv6pnd-xrootd-5.8.0/include to /nix/store/6vnmipw8p1hc6cmkrsq9v1ay7j6iycq2-xrootd-5.8.0-dev/include - # mv: cannot overwrite '/nix/store/6vnmipw8p1hc6cmkrsq9v1ay7j6iycq2-xrootd-5.8.0-dev/include/xrootd': Directory not empty - # Patch submitted upstream: https://github.com/xrootd/xrootd/pull/2478 - + '' - substituteInPlace src/XrdPfc.cmake \ - --replace-fail \ - 'DESTINATION ''${CMAKE_INSTALL_PREFIX}/include/xrootd/XrdPfc' \ - 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}/xrootd/XrdPfc' - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )' ''; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 9bdc03393c89..f09e80123c05 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.183.11"; + version = "0.184.8"; outputs = [ "out" ] @@ -111,7 +111,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-ctJpwlWue8ntI6dcPhxEV1aQ1Abs2Am2lqVQpYXp7V0="; + hash = "sha256-YqLvq08P/DoRDhmx4n1JY+gwdPr8ZzMH2KU/V9J0E68="; }; patches = [ @@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-QC1EiWLiuk+4CG4+6dU0/r6Qvpra8QDPOwEFv76ThAI="; + cargoHash = "sha256-cD5iqsnP6ZGCL02WLREkMsvDsjwmFENzez4hyscTvEU="; nativeBuildInputs = [ diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix index 795565e78913..116f81dab20e 100644 --- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; tag = finalAttrs.version; - hash = "sha256-hct761D92PqgiXUtclk/X2ifySSSta7dgDQEibqPBaM="; + hash = "sha256-u3wSp+F31I8PNzh5uQe0MC+WgmQCUvOlWqX1HT7qVhM="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-0ophLiyTbdYEZcm4nO63OCRxENr5X2CXepHkfy1+QJM="; + hash = "sha256-WiX2BL5C0LmwGfOc/mWCRpp9jIezmqfl9ZkeIGR4i9w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 1b7429bc482d..f90ba95d3116 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + withSaidar ? true, + ncurses, }: stdenv.mkDerivation rec { @@ -13,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; }; + buildInputs = lib.optional withSaidar ncurses; + meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; description = "Library that provides cross platforms access to statistics about the running system"; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 0c245d424de1..97d05c5ab0fa 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -40,6 +40,7 @@ gst_all_1, ffmpeg, fftwFloat, + bluezSupport ? stdenv.hostPlatform.isLinux, bluez, sbc, libfreeaptx, @@ -74,7 +75,6 @@ let webrtc-audio-processing ]; - bluezSupport = stdenv.hostPlatform.isLinux; modemmanagerSupport = lib.meta.availableOn stdenv.hostPlatform modemmanager; libcameraSupport = lib.meta.availableOn stdenv.hostPlatform libcamera; ldacbtSupport = lib.meta.availableOn stdenv.hostPlatform ldacbt; diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 3a5c57f1b0f0..84f4aa5c1eec 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "erev0s"; repo = "apkInspector"; tag = "v${version}"; - hash = "sha256-KJ8B/KTT8oGKlON8/xDdxxZ61dGdOgyCrZlI5ENXpTw="; + hash = "sha256-rrXhlGJUeIP6toq1L6gA6O4+t7ER6hlnq89VFxof1Jg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index e151d2aa071e..f5ada31de500 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -11,10 +11,10 @@ buildPythonPackage rec { pname = "array-record"; - version = "0.7.1"; + version = "0.7.2"; format = "wheel"; - disabled = pythonOlder "3.10" || pythonAtLeast "3.13"; + disabled = pythonOlder "3.10" || pythonAtLeast "3.14"; src = let @@ -29,9 +29,10 @@ buildPythonPackage rec { platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; hash = { - cp310 = "sha256-JDaj1iJy1BQ7fHjmCbGQkNqG5rIRuwTwENbanM9a8hg="; - cp311 = "sha256-QVynMK9t0BnEtgdfbJ5T3s7N02i0XD2siUSRxKtrI+M="; - cp312 = "sha256-xJJGm6kLQ2/TzVYTrBtQ1Hqky1odHfbhe/g+PSSYt1c="; + cp310 = "sha256-UmMEehSqMqgLy1TcYoKUX/tG4Tf8UM2xgnuUrXOiHGo="; + cp311 = "sha256-cUN9Ws8A1xIN/n+/oGfv3mGUfmlsojLS69iWRpA2meM="; + cp312 = "sha256-S+cV0NhXXlOzSTr2ED1oUuk6U1gQA0ZXoGPaWxGp/ZQ="; + cp313 = "sha256-C7UvwXV0/NXA5dhr7NbUCW/KeUWg5w5F18aN2oAUXAQ="; } .${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); }; @@ -44,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "array_record" ]; meta = { - description = "ArrayRecord is a new file format derived from Riegeli, achieving a new frontier of IO efficiency"; + description = "New file format derived from Riegeli, achieving a new frontier of IO efficiency"; homepage = "https://github.com/google/array_record"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 13676a88c6e7..52053488a039 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "8.1.2"; + version = "8.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-/EQpeTFGDbJnC/HnnK9v3eaz1xVvv3i0bSIZ27z9GVU="; + hash = "sha256-r3VsqSfJiwlMP2xc49H4gr4H8XeFjUacefIEpnc4e3o="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 470cd51401c9..f2a8e1a53114 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "holoviz"; repo = "datashader"; tag = "v${version}"; - hash = "sha256-ZmVuDqmFTjq2cgnG+Eve07pynMkEyqFkLtNiCXSandA="; + hash = "sha256-HduEO2XDH20tovtlpg5DbF96G5Lpbo+XVmQKnWvfyL8="; }; build-system = [ diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index b67c6d621376..a2b514901be5 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "desktop-notifier"; tag = "v${version}"; - hash = "sha256-cSeEekjX9NeoEoe9mDokCanK5zrawyvdHK1c4RJ9kSk="; + hash = "sha256-COPJHMURwb76p5a5w1/i1xL7B8f2GWGfXXeWW/GUxeY="; }; build-system = [ setuptools ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { description = "Python library for cross-platform desktop notifications"; homepage = "https://github.com/samschott/desktop-notifier"; - changelog = "https://github.com/samschott/desktop-notifier/releases/tag/v${version}"; + changelog = "https://github.com/samschott/desktop-notifier/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 4275f28f8532..3503ea42f522 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.15"; + version = "4.8.16"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-Eb8ndWtc8TxQGO/7BCa+gU/3SUVPaOvZQBtj7YHT3PA="; + hash = "sha256-yG4nJLnzIrITRMbtT/9UxDB0xvRiwnQMW13Z9HNQIq8="; }; pythonRemoveDeps = [ "pip" ]; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 00f2fc0a9055..44a21d7c5882 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; tag = version; - hash = "sha256-YDosRPROWpjG27MyCErCTvP99mAlzg/GfmU73cBVUTo="; + hash = "sha256-OguS5oRo7wNQUvT33k6+Sg8GE4GipFo84F/13TADUpw="; }; build-system = [ setuptools ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to get Environment Canada weather data"; homepage = "https://github.com/michaeldavie/env_canada"; - changelog = "https://github.com/michaeldavie/env_canada/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/michaeldavie/env_canada/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index c7596aa877b6..cc31f97a17bb 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "essentials-openapi"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Neoteroi"; repo = "essentials-openapi"; tag = "v${version}"; - hash = "sha256-CdDRPzRNx/5docikL8BYdFnEIr/qav8ij/1exWb24fg="; + hash = "sha256-aag66YafLDSLBcXyRNcTyiqf3U4hx2gjimxhKVns/zc="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/functiontrace/default.nix b/pkgs/development/python-modules/functiontrace/default.nix index 505c5f14d9e8..7da09ce41208 100644 --- a/pkgs/development/python-modules/functiontrace/default.nix +++ b/pkgs/development/python-modules/functiontrace/default.nix @@ -4,6 +4,7 @@ fetchPypi, setuptools, toml, + functiontrace-server, }: buildPythonPackage rec { @@ -23,10 +24,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "functiontrace" ]; + # `functiontrace` needs `functiontrace-server` in its path. + # Technically we also need this when running via a Python import, such as for + # `python3 -m functiontrace`, but that's a less common use-case. + postFixup = '' + wrapProgram $out/bin/functiontrace \ + --prefix PATH : ${lib.makeBinPath [ functiontrace-server ]} + ''; + meta = with lib; { homepage = "https://functiontrace.com"; description = "Python module for Functiontrace"; license = licenses.prosperity30; - maintainers = with maintainers; [ mathiassven ]; + maintainers = with maintainers; [ + mathiassven + tehmatt + ]; }; } diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index c0533757cdbc..00167c4102df 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; tag = "v${version}"; - hash = "sha256-FsJZaDHx1AagNMIRXBNS9BcDJBie2qwXwnQACW/Rzdk="; + hash = "sha256-KMCShC3oZCPk87rxCYuwdSNXy0i20IQ1gzL9nFqgn0Q="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index a6d9cd71ba89..fb74554ad83e 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.43.1"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; tag = "v${version}"; - hash = "sha256-JhhHg/ht5vfW3zvX9nRwMzvPTgRsnj7WZiS9y7XX9IM="; + hash = "sha256-19kGgelUFuMuiZxzb0ySkG6L52I/CHsfPQdzSbwucPY="; }; build-system = [ poetry-core ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Govee BLE devices"; homepage = "https://github.com/Bluetooth-Devices/govee-ble"; - changelog = "https://github.com/bluetooth-devices/govee-ble/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/govee-ble/blob/${src.tag}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index f562760c44cf..ce7118a61a47 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "2.4.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-1CUIjno2lN2DCmySL0GdYB0V0XQXBh1Iy59fupVo33Y="; + hash = "sha256-8LpMczdv+D/QswhzD8sKfmxc1PXhBKg+E1hzMX7zfc8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index 9bca8fc0f2bc..8d5e78846855 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.7"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "incomfort-client"; tag = "v${version}"; - hash = "sha256-ySE2J6h1EeoN7/Y3OK6mrDrXivv9saq9ghHEFGlVlQw="; + hash = "sha256-hQYgGxGkUyIdQN8oOhicLJXeOxRCREhwiOLO0sPcUfs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mirakuru/default.nix b/pkgs/development/python-modules/mirakuru/default.nix index 573548da6825..85085c1e6ebc 100644 --- a/pkgs/development/python-modules/mirakuru/default.nix +++ b/pkgs/development/python-modules/mirakuru/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pythonOlder, pytestCheckHook, + pytest-rerunfailures, setuptools, psutil, netcat, @@ -14,8 +15,8 @@ buildPythonPackage rec { pname = "mirakuru"; - version = "2.5.3"; - format = "pyproject"; + version = "2.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,24 +24,21 @@ buildPythonPackage rec { owner = "ClearcodeHQ"; repo = "mirakuru"; tag = "v${version}"; - hash = "sha256-blk4Oclb3+Cj3RH7BhzacfoPFDBIP/zgv4Ct7fawGnQ="; + hash = "sha256-R5prLIub2kVhsKRGWbZMf/v0U7oOBieoLiHwMRDEs0I="; }; - patches = [ - # https://github.com/ClearcodeHQ/mirakuru/pull/810 - ./tmpdir.patch - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ psutil ]; + dependencies = [ psutil ]; nativeCheckInputs = [ netcat.nc ps python-daemon + pytest-rerunfailures pytestCheckHook ]; + pythonImportsCheck = [ "mirakuru" ]; # Necessary for the tests to pass on Darwin with sandbox enabled. @@ -61,7 +59,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://pypi.org/project/mirakuru"; + homepage = "https://github.com/dbfixtures/mirakuru"; description = "Process orchestration tool designed for functional and integration tests"; changelog = "https://github.com/ClearcodeHQ/mirakuru/blob/v${version}/CHANGES.rst"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/mirakuru/tmpdir.patch b/pkgs/development/python-modules/mirakuru/tmpdir.patch deleted file mode 100644 index 2fd6fcfd2741..000000000000 --- a/pkgs/development/python-modules/mirakuru/tmpdir.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/tests/executors/test_unixsocket_executor.py -+++ b/tests/executors/test_unixsocket_executor.py -@@ -4,6 +4,7 @@ Some of these tests run ``nc``: when running Debian, make sure the - ``netcat-openbsd`` package is used, not ``netcat-traditional``. - """ - -+import os - import sys - - import pytest -@@ -12,7 +13,7 @@ from mirakuru import TimeoutExpired - from mirakuru.unixsocket import UnixSocketExecutor - from tests import TEST_SOCKET_SERVER_PATH - --SOCKET_PATH = "/tmp/mirakuru.sock" -+SOCKET_PATH = os.path.join(os.getenv("TMPDIR", "/tmp"), "mirakuru.sock") - - SOCKET_SERVER_CMD = f"{sys.executable} {TEST_SOCKET_SERVER_PATH} {SOCKET_PATH}" - diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index c0cd877ccaaa..e998bd6141b7 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "msprime"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2K55gHYWf2Mrj9fszVCJ+qqEyQNMppQi+IZCX5SlsBs="; + hash = "sha256-0PlEo3pREx34zZZ5fyR5gXPEC6L/XAlFgdHKVvxRFzA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 64ab1608a406..32db3764b628 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "nethsm"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nethsm-sdk-py"; tag = "v${version}"; - hash = "sha256-vH5YjS3VO5krCMVQFcEgDhJeCUzo9EzFnBxq+zPuZ68="; + hash = "sha256-cbBYElR2J35ZHW5zvL9jlMg9KSerqjFBLsg5QdmqAoA="; }; pythonRelaxDeps = true; @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client-side Python SDK for NetHSM"; homepage = "https://github.com/Nitrokey/nethsm-sdk-py"; - changelog = "https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/v${version}"; + changelog = "https://github.com/Nitrokey/nethsm-sdk-py/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ frogamic ]; }; diff --git a/pkgs/development/python-modules/obspy/default.nix b/pkgs/development/python-modules/obspy/default.nix index 2d5e26cc8790..959197454728 100644 --- a/pkgs/development/python-modules/obspy/default.nix +++ b/pkgs/development/python-modules/obspy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "obspy"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "obspy"; repo = "obspy"; tag = version; - hash = "sha256-Y833OWWBDYduyky0+MRbPoBtATTytak87hgh68QAgfw="; + hash = "sha256-QBV9FRvUUy8/5KK5RdAXXLB8SK9llFy1XRnQ9T5bgcU="; }; build-system = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Python framework for seismological observatories"; homepage = "https://www.obspy.org"; - changelog = "https://github.com/obspy/obspy/releases/tag/${version}"; + changelog = "https://github.com/obspy/obspy/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; maintainers = [ lib.maintainers.ametrine ]; }; diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 8ff31f307b9e..334d94b1f559 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; homepage = "https://github.com/klaasnicolaas/python-odp-amsterdam"; - changelog = "https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v${version}"; + changelog = "https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index ebf5da811746..0285d6988da6 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.12"; + version = "2.9.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pu5UEVgys6glBnWCIozj2dubQvnF75KCA6fxeujx/pA="; + hash = "sha256-jY6SZ1G3+NquF5TfLsGw6T9WO4smeBYT0gXLnRDoN+8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 1e90be9112c2..94892e20415b 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.12"; + version = "0.11.13"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-pwp3YIRiR17TBDu7ILmf0pi37biQ2hr7QtWKqBPVP2A="; + hash = "sha256-qmq0Kz8wXUFFE4CqsdFwKXAIvysFbv7JomQSrNj1QCc="; }; sourceRoot = "${src.name}/checkpoint"; @@ -104,6 +104,7 @@ buildPythonPackage rec { "orbax/checkpoint/_src/metadata/tree_rich_types_test.py" "orbax/checkpoint/_src/metadata/tree_test.py" "orbax/checkpoint/_src/testing/test_tree_utils.py" + "orbax/checkpoint/_src/tree/parts_of_test.py" "orbax/checkpoint/_src/tree/utils_test.py" "orbax/checkpoint/single_host_test.py" "orbax/checkpoint/transform_utils_test.py" diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 33a8c7da3948..d7cfcc952eb4 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -2,27 +2,20 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "parts"; - version = "2.1.0"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + version = "3.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zauHOv8pM47CVIQIo8aMMPZJgwIowgbVLvfFWzIqHoc="; + hash = "sha256-MuZDe/j04sE8tX6658zYwbebwGYp7r3wVBbumoBJ2WQ="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; # Project has no tests doCheck = false; @@ -32,7 +25,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for common list functions related to partitioning lists"; homepage = "https://github.com/lapets/parts"; - license = with licenses; [ mit ]; + changelog = "https://github.com/lapets/parts/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix index d826006563f4..5a1a1b3ce955 100644 --- a/pkgs/development/python-modules/pathlib-abc/default.nix +++ b/pkgs/development/python-modules/pathlib-abc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pathlib-abc"; - version = "0.4.1"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pathlib_abc"; inherit version; - hash = "sha256-5mq5oqnMt51os9aVOc9lRs2jSlr+U7tiKqVricW7/LM="; + hash = "sha256-zJs6N10psy0KVxRa2c5fNAqySXKf9+0TC8fi29RcrQs="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix index dccb8016bd49..cf306e040710 100644 --- a/pkgs/development/python-modules/polyfactory/default.nix +++ b/pkgs/development/python-modules/polyfactory/default.nix @@ -48,6 +48,11 @@ buildPythonPackage rec { pytest-asyncio ]; + disabledTests = [ + # Unsupported type: LiteralAlias + "test_type_alias" + ]; + pythonImporeCheck = [ "polyfactory" ]; meta = { diff --git a/pkgs/development/python-modules/psycopg/ctypes.patch b/pkgs/development/python-modules/psycopg/ctypes.patch index 98a6ba080f78..2863c9bfbfc2 100644 --- a/pkgs/development/python-modules/psycopg/ctypes.patch +++ b/pkgs/development/python-modules/psycopg/ctypes.patch @@ -1,30 +1,28 @@ diff --git a/psycopg/psycopg/pq/_pq_ctypes.py b/psycopg/psycopg/pq/_pq_ctypes.py -index f3a7b143..1bf935fb 100644 +index 99e49357..3827d6dd 100644 --- a/psycopg/psycopg/pq/_pq_ctypes.py +++ b/psycopg/psycopg/pq/_pq_ctypes.py -@@ -13,14 +13,11 @@ from ctypes import Structure, CFUNCTYPE, POINTER - from ctypes import c_char, c_char_p, c_int, c_size_t, c_ubyte, c_uint, c_void_p +@@ -13,13 +13,10 @@ from ctypes import CFUNCTYPE, POINTER, Structure, c_char, c_char_p, c_int, c_siz + from ctypes import c_ubyte, c_uint, c_void_p from typing import Any, NoReturn -from .misc import find_libpq_full_path, version_pretty +from .misc import version_pretty from ..errors import NotSupportedError --libname = find_libpq_full_path() --if not libname: +-if not (libname := find_libpq_full_path()): - raise ImportError("libpq library not found") - +- -pq = ctypes.cdll.LoadLibrary(libname) +pq = ctypes.cdll.LoadLibrary("@libpq@") class FILE(Structure): -@@ -30,12 +27,7 @@ class FILE(Structure): +@@ -29,11 +26,7 @@ class FILE(Structure): FILE_ptr = POINTER(FILE) if sys.platform == "linux": -- libcname = ctypes.util.find_library("c") -- if not libcname: +- if not (libcname := ctypes.util.find_library("c")): - # Likely this is a system using musl libc, see the following bug: - # https://github.com/python/cpython/issues/65821 - libcname = "libc.so" @@ -34,10 +32,10 @@ index f3a7b143..1bf935fb 100644 fdopen = libc.fdopen fdopen.argtypes = (c_int, c_char_p) diff --git a/tests/fix_pq.py b/tests/fix_pq.py -index 1cff7e18..218d90a0 100644 +index 8d7e9ae6..074be456 100644 --- a/tests/fix_pq.py +++ b/tests/fix_pq.py -@@ -49,18 +49,7 @@ def pytest_runtest_setup(item): +@@ -50,18 +50,7 @@ def pytest_runtest_setup(item): @pytest.fixture def libpq(): """Return a ctypes wrapper to access the libpq.""" diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 2e5174552fce..e0fe35eda093 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.2.6"; + version = "3.2.7"; src = fetchFromGitHub { owner = "psycopg"; repo = "psycopg"; tag = version; - hash = "sha256-fCiTu6lKFqY7Yl9KfmhRZQIDg5sEkXkQ95kPfIDSGn8="; + hash = "sha256-v4R+5jgC4dTrL+i6O+UCCr7+g673hKi9YmrSeROLpZs="; }; patches = [ diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index dc8a4f92e63a..df210480f7bd 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.14" +version = "0.12.15" dependencies = [ "pyo3", "yrs", @@ -393,9 +393,9 @@ checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index a51cacc66692..8f71484697bd 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.12.14"; + version = "0.12.15"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; tag = version; - hash = "sha256-QPA9ek0szYgN6R0mnnU5MN4cYa8DVqIw10DxQ/TzaH0="; + hash = "sha256-+DRHOX4X2ez+G/nHYnXfANNzdPU7QDbq6lBWBwLJoP4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index b2cfcad61c3e..887ea6e9d6a3 100644 --- a/pkgs/development/python-modules/pygsl/default.nix +++ b/pkgs/development/python-modules/pygsl/default.nix @@ -2,42 +2,41 @@ lib, buildPythonPackage, fetchFromGitHub, + pkg-config, gsl, swig, + meson-python, numpy, pytestCheckHook, }: buildPythonPackage rec { pname = "pygsl"; - version = "2.5.1"; - format = "setuptools"; + version = "2.6.2"; + pyproject = true; src = fetchFromGitHub { owner = "pygsl"; repo = "pygsl"; tag = "v${version}"; - hash = "sha256-Xgb37uY8CV0gkBZ7Rgg8d5uD+bIBsPfi1ss8PT1LMAY="; + hash = "sha256-1aAc2qGVlClnsw70D1QqPbSsyij0JNgfIXsLzelYx3E="; }; - # error: no member named 'n' in 'gsl_bspline_workspace' - postPatch = lib.optionalString (lib.versionAtLeast gsl.version "2.8") '' - substituteInPlace src/bspline/bspline.ic \ - --replace-fail "self->w->n" "self->w->ncontrol" - substituteInPlace swig_src/bspline_wrap.c \ - --replace-fail "self->w->n;" "self->w->ncontrol;" - ''; - nativeBuildInputs = [ - gsl.dev + pkg-config swig ]; - buildInputs = [ gsl ]; - dependencies = [ numpy ]; + buildInputs = [ + gsl + ]; - preBuild = '' - python setup.py build_ext --inplace - ''; + build-system = [ + meson-python + numpy + ]; + dependencies = [ + numpy + ]; preCheck = '' cd tests diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 48478ca5d676..93aaf0c4bc5f 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "2.0.6"; + version = "2.0.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; tag = "v${version}"; - hash = "sha256-x91QVCDPjfC8rCVam/mrc8HP84ONa2/mJtSV64hrilc="; + hash = "sha256-VNT86sZyQBNCA4jq+uYp2sBd/FLN0c5tp2u4/PjVGnA="; }; pythonRelaxDeps = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Solcast API"; homepage = "https://github.com/mcaulifn/solcast"; - changelog = "https://github.com/mcaulifn/solcast/releases/tag/v${version}"; + changelog = "https://github.com/mcaulifn/solcast/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 369b41f5522c..f249489e4bac 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -1,13 +1,20 @@ { + lib, buildPythonPackage, - cython, fetchPypi, + + # build-system + cython, + setuptools, + + # dependencies fontconfig, freefont_ttf, - lib, makeFontsConf, + + # testing + dejavu_fonts, python, - setuptools, }: let @@ -35,6 +42,8 @@ buildPythonPackage rec { ${python.pythonOnBuildForHost.interpreter} setup.py build_ext -i ''; + nativeCheckInputs = [ dejavu_fonts ]; + preCheck = '' export FONTCONFIG_FILE=${fontsConf}; export HOME=$TMPDIR @@ -50,6 +59,7 @@ buildPythonPackage rec { homepage = "https://github.com/Vayn/python-fontconfig"; description = "Python binding for Fontconfig"; license = lib.licenses.gpl3; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 62d8ca498643..08c66c8114cb 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -12,7 +12,6 @@ numpy, packaging, pyyaml, - tensorboardx, torch, torchmetrics, tqdm, @@ -47,7 +46,6 @@ buildPythonPackage rec { numpy packaging pyyaml - tensorboardx torch torchmetrics tqdm diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 69a37b8b0471..3f7a6b5e2f1c 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.25.5"; + version = "0.26.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; tag = "v${version}"; - hash = "sha256-fVUvAXtZcMWBBK0wdGJA0oIneCNKI4GI2qNIc30HU9M="; + hash = "sha256-8ZD/vqWA1QnEQXz6P/+NIxe0go1Q/XQ3iRNL/TkoTmM="; }; patches = [ @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing the Rigetti QCS API"; homepage = "https://qcs-api-client-python.readthedocs.io/"; - changelog = "https://github.com/rigetti/qcs-api-client-python/releases/tag/v${version}"; + changelog = "https://github.com/rigetti/qcs-api-client-python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index bb7cafc77fbd..b7747180262a 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; tag = "v${version}"; - hash = "sha256-Uo8Shryw365l1970R0VpvGPAJOTxuJy6ZjIE2pcZkGs="; + hash = "sha256-L71tlDUo3kbENjfMJgppikP+IasGZ6WeER7vfwxA61c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index d11d9e1edb37..d2741a87084f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1369"; + version = "3.0.1370"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-2KJ8Xcg5JB7/CWrFohvDcEplYY5QjJsr/b8xCKZpUQY="; + hash = "sha256-o0X1liAHKIGQEymmSU25rGu+HPSzJiPgx+tk4LlIl8Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 218ae2bb3456..0e4e6ffdc718 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -34,17 +34,9 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; tag = "v${version}"; - hash = "sha256-ZYuu1vKhC5Yi9m3EsPUhA9OXHjmHafUJRCDnQIu5kFk="; + hash = "sha256-yEwuCsIKNHQf8iCSB38R8mJXvdOi0+MeNk9M9+jWfxU="; }; - # TODO: remove at next release - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail \ - 'version = "0.8.0"' \ - 'version = "0.8.1"' - ''; - build-system = [ pybind11 setuptools diff --git a/pkgs/development/python-modules/wapiti-arsenic/default.nix b/pkgs/development/python-modules/wapiti-arsenic/default.nix new file mode 100644 index 000000000000..b0fb440cf612 --- /dev/null +++ b/pkgs/development/python-modules/wapiti-arsenic/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + poetry-core, + + # dependencies + aiohttp, + attrs, + packaging, + structlog, +}: + +buildPythonPackage rec { + pname = "wapiti-arsenic"; + version = "28.2"; + pyproject = true; + + # Latest tag is not on GitHub + src = fetchPypi { + pname = "wapiti_arsenic"; + inherit version; + hash = "sha256-QxjM0BsiHm/LPUuGLLPG6OUcr4YXBEpfJGTwKp1zTWQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry>=0.12" "poetry-core" \ + --replace-fail "poetry.masonry" "poetry.core.masonry" + ''; + + build-system = [ + poetry-core + ]; + + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = [ + aiohttp + attrs + packaging + structlog + ]; + + pythonImportsCheck = [ "wapiti_arsenic" ]; + + # No tests in the pypi archive + doCheck = false; + + meta = { + description = "Asynchronous WebDriver client"; + homepage = "https://github.com/wapiti-scanner/arsenic"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/wapiti-swagger/default.nix b/pkgs/development/python-modules/wapiti-swagger/default.nix new file mode 100644 index 000000000000..16e6668ebdc3 --- /dev/null +++ b/pkgs/development/python-modules/wapiti-swagger/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyyaml, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "wapiti-swagger"; + version = "0.1.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "wapiti-scanner"; + repo = "wapiti_swagger"; + tag = version; + hash = "sha256-On4R5+9+6w8CdZYQ8oxAfuxWTQZotkxjrIf497lETfw="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyyaml + ]; + + pythonImportsCheck = [ "wapiti_swagger" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Library for parsing and generating request bodies from Swagger/OpenAPI specifications"; + homepage = "https://github.com/wapiti-scanner/wapiti_swagger"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 2c0e4ad21819..8f1bbf2d61e9 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "apko"; - version = "0.25.7"; + version = "0.27.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; tag = "v${version}"; - hash = "sha256-vE7aFdpzm8i/luF50g/De+tSHKMHDMtyJf9hOZ6hhSY="; + hash = "sha256-p3Wu3kOCTcIOR/4N3dZNfBxpcqcu4rob9kA9vawZNbc="; # 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. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-v7u3NKiaNPqSCP7lsw+On1j/h7zYUyIE6WoooaX1aZc="; + vendorHash = "sha256-9JhbKfoqySB4nsCI1dCpOed9CnQJWwUPkpL/DXGnV3E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 6c86048160ca..9c4827882945 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-kwchy30i2zYS7uwUonDusumLbpZxdzZ/8Rts25zwqdo="; + hash = "sha256-HJ7mLN2j8ugnQFuauRvvNfticICRojXeqM1kUxu9yuU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ebrjEnLOvkAMICcreJu+jOze9R/crtAFfRDa6kqLNnA="; + cargoHash = "sha256-HVEoUA5jvKDCiCeCA2gdKm78zAL/qoNlXsY4qLHTmrY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 55534357be86..851df1936a27 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -10,6 +10,8 @@ lib, libGL, libGLU, + libwebp, + libtiff, libX11, libxml2, libxmlxx5, @@ -52,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libX11 + libwebp + libtiff libxmlxx5 libxml2 libxslt diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix index b9cc9abb40bf..9feecf8fcf2f 100644 --- a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix +++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix @@ -7,13 +7,13 @@ let fingers = crystal.buildCrystalPackage rec { format = "shards"; - version = "2.2.2"; + version = "2.4.0"; pname = "fingers"; src = fetchFromGitHub { owner = "Morantron"; repo = "tmux-fingers"; rev = "${version}"; - sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I="; + sha256 = "sha256-bUxwJwOl7195jsbrimMOZNTOUGpkFF0lYYiRkc//bY4="; }; shardsFile = ./shards.nix; diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix index 9367ddf7b1a7..9b8136af9bd9 100644 --- a/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix +++ b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix @@ -4,6 +4,11 @@ rev = "v3.0.0"; sha256 = "0mj5xvpiif1vhg4qds938p9zb5a47qzl397ybz1l1jks0gg361wq"; }; + tablo = { + url = "https://github.com/hutou/tablo.git"; + rev = "v0.10.1"; + sha256 = "0aavacqa35y3zlrllw83bkmj27fmxph5h07ni5l0nx11w1m0l5j4"; + }; xdg_base_directory = { url = "https://github.com/tijn/xdg_base_directory.git"; rev = "60bf28dc060c221d5af52727927e92b840022eb0"; diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 926e024d9e3e..f3a00333a751 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "digimend"; - version = "13"; + version = "13-unstable-2025-01-02"; src = fetchFromGitHub { owner = "digimend"; repo = "digimend-kernel-drivers"; - rev = "v${version}"; - hash = "sha256-YYCxTyoZGMnqC2nKkRi5Z1uofldGvJDGY2/sO9iMNIo="; + rev = "f3c7c7f1179fc786a8e5aad027d4db904c31b42c"; + hash = "sha256-5kJj3SJfzrQ3n9r1YOn5xt0KO9WcEf0YpNMjiZEYMEo="; }; postPatch = '' @@ -27,13 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - postInstall = '' - # Remove module reload hack. - # The hid-rebind unloads and then reloads the hid-* module to ensure that - # the extra/ module is loaded. - rm -r $out/lib/udev - ''; - makeFlags = kernelModuleMakeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix index af29f4888321..74287f16a65c 100644 --- a/pkgs/os-specific/linux/nct6687d/default.nix +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "nct6687d"; - version = "0-unstable-2024-11-05"; + version = "0-unstable-2025-04-27"; src = fetchFromGitHub { owner = "Fred78290"; repo = "nct6687d"; - rev = "2f1a27a29f71797922c74afda6a39ce368e80356"; - hash = "sha256-fnSy3C6R8SHlu+xB+1ID8m4Eqfgb2+2y3DkDlp3blVo="; + rev = "19f66d618fc2c73b277ca1a8c72a336cf2072cbe"; + hash = "sha256-Wmze2kU5kGZ/afeW5ZG6d4n2//l/EpLanbaY4Nn/K3c="; }; setSourceRoot = '' diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index c477c85ec87f..34ad087497dd 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -4,8 +4,8 @@ generic: { hash = "sha256-DQGzk90isqYLNvs3qY/PEIHGg62Ygyot3YeUOhIAg54="; }; v70 = generic { - version = "7.0.11"; - hash = "sha256-r9VNy3bRuFvJAL+ZQEbKjCAS3+AvetnWAwFjLxFVuGU="; + version = "7.0.12"; + hash = "sha256-YGntYEql4z/mMczGi3gmVKaXBxlSoc82UVFlWgoSKwU="; }; v60 = generic { version = "6.0.36"; diff --git a/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch b/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch index 6e0f38582cc7..4d1afac81a50 100644 --- a/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch +++ b/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch @@ -1,21 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b05ab0..81e31f5 100644 +index 574b354..1a62874 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -236,16 +236,6 @@ endif() - - if (''${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +@@ -254,16 +254,6 @@ endif() + + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(MACOSX_BUNDLE_LIBS) - if (OPENSSL_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib) - endif() - if (TAGLIB_FOUND) -- list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.1.dylib) +- list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.2.dylib) - endif() - if (FUSE_FOUND) - list(APPEND MACOSX_BUNDLE_LIBS /usr/local/lib/libosxfuse.2.dylib) - endif() - set(MACOSX_BUNDLE_LIBS_INSTALL) - set(MACOSX_BUNDLE_ROOT_DIR "''${CMAKE_INSTALL_PREFIX}/''${CMAKE_PROJECT_NAME}.app") - message(STATUS "bundle root dir: ''${MACOSX_BUNDLE_ROOT_DIR}") + set(MACOSX_BUNDLE_ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}.app") + message(STATUS "bundle root dir: ${MACOSX_BUNDLE_ROOT_DIR}") diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index d7a48f8ed9ed..d270cd8e7a6d 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "android-file-transfer"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU="; + sha256 = "sha256-1euoWM9KMauOkAp7g1FvY4olMiOg+La/Uk1QlQ3mKi8="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 3a3409bf68ae..b919d7c48d2b 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.25"; + version = "3.88.26"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-yAGeB2+FGtdL5zbJkYL96RPf+jBoCSPz1OpFV9tsGdk="; + hash = "sha256-WB2ZL6Vut1dhSDslcAiTvf2REKlUtIEFEIA3rImrMJ4="; }; - vendorHash = "sha256-uNJmM1xVaSaAGolb1ArRkr3iQ8Yar2MEY8/G0AhGAuU="; + vendorHash = "sha256-hBStZjhoBK58vQV22/EZ/h3Fd961fkj3tQbp1gvMID8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ebdbc74fed5..aa90a7c7f886 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1204,6 +1204,7 @@ mapAliases { mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21 msp430NewlibCross = msp430Newlib; # Added 2024-09-06 mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22 + music-player = throw "'music-player' has been removed due to lack of maintenance upstream. Consider using 'fum' or 'termusic' instead."; # Added 2025-05-02 mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02 mutt-with-sidebar = mutt; # Added 2022-09-17 mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8cb610ec25c..ed8bb440e3ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18727,6 +18727,10 @@ self: super: with self; { wandb = callPackage ../development/python-modules/wandb { }; + wapiti-arsenic = callPackage ../development/python-modules/wapiti-arsenic { }; + + wapiti-swagger = callPackage ../development/python-modules/wapiti-swagger { }; + waqiasync = callPackage ../development/python-modules/waqiasync { }; warble = callPackage ../development/python-modules/warble { };