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

K900 be1a14b8 301b0786

+1070 -497
+5
maintainers/maintainer-list.nix
··· 11620 11620 githubId = 1792886; 11621 11621 name = "Julien Malka"; 11622 11622 }; 11623 + juliusfreudenberger = { 11624 + name = "Julius Freudenberger"; 11625 + github = "JuliusFreudenberger"; 11626 + githubId = 13383409; 11627 + }; 11623 11628 juliusrickert = { 11624 11629 email = "nixpkgs@juliusrickert.de"; 11625 11630 github = "juliusrickert";
+1 -1
nixos/modules/services/misc/open-webui.nix
··· 97 97 } // cfg.environment; 98 98 99 99 serviceConfig = { 100 - ExecStart = "${lib.getExe cfg.package} serve --host ${cfg.host} --port ${toString cfg.port}"; 100 + ExecStart = "${lib.getExe cfg.package} serve --host \"${cfg.host}\" --port ${toString cfg.port}"; 101 101 EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; 102 102 WorkingDirectory = cfg.stateDir; 103 103 StateDirectory = "open-webui";
+1
nixos/tests/open-webui.nix
··· 15 15 { 16 16 services.open-webui = { 17 17 enable = true; 18 + host = ""; 18 19 environment = { 19 20 # Requires network connection 20 21 RAG_EMBEDDING_MODEL = "";
+12
pkgs/applications/editors/vim/plugins/generated.nix
··· 11223 11223 meta.homepage = "https://github.com/amitds1997/remote-nvim.nvim/"; 11224 11224 }; 11225 11225 11226 + remote-sshfs-nvim = buildVimPlugin { 11227 + pname = "remote-sshfs.nvim"; 11228 + version = "2024-08-29"; 11229 + src = fetchFromGitHub { 11230 + owner = "nosduco"; 11231 + repo = "remote-sshfs.nvim"; 11232 + rev = "03f6c40c4032eeb1ab91368e06db9c3f3a97a75d"; 11233 + sha256 = "1pl08cpgx27mhmbjxlqld4n2728hxs0hvwyjjy982k315hhhhldw"; 11234 + }; 11235 + meta.homepage = "https://github.com/nosduco/remote-sshfs.nvim/"; 11236 + }; 11237 + 11226 11238 renamer-nvim = buildVimPlugin { 11227 11239 pname = "renamer.nvim"; 11228 11240 version = "2022-08-29";
+13
pkgs/applications/editors/vim/plugins/overrides.nix
··· 44 44 nodejs, 45 45 notmuch, 46 46 openscad, 47 + openssh, 47 48 parinfer-rust, 48 49 phpactor, 49 50 ranger, 50 51 ripgrep, 51 52 skim, 52 53 sqlite, 54 + sshfs, 53 55 statix, 54 56 stylish-haskell, 55 57 tabnine, ··· 2794 2796 plenary-nvim 2795 2797 ]; 2796 2798 nvimSkipModule = "repro"; 2799 + }; 2800 + 2801 + remote-sshfs-nvim = super.remote-sshfs-nvim.overrideAttrs { 2802 + dependencies = with self; [ 2803 + telescope-nvim 2804 + plenary-nvim 2805 + ]; 2806 + runtimeDeps = [ 2807 + openssh 2808 + sshfs 2809 + ]; 2797 2810 }; 2798 2811 2799 2812 renamer-nvim = super.renamer-nvim.overrideAttrs {
+1
pkgs/applications/editors/vim/plugins/vim-plugin-names
··· 929 929 https://github.com/tversteeg/registers.nvim/,, 930 930 https://github.com/vladdoster/remember.nvim/,, 931 931 https://github.com/amitds1997/remote-nvim.nvim/,HEAD, 932 + https://github.com/nosduco/remote-sshfs.nvim/,HEAD, 932 933 https://github.com/filipdutescu/renamer.nvim/,, 933 934 https://github.com/MeanderingProgrammer/render-markdown.nvim/,, 934 935 https://github.com/gabrielpoca/replacer.nvim/,HEAD,
+2 -2
pkgs/applications/graphics/krita/default.nix
··· 1 1 { callPackage, ... }: 2 2 3 3 callPackage ./generic.nix { 4 - version = "5.2.6"; 4 + version = "5.2.9"; 5 5 kde-channel = "stable"; 6 - hash = "sha256-SNcShVT99LTpLFSuMbUq95IfR6jabOyqBnRKu/yC1fs="; 6 + hash = "sha256-CMmvVW3r8mkxvWUGeS45G0t6MzSlog9RazJJBDNKy6Y="; 7 7 }
+5 -5
pkgs/applications/virtualization/podman-desktop/default.nix
··· 3 3 , fetchFromGitHub 4 4 , makeWrapper 5 5 , copyDesktopItems 6 - , electron 6 + , electron_33 7 7 , nodejs 8 8 , pnpm_9 9 9 , makeDesktopItem ··· 56 56 buildPhase = '' 57 57 runHook preBuild 58 58 59 - cp -r ${electron.dist} electron-dist 59 + cp -r ${electron_33.dist} electron-dist 60 60 chmod -R u+w electron-dist 61 61 62 62 pnpm build ··· 64 64 --dir \ 65 65 --config .electron-builder.config.cjs \ 66 66 -c.electronDist=electron-dist \ 67 - -c.electronVersion=${electron.version} 67 + -c.electronVersion=${electron_33.version} 68 68 69 69 runHook postBuild 70 70 ''; ··· 84 84 85 85 install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg" 86 86 87 - makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \ 87 + makeWrapper '${electron_33}/bin/electron' "$out/bin/podman-desktop" \ 88 88 --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ 89 89 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ 90 90 --inherit-argv0 ··· 113 113 changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; 114 114 license = lib.licenses.asl20; 115 115 maintainers = with lib.maintainers; [ booxter panda2134 ]; 116 - inherit (electron.meta) platforms; 116 + inherit (electron_33.meta) platforms; 117 117 mainProgram = "podman-desktop"; 118 118 }; 119 119 })
+29
pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch
··· 1 + From 316457cf70dd105905d5d4925f43de280f08ab10 Mon Sep 17 00:00:00 2001 2 + From: OPNA2608 <opna2608@protonmail.com> 3 + Date: Sat, 11 Jan 2025 20:55:29 +0100 4 + Subject: [PATCH] tests/CMakeLists.txt: Drop hardcoded -no-pie linker flags 5 + 6 + --- 7 + tests/CMakeLists.txt | 2 -- 8 + 1 file changed, 2 deletions(-) 9 + 10 + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt 11 + index 63beacb..5b0812c 100644 12 + --- a/tests/CMakeLists.txt 13 + +++ b/tests/CMakeLists.txt 14 + @@ -32,7 +32,6 @@ add_dependencies("indicator-messages-service" "ayatana-indicator-messages-servic 15 + # test-gactionmuxer 16 + 17 + add_executable("test-gactionmuxer" test-gactionmuxer.cpp) 18 + -target_link_options("test-gactionmuxer" PRIVATE -no-pie) 19 + target_include_directories("test-gactionmuxer" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/src") 20 + target_link_libraries("test-gactionmuxer" "indicator-messages-service" ${PROJECT_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) 21 + add_test("test-gactionmuxer" "test-gactionmuxer") 22 + @@ -59,7 +58,6 @@ add_custom_target("gschemas-compiled" ALL DEPENDS gschemas.compiled) 23 + 24 + pkg_check_modules(DBUSTEST REQUIRED dbustest-1) 25 + add_executable("indicator-test" indicator-test.cpp) 26 + -target_link_options("indicator-test" PRIVATE -no-pie) 27 + target_include_directories("indicator-test" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} ${DBUSTEST_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/libmessaging-menu") 28 + target_link_libraries("indicator-test" "messaging-menu" ${PROJECT_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) 29 + target_compile_definitions(
+5
pkgs/by-name/ay/ayatana-indicator-messages/package.nix
··· 40 40 "dev" 41 41 ] ++ lib.optionals withDocumentation [ "devdoc" ]; 42 42 43 + patches = [ 44 + # Remove when https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/39 merged & in release 45 + ./fix-pie.patch 46 + ]; 47 + 43 48 postPatch = 44 49 '' 45 50 # Uses pkg_get_variable, cannot substitute prefix with that
+3 -3
pkgs/by-name/ca/cargo-make/package.nix
··· 12 12 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "cargo-make"; 15 - version = "0.37.23"; 15 + version = "0.37.24"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "sagiegurari"; 19 19 repo = "cargo-make"; 20 20 rev = version; 21 - hash = "sha256-yYZasrnfxpLf0z6GndLYhkIFfVNjTkx4zdfHYX6WyXk="; 21 + hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8="; 22 22 }; 23 23 24 24 useFetchCargoVendor = true; 25 - cargoHash = "sha256-DtNSP/S41wj4lfd8yE3t8dJOf0yX+ifuj+L6pB53yR8="; 25 + cargoHash = "sha256-ml/OW4S4fIMLmm7vVPgsXB7CigDYORGFpN3jZRp1f8c="; 26 26 27 27 nativeBuildInputs = [ 28 28 pkg-config
+5 -5
pkgs/by-name/gd/gdm-settings/package.nix
··· 1 1 { 2 2 lib, 3 - fetchFromGitHub, 4 - python3Packages, 5 3 appstream, 6 4 blueprint-compiler, 7 5 desktop-file-utils, 8 - glib, 6 + fetchFromGitHub, 9 7 gdm, 8 + glib, 10 9 libadwaita, 11 10 meson, 12 11 ninja, 13 12 pkg-config, 13 + python3Packages, 14 14 wrapGAppsHook4, 15 15 # gdm-settings needs to know where to look for themes 16 16 # This should work for most systems, but can be overridden if not ··· 23 23 24 24 python3Packages.buildPythonApplication rec { 25 25 pname = "gdm-settings"; 26 - version = "4.4"; 26 + version = "5.0"; 27 27 pyproject = false; 28 28 29 29 src = fetchFromGitHub { 30 30 owner = "gdm-settings"; 31 31 repo = "gdm-settings"; 32 32 tag = "v${version}"; 33 - hash = "sha256-3Te8bhv2TkpJFz4llm1itRhzg9v64M7Drtrm4s9EyiQ="; 33 + hash = "sha256-x7w6m0+uwkm95onR+ioQAoLlaPoUmLc0+NgawQIIa/Y="; 34 34 }; 35 35 36 36 nativeBuildInputs = [
+2 -2
pkgs/by-name/go/go-blueprint/package.nix
··· 9 9 10 10 buildGoModule rec { 11 11 pname = "go-blueprint"; 12 - version = "0.10.4"; 12 + version = "0.10.5"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "Melkeydev"; 16 16 repo = "go-blueprint"; 17 17 rev = "v${version}"; 18 - hash = "sha256-/MIMDQKdpgY0bCwrYpJNC6jiEhNECROe61uuoFz8P68="; 18 + hash = "sha256-8J+PxFHrNkX2McBn1tO7Q1X4tWtMWDIRsxzKtRhM/Jk="; 19 19 }; 20 20 21 21 ldflags = [
+10 -4
pkgs/by-name/in/inv-sig-helper/package.nix
··· 10 10 openssl, 11 11 12 12 # passthru 13 + nixosTests, 13 14 unstableGitUpdater, 14 15 }: 15 16 16 17 rustPlatform.buildRustPackage { 17 18 pname = "inv-sig-helper"; 18 - version = "0-unstable-2024-12-17"; 19 + version = "0-unstable-2025-01-31"; 19 20 20 21 src = fetchFromGitHub { 21 22 owner = "iv-org"; 22 23 repo = "inv_sig_helper"; 23 - rev = "74e879b54e46831e31c09fd08fe672ca58e9cb2d"; 24 - hash = "sha256-Q+u09WWBwWLcLLW9XwkaYDxM3xoQmeJzi37mrdDGvRc="; 24 + rev = "40835906774cc7cdefa76b2648216afd063ad0e2"; 25 + hash = "sha256-yjVN81VSXPOXSOhhlF6Jjc/7sYsdoWT+Tr1BA+C2XQI="; 25 26 }; 26 27 27 28 useFetchCargoVendor = true; ··· 35 36 openssl 36 37 ]; 37 38 38 - passthru.updateScript = unstableGitUpdater { }; 39 + passthru = { 40 + tests = { 41 + inherit (nixosTests) invidious; 42 + }; 43 + updateScript = unstableGitUpdater { }; 44 + }; 39 45 40 46 meta = { 41 47 description = "Rust service that decrypts YouTube signatures and manages player information";
+17
pkgs/by-name/ja/ja2-stracciatella/dont-use-vendored-sdl2.patch
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index e4e5547af..a3017d197 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -428,12 +425,6 @@ if (MINGW) 6 + install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-dlls-mingw.cmake") 7 + endif() 8 + 9 + -if(APPLE) 10 + - file(GLOB APPLE_DIST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/distr-files-mac/*.txt") 11 + - install(FILES ${APPLE_DIST_FILES} DESTINATION .) 12 + - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.20-macos/SDL2.framework DESTINATION .) 13 + -endif() 14 + - 15 + ## Build AppImage 16 + 17 + add_custom_target(package-appimage
+109
pkgs/by-name/ja/ja2-stracciatella/package.nix
··· 1 + { 2 + stdenv, 3 + lib, 4 + fetchurl, 5 + fetchFromGitHub, 6 + cmake, 7 + python3, 8 + rustPlatform, 9 + cargo, 10 + rustc, 11 + SDL2, 12 + fltk, 13 + lua5_3, 14 + miniaudio, 15 + rapidjson, 16 + sol2, 17 + gtest, 18 + }: 19 + 20 + let 21 + stringTheory = fetchurl { 22 + url = "https://github.com/zrax/string_theory/archive/3.8.tar.gz"; 23 + hash = "sha256-mq7pW3qRZs03/SijzbTl1txJHCSW/TO+gvRLWZh/11M="; 24 + }; 25 + 26 + magicEnum = fetchurl { 27 + url = "https://github.com/Neargye/magic_enum/archive/v0.8.2.zip"; 28 + hash = "sha256-oQ+mUDB8YJULcSploz+0bprJbqclhc+p/Pmsn1AsAes="; 29 + }; 30 + in 31 + stdenv.mkDerivation rec { 32 + pname = "ja2-stracciatella"; 33 + version = "0.21.0"; 34 + 35 + src = fetchFromGitHub { 36 + owner = "ja2-stracciatella"; 37 + repo = "ja2-stracciatella"; 38 + tag = "v${version}"; 39 + hash = "sha256-zMCFDMSKcsYz5LjW8UJbBlSmuJX6ibr9zIS3BgZMgAg="; 40 + }; 41 + 42 + patches = [ 43 + # Note: this patch is only relevant for darwin 44 + ./dont-use-vendored-sdl2.patch 45 + ]; 46 + 47 + postPatch = '' 48 + # Patch dependencies that are usually loaded by url 49 + substituteInPlace dependencies/lib-string_theory/builder/CMakeLists.txt.in \ 50 + --replace-fail ${stringTheory.url} file://${stringTheory} 51 + substituteInPlace dependencies/lib-magic_enum/getter/CMakeLists.txt.in \ 52 + --replace-fail ${magicEnum.url} file://${magicEnum} 53 + ''; 54 + 55 + strictDeps = true; 56 + 57 + nativeBuildInputs = [ 58 + cmake 59 + python3 60 + rustPlatform.cargoSetupHook 61 + cargo 62 + rustc 63 + ]; 64 + 65 + buildInputs = [ 66 + SDL2 67 + fltk 68 + lua5_3 69 + rapidjson 70 + sol2 71 + gtest 72 + ]; 73 + 74 + cargoRoot = "rust"; 75 + 76 + cargoDeps = rustPlatform.fetchCargoVendor { 77 + inherit 78 + pname 79 + version 80 + src 81 + cargoRoot 82 + ; 83 + hash = "sha256-5KZa5ocn6Q4qUeRmm7Tymgg09dr6aZoAuJvtF32CXNg="; 84 + }; 85 + 86 + cmakeFlags = [ 87 + (lib.cmakeBool "FLTK_SKIP_FLUID" true) # otherwise `find_package(FLTK)` fails 88 + (lib.cmakeBool "LOCAL_LUA_LIB" false) 89 + (lib.cmakeBool "LOCAL_MINIAUDIO_LIB" false) 90 + (lib.cmakeFeature "MINIAUDIO_INCLUDE_DIR" "${miniaudio}") 91 + (lib.cmakeBool "LOCAL_RAPIDJSON_LIB" false) 92 + (lib.cmakeBool "LOCAL_SOL_LIB" false) 93 + (lib.cmakeBool "LOCAL_GTEST_LIB" false) 94 + (lib.cmakeFeature "EXTRA_DATA_DIR" "${placeholder "out"}/share/ja2") 95 + ]; 96 + 97 + doInstallCheck = true; 98 + 99 + installCheckPhase = '' 100 + HOME=$(mktemp -d) $out/bin/ja2 -unittests 101 + ''; 102 + 103 + meta = { 104 + description = "Jagged Alliance 2, with community fixes"; 105 + license = "SFI Source Code license agreement"; 106 + homepage = "https://ja2-stracciatella.github.io/"; 107 + maintainers = [ ]; 108 + }; 109 + }
+2 -2
pkgs/by-name/ka/katawa-shoujo-re-engineered/package.nix
··· 10 10 }: 11 11 stdenvNoCC.mkDerivation (finalAttrs: { 12 12 pname = "katawa-shoujo-re-engineered"; 13 - version = "1.4.9"; 13 + version = "2.0.0"; 14 14 15 15 src = fetchFromGitea { 16 16 # GitHub mirror at fleetingheart/ksre ··· 18 18 owner = "fhs"; 19 19 repo = "katawa-shoujo-re-engineered"; 20 20 rev = "v${finalAttrs.version}"; 21 - hash = "sha256-JrR1om7bvigVJbJKrKhfigpLvEGWTKzH8BNeNIYJrvA="; 21 + hash = "sha256-JvwMbwbPWH3iLc03qCWknrK2kSC7D92rcdDpVpbaruM="; 22 22 }; 23 23 24 24 desktopItems = [
+2 -2
pkgs/by-name/ko/komga/package.nix
··· 9 9 10 10 stdenvNoCC.mkDerivation rec { 11 11 pname = "komga"; 12 - version = "1.18.0"; 12 + version = "1.19.0"; 13 13 14 14 src = fetchurl { 15 15 url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; 16 - sha256 = "sha256-I0xJfX0f1srIjiitBt5EN6j/pOCvfGUIwxCt5sT2UuY="; 16 + sha256 = "sha256-9klOS9VFKMiOWihJkXdk5/GTW6oRVrmSAKwK7es6IhM="; 17 17 }; 18 18 19 19 nativeBuildInputs = [
+5 -1
pkgs/by-name/ma/mattermost-desktop/package.nix
··· 2 2 lib, 3 3 fetchFromGitHub, 4 4 buildNpmPackage, 5 - electron, 5 + electron_33, 6 6 makeWrapper, 7 7 testers, 8 8 mattermost-desktop, 9 9 nix-update-script, 10 10 }: 11 + 12 + let 13 + electron = electron_33; 14 + in 11 15 12 16 buildNpmPackage rec { 13 17 pname = "mattermost-desktop";
+39
pkgs/by-name/mo/moonpalace/package.nix
··· 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + versionCheckHook, 6 + testers, 7 + nix-update-script, 8 + moonpalace, 9 + }: 10 + buildGoModule rec { 11 + pname = "moonpalace"; 12 + version = "0.12.0"; 13 + 14 + src = fetchFromGitHub { 15 + owner = "MoonshotAI"; 16 + repo = "moonpalace"; 17 + tag = "v${version}"; 18 + hash = "sha256-30ibs49srFwTsnjbtvLUNQ79yA/vZJdlHQZ8ERi5lls="; 19 + }; 20 + vendorHash = "sha256-e5G+28cgUJvUpS1CX/Tinn3gDK8fNEcJi8uv9xMR+5o="; 21 + 22 + passthru = { 23 + tests.version = testers.testVersion { 24 + package = moonpalace; 25 + version = "v${moonpalace.version}"; 26 + command = "HOME=$(mktemp -d) moonpalace --version"; 27 + }; 28 + updateScript = nix-update-script { }; 29 + }; 30 + 31 + meta = { 32 + description = "An API debugging tool provided by Moonshot AI"; 33 + homepage = "https://github.com/MoonshotAI/moonpalace"; 34 + changelog = "https://github.com/MoonshotAI/moonpalace/releases/tag/v${version}"; 35 + license = lib.licenses.gpl3Only; 36 + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; 37 + mainProgram = "moonpalace"; 38 + }; 39 + }
+3 -2
pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd
··· 17 17 18 18 # SYNOPSIS 19 19 20 + ; document here only non-deprecated flags 20 21 _nixos-rebuild_ \[--verbose] [--max-jobs MAX_JOBS] [--cores CORES] [--log-format LOG_FORMAT] [--keep-going] [--keep-failed] [--fallback] [--repair] [--option OPTION OPTION] [--builders BUILDERS]++ 21 22 \[--include INCLUDE] [--quiet] [--print-build-logs] [--show-trace] [--accept-flake-config] [--refresh] [--impure] [--offline] [--no-net] [--recreate-lock-file]++ 22 23 \[--no-update-lock-file] [--no-write-lock-file] [--no-registries] [--commit-lock-file] [--update-input UPDATE_INPUT] [--override-input OVERRIDE_INPUT OVERRIDE_INPUT]++ 23 24 \[--no-build-output] [--use-substitutes] [--help] [--file FILE] [--attr ATTR] [--flake [FLAKE]] [--no-flake] [--install-bootloader] [--profile-name PROFILE_NAME]++ 24 - \[--specialisation SPECIALISATION] [--rollback] [--upgrade] [--upgrade-all] [--json] [--ask-sudo-password] [--sudo] [--fast]++ 25 + \[--specialisation SPECIALISATION] [--rollback] [--upgrade] [--upgrade-all] [--json] [--ask-sudo-password] [--sudo] [--no-reexec]++ 25 26 \[--image-variant VARIANT]++ 26 27 \[--build-host BUILD_HOST] [--target-host TARGET_HOST]++ 27 28 \[{switch,boot,test,build,edit,repl,dry-build,dry-run,dry-activate,build-image,build-vm,build-vm-with-bootloader,list-generations}] ··· 170 171 Causes the boot loader to be (re)installed on the device specified by 171 172 the relevant configuration options. 172 173 173 - *--fast* 174 + *--no-reexec* 174 175 Normally, *nixos-rebuild* first finds and builds itself from the 175 176 _config.system.build.nixos-rebuild_ attribute from the current user 176 177 channel or flake and exec into it. This allows *nixos-rebuild* to run
+20 -15
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
··· 18 18 19 19 20 20 def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentParser]]: 21 - common_flags = argparse.ArgumentParser(add_help=False) 21 + common_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) 22 22 common_flags.add_argument( 23 23 "--verbose", 24 24 "-v", ··· 37 37 common_flags.add_argument("--repair", action="store_true") 38 38 common_flags.add_argument("--option", nargs=2, action="append") 39 39 40 - common_build_flags = argparse.ArgumentParser(add_help=False) 40 + common_build_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) 41 41 common_build_flags.add_argument("--builders") 42 42 common_build_flags.add_argument("--include", "-I", action="append") 43 43 common_build_flags.add_argument("--print-build-logs", "-L", action="store_true") 44 44 common_build_flags.add_argument("--show-trace", action="store_true") 45 45 46 - flake_common_flags = argparse.ArgumentParser(add_help=False) 46 + flake_common_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) 47 47 flake_common_flags.add_argument("--accept-flake-config", action="store_true") 48 48 flake_common_flags.add_argument("--refresh", action="store_true") 49 49 flake_common_flags.add_argument("--impure", action="store_true") ··· 57 57 flake_common_flags.add_argument("--update-input", action="append") 58 58 flake_common_flags.add_argument("--override-input", nargs=2, action="append") 59 59 60 - classic_build_flags = argparse.ArgumentParser(add_help=False) 60 + classic_build_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) 61 61 classic_build_flags.add_argument("--no-build-output", "-Q", action="store_true") 62 62 63 - copy_flags = argparse.ArgumentParser(add_help=False) 63 + copy_flags = argparse.ArgumentParser(add_help=False, allow_abbrev=False) 64 64 copy_flags.add_argument( 65 65 "--use-substitutes", 66 66 "--substitute-on-destination", ··· 167 167 ) 168 168 main_parser.add_argument("--no-ssh-tty", action="store_true", help="Deprecated") 169 169 main_parser.add_argument( 170 + "--no-reexec", 171 + action="store_true", 172 + help="Do not update nixos-rebuild in-place (also known as re-exec) before build", 173 + ) 174 + main_parser.add_argument( 170 175 "--fast", 171 176 action="store_true", 172 - help="Skip possibly expensive operations", 177 + help="Deprecated, use '--no-reexec' instead", 173 178 ) 174 179 main_parser.add_argument("--build-host", help="Specifies host to perform the build") 175 180 main_parser.add_argument( ··· 223 228 if args.ask_sudo_password: 224 229 args.sudo = True 225 230 226 - # TODO: use deprecated=True in Python >=3.13 227 231 if args.install_grub: 228 - parser_warn("--install-grub deprecated, use --install-bootloader instead") 232 + parser_warn("--install-grub is deprecated, use --install-bootloader instead") 229 233 args.install_bootloader = True 230 234 231 - # TODO: use deprecated=True in Python >=3.13 232 235 if args.use_remote_sudo: 233 - parser_warn("--use-remote-sudo deprecated, use --sudo instead") 236 + parser_warn("--use-remote-sudo is deprecated, use --sudo instead") 234 237 args.sudo = True 235 238 236 - # TODO: use deprecated=True in Python >=3.13 239 + if args.fast: 240 + parser_warn("--fast is deprecated, use --no-reexec instead") 241 + args.no_reexec = True 242 + 237 243 if args.no_ssh_tty: 238 - parser_warn("--no-ssh-tty deprecated, SSH's TTY is never used anymore") 244 + parser_warn("--no-ssh-tty is deprecated, SSH's TTY is never used anymore") 239 245 240 - # TODO: use deprecated=True in Python >=3.13 241 246 if args.no_build_nix: 242 - parser_warn("--no-build-nix deprecated, we do not build nix anymore") 247 + parser_warn("--no-build-nix is deprecated, we do not build nix anymore") 243 248 244 249 if args.action == Action.EDIT.value and (args.file or args.attr): 245 250 parser.error("--file and --attr are not supported with 'edit'") ··· 351 356 if ( 352 357 WITH_REEXEC 353 358 and can_run 354 - and not args.fast 359 + and not args.no_reexec 355 360 and not os.environ.get("_NIXOS_REBUILD_REEXEC") 356 361 ): 357 362 reexec(argv, args, build_flags, flake_build_flags)
+9 -9
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
··· 144 144 145 145 mock_run.side_effect = run_side_effect 146 146 147 - nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--fast"]) 147 + nr.execute(["nixos-rebuild", "boot", "--no-flake", "-vvv", "--no-reexec"]) 148 148 149 149 assert mock_run.call_count == 6 150 150 mock_run.assert_has_calls( ··· 222 222 "nixos-config=./configuration.nix", 223 223 "-I", 224 224 "nixpkgs=$HOME/.nix-defexpr/channels/pinned_nixpkgs", 225 - "--fast", 225 + "--no-reexec", 226 226 ] 227 227 ) 228 228 ··· 340 340 "--install-bootloader", 341 341 "--sudo", 342 342 "--verbose", 343 - "--fast", 343 + "--no-reexec", 344 344 # https://github.com/NixOS/nixpkgs/issues/374050 345 345 "--option", 346 346 "narinfo-cache-negative-ttl", ··· 418 418 "--use-remote-sudo", 419 419 "--target-host", 420 420 "user@localhost", 421 - "--fast", 421 + "--no-reexec", 422 422 ] 423 423 ) 424 424 ··· 508 508 "/path/to/config#hostname", 509 509 "--build-host", 510 510 "user@localhost", 511 - "--fast", 511 + "--no-reexec", 512 512 ] 513 513 ) 514 514 ··· 587 587 nixpkgs_path.touch() 588 588 589 589 nr.execute( 590 - ["nixos-rebuild", "switch", "--rollback", "--install-bootloader", "--fast"] 590 + ["nixos-rebuild", "switch", "--rollback", "--install-bootloader", "--no-reexec"] 591 591 ) 592 592 593 593 assert mock_run.call_count >= 2 ··· 625 625 CompletedProcess([], 0, str(config_path)), 626 626 ] 627 627 628 - nr.execute(["nixos-rebuild", "build", "--no-flake", "--fast"]) 628 + nr.execute(["nixos-rebuild", "build", "--no-flake", "--no-reexec"]) 629 629 630 630 assert mock_run.call_count == 1 631 631 mock_run.assert_has_calls( ··· 659 659 mock_run.side_effect = run_side_effect 660 660 661 661 nr.execute( 662 - ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--fast"] 662 + ["nixos-rebuild", "test", "--flake", "github:user/repo#hostname", "--no-reexec"] 663 663 ) 664 664 665 665 assert mock_run.call_count == 2 ··· 712 712 mock_run.side_effect = run_side_effect 713 713 714 714 nr.execute( 715 - ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--fast"] 715 + ["nixos-rebuild", "test", "--rollback", "--profile-name", "foo", "--no-reexec"] 716 716 ) 717 717 718 718 assert mock_run.call_count == 2
+12 -12
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
··· 20 20 autospec=True, 21 21 return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "), 22 22 ) 23 - def test_build(mock_run: Any, monkeypatch: Any) -> None: 23 + def test_build(mock_run: Any) -> None: 24 24 assert n.build( 25 25 "config.system.build.attr", 26 26 m.BuildAttr("<nixpkgs/nixos>", None), ··· 79 79 80 80 @patch(get_qualified_name(n.run_wrapper, n), autospec=True) 81 81 @patch(get_qualified_name(n.uuid4, n), autospec=True) 82 - def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: Any) -> None: 82 + def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: MonkeyPatch) -> None: 83 83 build_host = m.Remote("user@host", [], None) 84 84 monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts") 85 85 ··· 226 226 ) 227 227 228 228 229 - def test_copy_closure(monkeypatch: Any) -> None: 229 + def test_copy_closure(monkeypatch: MonkeyPatch) -> None: 230 230 closure = Path("/path/to/closure") 231 231 with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: 232 232 n.copy_closure(closure, None) ··· 290 290 291 291 292 292 @patch(get_qualified_name(n.run_wrapper, n), autospec=True) 293 - def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None: 293 + def test_edit(mock_run: Any, monkeypatch: MonkeyPatch, tmpdir: Path) -> None: 294 294 # Flake 295 295 flake = m.Flake.parse(f"{tmpdir}#attr") 296 296 n.edit(flake, {"commit_lock_file": True}) ··· 309 309 310 310 # Classic 311 311 with monkeypatch.context() as mp: 312 - default_nix = tmpdir.join("default.nix") 313 - default_nix.write("{}") 312 + default_nix = tmpdir / "default.nix" 313 + default_nix.write_text("{}", encoding="utf-8") 314 314 315 315 mp.setenv("NIXOS_CONFIG", str(tmpdir)) 316 316 mp.setenv("EDITOR", "editor") ··· 333 333 """, 334 334 ), 335 335 ) 336 - def test_get_build_image_variants(mock_run: Any) -> None: 336 + def test_get_build_image_variants(mock_run: Any, tmp_path: Path) -> None: 337 337 build_attr = m.BuildAttr("<nixpkgs/nixos>", None) 338 338 assert n.get_build_image_variants(build_attr) == { 339 339 "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", ··· 357 357 stdout=PIPE, 358 358 ) 359 359 360 - build_attr = m.BuildAttr(Path("/tmp"), "preAttr") 360 + build_attr = m.BuildAttr(Path(tmp_path), "preAttr") 361 361 assert n.get_build_image_variants(build_attr, {"inst_flag": True}) == { 362 362 "azure": "nixos-image-azure-25.05.20250102.6df2492-x86_64-linux.vhd", 363 363 "vmware": "nixos-image-vmware-25.05.20250102.6df2492-x86_64-linux.vmdk", ··· 369 369 "--strict", 370 370 "--json", 371 371 "--expr", 372 - textwrap.dedent(""" 372 + textwrap.dedent(f""" 373 373 let 374 - value = import "/tmp"; 375 - set = if builtins.isFunction value then value {} else value; 374 + value = import "{tmp_path}"; 375 + set = if builtins.isFunction value then value {{}} else value; 376 376 in 377 377 builtins.mapAttrs (n: v: v.passthru.filePath) set.preAttr.config.system.build.images 378 378 """), ··· 687 687 688 688 689 689 @patch(get_qualified_name(n.run_wrapper, n), autospec=True) 690 - def test_switch_to_configuration(mock_run: Any, monkeypatch: Any) -> None: 690 + def test_switch_to_configuration(mock_run: Any, monkeypatch: MonkeyPatch) -> None: 691 691 profile_path = Path("/path/to/profile") 692 692 config_path = Path("/path/to/config") 693 693
+3 -1
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py
··· 1 1 from typing import Any 2 2 from unittest.mock import patch 3 3 4 + from pytest import MonkeyPatch 5 + 4 6 import nixos_rebuild.models as m 5 7 import nixos_rebuild.process as p 6 8 ··· 94 96 ) 95 97 96 98 97 - def test_remote_from_name(monkeypatch: Any) -> None: 99 + def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: 98 100 monkeypatch.setenv("NIX_SSHOPTS", "") 99 101 assert m.Remote.from_arg("user@localhost", None, False) == m.Remote( 100 102 "user@localhost",
+3 -3
pkgs/by-name/op/openpgp-card-tools/package.nix
··· 13 13 14 14 rustPlatform.buildRustPackage rec { 15 15 pname = "openpgp-card-tools"; 16 - version = "0.11.7"; 16 + version = "0.11.8"; 17 17 18 18 src = fetchFromGitea { 19 19 domain = "codeberg.org"; 20 20 owner = "openpgp-card"; 21 21 repo = "openpgp-card-tools"; 22 22 rev = "v${version}"; 23 - hash = "sha256-sR+jBCSuDH4YdJz3YuvA4EE36RHV3m/xU8hIEXXsqKo="; 23 + hash = "sha256-pE7AAgps8LlsmM97q/XIi7If1UwNP/0uJH9wOeZ6neM="; 24 24 }; 25 25 26 26 useFetchCargoVendor = true; 27 - cargoHash = "sha256-WFh6blk0sdpDVBsiQVXtXzVQBjAKJ2995PQ4voqxm+A="; 27 + cargoHash = "sha256-/OC/+eMRBF2MICVUtsJR0m62fWLP0lr10J/XkKGcPnA="; 28 28 29 29 nativeBuildInputs = [ 30 30 installShellFiles
+16
pkgs/by-name/re/renpy/noSteam.patch
··· 1 + diff --git a/renpy/common/00steam.rpy b/renpy/common/00steam.rpy 2 + index 9a5f9c405..68c8c26e0 100644 3 + --- a/renpy/common/00steam.rpy 4 + +++ b/renpy/common/00steam.rpy 5 + @@ -1029,11 +1029,6 @@ init -1499 python in achievement: 6 + steam = None 7 + steamapi = None 8 + 9 + - if renpy.windows or renpy.macintosh or renpy.linux: 10 + - steam_preinit() 11 + - steam_init() 12 + - 13 + - 14 + init 1500 python in achievement: 15 + 16 + # Steam position.
+3 -4
pkgs/by-name/re/renpy/package.nix
··· 16 16 zlib, 17 17 harfbuzz, 18 18 makeWrapper, 19 + withoutSteam ? true, 19 20 }: 20 21 21 22 let ··· 90 91 patches = [ 91 92 ./shutup-erofs-errors.patch 92 93 ./5687.patch 93 - ]; 94 + ] ++ lib.optional withoutSteam ./noSteam.patch; 94 95 95 96 postPatch = '' 96 97 cp tutorial/game/tutorial_director.rpy{m,} ··· 136 137 maintainers = with lib.maintainers; [ shadowrz ]; 137 138 }; 138 139 139 - passthru = { 140 - inherit base_version vc_version; 141 - }; 140 + passthru = { inherit base_version vc_version; }; 142 141 }
+2 -2
pkgs/by-name/ta/tangram/package.nix
··· 27 27 28 28 stdenv.mkDerivation rec { 29 29 pname = "tangram"; 30 - version = "3.1"; 30 + version = "3.3"; 31 31 32 32 src = fetchFromGitHub { 33 33 owner = "sonnyp"; 34 34 repo = "Tangram"; 35 35 rev = "v${version}"; 36 - hash = "sha256-vN9zRc8Ac9SI0lIcuf01A2WLqLGtV3DUiNzCSmc2ri4="; 36 + hash = "sha256-OtQN8Iigu92iKa7CAaslIpbS0bqJ9Vus++inrgV/eeM="; 37 37 fetchSubmodules = true; 38 38 }; 39 39
+2 -2
pkgs/by-name/ti/tippecanoe/package.nix
··· 10 10 11 11 stdenv.mkDerivation (finalAttrs: { 12 12 pname = "tippecanoe"; 13 - version = "2.74.0"; 13 + version = "2.75.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "felt"; 17 17 repo = "tippecanoe"; 18 18 rev = finalAttrs.version; 19 - hash = "sha256-LOy9q2Qc47DQxPkAt2mmlmrJUcoL+hBpm0dFI4oZo/0="; 19 + hash = "sha256-0ayEGmIUw5jI5utp689oxlFR15TeQ1gbLJIos4AXdd4="; 20 20 }; 21 21 22 22 buildInputs = [
+4 -4
pkgs/by-name/tu/tuisky/package.nix
··· 10 10 11 11 rustPlatform.buildRustPackage rec { 12 12 pname = "tuisky"; 13 - version = "0.1.5"; 13 + version = "0.2.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "sugyan"; 17 17 repo = "tuisky"; 18 18 tag = "v${version}"; 19 - hash = "sha256-phadkJgSvizSNPvrVaYu/+y1uAj6fmb9JQLdj0dEQIg="; 19 + hash = "sha256-s0eKWP4cga82Fj7KGIG6yLk67yOqGoAqfhvJINzytTw="; 20 20 }; 21 21 22 22 useFetchCargoVendor = true; 23 - cargoHash = "sha256-nY+9DOdpFxVA16DTL47rDbbeBPSrXxlC1+APzb4Kkbk="; 23 + cargoHash = "sha256-F/gEBEpcgNT0Q55zUTf8254yYIZI6RmiW9heCuljAEY="; 24 24 25 25 nativeBuildInputs = [ 26 26 pkg-config ··· 43 43 meta = { 44 44 description = "TUI client for bluesky"; 45 45 homepage = "https://github.com/sugyan/tuisky"; 46 - changelog = "https://github.com/sugyan/tuisky/blob/${lib.removePrefix "refs/tags/" src.rev}/CHANGELOG.md"; 46 + changelog = "https://github.com/sugyan/tuisky/blob/v${version}/CHANGELOG.md"; 47 47 license = lib.licenses.mit; 48 48 maintainers = with lib.maintainers; [ GaetanLepage ]; 49 49 mainProgram = "tuisky";
+3 -3
pkgs/by-name/tu/turbo-unwrapped/package.nix
··· 17 17 18 18 rustPlatform.buildRustPackage rec { 19 19 pname = "turbo-unwrapped"; 20 - version = "2.3.3"; 20 + version = "2.3.4"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "vercel"; 24 24 repo = "turbo"; 25 25 tag = "v${version}"; 26 - hash = "sha256-L51RgXUlA9hnVt232qdLo6t0kqXl7b01jotUk1r8wO0="; 26 + hash = "sha256-cvwYBdvBxkntCXA4FJMc54Rca+zoZEjyWZUQoMH9Qdc="; 27 27 }; 28 28 29 29 useFetchCargoVendor = true; 30 - cargoHash = "sha256-qv5bK65vA94M/YSjSRaYilg44NqkzF2ybmUVapu8cpI="; 30 + cargoHash = "sha256-e9xq3xc8Rtuq3e/3IEwj9eR9SEj5N4bvsu4PFubm8mM="; 31 31 32 32 nativeBuildInputs = 33 33 [
+3 -3
pkgs/by-name/uv/uv/package.nix
··· 17 17 18 18 rustPlatform.buildRustPackage rec { 19 19 pname = "uv"; 20 - version = "0.5.25"; 20 + version = "0.5.26"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "astral-sh"; 24 24 repo = "uv"; 25 25 tag = version; 26 - hash = "sha256-nDZaS3Yc7Z8gKyl2+HTpwoTTJKJDZCTQIiZazICvlvQ="; 26 + hash = "sha256-Rp6DexvMbUdE7i8hik4MC2sW/VFmpxJFfF7ukc49VlE="; 27 27 }; 28 28 29 29 useFetchCargoVendor = true; 30 - cargoHash = "sha256-GWlL5NZwHfkOfl16Eh38xo4OETmy/HFFeOZCGDruluI="; 30 + cargoHash = "sha256-MZKrkxy7bXQ3lTrPwCRT8nAR8fP+SeZmBEMQrXlvkYo="; 31 31 32 32 nativeBuildInputs = [ 33 33 cmake
+5
pkgs/by-name/wh/whisper-ctranslate2/package.nix
··· 51 51 license = lib.licenses.mit; 52 52 maintainers = with lib.maintainers; [ happysalada ]; 53 53 mainProgram = "whisper-ctranslate2"; 54 + badPlatforms = [ 55 + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' 56 + # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:320 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. 57 + "aarch64-linux" 58 + ]; 54 59 }; 55 60 }
+8 -21
pkgs/by-name/zx/zxpy/package.nix
··· 2 2 lib, 3 3 python3, 4 4 fetchFromGitHub, 5 - fetchpatch, 6 5 deterministic-uname, 7 6 }: 8 - 9 7 python3.pkgs.buildPythonApplication rec { 10 8 pname = "zxpy"; 11 - version = "1.6.3"; 12 - format = "pyproject"; 9 + version = "1.6.4"; 10 + pyproject = true; 13 11 14 12 src = fetchFromGitHub { 15 13 owner = "tusharsadhwani"; 16 14 repo = "zxpy"; 17 - rev = version; 18 - hash = "sha256-/sOLSIqaAUkaAghPqe0Zoq7C8CSKAd61o8ivtjJFcJY="; 15 + tag = version; 16 + hash = "sha256-/VITHN517lPUmhLYgJHBYYvvlJdGg2Hhnwk47Mp9uc0="; 19 17 }; 20 18 21 - patches = [ 22 - # fix test caused by `uname -p` printing unknown 23 - # https://github.com/tusharsadhwani/zxpy/pull/53 24 - (fetchpatch { 25 - name = "allow-unknown-processor-in-injection-test.patch"; 26 - url = "https://github.com/tusharsadhwani/zxpy/commit/95ad80caddbab82346f60ad80a601258fd1238c9.patch"; 27 - hash = "sha256-iXasOKjWuxNjjTpb0umNMNhbFgBjsu5LsOpTaXllATM="; 28 - }) 29 - ]; 30 - 31 - nativeBuildInputs = [ 19 + build-system = [ 32 20 python3.pkgs.setuptools 33 - python3.pkgs.wheel 34 21 ]; 35 22 36 23 nativeCheckInputs = [ ··· 44 31 45 32 pythonImportsCheck = [ "zx" ]; 46 33 47 - meta = with lib; { 34 + meta = { 48 35 description = "Shell scripts made simple"; 49 36 homepage = "https://github.com/tusharsadhwani/zxpy"; 50 37 changelog = "https://github.com/tusharsadhwani/zxpy/releases/tag/${version}"; 51 - license = licenses.mit; 52 - maintainers = with maintainers; [ figsoda ]; 38 + license = lib.licenses.mit; 39 + maintainers = with lib.maintainers; [ figsoda ]; 53 40 mainProgram = "zxpy"; 54 41 }; 55 42 }
+2 -2
pkgs/desktops/lxqt/lximage-qt/default.nix
··· 21 21 22 22 stdenv.mkDerivation rec { 23 23 pname = "lximage-qt"; 24 - version = "2.1.0"; 24 + version = "2.1.1"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "lxqt"; 28 28 repo = pname; 29 29 rev = version; 30 - hash = "sha256-08HEPTbZw4CCq3A9KxMKeT/X1notXwsV1sSSgtRFPO0="; 30 + hash = "sha256-Y9lBXEROC4LIl1M7js0TvJBBNyO06qCWpHxvQjcYPhc="; 31 31 }; 32 32 33 33 nativeBuildInputs = [
+2 -2
pkgs/desktops/lxqt/lxqt-runner/default.nix
··· 23 23 24 24 stdenv.mkDerivation rec { 25 25 pname = "lxqt-runner"; 26 - version = "2.1.0"; 26 + version = "2.1.2"; 27 27 28 28 src = fetchFromGitHub { 29 29 owner = "lxqt"; 30 30 repo = pname; 31 31 rev = version; 32 - hash = "sha256-NsAlaoWMvisRZ04KkrQzwi5B2eXnaHqg0HtYG4NKLcs="; 32 + hash = "sha256-AJLm6bjlM6cq9PNrM8eyvX4xN6lUxVSzgJs4+p/11ug="; 33 33 }; 34 34 35 35 nativeBuildInputs = [
+5 -5
pkgs/development/lua-modules/generated-packages.nix
··· 2565 2565 lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: 2566 2566 buildLuarocksPackage { 2567 2567 pname = "lze"; 2568 - version = "0.4.5-1"; 2568 + version = "0.6.3-1"; 2569 2569 knownRockspec = (fetchurl { 2570 - url = "mirror://luarocks/lze-0.4.5-1.rockspec"; 2571 - sha256 = "1r029y9d8dvl5ynwspxq6168x0bg3qyf5m1x9yrqvb52mk0dyhbq"; 2570 + url = "mirror://luarocks/lze-0.6.3-1.rockspec"; 2571 + sha256 = "1g1snlzpqkmb3wlahdz2zd2ivrz1kqvszriznix612ziwd6i9iij"; 2572 2572 }).outPath; 2573 2573 src = fetchzip { 2574 - url = "https://github.com/BirdeeHub/lze/archive/v0.4.5.zip"; 2575 - sha256 = "0lsy7ikwqnpis8mwha4sl5i0v6x51xxravnsdjvy6fvcr6jbp51r"; 2574 + url = "https://github.com/BirdeeHub/lze/archive/v0.6.3.zip"; 2575 + sha256 = "02rjd1z4dznacn9m8smd141qaml9jyfgbgyb3vrxnx8irh50mbzl"; 2576 2576 }; 2577 2577 2578 2578 disabled = luaOlder "5.1";
+1 -1
pkgs/development/python-modules/keystoneauth1/default.nix
··· 58 58 optional-dependencies = { 59 59 betamax = [ 60 60 betamax 61 - fixtures 62 61 pyyaml 63 62 ]; 64 63 kerberos = [ requests-kerberos ]; ··· 67 66 }; 68 67 69 68 nativeCheckInputs = [ 69 + fixtures 70 70 hacking 71 71 oslo-config 72 72 oslo-utils
+66
pkgs/development/python-modules/podgen/default.nix
··· 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchFromGitHub, 5 + setuptools, 6 + dateutils, 7 + future, 8 + lxml, 9 + python-dateutil, 10 + pytz, 11 + requests, 12 + tinytag, 13 + pytest-mock, 14 + pytestCheckHook, 15 + }: 16 + 17 + buildPythonPackage rec { 18 + pname = "podgen"; 19 + version = "1.1.0"; 20 + pyproject = true; 21 + 22 + src = fetchFromGitHub { 23 + owner = "tobinus"; 24 + repo = "python-podgen"; 25 + tag = "v${version}"; 26 + hash = "sha256-IlTbKWNdEHJmEPdslKphZLB5IVERxNL/wqCMbJDHkD4="; 27 + }; 28 + 29 + build-system = [ 30 + setuptools 31 + ]; 32 + 33 + dependencies = [ 34 + dateutils 35 + future 36 + lxml 37 + python-dateutil 38 + pytz 39 + requests 40 + tinytag 41 + ]; 42 + 43 + pythonImportsCheck = [ "podgen" ]; 44 + 45 + nativeCheckInputs = [ 46 + pytest-mock 47 + pytestCheckHook 48 + ]; 49 + 50 + disabledTestPaths = [ 51 + # test requires downloading content 52 + "podgen/tests/test_media.py" 53 + ]; 54 + 55 + meta = { 56 + description = "Python module to generate Podcast feeds"; 57 + downloadPage = "https://github.com/tobinus/python-podgen"; 58 + changelog = "https://github.com/tobinus/python-podgen/blob/v${version}/CHANGELOG.md"; 59 + homepage = "https://podgen.readthedocs.io/en/latest/"; 60 + license = with lib.licenses; [ 61 + bsd2 62 + lgpl3 63 + ]; 64 + maintainers = with lib.maintainers; [ ethancedwards8 ]; 65 + }; 66 + }
+5 -9
pkgs/development/python-modules/python-swiftclient/default.nix
··· 14 14 buildPythonPackage rec { 15 15 pname = "python-swiftclient"; 16 16 version = "4.6.0"; 17 - format = "setuptools"; 17 + pyproject = true; 18 18 19 19 disabled = pythonOlder "3.6"; 20 20 ··· 23 23 hash = "sha256-1NGFQEE4k/wWrYd5HXQPgj92NDXoIS5o61PWDaJjgjM="; 24 24 }; 25 25 26 - # remove duplicate script that will be created by setuptools from the 27 - # entry_points section of setup.cfg 28 - postPatch = '' 29 - sed -i '/^scripts =/d' setup.cfg 30 - sed -i '/bin\/swift/d' setup.cfg 31 - ''; 32 - 33 26 nativeBuildInputs = [ installShellFiles ]; 34 27 35 - propagatedBuildInputs = [ 28 + build-system = [ 36 29 pbr 30 + ]; 31 + 32 + dependencies = [ 37 33 python-keystoneclient 38 34 ]; 39 35
+37
pkgs/development/python-modules/tivars/default.nix
··· 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchFromGitHub, 5 + setuptools, 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "tivars"; 10 + version = "0.9.2"; 11 + pyproject = true; 12 + 13 + src = fetchFromGitHub { 14 + owner = "TI-Toolkit"; 15 + repo = "tivars_lib_py"; 16 + tag = "v${version}"; 17 + hash = "sha256-4c5wRv78Rql9k98WNT58As/Ir1YJpTeoBdkft9TIn7o="; 18 + fetchSubmodules = true; 19 + }; 20 + 21 + build-system = [ 22 + setuptools 23 + ]; 24 + 25 + pythonImportsCheck = [ "tivars" ]; 26 + 27 + # no upstream tests exist 28 + doCheck = false; 29 + 30 + meta = { 31 + description = "Python library for interacting with TI-(e)z80 (82/83/84 series) calculator files"; 32 + license = lib.licenses.mit; 33 + homepage = "https://ti-toolkit.github.io/tivars_lib_py/"; 34 + changelog = "https://github.com/TI-Toolkit/tivars_lib_py/releases/tag/v${version}/CHANGELOG.md"; 35 + maintainers = with lib.maintainers; [ ethancedwards8 ]; 36 + }; 37 + }
-93
pkgs/games/ja2-stracciatella/default.nix
··· 1 - { 2 - stdenv, 3 - lib, 4 - fetchurl, 5 - fetchFromGitHub, 6 - cmake, 7 - python3, 8 - rustPlatform, 9 - SDL2, 10 - fltk, 11 - rapidjson, 12 - gtest, 13 - Carbon, 14 - Cocoa, 15 - }: 16 - let 17 - version = "0.17.0"; 18 - src = fetchFromGitHub { 19 - owner = "ja2-stracciatella"; 20 - repo = "ja2-stracciatella"; 21 - rev = "v${version}"; 22 - sha256 = "0m6rvgkba29jy3yq5hs1sn26mwrjl6mamqnv4plrid5fqaivhn6j"; 23 - }; 24 - libstracciatella = rustPlatform.buildRustPackage { 25 - pname = "libstracciatella"; 26 - inherit version; 27 - src = "${src}/rust"; 28 - cargoHash = "sha256-asUt+wUpwwDvSyuNZds6yMC4Ef4D8woMYWamzcJJiy4="; 29 - 30 - preBuild = '' 31 - mkdir -p $out/include/stracciatella 32 - export HEADER_LOCATION=$out/include/stracciatella/stracciatella.h 33 - ''; 34 - }; 35 - stringTheoryUrl = "https://github.com/zrax/string_theory/archive/3.1.tar.gz"; 36 - stringTheory = fetchurl { 37 - url = stringTheoryUrl; 38 - sha256 = "1flq26kkvx2m1yd38ldcq2k046yqw07jahms8a6614m924bmbv41"; 39 - }; 40 - in 41 - stdenv.mkDerivation { 42 - pname = "ja2-stracciatella"; 43 - inherit src version; 44 - 45 - nativeBuildInputs = [ 46 - cmake 47 - python3 48 - ]; 49 - buildInputs = 50 - [ 51 - SDL2 52 - fltk 53 - rapidjson 54 - gtest 55 - ] 56 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 57 - Carbon 58 - Cocoa 59 - ]; 60 - 61 - patches = [ 62 - ./remove-rust-buildstep.patch 63 - ]; 64 - 65 - preConfigure = '' 66 - # Use rust library built with nix 67 - substituteInPlace CMakeLists.txt \ 68 - --replace lib/libstracciatella_c_api.a ${libstracciatella}/lib/libstracciatella_c_api.a \ 69 - --replace include/stracciatella ${libstracciatella}/include/stracciatella \ 70 - --replace bin/ja2-resource-pack ${libstracciatella}/bin/ja2-resource-pack 71 - 72 - # Patch dependencies that are usually loaded by url 73 - substituteInPlace dependencies/lib-string_theory/builder/CMakeLists.txt.in \ 74 - --replace ${stringTheoryUrl} file://${stringTheory} 75 - 76 - cmakeFlagsArray+=("-DLOCAL_RAPIDJSON_LIB=OFF" "-DLOCAL_GTEST_LIB=OFF" "-DEXTRA_DATA_DIR=$out/share/ja2") 77 - ''; 78 - 79 - # error: 'uint64_t' does not name a type 80 - # gcc13 and above don't automatically include cstdint 81 - env.CXXFLAGS = "-include cstdint"; 82 - 83 - doInstallCheck = true; 84 - installCheckPhase = '' 85 - HOME=/tmp $out/bin/ja2 -unittests 86 - ''; 87 - 88 - meta = { 89 - description = "Jagged Alliance 2, with community fixes"; 90 - license = "SFI Source Code license agreement"; 91 - homepage = "https://ja2-stracciatella.github.io/"; 92 - }; 93 - }
-73
pkgs/games/ja2-stracciatella/remove-rust-buildstep.patch
··· 1 - diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index e4e5547af..a3017d197 100644 3 - --- a/CMakeLists.txt 4 - +++ b/CMakeLists.txt 5 - @@ -175,13 +175,12 @@ if(BUILD_LAUNCHER) 6 - endif() 7 - message(STATUS "Fltk Libraries: ${FLTK_LIBRARIES}") 8 - 9 - -set(JA2_INCLUDES "") 10 - +set(JA2_INCLUDES "include/stracciatella") 11 - set(JA2_SOURCES "") 12 - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/externalized") 13 - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/game") 14 - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sgp") 15 - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-smacker") 16 - -add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-stracciatella") 17 - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-string_theory") 18 - 19 - if(BUILD_LAUNCHER) 20 - @@ -239,14 +238,12 @@ string(LENGTH "${CMAKE_SOURCE_DIR}/src/" SOURCE_PATH_SIZE) 21 - add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}") 22 - 23 - add_executable(${JA2_BINARY} ${JA2_SOURCES}) 24 - -target_link_libraries(${JA2_BINARY} ${SDL2_LIBRARY} ${GTEST_LIBRARIES} smacker ${STRACCIATELLA_LIBRARIES} string_theory-internal) 25 - -add_dependencies(${JA2_BINARY} stracciatella) 26 - +target_link_libraries(${JA2_BINARY} ${SDL2_LIBRARY} ${GTEST_LIBRARIES} smacker lib/libstracciatella_c_api.a dl pthread string_theory-internal) 27 - set_property(SOURCE ${CMAKE_SOURCE_DIR}/src/game/GameVersion.cc APPEND PROPERTY COMPILE_DEFINITIONS "GAME_VERSION=v${ja2-stracciatella_VERSION}") 28 - 29 - if(BUILD_LAUNCHER) 30 - add_executable(${LAUNCHER_BINARY} ${LAUNCHER_SOURCES}) 31 - - target_link_libraries(${LAUNCHER_BINARY} ${FLTK_LIBRARIES} ${STRACCIATELLA_LIBRARIES} string_theory-internal) 32 - - add_dependencies(${LAUNCHER_BINARY} stracciatella) 33 - + target_link_libraries(${LAUNCHER_BINARY} ${FLTK_LIBRARIES} lib/libstracciatella_c_api.a dl pthread string_theory-internal) 34 - endif() 35 - 36 - macro(copy_assets_dir_to_ja2_binary_after_build DIR) 37 - @@ -375,12 +372,12 @@ set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${PACKAGE_ 38 - 39 - include(CPack) 40 - 41 - -if (UNIX AND NOT MINGW AND NOT APPLE) 42 - +if (UNIX) 43 - install(TARGETS ${JA2_BINARY} RUNTIME DESTINATION bin) 44 - if(BUILD_LAUNCHER) 45 - install(TARGETS ${LAUNCHER_BINARY} RUNTIME DESTINATION bin) 46 - endif() 47 - - install(PROGRAMS "${CMAKE_BINARY_DIR}/lib-stracciatella/bin/ja2-resource-pack${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION bin) 48 - + install(PROGRAMS "bin/ja2-resource-pack" DESTINATION bin) 49 - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/externalized assets/mods assets/unittests DESTINATION share/ja2) 50 - if(WITH_EDITOR_SLF) 51 - install(FILES "${EDITORSLF_FILE}" DESTINATION share/ja2) 52 - @@ -400,7 +397,7 @@ else() 53 - if(BUILD_LAUNCHER) 54 - install(TARGETS ${LAUNCHER_BINARY} RUNTIME DESTINATION .) 55 - endif() 56 - - install(PROGRAMS "${CMAKE_BINARY_DIR}/lib-stracciatella/bin/ja2-resource-pack${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION .) 57 - + install(PROGRAMS "bin/ja2-resource-pack" DESTINATION .) 58 - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/externalized assets/mods assets/unittests DESTINATION .) 59 - if(WITH_EDITOR_SLF) 60 - install(FILES "${EDITORSLF_FILE}" DESTINATION .) 61 - @@ -428,12 +425,6 @@ if (MINGW) 62 - install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install-dlls-mingw.cmake") 63 - endif() 64 - 65 - -if(APPLE) 66 - - file(GLOB APPLE_DIST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/assets/distr-files-mac/*.txt") 67 - - install(FILES ${APPLE_DIST_FILES} DESTINATION .) 68 - - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/lib-SDL2-2.0.8-macos/SDL2.framework DESTINATION .) 69 - -endif() 70 - - 71 - ## Uninstall 72 - 73 - add_custom_templated_target("uninstall")
+12 -5
pkgs/servers/sql/mysql/8.0.x.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchurl, 5 + fetchpatch, 5 6 bison, 6 7 cmake, 7 8 pkg-config, ··· 47 48 48 49 patches = [ 49 50 ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch 51 + # Fix compilation with LLVM 19, adapted from https://github.com/mysql/mysql-server/commit/3a51d7fca76e02257f5c42b6a4fc0c5426bf0421 52 + # in https://github.com/NixOS/nixpkgs/pull/374591#issuecomment-2615855076 53 + ./libcpp-fixes.patch 54 + (fetchpatch { 55 + url = "https://github.com/mysql/mysql-server/commit/4a5c00d26f95faa986ffed7a15ee15e868e9dcf2.patch"; 56 + hash = "sha256-MEl1lQlDYtFjHk0+S02RQFnxMr+YeFxAyNjpDtVHyeE="; 57 + }) 50 58 ]; 51 59 52 60 ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. 53 - postPatch = '' 54 - substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool 55 - substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool 61 + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' 62 + substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool 63 + substituteInPlace cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool ${cctools}/bin/libtool 64 + substituteInPlace cmake/package_name.cmake --replace-fail "COMMAND sw_vers" "COMMAND ${DarwinTools}/bin/sw_vers" 56 65 ''; 57 66 58 67 buildInputs = ··· 77 86 libtirpc 78 87 ] 79 88 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 80 - cctools 81 89 CoreServices 82 90 developer_cmds 83 - DarwinTools 84 91 ]; 85 92 86 93 strictDeps = true;
+183
pkgs/servers/sql/mysql/libcpp-fixes.patch
··· 1 + diff --git a/include/my_char_traits.h b/include/my_char_traits.h 2 + new file mode 100644 3 + index 00000000..6336bc03 4 + --- /dev/null 5 + +++ b/include/my_char_traits.h 6 + @@ -0,0 +1,65 @@ 7 + +/* Copyright (c) 2024, Oracle and/or its affiliates. 8 + + 9 + + This program is free software; you can redistribute it and/or modify 10 + + it under the terms of the GNU General Public License, version 2.0, 11 + + as published by the Free Software Foundation. 12 + + 13 + + This program is designed to work with certain software (including 14 + + but not limited to OpenSSL) that is licensed under separate terms, 15 + + as designated in a particular file or component or in included license 16 + + documentation. The authors of MySQL hereby grant you an additional 17 + + permission to link the program and your derivative works with the 18 + + separately licensed software that they have either included with 19 + + the program or referenced in the documentation. 20 + + 21 + + This program is distributed in the hope that it will be useful, 22 + + but WITHOUT ANY WARRANTY; without even the implied warranty of 23 + + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 + + GNU General Public License, version 2.0, for more details. 25 + + 26 + + You should have received a copy of the GNU General Public License 27 + + along with this program; if not, write to the Free Software 28 + + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ 29 + + 30 + +#ifndef MY_CHAR_TRAITS_INCLUDED 31 + +#define MY_CHAR_TRAITS_INCLUDED 32 + + 33 + +#include <cstring> 34 + + 35 + +template <class CharT> 36 + +struct my_char_traits; 37 + + 38 + +/* 39 + + This is a standards-compliant, drop-in replacement for 40 + + std::char_traits<unsigned char> 41 + + We need this because clang libc++ is removing support for it in clang 19. 42 + + It is not a complete implementation. Rather we implement just enough to 43 + + compile any usage of char_traits<uchar> we have in our codebase. 44 + + */ 45 + +template <> 46 + +struct my_char_traits<unsigned char> { 47 + + using char_type = unsigned char; 48 + + using int_type = unsigned int; 49 + + 50 + + static void assign(char_type &c1, const char_type &c2) { c1 = c2; } 51 + + 52 + + static char_type *assign(char_type *s, std::size_t n, char_type a) { 53 + + return static_cast<char_type *>(memset(s, a, n)); 54 + + } 55 + + 56 + + static int compare(const char_type *s1, const char_type *s2, std::size_t n) { 57 + + return memcmp(s1, s2, n); 58 + + } 59 + + 60 + + static char_type *move(char_type *s1, const char_type *s2, std::size_t n) { 61 + + if (n == 0) return s1; 62 + + return static_cast<char_type *>(memmove(s1, s2, n)); 63 + + } 64 + + 65 + + static char_type *copy(char_type *s1, const char_type *s2, std::size_t n) { 66 + + if (n == 0) return s1; 67 + + return static_cast<char_type *>(memcpy(s1, s2, n)); 68 + + } 69 + +}; 70 + + 71 + +#endif // MY_CHAR_TRAITS_INCLUDED 72 + diff --git a/sql/mdl_context_backup.h b/sql/mdl_context_backup.h 73 + index 89e7e23d..cf9c307e 100644 74 + --- a/sql/mdl_context_backup.h 75 + +++ b/sql/mdl_context_backup.h 76 + @@ -28,6 +28,7 @@ 77 + #include <map> 78 + #include <memory> 79 + 80 + +#include "my_char_traits.h" 81 + #include "sql/malloc_allocator.h" 82 + #include "sql/mdl.h" 83 + 84 + @@ -47,7 +48,8 @@ class MDL_context_backup_manager { 85 + /** 86 + Key for uniquely identifying MDL_context in the MDL_context_backup map. 87 + */ 88 + - typedef std::basic_string<uchar> MDL_context_backup_key; 89 + + using MDL_context_backup_key = 90 + + std::basic_string<uchar, my_char_traits<uchar>>; 91 + 92 + class MDL_context_backup; 93 + 94 + diff --git a/sql/stream_cipher.h b/sql/stream_cipher.h 95 + index 606d4064..358fbb41 100644 96 + --- a/sql/stream_cipher.h 97 + +++ b/sql/stream_cipher.h 98 + @@ -28,6 +28,8 @@ 99 + #include <memory> 100 + #include <string> 101 + 102 + +#include "my_char_traits.h" 103 + + 104 + /** 105 + @file stream_cipher.h 106 + 107 + @@ -35,7 +37,8 @@ 108 + binary log files. 109 + */ 110 + 111 + -typedef std::basic_string<unsigned char> Key_string; 112 + +using Key_string = 113 + + std::basic_string<unsigned char, my_char_traits<unsigned char>>; 114 + 115 + /** 116 + @class Stream_cipher 117 + diff --git a/unittest/gunit/binlogevents/transaction_compression-t.cc b/unittest/gunit/binlogevents/transaction_compression-t.cc 118 + index ba13f979..01af0e3a 100644 119 + --- a/unittest/gunit/binlogevents/transaction_compression-t.cc 120 + +++ b/unittest/gunit/binlogevents/transaction_compression-t.cc 121 + @@ -23,6 +23,7 @@ 122 + */ 123 + 124 + #include <array> 125 + +#include <string> 126 + 127 + #include <gtest/gtest.h> 128 + #include "libbinlogevents/include/binary_log.h" 129 + @@ -51,14 +52,13 @@ class TransactionPayloadCompressionTest : public ::testing::Test { 130 + using Managed_buffer_t = Decompressor_t::Managed_buffer_t; 131 + using Size_t = Decompressor_t::Size_t; 132 + using Char_t = Decompressor_t::Char_t; 133 + - using String_t = std::basic_string<Char_t>; 134 + using Decompress_status_t = 135 + binary_log::transaction::compression::Decompress_status; 136 + using Compress_status_t = 137 + binary_log::transaction::compression::Compress_status; 138 + 139 + - static String_t constant_data(Size_t size) { 140 + - return String_t(size, (Char_t)'a'); 141 + + static std::string constant_data(Size_t size) { 142 + + return std::string(size, (Char_t)'a'); 143 + } 144 + 145 + protected: 146 + @@ -69,7 +69,7 @@ class TransactionPayloadCompressionTest : public ::testing::Test { 147 + void TearDown() override {} 148 + 149 + static void compression_idempotency_test(Compressor_t &c, Decompressor_t &d, 150 + - String_t data) { 151 + + const std::string &data) { 152 + auto debug_string = concat( 153 + binary_log::transaction::compression::type_to_string(c.get_type_code()), 154 + " ", data.size()); 155 + @@ -104,8 +104,8 @@ class TransactionPayloadCompressionTest : public ::testing::Test { 156 + 157 + // Check decompressed data 158 + ASSERT_EQ(managed_buffer.read_part().size(), data.size()) << debug_string; 159 + - ASSERT_EQ(data, String_t(managed_buffer.read_part().begin(), 160 + - managed_buffer.read_part().end())) 161 + + ASSERT_EQ(data, std::string(managed_buffer.read_part().begin(), 162 + + managed_buffer.read_part().end())) 163 + << debug_string; 164 + 165 + // Check that we reached EOF 166 + @@ -118,7 +118,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressZstdTest) { 167 + for (auto size : buffer_sizes) { 168 + binary_log::transaction::compression::Zstd_dec d; 169 + binary_log::transaction::compression::Zstd_comp c; 170 + - String_t data{TransactionPayloadCompressionTest::constant_data(size)}; 171 + + std::string data{TransactionPayloadCompressionTest::constant_data(size)}; 172 + TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data); 173 + c.set_compression_level(22); 174 + TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data); 175 + @@ -129,7 +129,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressNoneTest) { 176 + for (auto size : buffer_sizes) { 177 + binary_log::transaction::compression::None_dec d; 178 + binary_log::transaction::compression::None_comp c; 179 + - String_t data{TransactionPayloadCompressionTest::constant_data(size)}; 180 + + std::string data{TransactionPayloadCompressionTest::constant_data(size)}; 181 + TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data); 182 + } 183 + }
+4 -4
pkgs/servers/teleport/15/default.nix
··· 2 2 import ../generic.nix ( 3 3 args 4 4 // { 5 - version = "15.4.21"; 6 - hash = "sha256-n5dAJ5ilq5nHo3neQzCUFnDRwLhArwleMSho4/g0MT4="; 7 - vendorHash = "sha256-bW8ztNeSzxUNtbuBtxIya9TeGfktC+/fz9iXB0GL0Mg="; 8 - yarnHash = "sha256-ZaLLrcwAeq6TQ1SaA2few4s0HqktOZEpxCTcNGloGfk="; 5 + version = "15.4.26"; 6 + hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o="; 7 + vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA="; 8 + yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY="; 9 9 cargoLock = { 10 10 lockFile = ./Cargo.lock; 11 11 outputHashes = {
+362 -178
pkgs/servers/teleport/16/Cargo.lock
··· 204 204 205 205 [[package]] 206 206 name = "aws-lc-rs" 207 - version = "1.8.1" 207 + version = "1.9.0" 208 208 source = "registry+https://github.com/rust-lang/crates.io-index" 209 - checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" 209 + checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" 210 210 dependencies = [ 211 211 "aws-lc-sys", 212 212 "mirai-annotations", ··· 216 216 217 217 [[package]] 218 218 name = "aws-lc-sys" 219 - version = "0.20.1" 219 + version = "0.21.2" 220 220 source = "registry+https://github.com/rust-lang/crates.io-index" 221 - checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" 221 + checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" 222 222 dependencies = [ 223 223 "bindgen 0.69.4", 224 224 "cc", ··· 249 249 version = "0.2.0" 250 250 source = "registry+https://github.com/rust-lang/crates.io-index" 251 251 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" 252 - 253 - [[package]] 254 - name = "base64" 255 - version = "0.21.7" 256 - source = "registry+https://github.com/rust-lang/crates.io-index" 257 - checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" 258 252 259 253 [[package]] 260 254 name = "base64" ··· 396 390 397 391 [[package]] 398 392 name = "bytes" 399 - version = "1.7.1" 393 + version = "1.9.0" 400 394 source = "registry+https://github.com/rust-lang/crates.io-index" 401 - checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" 395 + checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" 402 396 403 397 [[package]] 404 398 name = "cbc" ··· 838 832 839 833 [[package]] 840 834 name = "errno" 841 - version = "0.3.9" 835 + version = "0.3.10" 842 836 source = "registry+https://github.com/rust-lang/crates.io-index" 843 - checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" 837 + checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" 844 838 dependencies = [ 845 839 "libc", 846 - "windows-sys 0.52.0", 840 + "windows-sys 0.59.0", 847 841 ] 848 842 849 843 [[package]] 850 844 name = "fastrand" 851 - version = "2.1.0" 845 + version = "2.1.1" 852 846 source = "registry+https://github.com/rust-lang/crates.io-index" 853 - checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" 847 + checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" 854 848 855 849 [[package]] 856 850 name = "ff" ··· 1260 1254 ] 1261 1255 1262 1256 [[package]] 1257 + name = "icu_collections" 1258 + version = "1.5.0" 1259 + source = "registry+https://github.com/rust-lang/crates.io-index" 1260 + checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" 1261 + dependencies = [ 1262 + "displaydoc", 1263 + "yoke", 1264 + "zerofrom", 1265 + "zerovec", 1266 + ] 1267 + 1268 + [[package]] 1269 + name = "icu_locid" 1270 + version = "1.5.0" 1271 + source = "registry+https://github.com/rust-lang/crates.io-index" 1272 + checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" 1273 + dependencies = [ 1274 + "displaydoc", 1275 + "litemap", 1276 + "tinystr", 1277 + "writeable", 1278 + "zerovec", 1279 + ] 1280 + 1281 + [[package]] 1282 + name = "icu_locid_transform" 1283 + version = "1.5.0" 1284 + source = "registry+https://github.com/rust-lang/crates.io-index" 1285 + checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" 1286 + dependencies = [ 1287 + "displaydoc", 1288 + "icu_locid", 1289 + "icu_locid_transform_data", 1290 + "icu_provider", 1291 + "tinystr", 1292 + "zerovec", 1293 + ] 1294 + 1295 + [[package]] 1296 + name = "icu_locid_transform_data" 1297 + version = "1.5.0" 1298 + source = "registry+https://github.com/rust-lang/crates.io-index" 1299 + checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" 1300 + 1301 + [[package]] 1302 + name = "icu_normalizer" 1303 + version = "1.5.0" 1304 + source = "registry+https://github.com/rust-lang/crates.io-index" 1305 + checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" 1306 + dependencies = [ 1307 + "displaydoc", 1308 + "icu_collections", 1309 + "icu_normalizer_data", 1310 + "icu_properties", 1311 + "icu_provider", 1312 + "smallvec", 1313 + "utf16_iter", 1314 + "utf8_iter", 1315 + "write16", 1316 + "zerovec", 1317 + ] 1318 + 1319 + [[package]] 1320 + name = "icu_normalizer_data" 1321 + version = "1.5.0" 1322 + source = "registry+https://github.com/rust-lang/crates.io-index" 1323 + checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" 1324 + 1325 + [[package]] 1326 + name = "icu_properties" 1327 + version = "1.5.1" 1328 + source = "registry+https://github.com/rust-lang/crates.io-index" 1329 + checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" 1330 + dependencies = [ 1331 + "displaydoc", 1332 + "icu_collections", 1333 + "icu_locid_transform", 1334 + "icu_properties_data", 1335 + "icu_provider", 1336 + "tinystr", 1337 + "zerovec", 1338 + ] 1339 + 1340 + [[package]] 1341 + name = "icu_properties_data" 1342 + version = "1.5.0" 1343 + source = "registry+https://github.com/rust-lang/crates.io-index" 1344 + checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" 1345 + 1346 + [[package]] 1347 + name = "icu_provider" 1348 + version = "1.5.0" 1349 + source = "registry+https://github.com/rust-lang/crates.io-index" 1350 + checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" 1351 + dependencies = [ 1352 + "displaydoc", 1353 + "icu_locid", 1354 + "icu_provider_macros", 1355 + "stable_deref_trait", 1356 + "tinystr", 1357 + "writeable", 1358 + "yoke", 1359 + "zerofrom", 1360 + "zerovec", 1361 + ] 1362 + 1363 + [[package]] 1364 + name = "icu_provider_macros" 1365 + version = "1.5.0" 1366 + source = "registry+https://github.com/rust-lang/crates.io-index" 1367 + checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" 1368 + dependencies = [ 1369 + "proc-macro2", 1370 + "quote", 1371 + "syn 2.0.68", 1372 + ] 1373 + 1374 + [[package]] 1263 1375 name = "idna" 1264 - version = "0.5.0" 1376 + version = "1.0.3" 1265 1377 source = "registry+https://github.com/rust-lang/crates.io-index" 1266 - checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" 1378 + checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" 1267 1379 dependencies = [ 1268 - "unicode-bidi", 1269 - "unicode-normalization", 1380 + "idna_adapter", 1381 + "smallvec", 1382 + "utf8_iter", 1383 + ] 1384 + 1385 + [[package]] 1386 + name = "idna_adapter" 1387 + version = "1.2.0" 1388 + source = "registry+https://github.com/rust-lang/crates.io-index" 1389 + checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" 1390 + dependencies = [ 1391 + "icu_normalizer", 1392 + "icu_properties", 1270 1393 ] 1271 1394 1272 1395 [[package]] ··· 1310 1433 dependencies = [ 1311 1434 "console_error_panic_hook", 1312 1435 "getrandom", 1436 + "ironrdp-core", 1313 1437 "ironrdp-graphics", 1314 1438 "ironrdp-pdu", 1315 1439 "ironrdp-session", ··· 1325 1449 1326 1450 [[package]] 1327 1451 name = "ironrdp-async" 1328 - version = "0.1.0" 1329 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1452 + version = "0.2.0" 1453 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1330 1454 dependencies = [ 1331 1455 "bytes", 1332 1456 "ironrdp-connector", 1457 + "ironrdp-core", 1333 1458 "ironrdp-pdu", 1334 1459 "tracing", 1335 1460 ] ··· 1337 1462 [[package]] 1338 1463 name = "ironrdp-cliprdr" 1339 1464 version = "0.1.0" 1340 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1465 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1341 1466 dependencies = [ 1342 1467 "bitflags 2.6.0", 1468 + "ironrdp-core", 1343 1469 "ironrdp-pdu", 1344 1470 "ironrdp-svc", 1345 1471 "thiserror", ··· 1348 1474 1349 1475 [[package]] 1350 1476 name = "ironrdp-connector" 1351 - version = "0.1.0" 1352 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1477 + version = "0.2.1" 1478 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1353 1479 dependencies = [ 1480 + "ironrdp-core", 1354 1481 "ironrdp-error", 1355 1482 "ironrdp-pdu", 1356 1483 "ironrdp-svc", 1357 1484 "picky", 1358 - "picky-asn1-der 0.5.0", 1359 - "picky-asn1-x509 0.13.0", 1485 + "picky-asn1-der", 1486 + "picky-asn1-x509", 1360 1487 "rand_core", 1361 1488 "sspi", 1362 1489 "tracing", 1363 1490 "url", 1364 - "winapi", 1491 + ] 1492 + 1493 + [[package]] 1494 + name = "ironrdp-core" 1495 + version = "0.1.1" 1496 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1497 + dependencies = [ 1498 + "ironrdp-error", 1365 1499 ] 1366 1500 1367 1501 [[package]] 1368 1502 name = "ironrdp-displaycontrol" 1369 1503 version = "0.1.0" 1370 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1504 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1371 1505 dependencies = [ 1506 + "ironrdp-core", 1372 1507 "ironrdp-dvc", 1373 1508 "ironrdp-pdu", 1374 1509 "ironrdp-svc", ··· 1378 1513 [[package]] 1379 1514 name = "ironrdp-dvc" 1380 1515 version = "0.1.0" 1381 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1516 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1382 1517 dependencies = [ 1518 + "ironrdp-core", 1383 1519 "ironrdp-pdu", 1384 1520 "ironrdp-svc", 1385 1521 "slab", ··· 1389 1525 [[package]] 1390 1526 name = "ironrdp-error" 1391 1527 version = "0.1.0" 1392 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1528 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1393 1529 1394 1530 [[package]] 1395 1531 name = "ironrdp-graphics" 1396 1532 version = "0.1.0" 1397 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1533 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1398 1534 dependencies = [ 1399 1535 "bit_field", 1400 1536 "bitflags 2.6.0", 1401 1537 "bitvec", 1402 1538 "byteorder", 1403 - "ironrdp-error", 1539 + "ironrdp-core", 1404 1540 "ironrdp-pdu", 1405 1541 "lazy_static", 1406 1542 "num-derive", ··· 1410 1546 1411 1547 [[package]] 1412 1548 name = "ironrdp-pdu" 1413 - version = "0.1.0" 1414 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1549 + version = "0.1.1" 1550 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1415 1551 dependencies = [ 1416 1552 "bit_field", 1417 1553 "bitflags 2.6.0", 1418 1554 "byteorder", 1419 1555 "der-parser", 1556 + "ironrdp-core", 1420 1557 "ironrdp-error", 1421 1558 "md-5", 1422 1559 "num-bigint", ··· 1433 1570 [[package]] 1434 1571 name = "ironrdp-rdpdr" 1435 1572 version = "0.1.0" 1436 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1573 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1437 1574 dependencies = [ 1438 1575 "bitflags 2.6.0", 1576 + "ironrdp-core", 1439 1577 "ironrdp-error", 1440 1578 "ironrdp-pdu", 1441 1579 "ironrdp-svc", ··· 1445 1583 [[package]] 1446 1584 name = "ironrdp-rdpsnd" 1447 1585 version = "0.1.0" 1448 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1586 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1449 1587 dependencies = [ 1450 1588 "bitflags 2.6.0", 1589 + "ironrdp-core", 1451 1590 "ironrdp-pdu", 1452 1591 "ironrdp-svc", 1453 1592 "tracing", ··· 1455 1594 1456 1595 [[package]] 1457 1596 name = "ironrdp-session" 1458 - version = "0.1.0" 1459 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1597 + version = "0.2.0" 1598 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1460 1599 dependencies = [ 1461 1600 "ironrdp-connector", 1601 + "ironrdp-core", 1462 1602 "ironrdp-displaycontrol", 1463 1603 "ironrdp-dvc", 1464 1604 "ironrdp-error", ··· 1470 1610 1471 1611 [[package]] 1472 1612 name = "ironrdp-svc" 1473 - version = "0.1.0" 1474 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1613 + version = "0.1.1" 1614 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1475 1615 dependencies = [ 1476 1616 "bitflags 2.6.0", 1617 + "ironrdp-core", 1477 1618 "ironrdp-pdu", 1478 1619 ] 1479 1620 1480 1621 [[package]] 1481 1622 name = "ironrdp-tls" 1482 1623 version = "0.1.0" 1483 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1624 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1484 1625 dependencies = [ 1485 1626 "tokio", 1486 1627 "tokio-rustls", ··· 1489 1630 1490 1631 [[package]] 1491 1632 name = "ironrdp-tokio" 1492 - version = "0.1.0" 1493 - source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" 1633 + version = "0.2.0" 1634 + source = "git+https://github.com/Devolutions/IronRDP?rev=2f57fd2de320f58fe240d88a83519255ba94cb73#2f57fd2de320f58fe240d88a83519255ba94cb73" 1494 1635 dependencies = [ 1495 1636 "bytes", 1496 1637 "ironrdp-async", ··· 1505 1646 1506 1647 [[package]] 1507 1648 name = "iso7816" 1508 - version = "0.1.2" 1649 + version = "0.1.3" 1509 1650 source = "registry+https://github.com/rust-lang/crates.io-index" 1510 - checksum = "b3af73ac9c821e7aea3280532118e15cdf9e7bb45c923cbf0e319ae25b27d20c" 1651 + checksum = "c75f5d3f2d959c5d37b382ed9b5a32d0a0e6112ab6ac9eb8fce82359db6f2367" 1511 1652 dependencies = [ 1512 1653 "delog", 1513 1654 "heapless", ··· 1548 1689 1549 1690 [[package]] 1550 1691 name = "js-sys" 1551 - version = "0.3.70" 1692 + version = "0.3.72" 1552 1693 source = "registry+https://github.com/rust-lang/crates.io-index" 1553 - checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" 1694 + checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" 1554 1695 dependencies = [ 1555 1696 "wasm-bindgen", 1556 1697 ] ··· 1581 1722 1582 1723 [[package]] 1583 1724 name = "libc" 1584 - version = "0.2.155" 1725 + version = "0.2.168" 1585 1726 source = "registry+https://github.com/rust-lang/crates.io-index" 1586 - checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" 1727 + checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" 1587 1728 1588 1729 [[package]] 1589 1730 name = "libloading" ··· 1606 1747 version = "0.4.14" 1607 1748 source = "registry+https://github.com/rust-lang/crates.io-index" 1608 1749 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" 1750 + 1751 + [[package]] 1752 + name = "litemap" 1753 + version = "0.7.4" 1754 + source = "registry+https://github.com/rust-lang/crates.io-index" 1755 + checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" 1609 1756 1610 1757 [[package]] 1611 1758 name = "lock_api" ··· 1950 2097 1951 2098 [[package]] 1952 2099 name = "picky" 1953 - version = "7.0.0-rc.9" 2100 + version = "7.0.0-rc.11" 1954 2101 source = "registry+https://github.com/rust-lang/crates.io-index" 1955 - checksum = "fe9b488630f493840c2e6ef270c3619a3dc2ad0953eb978d6e4273a8337fee5e" 2102 + checksum = "f62f11977ee3ab76e48f7465f035a607e61b7421b154384b71607cb85a26d5dd" 1956 2103 dependencies = [ 1957 2104 "aes", 1958 2105 "aes-gcm", 1959 2106 "aes-kw", 1960 - "base64 0.22.1", 2107 + "base64", 1961 2108 "cbc", 1962 2109 "des", 1963 2110 "digest", ··· 1971 2118 "p384", 1972 2119 "p521", 1973 2120 "pbkdf2", 1974 - "picky-asn1 0.9.0", 1975 - "picky-asn1-der 0.5.0", 1976 - "picky-asn1-x509 0.13.0", 2121 + "picky-asn1", 2122 + "picky-asn1-der", 2123 + "picky-asn1-x509", 1977 2124 "rand", 1978 2125 "rand_core", 1979 2126 "rc2", ··· 1990 2137 1991 2138 [[package]] 1992 2139 name = "picky-asn1" 1993 - version = "0.8.0" 1994 - source = "registry+https://github.com/rust-lang/crates.io-index" 1995 - checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" 1996 - dependencies = [ 1997 - "oid", 1998 - "serde", 1999 - "serde_bytes", 2000 - ] 2001 - 2002 - [[package]] 2003 - name = "picky-asn1" 2004 - version = "0.9.0" 2140 + version = "0.10.0" 2005 2141 source = "registry+https://github.com/rust-lang/crates.io-index" 2006 - checksum = "360019b238b11b8c0e88cd9db3a6677f1af122e3422d0a26a2b576f084d9be36" 2142 + checksum = "d061c9f67e256511d8d69b86730a506bed100db520c8812e789cf91d9c6a16cc" 2007 2143 dependencies = [ 2008 2144 "oid", 2009 2145 "serde", ··· 2014 2150 2015 2151 [[package]] 2016 2152 name = "picky-asn1-der" 2017 - version = "0.4.1" 2018 - source = "registry+https://github.com/rust-lang/crates.io-index" 2019 - checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" 2020 - dependencies = [ 2021 - "picky-asn1 0.8.0", 2022 - "serde", 2023 - "serde_bytes", 2024 - ] 2025 - 2026 - [[package]] 2027 - name = "picky-asn1-der" 2028 - version = "0.5.0" 2153 + version = "0.5.1" 2029 2154 source = "registry+https://github.com/rust-lang/crates.io-index" 2030 - checksum = "04784987e157b5a8f832ce68b3364915dc6ef4bed94a6e10e241fa1bae3db2e3" 2155 + checksum = "e15b90fb132c46ded79c39277afa93151691d9df6e7ff369c071890b36478392" 2031 2156 dependencies = [ 2032 - "picky-asn1 0.9.0", 2157 + "picky-asn1", 2033 2158 "serde", 2034 2159 "serde_bytes", 2035 2160 ] 2036 2161 2037 2162 [[package]] 2038 2163 name = "picky-asn1-x509" 2039 - version = "0.12.0" 2040 - source = "registry+https://github.com/rust-lang/crates.io-index" 2041 - checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" 2042 - dependencies = [ 2043 - "base64 0.21.7", 2044 - "oid", 2045 - "picky-asn1 0.8.0", 2046 - "picky-asn1-der 0.4.1", 2047 - "serde", 2048 - ] 2049 - 2050 - [[package]] 2051 - name = "picky-asn1-x509" 2052 - version = "0.13.0" 2164 + version = "0.14.1" 2053 2165 source = "registry+https://github.com/rust-lang/crates.io-index" 2054 - checksum = "f3384ff768b1c4a04532916be77935f634a4738d3b2138da98798e90352fadf4" 2166 + checksum = "f702973074c654cef724d7430e2852acdb8b0e897ed9c4120727446a1bda1464" 2055 2167 dependencies = [ 2056 - "base64 0.22.1", 2168 + "base64", 2057 2169 "num-bigint-dig", 2058 2170 "oid", 2059 - "picky-asn1 0.9.0", 2060 - "picky-asn1-der 0.5.0", 2171 + "picky-asn1", 2172 + "picky-asn1-der", 2061 2173 "serde", 2062 2174 "widestring", 2063 2175 "zeroize", ··· 2065 2177 2066 2178 [[package]] 2067 2179 name = "picky-krb" 2068 - version = "0.9.0" 2180 + version = "0.9.2" 2069 2181 source = "registry+https://github.com/rust-lang/crates.io-index" 2070 - checksum = "e2213fd3942a9d3366b3e108b6d02db2227c80937a55f79a71e1719ab075bb77" 2182 + checksum = "f5f3c62393fbe5538020af4f8b07d1647f99748becd207476417f8d2aa8900cd" 2071 2183 dependencies = [ 2072 2184 "aes", 2073 2185 "byteorder", ··· 2078 2190 "num-bigint-dig", 2079 2191 "oid", 2080 2192 "pbkdf2", 2081 - "picky-asn1 0.9.0", 2082 - "picky-asn1-der 0.5.0", 2083 - "picky-asn1-x509 0.13.0", 2193 + "picky-asn1", 2194 + "picky-asn1-der", 2195 + "picky-asn1-x509", 2084 2196 "rand", 2085 2197 "serde", 2086 2198 "sha1", ··· 2274 2386 "env_logger", 2275 2387 "ironrdp-cliprdr", 2276 2388 "ironrdp-connector", 2389 + "ironrdp-core", 2277 2390 "ironrdp-displaycontrol", 2278 2391 "ironrdp-dvc", 2279 2392 "ironrdp-pdu", ··· 2288 2401 "log", 2289 2402 "parking_lot 0.12.3", 2290 2403 "picky", 2291 - "picky-asn1-der 0.4.1", 2292 - "picky-asn1-x509 0.12.0", 2404 + "picky-asn1-der", 2405 + "picky-asn1-x509", 2406 + "picky-krb", 2293 2407 "rand", 2294 2408 "rand_chacha", 2295 2409 "reqwest", ··· 2354 2468 2355 2469 [[package]] 2356 2470 name = "reqwest" 2357 - version = "0.12.7" 2471 + version = "0.12.9" 2358 2472 source = "registry+https://github.com/rust-lang/crates.io-index" 2359 - checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" 2473 + checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" 2360 2474 dependencies = [ 2361 - "base64 0.22.1", 2475 + "base64", 2362 2476 "bytes", 2363 2477 "futures-channel", 2364 2478 "futures-core", ··· 2420 2534 2421 2535 [[package]] 2422 2536 name = "rsa" 2423 - version = "0.9.6" 2537 + version = "0.9.7" 2424 2538 source = "registry+https://github.com/rust-lang/crates.io-index" 2425 - checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" 2539 + checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" 2426 2540 dependencies = [ 2427 2541 "const-oid", 2428 2542 "digest", ··· 2471 2585 2472 2586 [[package]] 2473 2587 name = "rustix" 2474 - version = "0.38.34" 2588 + version = "0.38.42" 2475 2589 source = "registry+https://github.com/rust-lang/crates.io-index" 2476 - checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" 2590 + checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" 2477 2591 dependencies = [ 2478 2592 "bitflags 2.6.0", 2479 2593 "errno", 2480 2594 "libc", 2481 2595 "linux-raw-sys", 2482 - "windows-sys 0.52.0", 2596 + "windows-sys 0.59.0", 2483 2597 ] 2484 2598 2485 2599 [[package]] 2486 2600 name = "rustls" 2487 - version = "0.23.12" 2601 + version = "0.23.19" 2488 2602 source = "registry+https://github.com/rust-lang/crates.io-index" 2489 - checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" 2603 + checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" 2490 2604 dependencies = [ 2491 2605 "aws-lc-rs", 2492 2606 "log", 2493 2607 "once_cell", 2494 - "ring", 2495 2608 "rustls-pki-types", 2496 2609 "rustls-webpki", 2497 2610 "subtle", ··· 2500 2613 2501 2614 [[package]] 2502 2615 name = "rustls-native-certs" 2503 - version = "0.7.2" 2616 + version = "0.8.0" 2504 2617 source = "registry+https://github.com/rust-lang/crates.io-index" 2505 - checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" 2618 + checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" 2506 2619 dependencies = [ 2507 2620 "openssl-probe", 2508 2621 "rustls-pemfile", ··· 2517 2630 source = "registry+https://github.com/rust-lang/crates.io-index" 2518 2631 checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" 2519 2632 dependencies = [ 2520 - "base64 0.22.1", 2633 + "base64", 2521 2634 "rustls-pki-types", 2522 2635 ] 2523 2636 2524 2637 [[package]] 2525 2638 name = "rustls-pki-types" 2526 - version = "1.8.0" 2639 + version = "1.10.0" 2527 2640 source = "registry+https://github.com/rust-lang/crates.io-index" 2528 - checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" 2641 + checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" 2529 2642 2530 2643 [[package]] 2531 2644 name = "rustls-webpki" 2532 - version = "0.102.6" 2645 + version = "0.102.8" 2533 2646 source = "registry+https://github.com/rust-lang/crates.io-index" 2534 - checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" 2647 + checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" 2535 2648 dependencies = [ 2536 2649 "aws-lc-rs", 2537 2650 "ring", ··· 2776 2889 2777 2890 [[package]] 2778 2891 name = "sspi" 2779 - version = "0.13.0" 2892 + version = "0.15.0" 2780 2893 source = "registry+https://github.com/rust-lang/crates.io-index" 2781 - checksum = "1734839082c6d33f8368b40a40d0d5cc1ed10fbde00dc8a404f64e70272ed3f6" 2894 + checksum = "b94e3c7aa94f5b440eedeab677686629bddcb43edf52ef3703038cce98e2bf70" 2782 2895 dependencies = [ 2783 2896 "async-dnssd", 2784 2897 "async-recursion", ··· 2796 2909 "num-traits", 2797 2910 "oid", 2798 2911 "picky", 2799 - "picky-asn1 0.9.0", 2800 - "picky-asn1-der 0.5.0", 2801 - "picky-asn1-x509 0.13.0", 2912 + "picky-asn1", 2913 + "picky-asn1-der", 2914 + "picky-asn1-x509", 2802 2915 "picky-krb", 2803 2916 "portpicker", 2804 2917 "rand", ··· 2816 2929 "url", 2817 2930 "uuid", 2818 2931 "windows", 2819 - "windows-sys 0.52.0", 2932 + "windows-sys 0.59.0", 2820 2933 "winreg", 2821 2934 "zeroize", 2822 2935 ] ··· 2917 3030 2918 3031 [[package]] 2919 3032 name = "tempfile" 2920 - version = "3.12.0" 3033 + version = "3.14.0" 2921 3034 source = "registry+https://github.com/rust-lang/crates.io-index" 2922 - checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" 3035 + checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" 2923 3036 dependencies = [ 2924 3037 "cfg-if", 2925 3038 "fastrand", ··· 2991 3104 ] 2992 3105 2993 3106 [[package]] 2994 - name = "tinyvec" 2995 - version = "1.6.1" 3107 + name = "tinystr" 3108 + version = "0.7.6" 2996 3109 source = "registry+https://github.com/rust-lang/crates.io-index" 2997 - checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" 3110 + checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" 2998 3111 dependencies = [ 2999 - "tinyvec_macros", 3112 + "displaydoc", 3113 + "zerovec", 3000 3114 ] 3001 - 3002 - [[package]] 3003 - name = "tinyvec_macros" 3004 - version = "0.1.1" 3005 - source = "registry+https://github.com/rust-lang/crates.io-index" 3006 - checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" 3007 3115 3008 3116 [[package]] 3009 3117 name = "tls_codec" ··· 3028 3136 3029 3137 [[package]] 3030 3138 name = "tokio" 3031 - version = "1.39.3" 3139 + version = "1.42.0" 3032 3140 source = "registry+https://github.com/rust-lang/crates.io-index" 3033 - checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" 3141 + checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" 3034 3142 dependencies = [ 3035 3143 "backtrace", 3036 3144 "bytes", ··· 3223 3331 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" 3224 3332 3225 3333 [[package]] 3226 - name = "unicode-bidi" 3227 - version = "0.3.15" 3228 - source = "registry+https://github.com/rust-lang/crates.io-index" 3229 - checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" 3230 - 3231 - [[package]] 3232 3334 name = "unicode-ident" 3233 3335 version = "1.0.12" 3234 3336 source = "registry+https://github.com/rust-lang/crates.io-index" 3235 3337 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" 3236 - 3237 - [[package]] 3238 - name = "unicode-normalization" 3239 - version = "0.1.23" 3240 - source = "registry+https://github.com/rust-lang/crates.io-index" 3241 - checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" 3242 - dependencies = [ 3243 - "tinyvec", 3244 - ] 3245 3338 3246 3339 [[package]] 3247 3340 name = "universal-hash" ··· 3261 3354 3262 3355 [[package]] 3263 3356 name = "url" 3264 - version = "2.5.2" 3357 + version = "2.5.4" 3265 3358 source = "registry+https://github.com/rust-lang/crates.io-index" 3266 - checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" 3359 + checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" 3267 3360 dependencies = [ 3268 3361 "form_urlencoded", 3269 3362 "idna", ··· 3271 3364 ] 3272 3365 3273 3366 [[package]] 3367 + name = "utf16_iter" 3368 + version = "1.0.5" 3369 + source = "registry+https://github.com/rust-lang/crates.io-index" 3370 + checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" 3371 + 3372 + [[package]] 3274 3373 name = "utf16string" 3275 3374 version = "0.2.0" 3276 3375 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3278 3377 dependencies = [ 3279 3378 "byteorder", 3280 3379 ] 3380 + 3381 + [[package]] 3382 + name = "utf8_iter" 3383 + version = "1.0.4" 3384 + source = "registry+https://github.com/rust-lang/crates.io-index" 3385 + checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" 3281 3386 3282 3387 [[package]] 3283 3388 name = "utf8parse" ··· 3287 3392 3288 3393 [[package]] 3289 3394 name = "uuid" 3290 - version = "1.10.0" 3395 + version = "1.11.0" 3291 3396 source = "registry+https://github.com/rust-lang/crates.io-index" 3292 - checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" 3397 + checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" 3293 3398 dependencies = [ 3294 3399 "getrandom", 3295 3400 "serde", ··· 3324 3429 3325 3430 [[package]] 3326 3431 name = "wasm-bindgen" 3327 - version = "0.2.93" 3432 + version = "0.2.95" 3328 3433 source = "registry+https://github.com/rust-lang/crates.io-index" 3329 - checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" 3434 + checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" 3330 3435 dependencies = [ 3331 3436 "cfg-if", 3332 3437 "once_cell", ··· 3335 3440 3336 3441 [[package]] 3337 3442 name = "wasm-bindgen-backend" 3338 - version = "0.2.93" 3443 + version = "0.2.95" 3339 3444 source = "registry+https://github.com/rust-lang/crates.io-index" 3340 - checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" 3445 + checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" 3341 3446 dependencies = [ 3342 3447 "bumpalo", 3343 3448 "log", ··· 3362 3467 3363 3468 [[package]] 3364 3469 name = "wasm-bindgen-macro" 3365 - version = "0.2.93" 3470 + version = "0.2.95" 3366 3471 source = "registry+https://github.com/rust-lang/crates.io-index" 3367 - checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" 3472 + checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" 3368 3473 dependencies = [ 3369 3474 "quote", 3370 3475 "wasm-bindgen-macro-support", ··· 3372 3477 3373 3478 [[package]] 3374 3479 name = "wasm-bindgen-macro-support" 3375 - version = "0.2.93" 3480 + version = "0.2.95" 3376 3481 source = "registry+https://github.com/rust-lang/crates.io-index" 3377 - checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" 3482 + checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" 3378 3483 dependencies = [ 3379 3484 "proc-macro2", 3380 3485 "quote", ··· 3385 3490 3386 3491 [[package]] 3387 3492 name = "wasm-bindgen-shared" 3388 - version = "0.2.93" 3493 + version = "0.2.95" 3389 3494 source = "registry+https://github.com/rust-lang/crates.io-index" 3390 - checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" 3495 + checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" 3391 3496 3392 3497 [[package]] 3393 3498 name = "web-sys" 3394 - version = "0.3.70" 3499 + version = "0.3.72" 3395 3500 source = "registry+https://github.com/rust-lang/crates.io-index" 3396 - checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" 3501 + checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" 3397 3502 dependencies = [ 3398 3503 "js-sys", 3399 3504 "wasm-bindgen", ··· 3680 3785 "cfg-if", 3681 3786 "windows-sys 0.48.0", 3682 3787 ] 3788 + 3789 + [[package]] 3790 + name = "write16" 3791 + version = "1.0.0" 3792 + source = "registry+https://github.com/rust-lang/crates.io-index" 3793 + checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" 3794 + 3795 + [[package]] 3796 + name = "writeable" 3797 + version = "0.5.5" 3798 + source = "registry+https://github.com/rust-lang/crates.io-index" 3799 + checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" 3683 3800 3684 3801 [[package]] 3685 3802 name = "wyz" ··· 3715 3832 ] 3716 3833 3717 3834 [[package]] 3835 + name = "yoke" 3836 + version = "0.7.5" 3837 + source = "registry+https://github.com/rust-lang/crates.io-index" 3838 + checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" 3839 + dependencies = [ 3840 + "serde", 3841 + "stable_deref_trait", 3842 + "yoke-derive", 3843 + "zerofrom", 3844 + ] 3845 + 3846 + [[package]] 3847 + name = "yoke-derive" 3848 + version = "0.7.5" 3849 + source = "registry+https://github.com/rust-lang/crates.io-index" 3850 + checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" 3851 + dependencies = [ 3852 + "proc-macro2", 3853 + "quote", 3854 + "syn 2.0.68", 3855 + "synstructure", 3856 + ] 3857 + 3858 + [[package]] 3859 + name = "zerofrom" 3860 + version = "0.1.5" 3861 + source = "registry+https://github.com/rust-lang/crates.io-index" 3862 + checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" 3863 + dependencies = [ 3864 + "zerofrom-derive", 3865 + ] 3866 + 3867 + [[package]] 3868 + name = "zerofrom-derive" 3869 + version = "0.1.5" 3870 + source = "registry+https://github.com/rust-lang/crates.io-index" 3871 + checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" 3872 + dependencies = [ 3873 + "proc-macro2", 3874 + "quote", 3875 + "syn 2.0.68", 3876 + "synstructure", 3877 + ] 3878 + 3879 + [[package]] 3718 3880 name = "zeroize" 3719 3881 version = "1.8.1" 3720 3882 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 3733 3895 "quote", 3734 3896 "syn 2.0.68", 3735 3897 ] 3898 + 3899 + [[package]] 3900 + name = "zerovec" 3901 + version = "0.10.4" 3902 + source = "registry+https://github.com/rust-lang/crates.io-index" 3903 + checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" 3904 + dependencies = [ 3905 + "yoke", 3906 + "zerofrom", 3907 + "zerovec-derive", 3908 + ] 3909 + 3910 + [[package]] 3911 + name = "zerovec-derive" 3912 + version = "0.10.3" 3913 + source = "registry+https://github.com/rust-lang/crates.io-index" 3914 + checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" 3915 + dependencies = [ 3916 + "proc-macro2", 3917 + "quote", 3918 + "syn 2.0.68", 3919 + ]
+5 -5
pkgs/servers/teleport/16/default.nix
··· 2 2 import ../generic.nix ( 3 3 args 4 4 // { 5 - version = "16.4.6"; 6 - hash = "sha256-TdOCFs6YeqINM8aPryrjYPaXEjc/gIqu7kzVYDnMsjg="; 7 - vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8="; 8 - pnpmHash = "sha256-NF45Wp4itYud01VzxC8bRHZ3xZ1T1du1QmZTDMS5nOk="; 5 + version = "16.4.14"; 6 + hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA="; 7 + vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI="; 8 + pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE="; 9 9 cargoLock = { 10 10 lockFile = ./Cargo.lock; 11 11 outputHashes = { 12 12 "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; 13 - "ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0="; 13 + "ironrdp-async-0.2.0" = "sha256-s0WdaEd3J2r/UmSVBktxtspIytlfw6eWUW3A4kOsTP0="; 14 14 }; 15 15 }; 16 16 }
+3 -3
pkgs/servers/teleport/default.nix
··· 2 2 callPackages, 3 3 lib, 4 4 wasm-bindgen-cli_0_2_92, 5 - wasm-bindgen-cli_0_2_93, 5 + wasm-bindgen-cli_0_2_95, 6 6 ... 7 7 }@args: 8 8 let ··· 17 17 teleport_16 = import ./16 ( 18 18 args 19 19 // { 20 - wasm-bindgen-cli = wasm-bindgen-cli_0_2_93; 20 + wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; 21 21 } 22 22 ); 23 23 teleport = teleport_16; ··· 29 29 builtins.removeAttrs args [ 30 30 "callPackages" 31 31 "wasm-bindgen-cli_0_2_92" 32 - "wasm-bindgen-cli_0_2_93" 32 + "wasm-bindgen-cli_0_2_95" 33 33 ] 34 34 )
+10
pkgs/servers/teleport/generic.nix
··· 4 4 rustPlatform, 5 5 fetchFromGitHub, 6 6 fetchYarnDeps, 7 + fetchpatch, 7 8 makeWrapper, 8 9 CoreFoundation, 9 10 AppKit, ··· 115 116 fixup-yarn-lock 116 117 ] 117 118 ); 119 + 120 + patches = lib.optional (lib.versionAtLeast version "16") [ 121 + (fetchpatch { 122 + name = "disable-wasm-opt-for-ironrdp.patch"; 123 + url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1"; 124 + hash = "sha256-Y5SVIUQsfi5qI28x5ccoRkBjpdpeYn0mQk8sLO644xo="; 125 + }) 126 + ]; 118 127 119 128 configurePhase = '' 120 129 runHook preConfigure ··· 244 253 tomberek 245 254 freezeboy 246 255 techknowlogick 256 + juliusfreudenberger 247 257 ]; 248 258 platforms = platforms.unix; 249 259 # go-libfido2 is broken on platforms with less than 64-bit because it defines an array
+2 -2
pkgs/servers/teleport/tsh.patch
··· 2 2 index 5de21c69d0..3995c19e3c 100644 3 3 --- a/tool/tsh/common/tsh.go 4 4 +++ b/tool/tsh/common/tsh.go 5 - @@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { 5 + @@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error { 6 + } 6 7 7 8 var err error 8 - 9 9 - cf.executablePath, err = os.Executable() 10 10 + tempBinaryPath, err := os.Executable() 11 11 if err != nil {
+3 -3
pkgs/tools/system/plan9port/default.nix
··· 21 21 22 22 stdenv.mkDerivation rec { 23 23 pname = "plan9port"; 24 - version = "2024-10-22"; 24 + version = "2025-01-29"; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "9fans"; 28 28 repo = pname; 29 - rev = "61e362add9e1485bec1ab8261d729016850ec270"; 30 - hash = "sha256-Hpz9yuBktgJEOQ4ZD03c37pO9wgbvtYjIreYusr0Dzw="; 29 + rev = "a5d6857a3b912b43c88ef298c28d13d4623f9ef0"; 30 + sha256 = "0c23z56zygrsyr96ml7907mpfgx80vnsy99nqr3nmfw1a045mjgv"; 31 31 }; 32 32 33 33 postPatch = ''
-4
pkgs/top-level/all-packages.nix
··· 16309 16309 # used as base package for iortcw forks 16310 16310 iortcw_sp = callPackage ../games/iortcw/sp.nix { }; 16311 16311 16312 - ja2-stracciatella = callPackage ../games/ja2-stracciatella { 16313 - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; 16314 - }; 16315 - 16316 16312 katagoWithCuda = katago.override { 16317 16313 backend = "cuda"; 16318 16314 cudaPackages = cudaPackages_12;
+4
pkgs/top-level/python-packages.nix
··· 11017 11017 11018 11018 podcats = callPackage ../development/python-modules/podcats { }; 11019 11019 11020 + podgen = callPackage ../development/python-modules/podgen { }; 11021 + 11020 11022 podman = callPackage ../development/python-modules/podman { }; 11021 11023 11022 11024 poetry-core = callPackage ../development/python-modules/poetry-core { }; ··· 16329 16331 tinytuya = callPackage ../development/python-modules/tinytuya { }; 16330 16332 16331 16333 titlecase = callPackage ../development/python-modules/titlecase { }; 16334 + 16335 + tivars = callPackage ../development/python-modules/tivars { }; 16332 16336 16333 16337 tld = callPackage ../development/python-modules/tld { }; 16334 16338