From f498f8ef4a0142acacbe9b945f3939efb6670b58 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 30 Apr 2024 23:01:23 +0200 Subject: [PATCH 001/233] nixos/kubeswitch: use 'runCommand' instead of 'phases' --- nixos/modules/programs/kubeswitch.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/nixos/modules/programs/kubeswitch.nix b/nixos/modules/programs/kubeswitch.nix index 304df48e3c11..9348540022f2 100644 --- a/nixos/modules/programs/kubeswitch.nix +++ b/nixos/modules/programs/kubeswitch.nix @@ -29,17 +29,13 @@ in config = let - shell_files = pkgs.stdenv.mkDerivation rec { - name = "kubeswitch-shell-files"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/share - for shell in bash zsh; do - ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell - ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell - done - ''; - }; + shell_files = pkgs.runCommand "kubeswitch-shell-files" {} '' + mkdir -p $out/share + for shell in bash zsh; do + ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell + ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell + done + ''; in lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; From e4d99c8236129a45c4199370f0943c6ce4ef7288 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 23:05:59 +0000 Subject: [PATCH 002/233] steamPackages.steam-runtime: 0.20231127.68515 -> 0.20240415.84615 --- pkgs/games/steam/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 563a09d36907..eb95932482d2 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20231127.68515"; + version = "0.20240415.84615"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${finalAttrs.version}/steam-runtime.tar.xz"; - hash = "sha256-invUOdJGNhrswsj9Vj/bSAkEigWtBQ554sBAyvPf0mk="; + hash = "sha256-C8foNnIVA+O4YwuCrIf9N6Lr/GlApPVgZsYgi+3OZUE="; name = "scout-runtime-${finalAttrs.version}.tar.gz"; }; From 3c2a75098003690387d3d2606ee7ab8db9ff6996 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 27 May 2024 15:41:42 +0100 Subject: [PATCH 003/233] ispc: 1.23.0 -> 1.24.0 --- pkgs/development/compilers/ispc/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index ee162260929b..b8c48c5c6a01 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,15 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.23.0"; + version = "1.24.0"; + + dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zixPt7YICCG0N8t1pcXEu/sPKCVLQVPCiJsQEqEXl+A="; + sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 550a3f748f57..abcb4649af09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21552,7 +21552,7 @@ with pkgs; ispc = callPackage ../development/compilers/ispc { xcode = darwin.xcode_14; - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_17; }; isso = callPackage ../servers/isso { From 3ea9dd816eafb55fda7b5b948951c474e663c2cf Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 15 May 2024 12:52:46 +0200 Subject: [PATCH 004/233] prometheus-jmx-javaagent: init at 0.20.0 --- .../pr/prometheus-jmx-javaagent/package.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix new file mode 100644 index 000000000000..179acfe520ac --- /dev/null +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchurl, +}: +stdenv.mkDerivation ( + finalAttrs: + let + jarName = "jmx_prometheus_javaagent-${finalAttrs.version}.jar"; + in + { + pname = "jmx-prometheus-javaagent"; + version = "0.20.0"; + src = fetchurl { + url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_javaagent/${finalAttrs.version}/${jarName}"; + sha256 = "sha256-i2ftQEhdR1ZIw20R0hRktIRAb4X6+RKzNj9xpqeGEyA="; + }; + + dontUnpack = true; + + installPhase = '' + env + mkdir -p $out/lib + cp $src $out/lib/${jarName} + ''; + + meta = { + homepage = "https://github.com/prometheus/jmx_exporter"; + description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.srhb ]; + platforms = lib.platforms.unix; + }; + } +) From f7d8046fb83cf0bb4e0a8ad179dee89bcbe0335d Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Thu, 16 May 2024 02:10:39 +0300 Subject: [PATCH 005/233] buildDotnetModule: fix structured attributes support This change refactors internal hooks used by buildDotnetModule to support derivations with structured attributes. Note that this changes variable names that the internal hooks expect. --- .../misc/ArchiSteamFarm/default.nix | 2 +- .../build-dotnet-global-tool/default.nix | 2 +- .../dotnet/build-dotnet-module/default.nix | 36 ++++--- .../build-dotnet-module/hooks/default.nix | 36 ++----- .../hooks/dotnet-build-hook.sh | 76 +++++++++------ .../hooks/dotnet-check-hook.sh | 62 ++++++++---- .../hooks/dotnet-configure-hook.sh | 94 +++++++++++++------ .../hooks/dotnet-fixup-hook.sh | 81 +++++++++++----- .../hooks/dotnet-install-hook.sh | 84 ++++++++++------- pkgs/test/dotnet/default.nix | 4 +- .../dotnet/project-references/default.nix | 10 +- pkgs/test/dotnet/structured-attrs/default.nix | 36 +++++++ .../dotnet/structured-attrs/nuget-deps.nix | 5 + .../structured-attrs/src/Application.cs | 10 ++ .../structured-attrs/src/Application.csproj | 5 + .../dotnet/use-dotnet-from-env/default.nix | 60 ++++++++++++ .../dotnet/use-dotnet-from-env/nuget-deps.nix | 5 + .../use-dotnet-from-env/src/Application.cs | 3 + .../src/Application.csproj | 5 + 19 files changed, 440 insertions(+), 176 deletions(-) create mode 100644 pkgs/test/dotnet/structured-attrs/default.nix create mode 100644 pkgs/test/dotnet/structured-attrs/nuget-deps.nix create mode 100644 pkgs/test/dotnet/structured-attrs/src/Application.cs create mode 100644 pkgs/test/dotnet/structured-attrs/src/Application.csproj create mode 100644 pkgs/test/dotnet/use-dotnet-from-env/default.nix create mode 100644 pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix create mode 100644 pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs create mode 100644 pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7c334fb80455..fc3335ca3a92 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -41,7 +41,7 @@ buildDotnetModule rec { doCheck = true; preBuild = '' - export projectFile=(ArchiSteamFarm) + dotnetProjectFiles=(ArchiSteamFarm) ''; preInstall = '' diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 16cf029ca345..7ae9cfc9f661 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -28,7 +28,7 @@ buildDotnetModule (args // { ] ++ (nugetDeps fetchNuGet); }; - projectFile = ""; + dotnetGlobalTool = true; useDotnetFromEnv = true; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index e2ddee48cc00..6a4f9129cd44 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -69,7 +69,7 @@ , disabledTests ? [ ] # The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set. # It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. -, testProjectFile ? "" +, testProjectFile ? null # The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. , buildType ? "Release" @@ -88,17 +88,18 @@ } @ args: let + projectFiles = + lib.optionals (projectFile != null) (lib.toList projectFile); + testProjectFiles = + lib.optionals (testProjectFile != null) (lib.toList testProjectFile); + platforms = if args ? meta.platforms then lib.intersectLists args.meta.platforms dotnet-sdk.meta.platforms else dotnet-sdk.meta.platforms; inherit (callPackage ./hooks { - inherit dotnet-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; - runtimeId = - if runtimeId != null - then runtimeId - else dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; + inherit dotnet-sdk dotnet-runtime; }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook; localDeps = @@ -143,6 +144,19 @@ let nugetDepsFile = _nugetDeps.sourceFile; in stdenvNoCC.mkDerivation (args // { + dotnetInstallPath = installPath; + dotnetExecutables = executables; + dotnetBuildType = buildType; + dotnetProjectFiles = projectFiles; + dotnetTestProjectFiles = testProjectFiles; + dotnetDisabledTests = disabledTests; + dotnetRuntimeId = runtimeId; + nugetSource = nuget-source; + dotnetRuntimeDeps = map lib.getLib runtimeDeps; + dotnetSelfContainedBuild = selfContainedBuild; + dotnetUseAppHost = useAppHost; + inherit useDotnetFromEnv; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ dotnetConfigureHook dotnetBuildHook @@ -172,7 +186,7 @@ stdenvNoCC.mkDerivation (args // { else [ ])); makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ - "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" + "--prefix" "LD_LIBRARY_PATH" ":" "${dotnet-sdk.icu}/lib" ]; # Stripping breaks the executable @@ -181,8 +195,6 @@ stdenvNoCC.mkDerivation (args // { # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping dontWrapGApps = args.dontWrapGApps or true; - inherit selfContainedBuild useAppHost useDotnetFromEnv; - # propagate the runtime sandbox profile since the contents apply to published # executables propagatedSandboxProfile = toString dotnet-runtime.__propagatedSandboxProfile; @@ -267,11 +279,11 @@ stdenvNoCC.mkDerivation (args // { --no-cache \ --force \ ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - ${lib.optionalString (flags != []) (toString flags)} + ${lib.escapeShellArgs flags} } - declare -a projectFiles=( ${toString (lib.toList projectFile)} ) - declare -a testProjectFiles=( ${toString (lib.toList testProjectFile)} ) + declare -a projectFiles=( ${lib.escapeShellArgs projectFiles} ) + declare -a testProjectFiles=( ${lib.escapeShellArgs testProjectFiles} ) export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 44091604f5c2..b9c51a743c6a 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -4,28 +4,21 @@ , coreutils , zlib , openssl -, callPackage , makeSetupHook -, makeWrapper +, dotnetCorePackages + # Passed from ../default.nix , dotnet-sdk -, disabledTests -, nuget-source , dotnet-runtime -, runtimeDeps -, buildType -, runtimeId }: -assert (builtins.isString runtimeId); - let - libraryPath = lib.makeLibraryPath runtimeDeps; + runtimeId = dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system; in { dotnetConfigureHook = makeSetupHook { name = "dotnet-configure-hook"; substitutions = { - nugetSource = nuget-source; + runtimeId = lib.escapeShellArg runtimeId; dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib @@ -34,7 +27,6 @@ in zlib openssl ]; - inherit runtimeId; }; } ./dotnet-configure-hook.sh; @@ -43,7 +35,7 @@ in { name = "dotnet-build-hook"; substitutions = { - inherit buildType runtimeId; + runtimeId = lib.escapeShellArg runtimeId; }; } ./dotnet-build-hook.sh; @@ -52,15 +44,7 @@ in { name = "dotnet-check-hook"; substitutions = { - inherit buildType runtimeId libraryPath; - disabledTests = lib.optionalString (disabledTests != [ ]) - ( - let - escapedNames = lib.lists.map (n: lib.replaceStrings [ "," ] [ "%2C" ] n) disabledTests; - filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames; - in - "${lib.concatStringsSep "&" filters}" - ); + runtimeId = lib.escapeShellArg runtimeId; }; } ./dotnet-check-hook.sh; @@ -69,7 +53,7 @@ in { name = "dotnet-install-hook"; substitutions = { - inherit buildType runtimeId; + runtimeId = lib.escapeShellArg runtimeId; }; } ./dotnet-install-hook.sh; @@ -79,11 +63,7 @@ in name = "dotnet-fixup-hook"; substitutions = { dotnetRuntime = dotnet-runtime; - runtimeDeps = libraryPath; - shell = stdenv.shell; - which = "${which}/bin/which"; - dirname = "${coreutils}/bin/dirname"; - realpath = "${coreutils}/bin/realpath"; + wrapperPath = lib.makeBinPath [ which coreutils ]; }; } ./dotnet-fixup-hook.sh; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index 798109291f92..f209861f79b1 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -1,12 +1,25 @@ -# inherit arguments from derivation -dotnetBuildFlags=( ${dotnetBuildFlags[@]-} ) - dotnetBuildHook() { echo "Executing dotnetBuildHook" runHook preBuild - if [ "${enableParallelBuilding-}" ]; then + local -r hostRuntimeId=@runtimeId@ + local -r dotnetBuildType="${dotnetBuildType-Release}" + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) + local dotnetFlagsArray=( "${dotnetFlags[@]}" ) + local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) + local dotnetFlagsArray=($dotnetFlags) + local dotnetBuildFlagsArray=($dotnetBuildFlags) + fi + + if [[ -n "${enableParallelBuilding-}" ]]; then local -r maxCpuFlag="$NIX_BUILD_CORES" local -r parallelBuildFlag="true" else @@ -14,50 +27,53 @@ dotnetBuildHook() { local -r parallelBuildFlag="false" fi - if [ "${selfContainedBuild-}" ]; then - dotnetBuildFlags+=("-p:SelfContained=true") + if [[ -n ${dotnetSelfContainedBuild-} ]]; then + dotnetBuildFlagsArray+=("-p:SelfContained=true") else - dotnetBuildFlags+=("-p:SelfContained=false") + dotnetBuildFlagsArray+=("-p:SelfContained=false") fi - if [ "${useAppHost-}" ]; then - dotnetBuildFlags+=("-p:UseAppHost=true") + if [[ -n ${dotnetUseAppHost-} ]]; then + dotnetBuildFlagsArray+=("-p:UseAppHost=true") fi - local versionFlags=() - if [ "${version-}" ]; then - versionFlags+=("-p:InformationalVersion=${version-}") + local versionFlagsArray=() + if [[ -n ${version-} ]]; then + versionFlagsArray+=("-p:InformationalVersion=$version") fi - if [ "${versionForDotnet-}" ]; then - versionFlags+=("-p:Version=${versionForDotnet-}") + if [[ -n ${versionForDotnet-} ]]; then + versionFlagsArray+=("-p:Version=$versionForDotnet") fi dotnetBuild() { - local -r project="${1-}" + local -r projectFile="${1-}" - runtimeIdFlags=() - if [[ "$project" == *.csproj ]] || [ "${selfContainedBuild-}" ]; then - runtimeIdFlags+=("--runtime @runtimeId@") + local runtimeIdFlagsArray=() + if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then + runtimeIdFlagsArray+=("--runtime" "$dotnetRuntimeId") fi - dotnet build ${project-} \ - -maxcpucount:$maxCpuFlag \ - -p:BuildInParallel=$parallelBuildFlag \ + dotnet build ${1+"$projectFile"} \ + -maxcpucount:"$maxCpuFlag" \ + -p:BuildInParallel="$parallelBuildFlag" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --configuration "@buildType@" \ + --configuration "$dotnetBuildType" \ --no-restore \ - ${versionFlags[@]} \ - ${runtimeIdFlags[@]} \ - ${dotnetBuildFlags[@]} \ - ${dotnetFlags[@]} + "${versionFlagsArray[@]}" \ + "${runtimeIdFlagsArray[@]}" \ + "${dotnetBuildFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } - (( "${#projectFile[@]}" == 0 )) && dotnetBuild + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then + dotnetBuild + fi - for project in ${projectFile[@]} ${testProjectFile[@]-}; do - dotnetBuild "$project" + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do + dotnetBuild "$projectFile" done runHook postBuild @@ -65,6 +81,6 @@ dotnetBuildHook() { echo "Finished dotnetBuildHook" } -if [[ -z "${dontDotnetBuild-}" && -z "${buildPhase-}" ]]; then +if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then buildPhase=dotnetBuildHook fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh index f19bf9f620fe..c91251f4f180 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -1,39 +1,65 @@ -# inherit arguments from derivation -dotnetTestFlags=( ${dotnetTestFlags[@]-} ) - dotnetCheckHook() { echo "Executing dotnetCheckHook" runHook preCheck - if [ "${disabledTests-}" ]; then - local -r disabledTestsFlag="--filter @disabledTests@" + local -r hostRuntimeId=@runtimeId@ + local -r dotnetBuildType="${dotnetBuildType-Release}" + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) + local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" ) + local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" ) + local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) + local dotnetTestFlagsArray=($dotnetTestFlags) + local dotnetDisabledTestsArray=($dotnetDisabledTests) + local dotnetRuntimeDepsArray=($dotnetRuntimeDeps) fi - if [ "${enableParallelBuilding-}" ]; then + if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then + local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}") + local OLDIFS="$IFS" IFS='&' + dotnetTestFlagsArray+=("--filter:${disabledTestsFilters[*]//,/%2C}") + IFS="$OLDIFS" + fi + + local libraryPath="${LD_LIBRARY_PATH-}" + if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then + local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}") + local OLDIFS="$IFS" IFS=':' + libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath" + IFS="$OLDIFS" + fi + + if [[ -n ${enableParallelBuilding-} ]]; then local -r maxCpuFlag="$NIX_BUILD_CORES" else local -r maxCpuFlag="1" fi - for project in ${testProjectFile[@]-${projectFile[@]}}; do - runtimeIdFlags=() - if [[ "$project" == *.csproj ]]; then - runtimeIdFlags=("--runtime @runtimeId@") + local projectFile + for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do + local runtimeIdFlagsArray=() + if [[ $projectFile == *.csproj ]]; then + runtimeIdFlagsArray=("--runtime" "$dotnetRuntimeId") fi - LD_LIBRARY_PATH="@libraryPath@" \ - dotnet test "$project" \ - -maxcpucount:$maxCpuFlag \ + LD_LIBRARY_PATH=$libraryPath \ + dotnet test "$projectFile" \ + -maxcpucount:"$maxCpuFlag" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --configuration "@buildType@" \ + --configuration "$dotnetBuildType" \ --no-build \ --logger "console;verbosity=normal" \ - ${disabledTestsFlag-} \ - ${runtimeIdFlags[@]} \ - "${dotnetTestFlags[@]}" \ - "${dotnetFlags[@]}" + "${runtimeIdFlagsArray[@]}" \ + "${dotnetTestFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" done runHook postCheck diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index 3eb0d4e1f230..12fa34869986 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -1,63 +1,103 @@ -declare -a projectFile testProjectFile - -# Inherit arguments from derivation -dotnetFlags=( ${dotnetFlags[@]-} ) -dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} ) - dotnetConfigureHook() { echo "Executing dotnetConfigureHook" runHook preConfigure - if [ -z "${enableParallelBuilding-}" ]; then + if [[ -z ${nugetSource-} ]]; then + echo + echo "ERROR: no dependencies were specified" + echo 'Hint: set `nugetSource` if using these hooks individually. If this is happening with `buildDotnetModule`, please open an issue.' + echo + + exit 1 + fi + + local nugetSourceSedQuoted="${nugetSource//[\/\\&$'\n']/\\&}" + local nugetSourceXMLQuoted="$nugetSource" + nugetSourceXMLQuoted="${nugetSource//&/\&}" + nugetSourceXMLQuoted="${nugetSourceXMLQuoted//\"/\"}" + + local -r hostRuntimeId=@runtimeId@ + local -r dynamicLinker=@dynamicLinker@ + local -r libPath=@libPath@ + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) + local dotnetFlagsArray=( "${dotnetFlags[@]}" ) + local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) + local dotnetFlagsArray=($dotnetFlags) + local dotnetRestoreFlagsArray=($dotnetRestoreFlags) + fi + + if [[ -z ${enableParallelBuilding-} ]]; then local -r parallelFlag="--disable-parallel" fi dotnetRestore() { - local -r project="${1-}" - dotnet restore ${project-} \ + local -r projectFile="${1-}" + dotnet restore ${1+"$projectFile"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --runtime "@runtimeId@" \ - --source "@nugetSource@/lib" \ + --runtime "$dotnetRuntimeId" \ + --source "$nugetSource/lib" \ ${parallelFlag-} \ - ${dotnetRestoreFlags[@]} \ - ${dotnetFlags[@]} + "${dotnetRestoreFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } # Generate a NuGet.config file to make sure everything, # including things like dependencies, is restored from the proper source -cat < "./NuGet.config" + cat >NuGet.config < - + EOF - # Patch paket.dependencies and paket.lock (if found) to use the proper source. This ensures - # paket restore works correctly - # We use + instead of / in sed to avoid problems with slashes - find -name paket.dependencies -exec sed -i 's+source .*+source @nugetSource@/lib+g' {} \; - find -name paket.lock -exec sed -i 's+remote:.*+remote: @nugetSource@/lib+g' {} \; + # Patch paket.dependencies and paket.lock (if found) to use the proper + # source. This ensures paket restore works correctly. Note that the + # nugetSourceSedQuoted abomination below safely escapes nugetSource string + # for use as a sed replacement string to avoid issues with slashes and other + # special characters ('&', '\\' and '\n'). + find -name paket.dependencies -exec sed -i "s/source .*/source $nugetSourceSedQuoted\/lib/g" {} \; + find -name paket.lock -exec sed -i "s/remote:.*/remote: $nugetSourceSedQuoted\/lib/g" {} \; - dotnet tool restore --add-source "@nugetSource@/lib" + dotnet tool restore --add-source "$nugetSource/lib" - (( "${#projectFile[@]}" == 0 )) && dotnetRestore + # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but + # avoid other project-specific logic. This is a hack, but the old behavior + # is worse as it relied on a bug: setting projectFile to an empty string + # made the hooks actually skip all project-specific logic. It’s hard to keep + # backwards compatibility with this odd behavior now since we are using + # arrays, so instead we just pass a variable to indicate that we don’t have + # projects. + if [[ -z ${dotnetGlobalTool-} ]]; then + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then + dotnetRestore + fi - for project in ${projectFile[@]} ${testProjectFile[@]-}; do - dotnetRestore "$project" - done + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do + dotnetRestore "$projectFile" + done + fi echo "Fixing up native binaries..." # Find all native binaries and nuget libraries, and fix them up, # by setting the proper interpreter and rpath to some commonly used libraries + local binary for binary in $(find "$HOME/.nuget/packages/" -type f -executable); do if patchelf --print-interpreter "$binary" >/dev/null 2>/dev/null; then echo "Found binary: $binary, fixing it up..." - patchelf --set-interpreter "$(cat "@dynamicLinker@")" "$binary" + patchelf --set-interpreter "$(cat "$dynamicLinker")" "$binary" # This makes sure that if the binary requires some specific runtime dependencies, it can find it. # This fixes dotnet-built binaries like crossgen2 @@ -68,7 +108,7 @@ EOF --add-needed libssl.so \ "$binary" - patchelf --set-rpath "@libPath@" "$binary" + patchelf --set-rpath "$libPath" "$binary" fi done diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index e3671728af35..f9aba29a4355 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -1,28 +1,55 @@ -# Inherit arguments from the derivation -declare -a derivationMakeWrapperArgs="( ${makeWrapperArgs-} )" -makeWrapperArgs=( "${derivationMakeWrapperArgs[@]}" ) - # First argument is the executable you want to wrap, # the second is the destination for the wrapper. wrapDotnetProgram() { - local dotnetRootFlags=() + local -r dotnetRuntime=@dotnetRuntime@ + local -r wrapperPath=@wrapperPath@ - if [ ! "${selfContainedBuild-}" ]; then - if [ "${useDotnetFromEnv-}" ]; then + local -r dotnetFromEnvScript='dotnetFromEnv() { + local dotnetPath + if command -v dotnet 2>&1 >/dev/null; then + dotnetPath=$(which dotnet) && \ + dotnetPath=$(realpath "$dotnetPath") && \ + dotnetPath=$(dirname "$dotnetPath") && \ + export DOTNET_ROOT="$dotnetPath" + fi +} +dotnetFromEnv' + + if [[ -n $__structuredAttrs ]]; then + local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) + local -r makeWrapperArgsArray=( "${makeWrapperArgs[@]}" ) + else + local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps) + local -r makeWrapperArgsArray=($makeWrapperArgs) + fi + + local dotnetRuntimeDepsFlags=() + if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then + local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}") + local OLDIFS="$IFS" IFS=':' + dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}") + IFS="$OLDIFS" + fi + + local dotnetRootFlagsArray=() + if [[ -z ${dotnetSelfContainedBuild-} ]]; then + if [[ -n ${useDotnetFromEnv-} ]]; then # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime - dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@realpath@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"') - dotnetRootFlags+=("--suffix" "PATH" ":" "@dotnetRuntime@/bin") + dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath") + dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript") + dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime") + dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin") else - dotnetRootFlags+=("--set" "DOTNET_ROOT" "@dotnetRuntime@") - dotnetRootFlags+=("--prefix" "PATH" ":" "@dotnetRuntime@/bin") + dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime") + dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin") fi fi makeWrapper "$1" "$2" \ - --suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \ - "${dotnetRootFlags[@]}" \ + "${dotnetRuntimeDepsFlags[@]}" \ + "${dotnetRootFlagsArray[@]}" \ "${gappsWrapperArgs[@]}" \ - "${makeWrapperArgs[@]}" + "${makeWrapperArgsArray[@]}" echo "installed wrapper to "$2"" } @@ -30,13 +57,24 @@ wrapDotnetProgram() { dotnetFixupHook() { echo "Executing dotnetFixupPhase" - # check if executables is declared (including empty values, in which case we generate no executables) - if declare -p executables &>/dev/null; then - for executable in ${executables[@]}; do - path="${installPath-$out/lib/$pname}/$executable" + local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" + + local executable executableBasename + + # check if dotnetExecutables is declared (including empty values, in which case we generate no executables) + if declare -p dotnetExecutables &>/dev/null; then + if [[ -n $__structuredAttrs ]]; then + local dotnetExecutablesArray=( "${dotnetExecutables[@]}" ) + else + local dotnetExecutablesArray=($dotnetExecutables) + fi + for executable in "${dotnetExecutablesArray[@]}"; do + executableBasename=$(basename "$executable") + + local path="$dotnetInstallPath/$executable" if test -x "$path"; then - wrapDotnetProgram "$path" "$out/bin/$(basename "$executable")" + wrapDotnetProgram "$path" "$out/bin/$executableBasename" else echo "Specified binary \"$executable\" is either not an executable or does not exist!" echo "Looked in $path" @@ -45,8 +83,9 @@ dotnetFixupHook() { done else while IFS= read -d '' executable; do - wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")" \; - done < <(find "${installPath-$out/lib/$pname}" ! -name "*.dll" -executable -type f -print0) + executableBasename=$(basename "$executable") + wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \; + done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0) fi echo "Finished dotnetFixupPhase" diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index ed754d8ffcad..4d9b3c502c35 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -1,70 +1,86 @@ -# inherit arguments from derivation -dotnetInstallFlags=( ${dotnetInstallFlags[@]-} ) - dotnetInstallHook() { echo "Executing dotnetInstallHook" runHook preInstall - if [ "${selfContainedBuild-}" ]; then - dotnetInstallFlags+=("--self-contained") + local -r hostRuntimeId=@runtimeId@ + local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" + local -r dotnetBuildType="${dotnetBuildType-Release}" + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetFlagsArray=( "${dotnetFlags[@]}" ) + local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" ) + local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" ) else - dotnetInstallFlags+=("--no-self-contained") - # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained - # Trimming is only available for self-contained build, so force disable it here - dotnetInstallFlags+=("-p:PublishTrimmed=false") + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetFlagsArray=($dotnetFlags) + local dotnetInstallFlagsArray=($dotnetInstallFlags) + local dotnetPackFlagsArray=($dotnetPackFlags) fi - if [ "${useAppHost-}" ]; then - dotnetInstallFlags+=("-p:UseAppHost=true") + if [[ -n ${dotnetSelfContainedBuild-} ]]; then + dotnetInstallFlagsArray+=("--self-contained") + else + dotnetInstallFlagsArray+=("--no-self-contained") + # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained + # Trimming is only available for self-contained build, so force disable it here + dotnetInstallFlagsArray+=("-p:PublishTrimmed=false") + fi + + if [[ -n ${dotnetUseAppHost-} ]]; then + dotnetInstallFlagsArray+=("-p:UseAppHost=true") fi dotnetPublish() { - local -r project="${1-}" + local -r projectFile="${1-}" - runtimeIdFlags=() - if [[ "$project" == *.csproj ]] || [ "${selfContainedBuild-}" ]; then - runtimeIdFlags+=("--runtime @runtimeId@") + runtimeIdFlagsArray=() + if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then + runtimeIdFlagsArray+=("--runtime" "$dotnetRuntimeId") fi - dotnet publish ${project-} \ + dotnet publish ${1+"$projectFile"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --output "${installPath-$out/lib/$pname}" \ - --configuration "@buildType@" \ + --output "$dotnetInstallPath" \ + --configuration "$dotnetBuildType" \ --no-build \ - ${runtimeIdFlags[@]} \ - ${dotnetInstallFlags[@]} \ - ${dotnetFlags[@]} + "${runtimeIdFlagsArray[@]}" \ + "${dotnetInstallFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } dotnetPack() { - local -r project="${1-}" - dotnet pack ${project-} \ + local -r projectFile="${1-}" + dotnet pack ${1+"$projectFile"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --output "$out/share" \ - --configuration "@buildType@" \ + --configuration "$dotnetBuildType" \ --no-build \ - --runtime "@runtimeId@" \ - ${dotnetPackFlags[@]} \ - ${dotnetFlags[@]} + --runtime "$dotnetRuntimeId" \ + "${dotnetPackFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } - if (( "${#projectFile[@]}" == 0 )); then + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then dotnetPublish else - for project in ${projectFile[@]}; do - dotnetPublish "$project" + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}"; do + dotnetPublish "$projectFile" done fi - if [[ "${packNupkg-}" ]]; then - if (( "${#projectFile[@]}" == 0 )); then + if [[ -n ${packNupkg-} ]]; then + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then dotnetPack else - for project in ${projectFile[@]}; do - dotnetPack "$project" + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}"; do + dotnetPack "$projectFile" done fi fi diff --git a/pkgs/test/dotnet/default.nix b/pkgs/test/dotnet/default.nix index 7592b09d76e3..d70850c05fdb 100644 --- a/pkgs/test/dotnet/default.nix +++ b/pkgs/test/dotnet/default.nix @@ -1,5 +1,7 @@ -{ callPackage }: +{ lib, callPackage }: { project-references = callPackage ./project-references { }; + use-dotnet-from-env = lib.recurseIntoAttrs (callPackage ./use-dotnet-from-env { }); + structured-attrs = lib.recurseIntoAttrs (callPackage ./structured-attrs { }); } diff --git a/pkgs/test/dotnet/project-references/default.nix b/pkgs/test/dotnet/project-references/default.nix index f40b9196c209..4ac5cf2ad82e 100644 --- a/pkgs/test/dotnet/project-references/default.nix +++ b/pkgs/test/dotnet/project-references/default.nix @@ -4,11 +4,13 @@ { lib , dotnet-sdk -, buildDotnetModule +, buildPackages # buildDotnetModule , runCommand }: let + inherit (buildPackages) buildDotnetModule; + nugetDeps = ./nuget-deps.nix; # Specify the TargetFramework via an environment variable so that we don't @@ -18,7 +20,8 @@ let library = buildDotnetModule { name = "project-references-test-library"; src = ./library; - inherit nugetDeps TargetFramework; + inherit nugetDeps; + env.TargetFramework = TargetFramework; packNupkg = true; }; @@ -26,7 +29,8 @@ let application = buildDotnetModule { name = "project-references-test-application"; src = ./application; - inherit nugetDeps TargetFramework; + inherit nugetDeps; + env.TargetFramework = TargetFramework; projectReferences = [ library ]; }; diff --git a/pkgs/test/dotnet/structured-attrs/default.nix b/pkgs/test/dotnet/structured-attrs/default.nix new file mode 100644 index 000000000000..cf96fef8dbdc --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/default.nix @@ -0,0 +1,36 @@ +{ lib +, dotnet-sdk +, buildPackages # buildDotnetModule +, testers +, runCommand +}: +let + # Note: without structured attributes, we can’t use derivation arguments that + # contain spaces unambiguously because arguments are passed as space-separated + # environment variables. + copyrightString = "Public domain 🅮"; + + inherit (buildPackages) buildDotnetModule; + + app = buildDotnetModule { + name = "structured-attrs-test-application"; + src = ./src; + nugetDeps = ./nuget-deps.nix; + dotnetFlags = [ "--property:Copyright=${copyrightString}" ]; + env.TargetFramework = "net${lib.versions.majorMinor (lib.getVersion dotnet-sdk)}"; + __structuredAttrs = true; + }; +in +{ + no-structured-attrs = testers.testBuildFailure (app.overrideAttrs { + __structuredAttrs = false; + }); + + check-output = testers.testEqualContents { + assertion = "buildDotnetModule sets AssemblyCopyrightAttribute with structured attributes"; + expected = builtins.toFile "expected-copyright.txt" copyrightString; + actual = runCommand "dotnet-structured-attrs-test" { } '' + ${app}/bin/Application >"$out" + ''; + }; +} diff --git a/pkgs/test/dotnet/structured-attrs/nuget-deps.nix b/pkgs/test/dotnet/structured-attrs/nuget-deps.nix new file mode 100644 index 000000000000..f3a17967e25c --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/nuget-deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/test/dotnet/structured-attrs/src/Application.cs b/pkgs/test/dotnet/structured-attrs/src/Application.cs new file mode 100644 index 000000000000..3bc548105c2b --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/src/Application.cs @@ -0,0 +1,10 @@ +using System; +using System.Reflection; + +Console.Write( + ( + (AssemblyCopyrightAttribute)Assembly + .GetExecutingAssembly() + .GetCustomAttributes(typeof(AssemblyCopyrightAttribute), true)[0] + ).Copyright +); diff --git a/pkgs/test/dotnet/structured-attrs/src/Application.csproj b/pkgs/test/dotnet/structured-attrs/src/Application.csproj new file mode 100644 index 000000000000..decaa6d961aa --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/src/Application.csproj @@ -0,0 +1,5 @@ + + + exe + + diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix new file mode 100644 index 000000000000..711a98eb0c29 --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix @@ -0,0 +1,60 @@ +{ lib +, dotnet-sdk +, buildPackages # buildDotnetModule, dotnet-runtime +, testers +, runCommand +, removeReferencesTo +}: +let + inherit (buildPackages) buildDotnetModule dotnet-runtime; + + app = buildDotnetModule { + name = "use-dotnet-from-env-test-application"; + src = ./src; + nugetDeps = ./nuget-deps.nix; + useDotnetFromEnv = true; + env.TargetFramework = "net${lib.versions.majorMinor (lib.getVersion dotnet-sdk)}"; + }; + + appWithoutFallback = app.overrideAttrs (oldAttrs: { + nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ + removeReferencesTo + ]; + postFixup = (oldAttrs.postFixup or "") + '' + remove-references-to -t ${dotnet-runtime} "$out/bin/Application" + ''; + }); + + runtimeVersion = lib.getVersion dotnet-runtime; + runtimeVersionFile = builtins.toFile "dotnet-version.txt" runtimeVersion; +in +{ + fallback = testers.testEqualContents { + assertion = "buildDotnetModule sets fallback DOTNET_ROOT in wrapper"; + expected = runtimeVersionFile; + actual = runCommand "use-dotnet-from-env-fallback-test" { } '' + ${app}/bin/Application >"$out" + ''; + }; + + # Check that appWithoutFallback does not use fallback .NET runtime. + without-fallback = testers.testBuildFailure (runCommand "use-dotnet-from-env-without-fallback-test" { } '' + ${appWithoutFallback}/bin/Application >"$out" + ''); + + # NB assumes that without-fallback above to passes. + use-dotnet-root-env = testers.testEqualContents { + assertion = "buildDotnetModule uses DOTNET_ROOT from environment in wrapper"; + expected = runtimeVersionFile; + actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = dotnet-runtime; } '' + ${appWithoutFallback}/bin/Application >"$out" + ''; + }; + use-dotnet-path-env = testers.testEqualContents { + assertion = "buildDotnetModule uses DOTNET_ROOT from dotnet in PATH in wrapper"; + expected = runtimeVersionFile; + actual = runCommand "use-dotnet-from-env-path-test" { dotnetRuntime = dotnet-runtime; } '' + PATH=$dotnetRuntime''${PATH+:}$PATH ${appWithoutFallback}/bin/Application >"$out" + ''; + }; +} diff --git a/pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix b/pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix new file mode 100644 index 000000000000..f3a17967e25c --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs new file mode 100644 index 000000000000..5efc571ca9a3 --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs @@ -0,0 +1,3 @@ +using System; + +Console.Write(Environment.Version.ToString()); diff --git a/pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj new file mode 100644 index 000000000000..decaa6d961aa --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj @@ -0,0 +1,5 @@ + + + exe + + From 773c17e75258d2aa44dcef17123f129447f0ea11 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 25 May 2024 13:24:45 +0200 Subject: [PATCH 006/233] postgresqlPackages.plv8: 3.1.10 -> 3.2.2 Changes: https://github.com/plv8/plv8/blob/v3.2.2/Changes --- ...001-build-Allow-using-V8-from-system.patch | 55 +++++++++---------- .../sql/postgresql/ext/plv8/default.nix | 17 +++--- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch index 05f607911f20..e6099771ea1a 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch +++ b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch @@ -1,47 +1,44 @@ diff --git a/Makefile b/Makefile -index 38879cc..6e78eeb 100644 +index a705c11..08b952b 100644 --- a/Makefile +++ b/Makefile -@@ -20,6 +20,7 @@ OBJS = $(SRCS:.cc=.o) +@@ -13,11 +13,14 @@ OBJS = $(SRCS:.cc=.o) MODULE_big = plv8-$(PLV8_VERSION) EXTENSION = plv8 PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql +USE_SYSTEM_V8 = 0 - - # Platform detection -@@ -41,6 +42,7 @@ PGXS := $(shell $(PG_CONFIG) --pgxs) - PG_VERSION_NUM := $(shell cat `$(PG_CONFIG) --includedir-server`/pg_config*.h \ - | perl -ne 'print $$1 and exit if /PG_VERSION_NUM\s+(\d+)/') + ifeq ($(OS),Windows_NT) + # noop for now + else ++ ifeq ($(USE_SYSTEM_V8),0) + SHLIB_LINK += -Ldeps/v8-cmake/build ++ endif + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + CCFLAGS += -stdlib=libc++ +@@ -34,6 +37,7 @@ ifeq ($(NUMPROC),0) + NUMPROC = 1 + endif +ifeq ($(USE_SYSTEM_V8),0) - AUTOV8_DIR = build/v8 - AUTOV8_OUT = build/v8/out.gn/obj - AUTOV8_STATIC_LIBS = -lv8_libplatform -lv8_libbase -@@ -66,6 +68,7 @@ v8: - make -f Makefiles/Makefile.macos v8 - endif - endif + SHLIB_LINK += -Ldeps/v8-cmake/build + + all: v8 $(OBJS) +@@ -46,11 +50,16 @@ deps/v8-cmake/build/libv8_libbase.a: + @cd deps/v8-cmake && mkdir -p build && cd build && cmake -Denable-fPIC=ON -DCMAKE_BUILD_TYPE=Release ../ && make -j $(NUMPROC) + + v8: deps/v8-cmake/build/libv8_libbase.a ++else ++all: $(OBJS) +endif # enable direct jsonb conversion by default CCFLAGS += -DJSONB_DIRECT_CONVERSION -@@ -83,6 +86,7 @@ ifdef BIGINT_GRACEFUL - endif - +ifeq ($(USE_SYSTEM_V8),0) - # We're gonna build static link. Rip it out after include Makefile - SHLIB_LINK := $(filter-out -lv8, $(SHLIB_LINK)) - -@@ -101,6 +105,7 @@ else - SHLIB_LINK += -lrt -std=c++14 - endif - endif + CCFLAGS += -Ideps/v8-cmake/v8/include -std=c++17 +endif - DATA = $(PLV8_DATA) - ifndef DISABLE_DIALECT --- -2.37.3 - + ifdef EXECUTION_TIMEOUT + CCFLAGS += -DEXECUTION_TIMEOUT diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 2e8ac591a2dd..615dcb3a80ae 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, v8 +, nodejs_20 , perl , postgresql , jitSupport @@ -11,15 +11,17 @@ , gnugrep }: -stdenv.mkDerivation (finalAttrs: { +let + libv8 = nodejs_20.libv8; +in stdenv.mkDerivation (finalAttrs: { pname = "plv8"; - version = "3.1.10"; + version = "3.2.2"; src = fetchFromGitHub { owner = "plv8"; repo = "plv8"; rev = "v${finalAttrs.version}"; - hash = "sha256-g1A/XPC0dX2360Gzvmo9/FSQnM6Wt2K4eR0pH0p9fz4="; + hash = "sha256-azO33v22EF+/sTNmwswxyDR0PhrvWfTENuLu6JgSGJ0="; }; patches = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - v8 + libv8 postgresql ]; @@ -43,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { # Nixpkgs build a v8 monolith instead of separate v8_libplatform. "USE_SYSTEM_V8=1" "SHLIB_LINK=-lv8" - "V8_OUTDIR=${v8}/lib" + "V8_OUTDIR=${libv8}/lib" ]; installFlags = [ @@ -56,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs ./generate_upgrade.sh - # https://github.com/plv8/plv8/pull/506 - substituteInPlace generate_upgrade.sh \ - --replace " 2.3.10 " " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15 " ''; postInstall = '' From ca5654ba7dc0c6226b91d3b24a986da316aef761 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 30 May 2024 11:52:53 +0200 Subject: [PATCH 007/233] zammad: use nodejs.libv8 --- pkgs/applications/networking/misc/zammad/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 369b16282c41..63d2569b5777 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -17,7 +17,6 @@ , nodejs , yarn , yarn2nix-moretea -, v8 , cacert , redis }: @@ -83,7 +82,7 @@ let }; mini_racer = attrs: { buildFlags = [ - "--with-v8-dir=\"${v8}\"" + "--with-v8-dir=\"${nodejs.libv8}\"" ]; dontBuild = false; postPatch = '' From 826cc7fa1c45a8a5d54c9aa7e262f8a72d056472 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 30 May 2024 11:53:55 +0200 Subject: [PATCH 008/233] rubyPackages.libv8: use nodejs.libv8 --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3a64f7d2fd9d..2e59b8a99cc1 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -18,7 +18,7 @@ # (to make gems behave if necessary). { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which -, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem +, libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem @@ -476,7 +476,7 @@ in # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 libv8 = attrs: { - buildInputs = [ which v8 python2 ]; + buildInputs = [ which nodejs.libv8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; # The gem includes broken symlinks which are ignored during unpacking, but @@ -496,7 +496,7 @@ in }; execjs = attrs: { - propagatedBuildInputs = [ v8 ]; + propagatedBuildInputs = [ nodejs.libv8 ]; }; libxml-ruby = attrs: { From 214a77ff836ff093229ec6cb6643bac284cfee7d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 30 May 2024 11:56:30 +0200 Subject: [PATCH 009/233] rPackages.V8: use nodejs.libv8 --- pkgs/development/r-modules/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ce5f581be1bc..95e062808bc3 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -483,7 +483,7 @@ let units = [ pkgs.udunits ]; unigd = [ pkgs.pkg-config ]; vdiffr = [ pkgs.libpng.dev ]; - V8 = [ pkgs.v8 ]; + V8 = [ pkgs.nodejs.libv8 ]; XBRL = with pkgs; [ zlib libxml2.dev ]; XLConnect = [ pkgs.jdk ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; @@ -1407,12 +1407,15 @@ let V8 = old.V8.overrideAttrs (attrs: { postPatch = '' substituteInPlace configure \ - --replace " -lv8_libplatform" "" + --replace-fail " -lv8_libplatform" "" + # Bypass the test checking if pointer compression is needed + substituteInPlace configure \ + --replace-fail "./pctest1" "true" ''; preConfigure = '' - export INCLUDE_DIR=${pkgs.v8}/include - export LIB_DIR=${pkgs.v8}/lib + export INCLUDE_DIR=${pkgs.nodejs.libv8}/include + export LIB_DIR=${pkgs.nodejs.libv8}/lib patchShebangs configure ''; From bea2f0a2eaed6e0d7e139c5d5e55095843cc875f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 30 May 2024 11:57:13 +0200 Subject: [PATCH 010/233] v8: mark vulnerable The v8 package has not been updated for 3 years. --- pkgs/development/libraries/v8/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e633be6ac2ea..9320fe34bb64 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -190,5 +190,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + knownVulnerabilities = [ "Severely outdated with multiple publicly known vulnerabilities" ]; }; } From bcaca23529cd7d51dc432ca661076a54036e1143 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:19:18 -0700 Subject: [PATCH 011/233] freebsd.compat: re-add lost patch This patch was applied to 14.0 but not 13.1. It is necessary for 13.1 as well. --- .../bsd/freebsd/patches/13.1/compat-install-dirs.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch index 9bb2bea32ee9..4bc21cf8eb14 100644 --- a/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch @@ -2,12 +2,11 @@ diff --git a/tools/build/Makefile b/tools/build/Makefile index 948a5f9dfdb..592af84eeae 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile -@@ -327,15 +327,15 @@ host-symlinks: +@@ -327,14 +327,14 @@ host-symlinks: # and cross-tools stages. We do this here using mkdir since mtree may not exist # yet (this happens if we are crossbuilding from Linux/Mac). INSTALLDIR_LIST= \ - bin \ -- lib/casper \ - lib/geom \ - usr/include/casper \ - usr/include/private/ucl \ @@ -16,7 +15,6 @@ index 948a5f9dfdb..592af84eeae 100644 - usr/libdata/pkgconfig \ - usr/libexec + ${BINDIR} \ -+ ${LIBDIR}/casper \ + ${LIBDIR}/geom \ + ${INCLUDEDIR}/casper \ + ${INCLUDEDIR}/private/ucl \ From 295c645d807e4754b7d1f89ffdb65263cae9f042 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:24:30 -0700 Subject: [PATCH 012/233] freebsd.boot-install: wrap coreutils install instead of netbsd netbsd can no longer compile under FreeBSD native early bootstrap stdenv, so switch to coreutils. This only involves discarding the -l flag. The -l flag causes a symlink instead of a copy to be installed, so it is safe to discard during bootstrap. --- .../bsd/freebsd/pkgs/boot-install.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix index 966489d9aef3..79dab282e3f3 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix @@ -1,10 +1,23 @@ { buildPackages, freebsd-lib }: -# Wrap NetBSD's install +# Wrap GNU coreutils' install +# The -l flag causes a symlink instead of a copy to be installed, so +# it is safe to discard during bootstrap since coreutils does not support it. + buildPackages.writeShellScriptBin "boot-install" ( freebsd-lib.install-wrapper + '' + fixed_args=() + while [[ ''${#args[0]} > 0 ]]; do + case "''${args[0]}" in + -l) + args=("''${args[@]:2}") + continue + esac + fixed_args+=("''${args[0]}") + args=("''${args[@]:1}") + done - ${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}" + ${buildPackages.coreutils}/bin/install "''${fixed_args[@]}" '' ) From 2785d4f4aea77ac220eb329bc7c028f9819e9bff Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:26:02 -0700 Subject: [PATCH 013/233] freebsd.filterSource: use a less featureful rsync By adding fewer dependencies, the FreeBSD native bootstrap tarball becomes lighter. --- .../bsd/freebsd/pkgs/filterSource.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix index dc215c18aecb..09674056d9cd 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix @@ -18,6 +18,17 @@ let lib.concatMapStringsSep "\n" (path: "/${path}") sortedPaths ); in -runCommand "${pname}-filtered-src" { nativeBuildInputs = [ pkgsBuildBuild.rsync ]; } '' - rsync -a -r --files-from=${filterText} ${source}/ $out -'' +runCommand "${pname}-filtered-src" + { + nativeBuildInputs = [ + (pkgsBuildBuild.rsync.override { + enableZstd = false; + enableXXHash = false; + enableOpenSSL = false; + enableLZ4 = false; + }) + ]; + } + '' + rsync -a -r --files-from=${filterText} ${source}/ $out + '' From ba5f1b4400d3180563fc0822bb529eaf3239875c Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:27:21 -0700 Subject: [PATCH 014/233] freebsd.mkDerivation: process patches generated with git The diff parsing was pretty hardcoded for diff -u. Now it should handle git diff/show as well. --- pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index be195b3bc6fa..9659f92d17d7 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -128,15 +128,17 @@ lib.makeOverridable ( splitPatch = patchFile: let + allLines' = lib.strings.splitString "\n" (builtins.readFile patchFile); + allLines = builtins.filter ( + line: !((lib.strings.hasPrefix "diff --git" line) || (lib.strings.hasPrefix "index " line)) + ) allLines'; foldFunc = a: b: - if (lib.strings.hasPrefix "--- " b) then + if ((lib.strings.hasPrefix "--- " b) || (lib.strings.hasPrefix "diff --git " b)) then (a ++ [ [ b ] ]) else ((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ]))); - partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] ( - lib.strings.splitString "\n" (builtins.readFile patchFile) - ); + partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] allLines; partitionedPatches = if (builtins.length partitionedPatches' > 1) then (lib.lists.drop 1 partitionedPatches') From 61202561d92cf1cd74532fcbd8b9d6662c5bc57b Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:28:35 -0700 Subject: [PATCH 015/233] freebsd.{libc,compat,include}: use no-libs stdenv Previously, an attribute named isStatic did this, but this was lost in a refactor. Revive it and rename it to noLibc to be more clear about its intended use. --- pkgs/os-specific/bsd/freebsd/pkgs/csu.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 9 ++++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix index 0f74d78b1d13..020a08c1d01e 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix @@ -12,7 +12,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; path = "lib/csu"; extraPaths = [ "lib/Makefile.inc" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index 70734226a54f..a7ceb0cdf384 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -7,7 +7,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; path = "include"; extraPaths = [ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 8f2cc976463e..a991e6926582 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -21,7 +21,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; pname = "libc"; path = "lib/libc"; extraPaths = diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index 9659f92d17d7..c6659ac0d91c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,6 +2,7 @@ lib, stdenv, stdenvNoCC, + stdenvNoLibs, versionData, writeText, patches, @@ -21,7 +22,13 @@ lib.makeOverridable ( attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + stdenv' = + if attrs.noCC or false then + stdenvNoCC + else if attrs.noLibc or false then + stdenvNoLibs + else + stdenv; in stdenv'.mkDerivation ( rec { From d78f853f7e3bf84924d54c0280f4bca2e0665d57 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:31:26 -0700 Subject: [PATCH 016/233] freebsd.libxo: init --- pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix new file mode 100644 index 000000000000..a4882ea1970c --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libxo"; + extraPaths = [ "contrib/libxo" ]; + MK_TESTS = "no"; +} From 95fa436fbe232a7da493775eeef9a794d249de15 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:32:41 -0700 Subject: [PATCH 017/233] freebsd.libelf: init --- pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix new file mode 100644 index 000000000000..a116aff81f39 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, + lib, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + m4, +}: +mkDerivation { + path = "lib/libelf"; + extraPaths = [ + "lib/libc" + "contrib/elftoolchain" + "sys/sys/elf32.h" + "sys/sys/elf64.h" + "sys/sys/elf_common.h" + ]; + buildInputs = [ ]; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + m4 + ]; + + meta.platforms = lib.platforms.freebsd; +} From d792ea2d412b9229bbb265d08e3b07a669d696d2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:33:47 -0700 Subject: [PATCH 018/233] freebsd.{libncurses,libncurses-tinfo}: init These packages are preferred over libncurses proper for some in-tree FreeBSD packages. --- .../freebsd/patches/14.0/tinfo-host-cc.patch | 15 +++++++++++ .../bsd/freebsd/pkgs/libncurses-tinfo.nix | 15 +++++++++++ .../bsd/freebsd/pkgs/libncurses.nix | 25 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch new file mode 100644 index 000000000000..6446322a8a0a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch @@ -0,0 +1,15 @@ +--- a/lib/ncurses/tinfo/Makefile 2023-12-26 23:02:07.827892619 -0800 ++++ b/lib/ncurses/tinfo/Makefile 2023-12-26 23:01:24.175546100 -0800 +@@ -282,10 +282,10 @@ + build-tools: make_hash make_keys + + make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} +- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c ++ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c + + make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} +- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ++ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ + ${NCURSES_DIR}/ncurses/tinfo/make_hash.c + .endif + .if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix new file mode 100644 index 000000000000..f86f78dbc291 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix @@ -0,0 +1,15 @@ +{ mkDerivation, pkgsBuildBuild }: +mkDerivation { + path = "lib/ncurses/tinfo"; + extraPaths = [ + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ]; + CC_HOST = "${pkgsBuildBuild.stdenv.cc}/bin/cc"; + MK_TESTS = "no"; + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T -D_WCHAR_T" + make $makeFlags "CFLAGS=-D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -I$BSDSRCDIR/contrib/ncurses/ncurses -I$BSDSRCDIR/contrib/ncurses/include -I." ncurses_dll.h make_hash make_keys + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix new file mode 100644 index 000000000000..2dd1ee2fe57d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix @@ -0,0 +1,25 @@ +{ + lib, + versionData, + mkDerivation, + libncurses-tinfo, + ... +}: +mkDerivation { + path = "lib/ncurses/ncurses"; + extraPaths = [ + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ]; + MK_TESTS = "no"; + preBuild = lib.optionalString (versionData.major == 14) '' + make -C ../tinfo $makeFlags curses.h ncurses_dll.h ncurses_def.h + ''; + buildInputs = lib.optionals (versionData.major == 14) [ libncurses-tinfo ]; + + # some packages depend on libncursesw.so.8 + postInstall = '' + ln -s $out/lib/libncursesw.so.9 $out/lib/libncursesw.so.8 + ''; +} From 98587064a0d688f9fbfc4437571734b77dde6601 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:36:40 -0700 Subject: [PATCH 019/233] freebsd.libedit: init --- pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix new file mode 100644 index 000000000000..50b1c9f58333 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix @@ -0,0 +1,7 @@ +{ mkDerivation, libncurses-tinfo }: +mkDerivation { + path = "lib/libedit"; + extraPaths = [ "contrib/libedit" ]; + buildInputs = [ libncurses-tinfo ]; + MK_TESTS = "no"; +} From a753d385dad0a3603ac9ddb378da1727bad9ebe3 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:37:07 -0700 Subject: [PATCH 020/233] freebsd.libjail: init --- pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix new file mode 100644 index 000000000000..9150be559c65 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libjail"; + MK_TESTS = "no"; +} From ae993bd1e345cf4bb822bda3fce12f688cd523c4 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:37:37 -0700 Subject: [PATCH 021/233] freebsd.libdl: init --- pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix new file mode 100644 index 000000000000..2b77a0f71662 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix @@ -0,0 +1,9 @@ +{ mkDerivation, ... }: +mkDerivation { + path = "lib/libdl"; + extraPaths = [ + "lib/libc" + "libexec/rtld-elf" + ]; + buildInputs = [ ]; +} From 78536028670181b6e1c78b6bbbb50724dcd7cd02 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:38:32 -0700 Subject: [PATCH 022/233] freebsd.libcasper: init --- .../bsd/freebsd/pkgs/libcasper.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix new file mode 100644 index 000000000000..df27f72bc8cb --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix @@ -0,0 +1,26 @@ +{ + lib, + stdenv, + mkDerivation, + libnv, +}: +mkDerivation { + path = "lib/libcasper/libcasper"; + extraPaths = [ + "lib/Makefile.inc" + "lib/libcasper" + ]; + buildInputs = [ libnv ]; + + MK_TESTS = "no"; + + makeFlags = [ + "STRIP=-s" # flag to install, not command + "CFLAGS=-DWITH_CASPER" + ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; + + postInstall = '' + make -C $BSDSRCDIR/lib/libcasper/services $makeFlags CFLAGS="-DWITH_CASPER -I$out/include" + make -C $BSDSRCDIR/lib/libcasper/services $makeFlags install + ''; +} From 892f600edd9608ee277cf8c5cb4bf31f1a677a3e Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:39:02 -0700 Subject: [PATCH 023/233] freebsd.libcapsicum: init --- pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix | 1 + 1 file changed, 1 insertion(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix new file mode 100644 index 000000000000..3cb1560df77a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "lib/libcapsicum"; } From ce0a5ce3400e952c9e400a5785dd9539dba1c2d2 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:40:55 -0700 Subject: [PATCH 024/233] freebsd.localedef: init --- .../bsd/freebsd/patches/14.0/localedef.patch | 158 ++++++++++++++++++ .../bsd/freebsd/pkgs/localedef.nix | 39 +++++ 2 files changed, 197 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch new file mode 100644 index 000000000000..73a0341bd324 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch @@ -0,0 +1,158 @@ +diff --git a/include/_ctype.h b/include/_ctype.h +index 91e6b1d14f6b..a6896b598da3 100644 +--- a/include/_ctype.h ++++ b/include/_ctype.h +@@ -44,7 +44,7 @@ + #define __CTYPE_H_ + + #include +-#include ++#include + + #define _CTYPE_A 0x00000100L /* Alpha */ + #define _CTYPE_C 0x00000200L /* Control */ +diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h +index 2d3723b49f5b..6bbff732b9d7 100644 +--- a/lib/libc/locale/collate.h ++++ b/lib/libc/locale/collate.h +@@ -36,6 +36,7 @@ + #ifndef _COLLATE_H_ + #define _COLLATE_H_ + ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c +index 44b7e3292eae..79c30b7cf372 100644 +--- a/usr.bin/localedef/charmap.c ++++ b/usr.bin/localedef/charmap.c +@@ -31,6 +31,7 @@ + /* + * CHARMAP file handling for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c +index 2a080773a95e..3f0030c638f5 100644 +--- a/usr.bin/localedef/collate.c ++++ b/usr.bin/localedef/collate.c +@@ -31,6 +31,7 @@ + /* + * LC_COLLATE database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c +index ab7b76e57b2d..846c6d6480a8 100644 +--- a/usr.bin/localedef/ctype.c ++++ b/usr.bin/localedef/ctype.c +@@ -32,6 +32,7 @@ + /* + * LC_CTYPE database generation routines for localedef. + */ ++#include + #include + #include + +diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c +index 5ff146d6f655..ed69aa1f0c0e 100644 +--- a/usr.bin/localedef/localedef.c ++++ b/usr.bin/localedef/localedef.c +@@ -32,7 +32,7 @@ + * POSIX localedef. + */ + #include +-#include ++#include + #include + #include + +diff --git a/usr.bin/localedef/messages.c b/usr.bin/localedef/messages.c +index 6b8eb9d684dd..0155821d0e56 100644 +--- a/usr.bin/localedef/messages.c ++++ b/usr.bin/localedef/messages.c +@@ -31,6 +31,7 @@ + /* + * LC_MESSAGES database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c +index 7a77ac7e256c..7636c4deca1f 100644 +--- a/usr.bin/localedef/monetary.c ++++ b/usr.bin/localedef/monetary.c +@@ -31,6 +31,7 @@ + /* + * LC_MONETARY database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c +index 5533b7c10e1a..9c47494f815c 100644 +--- a/usr.bin/localedef/numeric.c ++++ b/usr.bin/localedef/numeric.c +@@ -31,6 +31,7 @@ + /* + * LC_NUMERIC database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/parser.y b/usr.bin/localedef/parser.y +index 23b3b54f8a6e..e01330f0152d 100644 +--- a/usr.bin/localedef/parser.y ++++ b/usr.bin/localedef/parser.y +@@ -33,6 +33,7 @@ + * POSIX localedef grammar. + */ + ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/scanner.c b/usr.bin/localedef/scanner.c +index c6d45a993f28..b17670ef4b4a 100644 +--- a/usr.bin/localedef/scanner.c ++++ b/usr.bin/localedef/scanner.c +@@ -32,6 +32,7 @@ + * This file contains the "scanner", which tokenizes the input files + * for localedef for processing by the higher level grammar processor. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c +index 7a56e244c921..0e409a742d0a 100644 +--- a/usr.bin/localedef/time.c ++++ b/usr.bin/localedef/time.c +@@ -31,6 +31,7 @@ + /* + * LC_TIME database generation routines for localedef. + */ ++#include + #include + #include + #include +diff --git a/usr.bin/localedef/wide.c b/usr.bin/localedef/wide.c +index 062e120e6912..a199cddb198d 100644 +--- a/usr.bin/localedef/wide.c ++++ b/usr.bin/localedef/wide.c +@@ -34,6 +34,7 @@ + * to the wide character forms used internally by libc. Unfortunately, + * this approach means that we need a method for each and every encoding. + */ ++#include + #include + #include + #include diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix new file mode 100644 index 000000000000..2e4902860c8d --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix @@ -0,0 +1,39 @@ +{ + mkDerivation, + lib, + stdenv, + compat, + bsdSetupHook, + byacc, + freebsdSetupHook, + makeMinimal, + install, +}: +mkDerivation ( + { + path = "usr.bin/localedef"; + + extraPaths = [ + "lib/libc/locale" + "lib/libc/stdtime" + ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ]; + + nativeBuildInputs = [ + bsdSetupHook + byacc + freebsdSetupHook + makeMinimal + install + ]; + + buildInputs = [ ]; + + preBuild = lib.optionalString (!stdenv.hostPlatform.isFreeBSD) '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${compat}/include -D__unused= -D__pure= -Wno-strict-aliasing" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${compat}/lib" + ''; + + MK_TESTS = "no"; + } + // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = 1; } +) From 2c41534d75174f30e770ac58363242cce9cfaeef Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:41:28 -0700 Subject: [PATCH 025/233] freebsd.locales: init The parameters to control which locales are built are placeholders. --- pkgs/os-specific/bsd/freebsd/pkgs/locales.nix | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/locales.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix b/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix new file mode 100644 index 000000000000..d8d3de93d5ec --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix @@ -0,0 +1,51 @@ +{ + mkDerivation, + lib, + symlinkJoin, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, + localedef, + allLocales ? true, + locales ? [ "en_US.UTF-8" ], +}: +let + build = + name: needsLocaledef: + mkDerivation { + path = "share/${name}"; + + extraPaths = lib.optional needsLocaledef "tools/tools/locale/etc/final-maps"; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + ] ++ lib.optional needsLocaledef localedef; + }; + directories = { + colldef = true; + colldef_unicode = true; + ctypedef = true; + monetdef = false; + monetdef_unicode = false; + msgdef = false; + msgdef_unicode = false; + numericdef = false; + numericdef_unicode = false; + timedef = false; + }; +in +symlinkJoin { + name = "freebsd-locales"; + paths = lib.mapAttrsToList build directories; +} From fe0a405397cf84861b4b866f40142f3a2c362b54 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:42:27 -0700 Subject: [PATCH 026/233] freebsd.locale: init --- pkgs/os-specific/bsd/freebsd/pkgs/locale.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/locale.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/locale.nix b/pkgs/os-specific/bsd/freebsd/pkgs/locale.nix new file mode 100644 index 000000000000..b661a7cee853 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/locale.nix @@ -0,0 +1,7 @@ +{ mkDerivation, libsbuf }: +mkDerivation { + path = "usr.bin/locale"; + buildInputs = [ libsbuf ]; + extraPaths = [ "lib/libc/locale" ]; + MK_TESTS = "no"; +} From 2bf350788ce698b1f9bd8c73bb74a53bfbce65b9 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:43:20 -0700 Subject: [PATCH 027/233] freebsd.bin: init This is a single derivation containing everything in /bin on a normal FreeBSD machine, which is an incredibly compact set of core utilities. --- pkgs/os-specific/bsd/freebsd/pkgs/bin.nix | 92 +++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/bin.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix new file mode 100644 index 000000000000..2b2738ec5794 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix @@ -0,0 +1,92 @@ +{ + mkDerivation, + pkgsBuildBuild, + libjail, + libmd, + libnetbsd, + libcapsicum, + libcasper, + libelf, + libxo, + libncurses-tinfo, + libedit, + lib, + stdenv, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, + byacc, + gencat, +}: +mkDerivation { + pname = "bins"; + path = "bin"; + extraPaths = [ + "sys/conf" + "sys/sys/param.h" + "contrib/sendmail" + "contrib/tcsh" + "usr.bin/printf" + "lib/libsm" + ]; + buildInputs = [ + libjail + libmd + libnetbsd + libcapsicum + libcasper + libelf + libxo + libncurses-tinfo + libedit + ]; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + + byacc + gencat + ]; + + MK_TESTS = "no"; + + postPatch = '' + sed -E -i -e '/#define\tBSD.*/d' $BSDSRCDIR/sys/sys/param.h + sed -E -i -e '/^SYMLINKS.*/d' $BSDSRCDIR/bin/*/Makefile + sed -E -i -e 's/mktemp -t ka/mktemp -t kaXXXXXX/' $BSDSRCDIR/bin/sh/mkbuiltins $BSDSRCDIR/bin/sh/mktokens + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$BSDSRCDIR/sys $NIX_CFLAGS_COMPILE" + + make -C $BSDSRCDIR/lib/libsm $makeFlags + + make -C $BSDSRCDIR/bin/sh $makeFlags "CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" CFLAGS="-D__unused= -D__printf0like\(a,b\)= -D__dead2=" ${ + lib.optionalString (!stdenv.buildPlatform.isFreeBSD) "MK_PIE=no " + }mkbuiltins mksyntax mktokens mknodes + make -C $BSDSRCDIR/bin/csh $makeFlags "CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" CFLAGS="-D__unused= -D__printf0like\(a,b\)= -D__dead2= -I$BSDSRCDIR/contrib/tcsh -I." ${ + lib.optionalString (!stdenv.buildPlatform.isFreeBSD) "MK_PIE=no " + }gethost + ''; + + preInstall = '' + makeFlags="$makeFlags ROOTDIR=$out/root" + ''; + + outputs = [ + "out" + "man" + "debug" + ]; +} From 1bc374d91d74d0f0a4736196998ed2f280c3457b Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:44:04 -0700 Subject: [PATCH 028/233] freebsd.cp: init While cp is part of freebsd.bin, this particular package is critical for early stdenv boot and has its own derivation to require fewer dependencies --- pkgs/os-specific/bsd/freebsd/pkgs/cp.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/cp.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/cp.nix b/pkgs/os-specific/bsd/freebsd/pkgs/cp.nix new file mode 100644 index 000000000000..3ebfd91a4e15 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/cp.nix @@ -0,0 +1,10 @@ +{ mkDerivation }: +mkDerivation { + path = "bin/cp"; + + extraPaths = [ "sys" ]; + + postPatch = '' + substituteInPlace $BSDSRCDIR/bin/cp/Makefile --replace 'tests' "" + ''; +} From 8d5db1db1619a5b0963a3abb49600ff71ee96405 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:46:48 -0700 Subject: [PATCH 029/233] freebsd.iconv: init --- pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix b/pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix new file mode 100644 index 000000000000..9c1ba1835c14 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix @@ -0,0 +1,12 @@ +{ + mkDerivation, + libcapsicum, + libcasper, +}: +mkDerivation { + path = "usr.bin/iconv"; + buildInputs = [ + libcapsicum + libcasper + ]; +} From 41c2bba81ec7c3c03b5841ad8c981b6f98a261be Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 27 May 2024 12:48:20 -0700 Subject: [PATCH 030/233] freebsd.ldd: init --- pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix new file mode 100644 index 000000000000..406e37402b2b --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix @@ -0,0 +1,21 @@ +{ + lib, + stdenv, + mkDerivation, + libelf, +}: +mkDerivation { + path = "usr.bin/ldd"; + extraPaths = [ + "libexec/rtld-elf" + "contrib/elftoolchain/libelf" + ]; + + buildInputs = [ libelf ]; + + env = { + NIX_CFLAGS_COMPILE = "-D_RTLD_PATH=${lib.getLib stdenv.cc.libc}/libexec/ld-elf.so.1"; + }; + + meta.platforms = lib.platforms.freebsd; +} From f9b9794d934ebf5246c46ac457a72c02bf2ec390 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 4 Jun 2024 07:25:26 -0700 Subject: [PATCH 031/233] nix: make boehmgc patch respect HAVE_PTHREAD_ATTR_GET_NP Fixes build on FreeBSD. --- .../nix/patches/boehmgc-coroutine-sp-fallback.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index 578bd325d56b..a53b7f1f52f4 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -11,14 +11,23 @@ index 2b45489..0e6d8ef 100644 GC_bool found_me = FALSE; size_t nthreads = 0; int i; -@@ -868,6 +870,31 @@ GC_INNER void GC_push_all_stacks(void) +@@ -868,6 +870,40 @@ GC_INNER void GC_push_all_stacks(void) hi = p->altstack + p->altstack_size; # endif /* FIXME: Need to scan the normal stack too, but how ? */ + } else { ++ #ifdef HAVE_PTHREAD_ATTR_GET_NP ++ if (pthread_attr_init(&pattr) != 0) { ++ ABORT("GC_push_all_stacks: pthread_attr_init failed!"); ++ } ++ if (pthread_attr_get_np(p->id, &pattr) != 0) { ++ ABORT("GC_push_all_stacks: pthread_attr_get_np failed!"); ++ } ++ #else + if (pthread_getattr_np(p->id, &pattr)) { + ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); + } ++ #endif + if (pthread_attr_getstacksize(&pattr, &stack_limit)) { + ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!"); + } From 3ef17e2e9fe415d07dd9cd737be11b3151f3eb52 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 6 Jun 2024 17:05:04 +0000 Subject: [PATCH 032/233] losslesscut-bin: 3.58.0 -> 3.61.1 --- pkgs/applications/video/losslesscut-bin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index ebab149ab1a8..71aca3921e12 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -6,7 +6,7 @@ let pname = "losslesscut"; - version = "3.58.0"; + version = "3.61.1"; metaCommon = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -17,22 +17,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-wmOdW5LdGLs6Wrt/VBlbC1ScFZBmd5gVQaj/cYADnWc="; + hash = "sha256-wKhEB+MfOsBvZRTIt3hLofw37+YO+hWKowlSi1OxSAU="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-ZNUkzxpFTmsFcdC4oJWDxvqunpaBKz7Fnmrsa4W12Bg="; + hash = "sha256-yZYmM533D9VzM+a0bnYz/aqocaEJVFOTgLWjbQGOQR0="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-PpQF31qsn9TOIRVzOdDoLUqti+m1uRpBQrrqKtxFleE="; + hash = "sha256-/qa2P0R7xRzDgnPKqkeKN6lrDbPg9WuZ/Nnc51NTzaM="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-AgWvLU9m2q7fxZYXgHGMgEj1WLP5XzERq7tWcin2/30="; + hash = "sha256-0awYmSGxm8M12X0WQftlapRF9m3GGCZivNwBtRjSa4E="; }; in ( From 0b8fdfd917b4994325312c1b5e7ad24e34a6b997 Mon Sep 17 00:00:00 2001 From: Nicolas Lenz Date: Thu, 6 Jun 2024 21:37:14 +0200 Subject: [PATCH 033/233] nixos/pretix: fix defaultText for celery options --- nixos/modules/services/web-apps/pretix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index 498face7456d..9786b6116026 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/nixos/modules/services/web-apps/pretix.nix @@ -310,7 +310,7 @@ in type = types.str; default = "redis+socket://${config.services.redis.servers.pretix.unixSocket}?virtual_host=1"; defaultText = literalExpression '' - optionalString config.services.pretix.celery.enable "redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1" + redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1 ''; description = '' URI to the celery backend used for the asynchronous job queue. @@ -321,7 +321,7 @@ in type = types.str; default = "redis+socket://${config.services.redis.servers.pretix.unixSocket}?virtual_host=2"; defaultText = literalExpression '' - optionalString config.services.pretix.celery.enable "redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2" + redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2 ''; description = '' URI to the celery broker used for the asynchronous job queue. From 598462adbd5322dee73893cb135ce2389f293665 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 6 Jun 2024 18:22:38 -0700 Subject: [PATCH 034/233] c3c: specify meta.mainProgram causes a warning when we try to use lib.getExe in later commits --- pkgs/development/compilers/c3c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 4310ad931792..d394ecbc4c21 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -56,5 +56,6 @@ llvmPackages.stdenv.mkDerivation rec { license = licenses.lgpl3Only; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "c3c"; }; } From 809e6a82a49daae236f02f7c509a85be56d76735 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 7 Jun 2024 12:23:18 +0800 Subject: [PATCH 035/233] losslesscut-bin: *-dmg: unpack with _7zz instead of undmg Support both HFS and Zstd format with 7zz. --- pkgs/applications/video/losslesscut-bin/build-from-dmg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix index 9b3a91b9d029..52a53c5bca25 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix @@ -1,7 +1,7 @@ { lib , stdenvNoCC , fetchurl -, undmg +, _7zz , pname , version , hash @@ -19,7 +19,7 @@ in stdenvNoCC.mkDerivation { inherit pname version src; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "LosslessCut.app"; From c47da5739fb9ee0cc9fcb02d02f53b5c722097ce Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 7 Jun 2024 13:06:53 +0800 Subject: [PATCH 036/233] losslesscut-bin: *-dmg: refactor Run pre- and post- hooks. Utilize $sourceRoot. --- .../video/losslesscut-bin/build-from-dmg.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix index 52a53c5bca25..12b8205eec34 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix @@ -24,10 +24,13 @@ stdenvNoCC.mkDerivation { sourceRoot = "LosslessCut.app"; installPhase = '' - mkdir -p "$out/Applications/LosslessCut.app" - cp -R . "$out/Applications/LosslessCut.app" + runHook preInstall + mkdir -p "$out/Applications" + cd .. + mv "$sourceRoot" "$out/Applications" mkdir -p "$out/bin" - ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + ln -s "$out/Applications/$(basename "$sourceRoot")/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + runHook postInstall ''; meta = metaCommon // (with lib; { From 56e05f27a3a9da27f74a03e0c7a5907f53c14d14 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 7 Jun 2024 12:47:36 +0800 Subject: [PATCH 037/233] losslesscut-bin: *-windows: refactor Run pre- and post- hooks. Utilize $sourceRoot. cd when CWD is about to move away. --- .../video/losslesscut-bin/build-from-windows.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix index ddaf87380644..e6520e4a54b9 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix @@ -19,15 +19,20 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ p7zip ]; unpackPhase = '' - 7z x $src -oLosslessCut-win-x64 + runHook preUnpack + 7z x "$src" -o"$sourceRoot" + runHook postUnpack ''; sourceRoot = "LosslessCut-win-x64"; installPhase = '' - mkdir -p $out/bin $out/libexec - (cd .. && mv LosslessCut-win-x64 $out/libexec) - ln -s "$out/libexec/LosslessCut-win-x64/LosslessCut.exe" "$out/bin/LosslessCut.exe" + runHook preInstall + mkdir -p "$out/bin" "$out/libexec" + cd .. + mv "$sourceRoot" "$out/libexec" + ln -s "$out/libexec/$(basename "$sourceRoot")/LosslessCut.exe" "$out/bin/LosslessCut.exe" + runHook postInstall ''; meta = metaCommon // (with lib; { From f0bf230b99120aaa6914ba4e1d21f78cb9294212 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 7 Jun 2024 06:42:10 -0700 Subject: [PATCH 038/233] less: add upstream patch to fix FreeBSD build --- pkgs/by-name/le/less/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 326e4e2df017..83bc3204e3cf 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/less/-/raw/1d570db0c84fe95799f460526492e45e24c30ad0/backport-007521ac3c95bc76.patch"; hash = "sha256-BT8DLIu7oVhL5XL50uFVUp97qjklcvRHy85UQwVKAmc="; }) + (fetchpatch { + # https://github.com/gwsw/less/pull/416 + name = "freebsd.patch"; + url = "https://github.com/gwsw/less/commit/3ecff3752078fda90fd46c9f020f2a2bb548dd71.patch"; + hash = "sha256-Iv2Jm/7wwRsyLchoEvYz9VziySJ6sI4YbSgFTdQrV+I="; + }) ]; buildInputs = [ From 52e351b5164f78b271677047ea47f5da261b0460 Mon Sep 17 00:00:00 2001 From: Lyle Mantooth Date: Sat, 8 Jun 2024 11:35:42 -0400 Subject: [PATCH 039/233] alttpr-opentracker: fix build errors. --- pkgs/tools/games/opentracker/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index d1c988876c5f..da519da374bf 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -3,10 +3,13 @@ stdenv, buildDotnetModule, fetchFromGitHub, + autoPatchelfHook, wrapGAppsHook3, dotnetCorePackages, fontconfig, gtk3, + icu, + libkrb5, libunwind, openssl, xinput, @@ -39,6 +42,7 @@ buildDotnetModule rec { ]; nativeBuildInputs = [ + autoPatchelfHook wrapGAppsHook3 ]; @@ -46,7 +50,10 @@ buildDotnetModule rec { stdenv.cc.cc.lib fontconfig gtk3 + icu + libkrb5 libunwind + openssl ]; runtimeDeps = @@ -62,6 +69,11 @@ buildDotnetModule rec { libXi ]); + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + "libintl.so.8" + ]; + meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; homepage = "https://github.com/trippsc2/OpenTracker"; From 131ef6d2ed52eb3a670f50d1f33b1307230286f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 May 2024 22:38:10 +0200 Subject: [PATCH 040/233] nixos/no-x-libs: fix gjs Due to the switch to finalAttrs, we now need to properly disable installTests. --- nixos/modules/config/no-x-libs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 87b6fea92ba4..930e57dbde5b 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -39,7 +39,7 @@ with lib; # dep of graphviz, libXpm is optional for Xpm support gd = super.gd.override { withXorg = false; }; ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; }; - gjs = super.gjs.overrideAttrs { doCheck = false; installTests = false; }; # avoid test dependency on gtk3 + gjs = (super.gjs.override { installTests = false; }).overrideAttrs { doCheck = false; }; # avoid test dependency on gtk3 gobject-introspection = super.gobject-introspection.override { x11Support = false; }; gpg-tui = super.gpg-tui.override { x11Support = false; }; gpsd = super.gpsd.override { guiSupport = false; }; From 7813e1f32abcae12c00ce936b3efbcb254a490b0 Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sun, 9 Jun 2024 20:33:57 -0400 Subject: [PATCH 041/233] onthespot: desktop file --- pkgs/by-name/on/onthespot/package.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix index 7e52d4892fa5..138ac6e94b7c 100644 --- a/pkgs/by-name/on/onthespot/package.nix +++ b/pkgs/by-name/on/onthespot/package.nix @@ -4,6 +4,7 @@ , makeDesktopItem , python3 , libsForQt5 +, ffmpeg }: python3.pkgs.buildPythonApplication rec { @@ -27,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ charset-normalizer defusedxml + ffmpeg librespot music-tag packaging @@ -52,16 +54,32 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; + postInstall = '' + install -Dm444 $src/src/onthespot/resources/icon.png $out/share/icons/hicolor/256x256/apps/onthespot.png + ''; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; + desktopItems = [ + (makeDesktopItem { + name = "Onthespot"; + exec = "onthespot_gui"; + icon = "onthespot"; + desktopName = "Onthespot"; + comment = meta.description; + categories = [ "Audio" ]; + }) + ]; + meta = with lib; { - description = " QT based Spotify music downloader written in Python"; + description = "QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; + mainProgram = "onthespot_gui"; }; } From 55d18686750432f6a569aab9bdc5fe0a0f08d241 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 9 Jun 2024 22:23:24 -0500 Subject: [PATCH 042/233] =?UTF-8?q?ffms:=202.40=20=E2=86=92=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://github.com/FFMS/ffms2/releases/tag/5.0 --- pkgs/development/libraries/ffms/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 370b4267bdb4..1afdd23923dd 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, ffmpeg_4 +, ffmpeg , zlib }: stdenv.mkDerivation rec { pname = "ffms"; - version = "2.40"; + version = "5.0"; src = fetchFromGitHub { owner = "FFMS"; repo = "ffms2"; rev = version; - sha256 = "sha256-3bPxt911T0bGpAIS2RxBjo+VV84xW06eKcCj3ZAcmvw="; + sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E="; }; env.NIX_CFLAGS_COMPILE = "-fPIC"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ffmpeg_4 + ffmpeg zlib ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/FFMS/ffms2/"; + homepage = "https://github.com/FFMS/ffms2"; description = "FFmpeg based source library for easy frame accurate access"; mainProgram = "ffmsindex"; license = licenses.mit; From 28d29422b25062e8fd558b00b602f5581918cdb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 10 Jun 2024 11:14:47 +0200 Subject: [PATCH 043/233] openjdk22: remove redundant let binding With the new `mkDerivation (finalAttrs: {})` pattern, the ``` let openjdk = ... ; in openjdk ``` is no longer necessary --- pkgs/development/compilers/openjdk/22.nix | 429 +++++++++++----------- 1 file changed, 214 insertions(+), 215 deletions(-) diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix index 9cdec758544c..97d1a3b3b44d 100644 --- a/pkgs/development/compilers/openjdk/22.nix +++ b/pkgs/development/compilers/openjdk/22.nix @@ -59,219 +59,218 @@ let # when building a headless jdk, also bootstrap it with a headless jdk openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation (finalAttrs: { - pname = "openjdk" + lib.optionalString headless "-headless"; - inherit version; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = info.repo; - rev = "jdk-${version}"; - hash = info.hash; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; - buildInputs = [ - cpio - file - which - zip - perl - zlib - cups - freetype - alsa-lib - libjpeg - giflib - libpng - zlib - lcms2 - libX11 - libICE - libXrender - libXext - libXtst - libXt - libXtst - libXi - libXinerama - libXcursor - libXrandr - fontconfig - openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 - gnome_vfs - GConf - glib - ]; - - patches = [ - ./fix-java-home-jdk21.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = [ "build" "host" ]; - - - # https://openjdk.org/groups/build/doc/building.html - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-string=${version}" - "--with-vendor-version-string=(nix)" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" - "-lcups" - "-lXinerama" - "-lXrandr" - "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" - "-lgio-2.0" - "-lgnomevfs-2" - "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = __curPos; - meta = import ./meta.nix lib featureVersion; - - passthru = { - updateScript = - let - java-json = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar"; - hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="; - }; - in - writeShellScript "update-java" '' - ${finalAttrs.finalPackage}/bin/java \ - -cp ${java-json} \ - ${./JavaUpdater.java} \ - 22 pkgs/development/compilers/openjdk/info.json - ''; - - home = "${finalAttrs.finalPackage}/lib/openjdk"; - - inherit gtk3; - }; - }); in -openjdk + +stdenv.mkDerivation (finalAttrs: { + pname = "openjdk" + lib.optionalString headless "-headless"; + inherit version; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = info.repo; + rev = "jdk-${version}"; + hash = info.hash; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio + file + which + zip + perl + zlib + cups + freetype + alsa-lib + libjpeg + giflib + libpng + zlib + lcms2 + libX11 + libICE + libXrender + libXext + libXtst + libXt + libXtst + libXi + libXinerama + libXcursor + libXrandr + fontconfig + openjdk-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 + gnome_vfs + GConf + glib + ]; + + patches = [ + ./fix-java-home-jdk21.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + # JDK's build system attempts to specifically detect + # and special-case WSL, and we don't want it to do that, + # so pass the correct platform names explicitly + configurePlatforms = [ "build" "host" ]; + + + # https://openjdk.org/groups/build/doc/building.html + configureFlags = [ + "--with-boot-jdk=${openjdk-bootstrap.home}" + "--with-version-string=${version}" + "--with-vendor-version-string=(nix)" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" + "-lcups" + "-lXinerama" + "-lXrandr" + "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" + "-lgio-2.0" + "-lgnomevfs-2" + "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk-bootstrap ]; + + pos = __curPos; + meta = import ./meta.nix lib featureVersion; + + passthru = { + updateScript = + let + java-json = fetchurl { + url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar"; + hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="; + }; + in + writeShellScript "update-java" '' + ${finalAttrs.finalPackage}/bin/java \ + -cp ${java-json} \ + ${./JavaUpdater.java} \ + 22 pkgs/development/compilers/openjdk/info.json + ''; + + home = "${finalAttrs.finalPackage}/lib/openjdk"; + + inherit gtk3; + }; +}) From 0cb601e32cd8673f764b232fe400570d579c7edb Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 10 Jun 2024 17:03:01 +0800 Subject: [PATCH 044/233] bilibili: 1.13.2-1 -> 1.13.5-2 --- pkgs/by-name/bi/bilibili/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix index e460a9037da4..e410e92f8d9a 100644 --- a/pkgs/by-name/bi/bilibili/package.nix +++ b/pkgs/by-name/bi/bilibili/package.nix @@ -2,22 +2,23 @@ , stdenv , fetchurl , electron +, zstd , makeWrapper }: stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.13.2-1"; + version = "1.13.5-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-yqgQNsTD4iT54LJYEbV6dk7OD7KoZvX61XERYQ4MsSA="; + hash = "sha256-4p5izaQsax4i2/AnjivDVoY205ITmEx48GhblPOZDjk="; }; unpackPhase = '' runHook preUnpack ar x $src - tar xf data.tar.xz + tar -I ${zstd}/bin/zstd -xvf data.tar.zst runHook postUnpack ''; From f91c4d43eaad88736dd27c3fe2c69cb6e43a5d92 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 10 Jun 2024 14:15:52 +0100 Subject: [PATCH 045/233] catppuccin-gtk: 0.7.5 -> 1.0.3 --- .../ca/catppuccin-gtk/package.nix} | 55 ++++++++----------- .../colloid-src-git-reset.patch | 17 ------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 22 insertions(+), 52 deletions(-) rename pkgs/{data/themes/catppuccin-gtk/default.nix => by-name/ca/catppuccin-gtk/package.nix} (56%) delete mode 100644 pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix similarity index 56% rename from pkgs/data/themes/catppuccin-gtk/default.nix rename to pkgs/by-name/ca/catppuccin-gtk/package.nix index 49fbade1a88a..5bc1ffbcecab 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -2,9 +2,8 @@ , stdenvNoCC , fetchFromGitHub , gtk3 +, git , colloid-gtk-theme -, gnome-themes-extra -, gtk-engine-murrine , python3 , sassc , nix-update-script @@ -20,6 +19,7 @@ let validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; pname = "catppuccin-gtk"; + version = "1.0.3"; in lib.checkListOfEnum "${pname}: theme accent" validAccents accents @@ -27,38 +27,29 @@ lib.checkListOfEnum "${pname}: color variant" validVariants [variant] lib.checkListOfEnum "${pname}: size variant" validSizes [size] lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks -stdenvNoCC.mkDerivation rec { - inherit pname; - version = "0.7.5"; +stdenvNoCC.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - hash = "sha256-DIeMdkEjIcPIf/EgE83F5URHY+lR2+hxdc4wSrruFJ8="; + hash = "sha256-8KyZtZqVVz5UKuGdLrUsR2djD3nsJDliHMtvFtUVim8="; }; - nativeBuildInputs = [ gtk3 sassc ]; - - patches = [ - ./colloid-src-git-reset.patch - ]; - - buildInputs = [ - gnome-themes-extra + nativeBuildInputs = [ + gtk3 + sassc + # git is needed here since "git apply" is being used for patches + # see + git (python3.withPackages (ps: [ ps.catppuccin ])) ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postUnpack = '' - rm -rf source/colloid - cp -r ${colloid-gtk-theme.src} source/colloid - chmod -R +w source/colloid - ''; - - postPatch = '' - patchShebangs --build colloid/install.sh colloid/build.sh + rm -rf source/sources/colloid + cp -r ${colloid-gtk-theme.src} source/sources/colloid + chmod -R +w source/sources/colloid ''; dontConfigure = true; @@ -67,14 +58,12 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - cp -r colloid colloid-base mkdir -p $out/share/themes - export HOME=$(mktemp -d) - python3 install.py ${variant} \ - ${lib.optionalString (accents != []) "--accent " + builtins.toString accents} \ - ${lib.optionalString (size != []) "--size " + size} \ - ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + python3 build.py ${variant} \ + --accent ${builtins.toString accents} \ + ${lib.optionalString (size != [ ]) "--size " + size} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ --dest $out/share/themes runHook postInstall @@ -82,11 +71,11 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Soothing pastel theme for GTK"; homepage = "https://github.com/catppuccin/gtk"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ fufexan dixslyf ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fufexan dixslyf isabelroses ]; }; } diff --git a/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch b/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch deleted file mode 100644 index 7ee1f4bd9b6f..000000000000 --- a/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/scripts/create_theme.py b/scripts/create_theme.py -index 074dc43..7e7a8eb 100644 ---- a/scripts/create_theme.py -+++ b/scripts/create_theme.py -@@ -34,7 +34,11 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F - os.chdir(work_dir) - subprocess.call("./build.sh", shell=True) # Rebuild all scss - subprocess.call(install_cmd, shell=True) # Install the theme globally for you -- subprocess.call("git reset --hard HEAD", shell=True) # reset colloid repo to original state -+ # subprocess.call("git reset --hard HEAD", shell=True) # reset colloid repo to original state -+ # recreate git reset -+ os.chdir(repo_dir) -+ shutil.rmtree("colloid") -+ shutil.copytree("colloid-base", "colloid") - - try: - # Rename colloid generated files as per catppuccin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 169e0f6bc72c..419a34777311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,8 +417,6 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; - catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { }; From a1c5b0fe2aa0715b1c863f344a5ee80c140393f4 Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:50:36 +0200 Subject: [PATCH 046/233] vscode-extensions.continue.continue: 0.8.25 -> 0.8.40 --- .../applications/editors/vscode/extensions/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a05bb510c6eb..8ce64c93323b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -948,26 +948,26 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-GQH+KKteWbCz18AlTWjLWrVpPRxumi+iDPS5n+5xy/0="; + hash = "sha256-ZlbPRFQwvZNCp8K/rbHqVa3coXa2dT4nOrNChC9naC8="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-xBwuAtvRdOgYkfxP0JaxhAQZx5AJWymDVQ50piTx608="; + hash = "sha256-hSRdvno8VZNi48rckaqWbAgDXT6RXEcPnkNOT8DV1wA="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-oLLKnNZ+E06PbUrhj5Y0HOdHhUs/fXd+3lZXX/P2C10="; + hash = "sha256-rimE7dKT6zajHo6E42z7IyfP35xBXThIwMHhZjaZwHk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-nWuyqOIELp8MrjzCFH3yu4pWm5KsNxmx3eacgStWKG0="; + hash = "sha256-7TeUAZLiEnqi5i5nHLhtv5aMxIcw7iiABOAkwP1YYqM="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.25"; + version = "0.8.40"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; From 06c9d396bdabc505c53e5ad0d336cf8fa35c7155 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 13 May 2024 12:02:50 +0200 Subject: [PATCH 047/233] gdal: 3.8.5 -> 3.9.0 --- pkgs/development/libraries/gdal/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e7a999488827..35875c8aef75 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchFromGitHub -, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -80,23 +79,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.8.5"; + version = "3.9.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z+mYlyOX9vJ772qwZMQfCbD/V7RL6+9JLHTzoZ55ot0="; + hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; }; - patches = [ - # bump java source option to fix build with JDK 21 - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch"; - sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo="; - }) - ]; - nativeBuildInputs = [ bison cmake @@ -229,8 +220,8 @@ stdenv.mkDerivation (finalAttrs: { export GDAL_DOWNLOAD_TEST_DATA=OFF # allows to skip tests that fail because of file handle leak # the issue was not investigated - # https://github.com/OSGeo/gdal/blob/v3.7.0/autotest/gdrivers/bag.py#L61 - export BUILD_NAME=fedora + # https://github.com/OSGeo/gdal/blob/v3.9.0/autotest/gdrivers/bag.py#L54 + export CI=1 ''; nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook From e18cf4f3cbd236180c0780033ded4bf0579b13f5 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 30 May 2024 13:22:50 +0200 Subject: [PATCH 048/233] python3Packages.rasterio: disable tests failing with latest gdal version --- pkgs/development/python-modules/rasterio/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 158394a3b331..d7ab45fd4732 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -99,6 +99,12 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" + + # Failing with GDAL 3.9. + # Fixed in https://github.com/rasterio/rasterio/commit/24d0845e576158217f6541c3c81b163d873a994d + # Re-enable in next rasterio update. + "test_create_sidecar_mask" + "test_update_tags" ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; From 6997f6739f9919b054aa1d4f2b5d4a9887fea388 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 4 Jun 2024 16:52:27 +0200 Subject: [PATCH 049/233] gdal: fix build with latest hdf5 version --- pkgs/development/libraries/gdal/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 35875c8aef75..f8bf3f7c075a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,6 +2,7 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -88,6 +89,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; }; + patches = [ + # HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch"; + sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc="; + }) + ]; + nativeBuildInputs = [ bison cmake From 04a9b513e37867e59e7459eb6eeb771ae2bb47b5 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 10 Jun 2024 16:21:32 +0200 Subject: [PATCH 050/233] pdal: temporary disable test failing with latest gdal version --- pkgs/development/libraries/pdal/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 86d976531cb3..edaf281c65bc 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -87,6 +87,12 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; disabledTests = [ + # Failing due to GDAL 3.9 change in coordinates precision. + # See: https://github.com/PDAL/PDAL/issues/4403 + # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411 + # is merged ! + "pdal_io_ogr_writer_test" + # Tests failing due to TileDB library implementation, disabled also # by upstream CI. # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 From 0e012f363ffbb618e8b2ad99e522e90476a765bd Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 10 Jun 2024 18:38:50 +0200 Subject: [PATCH 051/233] python3Packages.geopandas: fix compatibility with latest gdal version --- .../python-modules/geopandas/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 021292f8c4ac..e4b958d42461 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, setuptools, @@ -29,6 +30,20 @@ buildPythonPackage rec { hash = "sha256-FBhPcae8bnNnsfr14I1p22VhoOf9USF9DAcrAqx+zso="; }; + patches = [ + # GDAL 3.9 compat for boolean array in shp + (fetchpatch { + url = "https://github.com/geopandas/geopandas/commit/f1be60532bed31cb410ce4db2da6b733bc8713c9.patch"; + sha256 = "sha256-DZhC7sSOki0XTcojSRvVVSlsnYnxCw/Ee7vHBmDCsbA="; + }) + + # GDAL 3.9 compat for boolean array in shp for fiona + (fetchpatch { + url = "https://github.com/geopandas/geopandas/commit/1e08422d8aee4877752047a8a08f41e3a67188f2.patch"; + sha256 = "sha256-SpNqe7jL1rA79YhhSUfEzt30plt56Tux5v1h7IHp31I="; + }) + ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ From ba70d8f1c11cd2ddd9e60d96e6bbfa42418b8721 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 09:15:34 +0000 Subject: [PATCH 052/233] wasmer: 4.3.1 -> 4.3.2 --- pkgs/development/interpreters/wasmer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 030aa67fc2e3..4b855186bc31 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1bxxy0Dso54cYQIZC9UUjtkgL1eyd3oRbhaYCwI0otw="; + hash = "sha256-FxbODuIWGHdhGAt6EFDwrashmYFy+ldkfUucUkLzyms="; }; - cargoHash = "sha256-3MwQZdFIWqHvELpIGlqsn/VKyobWki7OcMXQrjbxwKk="; + cargoHash = "sha256-ZPYqMXzX7yMaNrFUKuvUPyfQovd/E5/3T3n535oD+Tw="; nativeBuildInputs = [ rustPlatform.bindgenHook From 494442762c4f515b2b8e437a61cf76fd3af3d584 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 12 Jun 2024 11:50:17 +0200 Subject: [PATCH 053/233] amazon-ssm-agent: remove overrideEtc parameter This was meant to make amazon-ssm-agent work "out of the box" on non-NixOS systems but the feature never really worked. The problem is that amazon-ssm-agent looks for the files "amazon-ssm-agent.json" and "seelog.xml" but the files in the package are named "amazon-ssm-agent.json.template" and "seelog.xml.template". So even with this overrideEtc = true it would not be able to find the config. E.g. you'd get an error like Error occurred fetching the seelog config file path: open /nix/store/pyfxjr0i0hszcj9b6fqly6344zf9zhcb-amazon-ssm-agent-3.3.484.0/etc/amazon/ssm/seelog.xml: no such file or directory on startup. Removing this parameter from the from the package doesn't break things as it didn't work in the first place. --- nixos/modules/services/misc/amazon-ssm-agent.nix | 8 +------- pkgs/by-name/am/amazon-ssm-agent/package.nix | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixos/modules/services/misc/amazon-ssm-agent.nix index 9ab4a7f96d08..0da10621d0a0 100644 --- a/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -28,13 +28,7 @@ in { options.services.amazon-ssm-agent = { enable = mkEnableOption "Amazon SSM agent"; - - package = mkOption { - type = types.path; - description = "The Amazon SSM agent package to use"; - default = pkgs.amazon-ssm-agent.override { overrideEtc = false; }; - defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }"; - }; + package = mkPackageOption pkgs "amazon-ssm-agent" {}; }; config = mkIf cfg.enable { diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 5845d5c71aa3..62f66302806f 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -14,7 +14,6 @@ , nixosTests , testers , amazon-ssm-agent -, overrideEtc ? true }: let @@ -96,9 +95,6 @@ buildGoModule rec { --replace "/sbin/shutdown" "shutdown" echo "${version}" > VERSION - '' + lib.optionalString overrideEtc '' - substituteInPlace agent/appconfig/constants_unix.go \ - --replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"' '' + lib.optionalString stdenv.isLinux '' substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode From 16999590ce0cb09df693fe0d2470153c86d27d5f Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Mon, 3 Jun 2024 21:48:42 +0300 Subject: [PATCH 054/233] opencl-info: drop Upstream has been abandoned and unmaintained for 11 years. opencl-clhpp updates are causing build failures which need vendored patches. --- pkgs/tools/system/opencl-info/default.nix | 38 ------------------- .../opencl-info/opencl-info-clhpp2.diff | 22 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/tools/system/opencl-info/default.nix delete mode 100644 pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix deleted file mode 100644 index 7396e67087b1..000000000000 --- a/pkgs/tools/system/opencl-info/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: - -stdenv.mkDerivation { - pname = "opencl-info"; - version = "unstable-2014-02-21"; - - src = fetchFromGitHub { - owner = "marchv"; - repo = "opencl-info"; - rev = "3e53d001a98978feb865650cf0e93b045400c0d7"; - sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l"; - }; - - patches = [ - # The cl.hpp header was removed from opencl-clhpp. This patch - # updates opencl-info to use the new cp2.hpp header. - # - # Submitted upstream: https://github.com/marchv/opencl-info/pull/2 - ./opencl-info-clhpp2.diff - ]; - - buildInputs = [ opencl-clhpp ocl-icd ]; - - NIX_LDFLAGS = "-lOpenCL"; - - installPhase = '' - install -Dm755 opencl-info $out/bin/opencl-info - ''; - - meta = with lib; { - description = "Tool to dump OpenCL platform/device information"; - homepage = "https://github.com/marchv/opencl-info"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - mainProgram = "opencl-info"; - }; -} diff --git a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff b/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff deleted file mode 100644 index 013222beebf7..000000000000 --- a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/opencl-info.cpp b/opencl-info.cpp -index a23015d..a6de0c1 100644 ---- a/opencl-info.cpp -+++ b/opencl-info.cpp -@@ -7,7 +7,7 @@ - #if defined(__APPLE__) || defined(__MACOSX) - # include - #else --# include -+# include - #endif - - #include -@@ -130,7 +130,7 @@ int main() { - PconstEnd; - P(device, CL_DEVICE_LOCAL_MEM_SIZE); - Pbool(device, CL_DEVICE_ERROR_CORRECTION_SUPPORT); -- Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); -+ // Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); /* Deprecated in 2.0 */ - P(device, CL_DEVICE_PROFILING_TIMER_RESOLUTION); - Pbool(device, CL_DEVICE_ENDIAN_LITTLE); - Pbool(device, CL_DEVICE_AVAILABLE); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58afce07bdcc..bba9374aec5e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -958,6 +958,7 @@ mapAliases ({ openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 + opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0def6bf6c19..c4072d608272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11241,8 +11241,6 @@ with pkgs; opencc = callPackage ../tools/text/opencc { }; - opencl-info = callPackage ../tools/system/opencl-info { }; - opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; From ae7c4ca17ff8afe9a8bc771cb68d78e6186295a5 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 30 May 2024 10:31:57 -0700 Subject: [PATCH 055/233] freebsd.libcxxrt: fixup in preparation for inclusion in stdenv - add option to build without libcxx - don't build with libcxx - distribute headers --- .../bsd/freebsd/patches/14.0/libcxxrt-headers.patch | 11 +++++++++++ pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix | 9 ++++++++- pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch new file mode 100644 index 000000000000..256db9e2d9cf --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch @@ -0,0 +1,11 @@ +--- freebsd/lib/libcxxrt/Makefile 2024-05-30 14:27:42.328086005 -0700 ++++ freebsd/lib/libcxxrt/Makefile.mod 2024-05-30 14:27:48.048014581 -0700 +@@ -19,6 +19,8 @@ + SRCS+= terminate.cc + SRCS+= typeinfo.cc + ++INCS+=cxxabi.h unwind.h unwind-arm.h unwind-itanium.h ++ + WARNS?= 0 + CFLAGS+= -isystem ${SRCDIR} -nostdinc++ + CXXSTD?= c++14 diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix index 0640d2292d49..fd5591c0ffb8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, ... }: +{ mkDerivation }: # this package is quite different from stock libcxxrt. # as of FreeBSD 14.0, it is vendored from APPROXIMATELY libcxxrt # 5d8a15823a103bbc27f1bfdcf2b5aa008fab57dd, though the vendoring mechanism is @@ -8,4 +8,11 @@ mkDerivation { pname = "libcxxrt"; path = "lib/libcxxrt"; extraPaths = [ "contrib/libcxxrt" ]; + outputs = [ + "out" + "dev" + "debug" + ]; + noLibcxx = true; + libName = "cxxrt"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index c6659ac0d91c..12f2c9407e3c 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -3,6 +3,8 @@ stdenv, stdenvNoCC, stdenvNoLibs, + overrideCC, + buildPackages, versionData, writeText, patches, @@ -27,6 +29,8 @@ lib.makeOverridable ( stdenvNoCC else if attrs.noLibc or false then stdenvNoLibs + else if attrs.noLibcxx or false then + overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx else stdenv; in From b81447c6318286622abb221ea77815153b7cd12a Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Wed, 12 Jun 2024 09:10:58 +0100 Subject: [PATCH 056/233] shipwright: darwin build, add maintainer --- pkgs/games/shipwright/darwin-fixes.patch | 37 ++++++++++ pkgs/games/shipwright/default.nix | 90 ++++++++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 118 insertions(+), 13 deletions(-) create mode 100644 pkgs/games/shipwright/darwin-fixes.patch diff --git a/pkgs/games/shipwright/darwin-fixes.patch b/pkgs/games/shipwright/darwin-fixes.patch new file mode 100644 index 000000000000..ae5e936603dd --- /dev/null +++ b/pkgs/games/shipwright/darwin-fixes.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c8644af..157758c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -166,17 +166,13 @@ endif() + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_custom_target(CreateOSXIcons + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset +- COMMAND sips -z 16 16 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png +- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png +- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png +- COMMAND sips -z 64 64 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png +- COMMAND sips -z 128 128 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png +- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png +- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png +- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png +- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png +- COMMAND cp soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png +- COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset ++ COMMAND convert soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png ++ COMMAND png2icns ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_{16,32,64,128,256,512}.png + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Creating OSX icons ..." + ) +@@ -201,7 +197,6 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/assets + + install(CODE " + include(BundleUtilities) +- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/soh-macos\" \"\" \"${dirs}\") + ") + + endif() diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 397226fc4ba5..cdb48733eb01 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -24,8 +24,13 @@ , imagemagick , gnome , makeWrapper +, darwin +, libicns }: - +let + inherit (darwin.apple_sdk_11_0.frameworks) + IOSurface Metal QuartzCore Cocoa AVFoundation; +in stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; version = "8.0.5"; @@ -38,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + ./darwin-fixes.patch + ]; + # This would get fetched at build time otherwise, see: # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736 gamecontrollerdb = fetchurl { @@ -50,27 +59,39 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - lsb-release python3 imagemagick - copyDesktopItems makeWrapper + ] ++ lib.optionals stdenv.isLinux [ + lsb-release + copyDesktopItems + ] ++ lib.optionals stdenv.isDarwin [ + libicns + darwin.sigtool ]; buildInputs = [ boost + glew + SDL2 + SDL2_net + libpng + ] ++ lib.optionals stdenv.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext - glew - SDL2 - SDL2_net libpulseaudio - libpng gnome.zenity + ] ++ lib.optionals stdenv.isDarwin [ + IOSurface + Metal + QuartzCore + Cocoa + AVFoundation + darwin.apple_sdk_11_0.libs.simd ]; cmakeFlags = [ @@ -78,6 +99,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NON_PORTABLE" true) ]; + env.NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.isDarwin "-Wno-int-conversion -Wno-implicit-int"; + dontAddPrefix = true; # Linking fails without this @@ -90,18 +114,60 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - preInstall = '' + preInstall = lib.optionalString stdenv.isLinux '' # Cmake likes it here for its install paths cp ../OTRExporter/soh.otr .. + '' + lib.optionalString stdenv.isDarwin '' + cp ../OTRExporter/soh.otr soh/soh.otr ''; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p $out/bin ln -s $out/lib/soh.elf $out/bin/soh install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png + '' + lib.optionalString stdenv.isDarwin '' + # Recreate the macOS bundle (without using cpack) + # We mirror the structure of the bundle distributed by the project + + mkdir -p $out/Applications/soh.app/Contents + cp $src/soh/macosx/Info.plist.in $out/Applications/soh.app/Contents/Info.plist + substituteInPlace $out/Applications/soh.app/Contents/Info.plist \ + --replace-fail "@CMAKE_PROJECT_VERSION@" "${finalAttrs.version}" + + mv $out/MacOS $out/Applications/soh.app/Contents/MacOS + + # Wrapper + cp $src/soh/macosx/soh-macos.sh.in $out/Applications/soh.app/Contents/MacOS/soh + chmod +x $out/Applications/soh.app/Contents/MacOS/soh + patchShebangs $out/Applications/soh.app/Contents/MacOS/soh + + # "lib" contains all resources that are in "Resources" in the official bundle. + # We move them to the right place and symlink them back to $out/lib, + # as that's where the game expects them. + mv $out/Resources $out/Applications/soh.app/Contents/Resources + mv $out/lib/** $out/Applications/soh.app/Contents/Resources + rm -rf $out/lib + ln -s $out/Applications/soh.app/Contents/Resources $out/lib + + # Copy icons + cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns + + # Fix executable + install_name_tool -change @executable_path/../Frameworks/libSDL2-2.0.0.dylib \ + ${SDL2}/lib/libSDL2-2.0.0.dylib \ + $out/Applications/soh.app/Contents/Resources/soh-macos + install_name_tool -change @executable_path/../Frameworks/libGLEW.2.2.0.dylib \ + ${glew}/lib/libGLEW.2.2.0.dylib \ + $out/Applications/soh.app/Contents/Resources/soh-macos + install_name_tool -change @executable_path/../Frameworks/libpng16.16.dylib \ + ${libpng}/lib/libpng16.16.dylib \ + $out/Applications/soh.app/Contents/Resources/soh-macos + + # Codesign (ad-hoc) + codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos ''; - fixupPhase = '' + fixupPhase = lib.optionalString stdenv.isLinux '' wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} ''; @@ -121,8 +187,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/HarbourMasters/Shipwright"; description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more"; mainProgram = "soh"; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ ivar j0lol ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ ivar j0lol matteopacini ]; license = with lib.licenses; [ # OTRExporter, OTRGui, ZAPDTR, libultraship mit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63ef0ecff6c8..f664ddd43c3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36251,7 +36251,9 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; - shipwright = callPackage ../games/shipwright { }; + shipwright = callPackage ../games/shipwright { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; wipeout-rewrite = callPackage ../games/wipeout-rewrite { inherit (darwin.apple_sdk.frameworks) Foundation; From 17e2421e08da31b1c79aa795f1e12babd19cf328 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 12 Jun 2024 22:55:09 +0100 Subject: [PATCH 057/233] nixVersions.latest: 2.22.1 -> 2.23.0 Changes: https://github.com/NixOS/nix/blob/2.23.0/doc/manual/src/release-notes/rl-2.23.md --- pkgs/tools/package-management/nix/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1eeecab4e7ec..5f2a9dadfd6b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -176,6 +176,12 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_22"; }; + nix_2_23 = common { + version = "2.23.0"; + hash = "sha256-cRCwRDxR8rEQQEvGjIH8g0krJd4ZFJrdgmPXkv65S/Y="; + self_attribute_name = "nix_2_23"; + }; + git = common rec { version = "2.23.0"; suffix = "pre20240526_${lib.substring 0 8 src.rev}"; @@ -188,7 +194,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "git"; }; - latest = self.nix_2_22; + latest = self.nix_2_23; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From 099266ab84a55b9bf6262958cf4f719ac8d8ad84 Mon Sep 17 00:00:00 2001 From: vigress8 <150687949+vigress8@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:02:58 +0400 Subject: [PATCH 058/233] maintainers: add vigress8 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 79b4296693c4..1bb9715b2e0c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21770,6 +21770,12 @@ githubId = 5837359; name = "Adrian Pistol"; }; + vigress8 = { + email = "vig@disroot.org"; + github = "vigress8"; + githubId = 150687949; + name = "Vigress"; + }; vikanezrimaya = { email = "vika@fireburn.ru"; github = "vikanezrimaya"; From 2a99501296cc28fa3bc9ffb626daee8ac3ad131a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 21:04:37 +0000 Subject: [PATCH 059/233] plexRaw: 1.40.2.8395-c67dce28e -> 1.40.3.8555-fef15d30c --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 0a3d243d0a20..dbcd3aa9682f 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.40.2.8395-c67dce28e"; + version = "1.40.3.8555-fef15d30c"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-ZJqbE9pgflqFVjiDqCED6K5KBk6KHSbkIQllF06jJVQ="; + sha256 = "0v415di48dg5mvkvb374lbx089iavrbqiaada1wdhaz87gb54lww"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-gYRhQIf6RaXgFTaigFW1yJ7ndxRmOP6oJSNnr8o0EBM="; + sha256 = "0m2b9xalrvnwiblwygkjrypr8kpbcxh8mw30ka1sf4cxmny4g5lq"; }; outputs = [ "out" "basedb" ]; From 64520717431e72c7c0fd11c2a0730da3a48c353c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 02:06:40 +0000 Subject: [PATCH 060/233] plumber: 2.6.1 -> 2.7.0 --- pkgs/by-name/pl/plumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index a682fa832406..8571bd7ca096 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-7sOj21ZTmo3KJ8CduH25jA4gmXLMKi5QWAng6nP0dsQ="; + hash = "sha256-20rc9TLiCkt9k/Gtr5aoheGiiqOp1eURSqg4p1jTnkE="; }; vendorHash = null; From 01aed33c9153a59b0cf642d1ebd351a3f0d53e83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 15:58:54 +0000 Subject: [PATCH 061/233] bun: 1.1.10 -> 1.1.13 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 9b0a1f3a9bd3..12ad864a3a40 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.10"; + version = "1.1.13"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-txTr+uYvGOsytyTO2mXZUQOOJMcNT4uyzNCdz4pn0AQ="; + hash = "sha256-pg6nL+brc1B7GyBt8Y/FFqdBKt8uTw9KhNqITYbdi5A="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-8Wp3RDvP2/tonU8ngDTWuGD1m7q7gxwnuwbxpc6N/+Y="; + hash = "sha256-18iAnXEELi+YvRVs1PP1MqZPeROVVl4T+qu2izyE4s0="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-cV3NO0qGqZqSgVLj1U2bvQUqGzgGugLPwk4eq+XfjTU="; + hash = "sha256-NeYGWYG3kRevI0CIShe4AHJzLRDV9cFbiaP7lpZO18A="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-iQM/BtoaDBRlH/jx9qH6WlV2Ox7MbtWMzHc8RxVCHH0="; + hash = "sha256-QC6dsWjRYiuBIojxPvs8NFMSU6ZbXbZ9Q/+u+45NmPc="; }; }; updateScript = writeShellScript "update-bun" '' From 82bff8fc884a46f329ef4dfcc512ba59a77e6175 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 8 Mar 2024 09:52:53 -0300 Subject: [PATCH 062/233] vkd3d: migrate to by-name --- .../vkd3d/default.nix => by-name/vk/vkd3d/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/vkd3d/default.nix => by-name/vk/vkd3d/package.nix} (100%) diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/by-name/vk/vkd3d/package.nix similarity index 100% rename from pkgs/development/libraries/vkd3d/default.nix rename to pkgs/by-name/vk/vkd3d/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f06962f5fad6..beb5ebcedf15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24748,8 +24748,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - vkd3d = callPackage ../development/libraries/vkd3d {}; - vkd3d-proton = callPackage ../development/libraries/vkd3d-proton {}; vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; From 8453d43b0524538c83a2fca9fcd4b1dd7e686394 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 14 Jun 2024 15:28:46 -0300 Subject: [PATCH 063/233] vkd3d: refactor - finalAttrs - split outputs - strictDeps - no nested with - meta - longDescription - mainProgram - add AndersonTorres as maintainer --- pkgs/by-name/vk/vkd3d/package.nix | 67 ++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index 4f1ddd6f12a6..f0d846e57799 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -1,26 +1,63 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, wine, flex, bison -, vulkan-headers, spirv-headers, vulkan-loader }: +{ + lib, + autoreconfHook, + bison, + fetchFromGitLab, + flex, + pkg-config, + spirv-headers, + stdenv, + vulkan-headers, + vulkan-loader, + wine, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vkd3d"; version = "1.10"; - nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; - buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; - src = fetchFromGitLab { domain = "gitlab.winehq.org"; owner = "wine"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-/5tc8agqpRbFRnfv8O1fBo2SPNOuO6exs0BZ9MnOTA0="; + repo = "vkd3d"; + rev = "vkd3d-${finalAttrs.version}"; + hash = "sha256-/5tc8agqpRbFRnfv8O1fBo2SPNOuO6exs0BZ9MnOTA0="; }; - meta = with lib; { + outputs = [ "out" "dev" "lib" ]; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + wine + ]; + + buildInputs = [ + spirv-headers + vulkan-headers + vulkan-loader + ]; + + strictDeps = true; + + meta = { homepage = "https://gitlab.winehq.org/wine/vkd3d"; - description = "3D graphics library with an API very similar, but not identical, to Direct3D 12"; - license = licenses.lgpl21; - maintainers = with maintainers; [ expipiplus1 ]; - platforms = platforms.all; + description = "Direct3D to Vulkan translation library"; + longDescription = '' + Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very + similar, but not identical, to Direct3D 12. + + Vkd3d can be used by projects that target Direct3D 12 as a drop-in + replacement at build-time with some modest source modifications. + + If vkd3d is available when building Wine, then Wine will use it to support + Direct3D 12 applications. + ''; + license = with lib.licenses; [ lgpl21Plus ]; + mainProgram = "vkd3d-compiler"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wine.meta) platforms; }; -} +}) From 6c631cfc47d2d7a80c320fe19688cf37d9b0897d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 14 Jun 2024 15:30:15 -0300 Subject: [PATCH 064/233] vkd3d: 1.10 -> 1.11 Co-authored-by: R. RyanTM --- pkgs/by-name/vk/vkd3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index f0d846e57799..ad7f8d72a5dc 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vkd3d"; - version = "1.10"; + version = "1.11"; src = fetchFromGitLab { domain = "gitlab.winehq.org"; owner = "wine"; repo = "vkd3d"; rev = "vkd3d-${finalAttrs.version}"; - hash = "sha256-/5tc8agqpRbFRnfv8O1fBo2SPNOuO6exs0BZ9MnOTA0="; + hash = "sha256-caEj5jplgKUUv5olWztUtlf3pk1ZvN9Rf4xXqsp/q0Y="; }; outputs = [ "out" "dev" "lib" ]; From 7c5ef0c3afa20badc0c85ea89b7c5fae31e804d9 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 14 Jun 2024 15:39:10 -0300 Subject: [PATCH 065/233] vkd3d: 1.11 -> 1.12 --- pkgs/by-name/vk/vkd3d/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix index ad7f8d72a5dc..eba5b7014300 100644 --- a/pkgs/by-name/vk/vkd3d/package.nix +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vkd3d"; - version = "1.11"; + version = "1.12"; src = fetchFromGitLab { domain = "gitlab.winehq.org"; owner = "wine"; repo = "vkd3d"; rev = "vkd3d-${finalAttrs.version}"; - hash = "sha256-caEj5jplgKUUv5olWztUtlf3pk1ZvN9Rf4xXqsp/q0Y="; + hash = "sha256-9FNuWtfJJqkSZ3O11G22aNp8PfseLHH4oyL6MulNwMY="; }; outputs = [ "out" "dev" "lib" ]; From 21b922257fb0441dd4d90f24d1027314d7a8ac76 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 14 Jun 2024 18:02:41 -0400 Subject: [PATCH 066/233] bpftune: 0-unstable-2024-05-17 -> 0-unstable-2024-06-07 Diff: https://github.com/oracle/bpftune/compare/83115c56cf9620fe5669f4a3be67ab779d8f4536...04bab5dd306b55b3e4e13e261af2480b7ccff9fc --- pkgs/os-specific/linux/bpftune/default.nix | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index 8747ef3d928f..cc97ed16faea 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,31 +12,28 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "0-unstable-2024-05-17"; + version = "0-unstable-2024-06-07"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "83115c56cf9620fe5669f4a3be67ab779d8f4536"; - hash = "sha256-er2i7CEUXF3BpWTG//s8C0xfIk5gSVOHB8nE1r7PX78="; + rev = "04bab5dd306b55b3e4e13e261af2480b7ccff9fc"; + hash = "sha256-kVjvupZ6HxJocwXWOrxUNqEGl0welJRlZwvOmMKqeBA="; }; postPatch = '' # otherwise shrink rpath would drop $out/lib from rpath substituteInPlace src/Makefile \ - --replace /lib64 /lib \ - --replace /sbin /bin \ - --replace ldconfig true + --replace-fail /lib64 /lib \ + --replace-fail /sbin /bin \ + --replace-fail ldconfig true substituteInPlace src/bpftune.service \ - --replace /usr/sbin/bpftune "$out/bin/bpftune" + --replace-fail /usr/sbin/bpftune "$out/bin/bpftune" substituteInPlace include/bpftune/libbpftune.h \ - --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ - --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/" + --replace-fail /usr/lib64/bpftune/ "$out/lib/bpftune/" \ + --replace-fail /usr/local/lib64/bpftune/ "$out/lib/bpftune/" substituteInPlace src/libbpftune.c \ - --replace /lib/modules /run/booted-system/kernel-modules/lib/modules - - substituteInPlace src/Makefile sample_tuner/Makefile \ - --replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \ + --replace-fail /lib/modules /run/booted-system/kernel-modules/lib/modules ''; nativeBuildInputs = [ @@ -56,6 +53,7 @@ stdenv.mkDerivation rec { "confprefix=${placeholder "out"}/etc" "BPFTUNE_VERSION=${version}" "NL_INCLUDE=${lib.getDev libnl}/include/libnl3" + "BPF_INCLUDE=${lib.getDev libbpf}/include" ]; hardeningDisable = [ From 6d9600d379142912c56b5af5548ee70ebf5f27f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Jun 2024 02:14:27 +0200 Subject: [PATCH 067/233] python312Packages.spacy: clean source for annotation test --- .../python-modules/spacy/annotation-test/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix index 02aad304a1e6..cb8a97aa568f 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -1,4 +1,5 @@ { + lib, stdenv, pytest, spacy-models, @@ -7,7 +8,12 @@ stdenv.mkDerivation { name = "spacy-annotation-test"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./annotate.py + ]; + }; dontConfigure = true; dontBuild = true; From 803ca835fb45c52ec68d48475989c9c6d8a5fbb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Jun 2024 02:20:47 +0200 Subject: [PATCH 068/233] python312Packages.spacy-transformers: clean source for annotation test --- .../spacy-transformers/annotation-test/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index 51d0388f72ca..d6d1094447d2 100644 --- a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -1,4 +1,5 @@ { + lib, stdenv, pytest, spacy-models, @@ -7,7 +8,12 @@ stdenv.mkDerivation { name = "spacy-transformers-annotation-test"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./annotate.py + ]; + }; dontConfigure = true; dontBuild = true; From f2e2f92866aa68488495fd17268e60685eabfedc Mon Sep 17 00:00:00 2001 From: Honnip Date: Sat, 15 Jun 2024 13:11:48 +0900 Subject: [PATCH 069/233] deno: 1.43.6 -> 1.44.2 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3f59d8eff6d0..f1a970485107 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.43.6"; + version = "1.44.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-8yBcSiaav28AevAH5wh0VwpMR5U5Vong8D+UFCx/wjo="; + hash = "sha256-Q76j1cbRL52jmmkpTZMkpP3/FCeGZqKYAN819mQY9BE="; }; - cargoHash = "sha256-o8DsFtn3+gtIMO5LS3mHbQS1iWT46iC9ZHr8hEOXZrs="; + cargoHash = "sha256-UtnHOzlko5RUAbohwU755BDLSF/Rx20vabaKokEsRLU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 9e98aba8af8a..27834540978a 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.91.1"; + version = "0.93.1"; shas = { - x86_64-linux = "sha256-2J/YDTtSCXo2nsO0Lx6mJqKSFu2hUc8HmNAL2SD9ImI="; - aarch64-linux = "sha256-NwuDVaEbYWZfF2epVPPhIKM1aw35e8Bp5siBoREpym8="; - x86_64-darwin = "sha256-JNf4Me4VMdvjgYM4OyCUlQW6Q/OdQ2BuDNWFKI4sbtg="; - aarch64-darwin = "sha256-WVBDiGWVBvMiKNgPaPw8KQChARkFDfx8Nt9QEobGNG4="; + x86_64-linux = "sha256-ttbwIxzMgihfwwjh3usu7FxVTwLt7ceXU+MyaxXfkxk="; + aarch64-linux = "sha256-rlyY4C4FMHTyPUzqHKYzToIs9tJunTXEor9wc/7zH/0="; + x86_64-darwin = "sha256-IUDe0ogBSCaz1q+uXepOi883hamtJYqBPtNfrm/y6Qo="; + aarch64-darwin = "sha256-53PuHq7AUi21cjopoFakzLuJyqSJ9VeF7g53IWxFXAI="; }; } From aa5aa63be72021dba2ff1782102d8750227d387f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Jun 2024 11:21:43 +0200 Subject: [PATCH 070/233] python311Packages.spectral-cube: patch distutils to provide python3.12 compatibility --- .../python-modules/spectral-cube/default.nix | 38 +++-- .../distutils-looseversion.patch | 152 ++++++++++++++++++ 2 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index c55e100a8002..444761c46159 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,24 +1,31 @@ { lib, stdenv, - aplpy, - astropy, buildPythonPackage, + pythonOlder, + fetchPypi, + + # build-system + setuptools-scm, + + # dependencies + astropy, casa-formats-io, dask, - fetchPypi, joblib, + looseversion, + radio-beam, + + # checks + aplpy, pytest-astropy, pytestCheckHook, - pythonOlder, - radio-beam, - setuptools-scm, }: buildPythonPackage rec { pname = "spectral-cube"; version = "0.6.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,14 +34,17 @@ buildPythonPackage rec { hash = "sha256-gJzrr3+/FsQN/HHDERxf/NECArwOaTqFwmI/Q2Z9HTM="; }; - nativeBuildInputs = [ setuptools-scm ]; + patches = [ ./distutils-looseversion.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ astropy casa-formats-io - radio-beam - joblib dask + joblib + looseversion + radio-beam ]; nativeCheckInputs = [ @@ -54,11 +64,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "spectral_cube" ]; - meta = with lib; { + meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; homepage = "https://spectral-cube.readthedocs.io"; changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ smaret ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ smaret ]; }; } diff --git a/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch b/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch new file mode 100644 index 000000000000..857d37a1a88a --- /dev/null +++ b/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch @@ -0,0 +1,152 @@ +diff --git a/spectral_cube/conftest.py b/spectral_cube/conftest.py +index 0d7c158..6fac9b4 100644 +--- a/spectral_cube/conftest.py ++++ b/spectral_cube/conftest.py +@@ -4,7 +4,7 @@ + from __future__ import print_function, absolute_import, division + + import os +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + from astropy.units.equivalencies import pixel_scale + + # Import casatools and casatasks here if available as they can otherwise +diff --git a/spectral_cube/lower_dimensional_structures.py b/spectral_cube/lower_dimensional_structures.py +index f0e3745..1b1e1f8 100644 +--- a/spectral_cube/lower_dimensional_structures.py ++++ b/spectral_cube/lower_dimensional_structures.py +@@ -526,7 +526,7 @@ class Projection(LowerDimensionalObject, SpatialCoordMixinClass, + " installed.") + + # Need version > 0.2 to work with cubes +- from distutils.version import LooseVersion ++ from looseversion import LooseVersion + if LooseVersion(version) < "0.3": + raise Warning("Requires version >=0.3 of reproject. The current " + "version is: {}".format(version)) +diff --git a/spectral_cube/np_compat.py b/spectral_cube/np_compat.py +index ed4a134..39aa320 100644 +--- a/spectral_cube/np_compat.py ++++ b/spectral_cube/np_compat.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import numpy as np +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + def allbadtonan(function): + """ +diff --git a/spectral_cube/spectral_cube.py b/spectral_cube/spectral_cube.py +index 771a2d4..af752b4 100644 +--- a/spectral_cube/spectral_cube.py ++++ b/spectral_cube/spectral_cube.py +@@ -57,7 +57,7 @@ from .spectral_axis import (determine_vconv_from_ctype, get_rest_value_from_wcs, + doppler_beta, doppler_gamma, doppler_z) + from .io.core import SpectralCubeRead, SpectralCubeWrite + +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + + __all__ = ['BaseSpectralCube', 'SpectralCube', 'VaryingResolutionSpectralCube'] +@@ -2659,7 +2659,7 @@ class BaseSpectralCube(BaseNDClass, MaskableArrayMixinClass, + + reproj_kwargs = kwargs + # Need version > 0.2 to work with cubes, >= 0.5 for memmap +- from distutils.version import LooseVersion ++ from looseversion import LooseVersion + if LooseVersion(version) < "0.5": + raise Warning("Requires version >=0.5 of reproject. The current " + "version is: {}".format(version)) +diff --git a/spectral_cube/tests/test_masks.py b/spectral_cube/tests/test_masks.py +index c38ba27..1d6895d 100644 +--- a/spectral_cube/tests/test_masks.py ++++ b/spectral_cube/tests/test_masks.py +@@ -14,7 +14,7 @@ from .. import (BooleanArrayMask, LazyMask, LazyComparisonMask, + FunctionMask, CompositeMask) + from ..masks import is_broadcastable_and_smaller, dims_to_skip, view_of_subset + +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + + def test_spectral_cube_mask(): +diff --git a/spectral_cube/tests/test_moments.py b/spectral_cube/tests/test_moments.py +index 3043dd5..7e05c5b 100644 +--- a/spectral_cube/tests/test_moments.py ++++ b/spectral_cube/tests/test_moments.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import warnings +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + import pytest + import numpy as np +diff --git a/spectral_cube/tests/test_performance.py b/spectral_cube/tests/test_performance.py +index bdee040..a778abc 100644 +--- a/spectral_cube/tests/test_performance.py ++++ b/spectral_cube/tests/test_performance.py +@@ -20,7 +20,7 @@ except ImportError: + + # The comparison of Quantities in test_memory_usage + # fail with older versions of numpy +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + NPY_VERSION_CHECK = LooseVersion(np.version.version) >= "1.13" + +diff --git a/spectral_cube/tests/test_regrid.py b/spectral_cube/tests/test_regrid.py +index 496ddd5..5b1fec7 100644 +--- a/spectral_cube/tests/test_regrid.py ++++ b/spectral_cube/tests/test_regrid.py +@@ -18,7 +18,7 @@ except ImportError: + + # The comparison of Quantities in test_memory_usage + # fail with older versions of numpy +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + NPY_VERSION_CHECK = LooseVersion(np.version.version) >= "1.13" + +diff --git a/spectral_cube/tests/test_spectral_cube.py b/spectral_cube/tests/test_spectral_cube.py +index 9ebeb7d..93e5647 100644 +--- a/spectral_cube/tests/test_spectral_cube.py ++++ b/spectral_cube/tests/test_spectral_cube.py +@@ -6,7 +6,7 @@ import operator + import itertools + import warnings + import mmap +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + import sys + + import pytest +diff --git a/spectral_cube/tests/test_subcubes.py b/spectral_cube/tests/test_subcubes.py +index 6f74f68..217c324 100644 +--- a/spectral_cube/tests/test_subcubes.py ++++ b/spectral_cube/tests/test_subcubes.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import pytest +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + from astropy import units as u + from astropy import wcs +diff --git a/spectral_cube/tests/test_visualization.py b/spectral_cube/tests/test_visualization.py +index 85ea038..0ac8d58 100644 +--- a/spectral_cube/tests/test_visualization.py ++++ b/spectral_cube/tests/test_visualization.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import pytest +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + from .test_spectral_cube import cube_and_raw + From e6af677352d4e59e194786420a00989485f202b7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 15 Jun 2024 14:56:35 +0200 Subject: [PATCH 071/233] rubyPackages.rails: 7.1.3.2 -> 7.1.3.4 Fixes CVE-2024-32464 and CVE-2024-28103. Changes: https://github.com/rails/rails/releases/tag/v7.1.3.4 https://github.com/rails/rails/releases/tag/v7.1.3.3 --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 62d65ff03b8d..386b8506c73c 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2872,10 +2872,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185zq5r9g56sfks852992bm0xf2vm9569jyiz5jyww3vx1jply1d"; + sha256 = "sha256-On/KnfdO5kHcHom4MCrG0D8iiD3nceeGoOnzCU5apq0="; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; From 892f87e2147b0d44471c78b00fbfd1c211d17fc6 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 29 May 2024 13:36:58 -0400 Subject: [PATCH 072/233] nanopb: Fix self-inclusive src Fixes issue described in #301014 --- .../nanopb/test-message-with-annotations/default.nix | 7 +++++-- .../nanopb/test-message-with-options/default.nix | 10 ++++++++-- .../libraries/nanopb/test-simple-proto2/default.nix | 7 +++++-- .../libraries/nanopb/test-simple-proto3/default.nix | 8 +++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix index 9eca4dbb9368..c2ffe6135fbb 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -1,9 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-annotations"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./withannotations.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix index 0030158df91b..f6bf28f3b645 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -1,9 +1,15 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-options"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./withoptions.proto + ./withoptions.options + ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix index d1d3e1a855a7..f8cd35cbf397 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -1,9 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto2"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./simple.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix index 71507054458f..d92698d21ece 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -1,10 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto3"; meta.timeout = 60; - src = ./.; - + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./simple.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did From 0fb9dc1375b8acaccb4f471cdc1b260ef7bf4bd1 Mon Sep 17 00:00:00 2001 From: 6t8k <58048945+6t8k@users.noreply.github.com> Date: Tue, 14 Nov 2023 21:05:05 +0100 Subject: [PATCH 073/233] djview: 4.10.6 -> 4.12 Changelog: https://sourceforge.net/p/djvu/djview-git/ci/release.4.12/tree/NEWS The release tarball no longer contains a configure script, so pull in the necessary dependencies to generate it here. Disable building the `nsdejavu` plugin as modern browsers have dropped support for NPAPI. The `npdjvu` plugin is based on NPAPI too, so remove the respective note. Split `man` output from `out`. --- pkgs/applications/graphics/djview/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 115233dd2641..3678b9760c81 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,6 +1,9 @@ { lib, stdenv , mkDerivation , fetchurl +, autoconf +, automake +, libtool , pkg-config , djvulibre , qtbase @@ -12,14 +15,19 @@ mkDerivation rec { pname = "djview"; - version = "4.10.6"; + version = "4.12"; + + outputs = [ "out" "man" ]; src = fetchurl { url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; - sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; + hash = "sha256-VnPGqLfhlbkaFyCyQJGRW4FF3jSHnbEVi8k2sQDq8+M="; }; nativeBuildInputs = [ + autoconf + automake + libtool pkg-config qttools ]; @@ -31,24 +39,24 @@ mkDerivation rec { libtiff ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--disable-silent-rules" "--disable-dependency-tracking" "--with-x" "--with-tiff" - # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails + "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI ] ++ lib.optional stdenv.isDarwin "--enable-mac"; - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - meta = with lib; { broken = stdenv.isDarwin; description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; longDescription = '' From bd5d563f2d4fd2de18b36d2764773c42c006c897 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 15 Jun 2024 21:59:17 +0100 Subject: [PATCH 074/233] nsncd: unstable-2024-01-16 -> unstable-2024-03-18 --- pkgs/os-specific/linux/nsncd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index 9491c4887fce..80dfdb5457fa 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "nsncd"; - version = "unstable-2024-01-16"; + version = "unstable-2024-03-18"; src = fetchFromGitHub { owner = "twosigma"; repo = "nsncd"; - rev = "f4706786f26d12c533035fb2916be9be5751150b"; - hash = "sha256-GbKDWW00eZZwmslkaGIO8hjCyD5xi7h+S2WP6q5ekOQ="; + rev = "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427"; + hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI="; }; - cargoSha256 = "sha256-jAxcyMPDTBFBrG0cuKm0Tm5p/UEnUgTPQKDgqY2yK7w="; + cargoHash = "sha256-i1rmc5wxtc631hZy2oM4d6r7od0w8GrG7+/pdM6Gqco="; checkFlags = [ # Relies on the test environment to be able to resolve "localhost" # on IPv4. That's not the case in the Nix sandbox somehow. Works From f85f6e2a98165551610091df4d959f77c6925aea Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Mon, 15 Apr 2024 20:14:09 +0000 Subject: [PATCH 075/233] release-plz: init at 0.3.72 --- pkgs/by-name/re/release-plz/package.nix | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/re/release-plz/package.nix diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix new file mode 100644 index 000000000000..f2ea059714da --- /dev/null +++ b/pkgs/by-name/re/release-plz/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, pkg-config +, perl +, openssl +}: +rustPlatform.buildRustPackage rec { + pname = "release-plz"; + version = "0.3.72"; + + src = fetchFromGitHub { + owner = "MarcoIeni"; + repo = "release-plz"; + rev = "release-plz-v${version}"; + hash = "sha256-wc/+X/P/FKDpvw0U7ItIgzHbqsEnngHk4wt7Pjzk594="; + }; + + cargoHash = "sha256-RB+NXuASfpx6tZJfG18Hj7JOfXK9FIqSD7QaDfGUHi4="; + + nativeBuildInputs = [ installShellFiles pkg-config perl ]; + buildInputs = [ openssl ]; + + buildAndTestSubdir = "crates/release_plz"; + + # Tests depend on additional infrastructure to be running locally + doCheck = false; + + postInstall = '' + installShellCompletion --cmd ${meta.mainProgram} \ + --bash <($out/bin/${meta.mainProgram} generate-completions bash) \ + --fish <($out/bin/${meta.mainProgram} generate-completions fish) \ + --zsh <($out/bin/${meta.mainProgram} generate-completions zsh) + ''; + + meta = { + description = "Publish Rust crates from CI with a Release PR"; + homepage = "https://release-plz.ieni.dev"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ dannixon ]; + mainProgram = "release-plz"; + broken = stdenv.isDarwin; + }; +} From 42f976148457ce8465ccbeccd374b78d174c69cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 16 Jun 2024 09:04:13 +1000 Subject: [PATCH 076/233] ccd2iso: fix darwin build Add an explicit include to fix the build on newer compilers. --- pkgs/tools/cd-dvd/ccd2iso/default.nix | 4 ++++ pkgs/tools/cd-dvd/ccd2iso/include.patch | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/cd-dvd/ccd2iso/include.patch diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index b364566f4b7d..a050175b69f2 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; + patches = [ + ./include.patch + ]; + meta = with lib; { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; diff --git a/pkgs/tools/cd-dvd/ccd2iso/include.patch b/pkgs/tools/cd-dvd/ccd2iso/include.patch new file mode 100644 index 000000000000..d7c05f701ccd --- /dev/null +++ b/pkgs/tools/cd-dvd/ccd2iso/include.patch @@ -0,0 +1,9 @@ +--- a/src/ccd2iso.c 2024-06-16 09:01:37 ++++ b/src/ccd2iso.c 2024-06-16 09:01:49 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + #include "clonecd.h" From d0944be9eb4b3ccf63ed28b5ccca1da67843f3f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Jun 2024 23:24:29 +0000 Subject: [PATCH 077/233] ecpdap: 0.1.8 -> 0.2.0 --- pkgs/development/embedded/fpga/ecpdap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 33cd013986cd..ef1ba75c45b1 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KXfEQnbhUUKsCDKhPBjwjF9eJMuiCx5o7gOSzyWv36s="; + sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM="; }; - cargoSha256 = "sha256-BEfsNSzrdV/tnzWk4oOwchOupW6PzZ8TEx7zUzwLBV8="; + cargoHash = "sha256-70Aq/gNfRv9JQyYWb7amYkfzFcNGCGbmCfJH4chbyyc="; nativeBuildInputs = [ pkg-config ]; From d1378ed481f6a075c0493ad9fd68ea3f16b8d57a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 15 Jun 2024 22:44:22 -0400 Subject: [PATCH 078/233] python312Packages.pylibjpeg-libjpeg: 2.02 -> 2.1.0 --- .../python-modules/pylibjpeg-libjpeg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index c9e1647f823c..892e24c62122 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "2.02"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,17 +21,17 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mGwku19Xe605fF3UU59712rYp+s/pP79lBRl79fhhTI="; + hash = "sha256-iU40QdAY5931YM3h3P+WCbiBfX88iVi2QdUvZLptsFs="; fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; From 0dfa1472d894c8643abafc65f954bfb4cbe0cecc Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 15 Jun 2024 03:12:06 -0400 Subject: [PATCH 079/233] telegram-desktop.tg_owt: 0-unstable-2023-12-21 -> 0-unstable-2024-06-15 Diff: https://github.com/desktop-app/tg_owt/compare/afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60...c9cc4390ab951f2cbc103ff783a11f398b27660b --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 8bc0f6f93b44..1889c1825d8c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2023-12-21"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60"; - sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; From 73406d271827272b5bfd47f0f7efc78bffc60b52 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 16 Jun 2024 09:53:53 +0300 Subject: [PATCH 080/233] macfuse: 4.4.1 -> 4.8.0 --- pkgs/os-specific/darwin/macfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix index c63b536f248b..4de9600e7910 100644 --- a/pkgs/os-specific/darwin/macfuse/default.nix +++ b/pkgs/os-specific/darwin/macfuse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "macfuse-stubs"; - version = "4.4.1"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; - sha256 = "2a2d0f37ec5fcff547c5efa7d08539103a0b46bc16080c2b41a7e749f6e65c61"; + hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; }; nativeBuildInputs = [ cpio xar undmg libtapi ]; From bf628c2b2d67aaf61e0d301660e3fd3bdb7e87bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 09:46:11 +0000 Subject: [PATCH 081/233] python311Packages.piccolo-theme: 0.22.0 -> 0.23.0 --- pkgs/development/python-modules/piccolo-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 6bb794e7f567..a1e3a0ae5fc3 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.22.0"; + version = "0.23.0"; format = "setuptools"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-TAbaUnPfAH17BYJqbkSYgNzwmpJkIXGCx1UkJmDML4g="; + hash = "sha256-jlnKZK2wuEM+n+3Y59U6+LyQJRBUwQAn0NarAGlNdx0="; }; propagatedBuildInputs = [ sphinx ]; From 700f27b185e21fa33b4ddf3e7bc25b5d77e90b1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 10:47:51 +0000 Subject: [PATCH 082/233] python311Packages.rich-argparse: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/rich-argparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 69d657d9b15c..8edcfa9fbd95 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hamdanal"; repo = "rich-argparse"; rev = "refs/tags/v${version}"; - hash = "sha256-NcsEGImUAqwZI6Ga3UIqnoELvz6WRKyVqGkR4jPIKPI="; + hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI="; }; build-system = [ hatchling ]; From 82db32ec2bf1b13bb0c6b934fcd1a884fcade8bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 12:55:02 +0000 Subject: [PATCH 083/233] python311Packages.confluent-kafka: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 2159735ed2eb..95cf2c7bf0b6 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; rev = "refs/tags/v${version}"; - hash = "sha256-sPlLlp0niR45lQPCvVd6NPtGI1cFbmPeQpIF1RnnY0I="; + hash = "sha256-JlPWh46WjY4GHRKtamB+qigVvVzvbRagbigyCol6lfg="; }; buildInputs = [ rdkafka ]; From fccc9249de3e5a633d4741841c59e934d8c45f81 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 16 Jun 2024 16:48:12 +0300 Subject: [PATCH 084/233] stats: 2.10.16 -> 2.10.18 Diff: https://github.com/exelban/stats/compare/v2.10.16...v2.10.18 Changelog: https://github.com/exelban/stats/releases/tag/v2.10.18 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index af74d5bdf103..a85e7d36f982 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.16"; + version = "2.10.18"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-fSn4qZMXRlWxqIZ2Jh1anLQPbx/TqHA7UFRq+pR3o+4="; + hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8="; }; sourceRoot = "."; From 098f96b6d9b43e25e394ea9c885fbd8853a81fda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 16:55:07 +0200 Subject: [PATCH 085/233] python312Packages.publicsuffixlist: 0.10.1.20240605 -> 0.10.1.20240616 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index f618ad602b5e..6d238e872403 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.1.20240605"; + version = "0.10.1.20240616"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ro7Ei9ijvq2wX8lE6+YJhl2co2Ls8qpcn+4gUfSmY1Y="; + hash = "sha256-fVmEBr9omsCeRAsaPUZ07y1in/bx7JeGHIPwrBxGpY8="; }; build-system = [ setuptools ]; From c84042b9ce975a6dee32fa7d1e416ea2dc7d51ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 16:55:59 +0200 Subject: [PATCH 086/233] python312Packages.sse-starlette: 2.1.0 -> 2.1.2 Diff: https://github.com/sysid/sse-starlette/compare/refs/tags/v2.1.0...v2.1.2 Changelog: https://github.com/sysid/sse-starlette/blob/2.1.2/CHANGELOG.md --- pkgs/development/python-modules/sse-starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index d2fc7de38bb1..baeaf9436c5c 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sse-starlette"; - version = "2.1.0"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "sysid"; repo = "sse-starlette"; rev = "refs/tags/v${version}"; - hash = "sha256-gBkEs1jSKIOme2rbLf+pM3jFDgJkxyU92q+GsUsp8Eo="; + hash = "sha256-/aL0IkMdHNt7Ms1Et+xf00B9FGI31FuHAiJbxVMm3w0="; }; build-system = [ pdm-backend ]; From 6a7dc95227d497b894535dfe098ce7b13d180b2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 16:57:01 +0200 Subject: [PATCH 087/233] python312Packages.pyexploitdb: 0.2.21 -> 0.2.22 Changelog: https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 7adc58c43e77..c86678cbc499 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.21"; + version = "0.2.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-r57zNuKRUfZy+ipttQSfE/+LKOSnH6/4u/ZC1NzgGt8="; + hash = "sha256-zLGJ8MYfyXrJwy8GywOq9fM9rMMmRTgPrgiByGwQ+gM="; }; build-system = [ setuptools ]; From ef98dbcc9854cff98413ebc352498e1537e13129 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 16:58:59 +0200 Subject: [PATCH 088/233] grype: 0.77.4 -> 0.79.0 Diff: https://github.com/anchore/grype/compare/refs/tags/v0.77.4...v0.79.0 Changelog: https://github.com/anchore/grype/releases/tag/v0.79.0 --- pkgs/by-name/gr/grype/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 2394ba246572..dd851078933c 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.4"; + version = "0.79.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-xD6G4DGimmYVVCZHpXlvC24zaRwpRpQ0iRc4Yxac3O8="; + hash = "sha256-fFiZ6GOKaHcBnxakhd3Mdm1hHmfAwyq/ScBNUwrm0vw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-WosgdN49MEXSfK42l4em+Cpk8iAQphf9KOhY0mgBQ7U="; + vendorHash = "sha256-PIs+6P7w6vjOOpH96KEdG6tHRCU7ijtdyS/1C77BPDw="; nativeBuildInputs = [ installShellFiles ]; From 8cac5cf31b485b81642f481ab9236a699942781d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 17:00:42 +0200 Subject: [PATCH 089/233] python312Packages.timezonefinder: 6.5.0 -> 6.5.1 Diff: https://github.com/jannikmi/timezonefinder/compare/refs/tags/6.5.0...6.5.1 Changelog: https://github.com/jannikmi/timezonefinder/blob/6.5.1/CHANGELOG.rst --- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 07f8fce863e9..38662f50d8f7 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.5.0"; + version = "6.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-V5g1zTdXWeJba71/eUGQbF9XOhMQuzivtGkqGD4OHMY="; + hash = "sha256-KVjAK4r+cRrX7U6MT0P7hH/TX6kMDv2DaSa456YG4sA="; }; nativeBuildInputs = [ From 734d0f3ef99262d762e5a17e341af5ca796ae32d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 17:03:44 +0200 Subject: [PATCH 090/233] trivy: 0.52.1 -> 0.52.2 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.52.1...v0.52.2 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.52.2 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index c8cbf6bf8ce2..26ac2c3938a1 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.52.1"; + version = "0.52.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-7jM0eTUydehzlY8esSxIvQ11Y8VEF6Uyk7mSC0whmq0="; + hash = "sha256-3RUL0sgO2/hcfuihNKr51t0qbXvxs9X7yD/OBGATDdw="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-MsHlJ56MT+UqF+Psj+hKKpwPnRTcQ3RvWoHbmI93A5E="; + vendorHash = "sha256-VkUyjmiiJsDx7NdU6T20LB3tltOYYtf/RaTTPuliMQU="; subPackages = [ "cmd/trivy" ]; From 5fc6ac58c8a0db924dada2b796fdd5699e7cd49d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 17:16:11 +0200 Subject: [PATCH 091/233] python312Packages.slack-sdk: 3.28.0 -> 3.29.0 Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.28.0...v3.29.0 Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.29.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index a3a093100864..cce3de84a0e8 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.28.0"; + version = "3.29.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-rsJLjqP1XT1JkFz3iQovF58XdkmVcL+jfjiiI9SqonE="; + hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; }; postPatch = '' From 9efeb0b0aa36eb4f1d21f3a25a3aa852d4e35c4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 17:30:38 +0200 Subject: [PATCH 092/233] python311Packages.piccolo-theme: refactor --- .../python-modules/piccolo-theme/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index a1e3a0ae5fc3..49dd8b2c3c4d 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, sphinx, }: @@ -10,24 +11,29 @@ buildPythonPackage rec { version = "0.23.0"; format = "setuptools"; - src = fetchPypi { + disabled = pythonOlder "3.9"; + + src = fetchPypi { pname = "piccolo_theme"; inherit version; hash = "sha256-jlnKZK2wuEM+n+3Y59U6+LyQJRBUwQAn0NarAGlNdx0="; }; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; + + # Module has no tests + doCheck = false; pythonImportsCheck = [ "piccolo_theme" ]; meta = with lib; { description = "Clean and modern Sphinx theme"; homepage = "https://piccolo-theme.readthedocs.io"; + changelog = "https://github.com/piccolo-orm/piccolo_theme/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ loicreynier ]; - platforms = platforms.unix; }; } From e63cb4ed39f0ba732663f51ae4a4837e0bfdb8d7 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 08:52:32 +0200 Subject: [PATCH 093/233] MIDIVisualizer: rename to midivisualizer --- .../{midi-visualizer => midivisualizer}/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/applications/audio/{midi-visualizer => midivisualizer}/default.nix (91%) diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix similarity index 91% rename from pkgs/applications/audio/midi-visualizer/default.nix rename to pkgs/applications/audio/midivisualizer/default.nix index a7a8843f46e6..10a2a5de6a09 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -20,14 +20,14 @@ , Kernel }: -stdenv.mkDerivation rec { - pname = "MIDIVisualizer"; +stdenv.mkDerivation (finalAttrs: { + pname = "midivisualizer"; version = "7.0"; src = fetchFromGitHub { owner = "kosua20"; - repo = pname; - rev = "v${version}"; + repo = "MIDIVisualizer"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.ericdallo ]; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..89847ae14fe9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -821,6 +821,7 @@ mapAliases ({ meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 + MIDIVisualizer = midivisualizer; # Added 2024-06-12 migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330ba..3eb1cf82f925 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23296,7 +23296,7 @@ with pkgs; micropython = callPackage ../development/interpreters/micropython { }; - MIDIVisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midi-visualizer { + midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer { inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; From 51bc895e2ac7d86667554daff51c69091760575c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 16:39:17 +0000 Subject: [PATCH 094/233] svd2rust: 0.33.3 -> 0.33.4 --- pkgs/development/tools/rust/svd2rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 1844d25c706a..b01d04ad8123 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.3"; + version = "0.33.4"; src = fetchCrate { inherit pname version; - hash = "sha256-Ed7dwVXjLOAtW9ZOh1g+yamnSzyoKo1lS4N2nyyqaJ8="; + hash = "sha256-V7d/lVNL7J/ErBlJUf8btrukGC+KSvk3r9AAethFNyk="; }; - cargoHash = "sha256-BppPMYsv0v7K6z9URYEWrz0SHPx+oe2jeP3EzydFcuI="; + cargoHash = "sha256-Wu/F4PU02hrmiL7OaKIP59CfDVWrU5cw60TYngqJYNg="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From f24d7e64a5e577884e8de5d729ab9f5e2d776118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 16:45:33 +0000 Subject: [PATCH 095/233] xplr: 0.21.8 -> 0.21.9 --- pkgs/by-name/xp/xplr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 924d1bc71dcc..b03cec6e5eff 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.21.8"; + version = "0.21.9"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpGYCGXSCQhFEPDUnHaOdz0LZ0jjRcCRnRCyOrulDVs="; + sha256 = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; }; - cargoHash = "sha256-eCIoUUWHpFk+O5ipswwiQxf1H1ygkj07Sjyj4L8Ui6I="; + cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { From 9e70b73ace3ff83fc33646577eee2e1e397af836 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 17:04:38 +0000 Subject: [PATCH 096/233] tenv: 2.0.3 -> 2.0.7 --- pkgs/by-name/te/tenv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index d3443e856b37..042c389ac42e 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tenv"; - version = "2.0.3"; + version = "2.0.7"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-Bx5E/vJe2SjYRJ2o3enBrzMMellRWapu99hH4HRr8nM="; + hash = "sha256-654ZaQ7KzAWEXwN9Xwzdmg4KsCCLCm+i2M0730gP/zM="; }; vendorHash = "sha256-OrMCzqqOFQkI8IwcfO/JVPyd/sw+Ud0VySV7UPiucwc="; From a83610d6177537a4574e46a0453632eae0008877 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 16 Jun 2024 19:35:26 +0200 Subject: [PATCH 097/233] gmic: 3.3.6 -> 3.4.0 https://github.com/GreycLab/gmic/compare/v.3.3.6...v.3.4.0 --- pkgs/by-name/gm/gmic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 2afb1f4d40e9..143954e9cf49 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.3.6"; + version = "3.4.0"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-gyQP+ulXLMVkNn1Bss7zlQINcTunwbP+MAsftADqtOk="; + hash = "sha256-uK/kgzlUvEAxRB8Wc3Inspv4/8vnjXrCilP1g/QMuCs="; }; # TODO: build this from source @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { gmic_stdlib = fetchurl { name = "gmic_stdlib_community.h"; url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; - hash = "sha256-mj6yOGc+CGY6oFDv9PJ7y9KABdn9DG32m2IVlLAhrsc="; + hash = "sha256-wq8yQ0pxEGH3sOmwmgQfRVluHAC4JBYgs2mto1PNLP4="; }; nativeBuildInputs = [ From a58896d4536b28f11cf1581c613554377f13c6f9 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 16 Jun 2024 19:35:26 +0200 Subject: [PATCH 098/233] gmic-qt: 3.3.6 -> 3.4.0 https://github.com/c-koi/gmic-qt/compare/v.3.3.6...v.3.4.0 --- pkgs/by-name/gm/gmic-qt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 389f366680c1..9c3d74cbe566 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -49,13 +49,13 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.3.6"; + version = "3.4.0"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${finalAttrs.version}"; - hash = "sha256-0MtQTc2nUF8N1IDIcRxGqfXKULl9ZjnqDt4q84jA5ow="; + hash = "sha256-IZMvvhWQwbnyxF3CkvEjySl3o3DB6UucpjqOFR9NjQ0="; }; nativeBuildInputs = [ From 16619820ba80c838faa52ef2db5673fd3134089e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 18:13:28 +0000 Subject: [PATCH 099/233] _64gram: 1.1.27 -> 1.1.29 --- pkgs/by-name/_6/_64gram/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 552ac3669aa1..da1357c71e8f 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -7,7 +7,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.27"; + version = "1.1.29"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-5Q2VxjiT1IpqCC9oXgHbKxcEfV/gPah0ovOpQ9TZJZs="; + hash = "sha256-OJiVmmDIsijK/IHGEdsCoAwvc9JlSth+76r9O1aJbd0="; }; passthru.updateScript = nix-update-script {}; From fc71c7935469fa9abf98950a69562725ac76a4d6 Mon Sep 17 00:00:00 2001 From: Andrea Ghensi Date: Thu, 13 Jun 2024 21:57:10 +0200 Subject: [PATCH 100/233] kodi-raiplay: init at 4.1.2 --- .../video/kodi/addons/raiplay/default.nix | 30 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/video/kodi/addons/raiplay/default.nix diff --git a/pkgs/applications/video/kodi/addons/raiplay/default.nix b/pkgs/applications/video/kodi/addons/raiplay/default.nix new file mode 100644 index 000000000000..ab5bcfedccfd --- /dev/null +++ b/pkgs/applications/video/kodi/addons/raiplay/default.nix @@ -0,0 +1,30 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, inputstreamhelper, plugin-cache }: + +buildKodiAddon rec { + pname = "raiplay"; + namespace = "plugin.video.raitv"; + version = "4.1.2"; + + propagatedBuildInputs = [ + plugin-cache + inputstreamhelper + ]; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-9aR1kkl+0+nhP0bOTnaKCgSfuPvJzX5TWHU0WJZIvSM="; + }; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.raiplay"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/maxbambi/plugin.video.raitv/"; + description = "Live radio and TV channels, latest 7 days of programming, broadcast archive, news"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index abc6c234e56b..a294fa2e0d30 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -99,6 +99,8 @@ let radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { }; + raiplay = callPackage ../applications/video/kodi/addons/raiplay { }; + svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; From 86290a18a095829ef7434a91e26c19f084bdd174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 18:44:03 +0000 Subject: [PATCH 101/233] python311Packages.branca: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/branca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 627939521ab3..4c16cd2a8893 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "branca"; - version = "0.7.2"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ipu0JZIx/YgR7F5Z7sl/9YEEHkyiDllR5dHko7AlSe8="; + hash = "sha256-9imrW4u2Ea1q7VKgk6Vs8y2OiSzAPr3W6471pi/gVm4="; }; postPatch = '' From 5bf4f16cbce24c0c288a3fc58a972896a691ffa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 19:24:25 +0000 Subject: [PATCH 102/233] python311Packages.sqlite-anyio: 0.2.0 -> 0.2.2 --- pkgs/development/python-modules/sqlite-anyio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix index 80926de7f47a..6b09c3557697 100644 --- a/pkgs/development/python-modules/sqlite-anyio/default.nix +++ b/pkgs/development/python-modules/sqlite-anyio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlite-anyio"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "davidbrochart"; repo = "sqlite-anyio"; rev = "refs/tags/v${version}"; - hash = "sha256-6khHta7Rzp3g8G/xZnsNZuURFB35JyHz04NTzNJIiBw="; + hash = "sha256-lOUGT9SUxvzTvTDpiwx7Oa+0o3/lnrJ9xxMYFQAmFZk="; }; build-system = [ hatchling ]; From 6f565453f4cf3c3eb217f82d33fc685d716adaf3 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 17 Jun 2024 03:38:59 +0800 Subject: [PATCH 103/233] media-downloader: move to pkgs/by-name --- .../me/media-downloader/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{applications/video/media-downloader/default.nix => by-name/me/media-downloader/package.nix} (93%) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/by-name/me/media-downloader/package.nix similarity index 93% rename from pkgs/applications/video/media-downloader/default.nix rename to pkgs/by-name/me/media-downloader/package.nix index 9340d174162d..a816496a258c 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -3,10 +3,9 @@ , fetchFromGitHub , ffmpeg , lib +, libsForQt5 , python3 -, qtbase , stdenv -, wrapQtAppsHook , yt-dlp }: @@ -23,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - qtbase + libsForQt5.qtbase ]; qtWrapperArgs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e6d8abd8253..b8ce4042f111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32600,8 +32600,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - media-downloader = libsForQt5.callPackage ../applications/video/media-downloader { }; - mediaelch = mediaelch-qt5; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; From d7dcb48bf4ffdc3651c97baec38a0907f0def724 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 17 Jun 2024 03:39:29 +0800 Subject: [PATCH 104/233] media-downloader: format with nixfmt-rfc-style --- pkgs/by-name/me/media-downloader/package.nix | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index a816496a258c..bb4375f467cb 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -1,12 +1,13 @@ -{ aria2 -, cmake -, fetchFromGitHub -, ffmpeg -, lib -, libsForQt5 -, python3 -, stdenv -, yt-dlp +{ + aria2, + cmake, + fetchFromGitHub, + ffmpeg, + lib, + libsForQt5, + python3, + stdenv, + yt-dlp, }: stdenv.mkDerivation (finalAttrs: { @@ -25,17 +26,17 @@ stdenv.mkDerivation (finalAttrs: { libsForQt5.wrapQtAppsHook ]; - buildInputs = [ - libsForQt5.qtbase - ]; + buildInputs = [ libsForQt5.qtbase ]; qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ + "--prefix PATH : ${ + lib.makeBinPath [ aria2 ffmpeg python3 yt-dlp - ]}" + ] + }" ]; meta = { From b5a20ff900009b972cb8434f7850cddc0bae8a0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 19:49:55 +0000 Subject: [PATCH 105/233] python311Packages.django-import-export: 4.0.7 -> 4.0.8 --- .../python-modules/django-import-export/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index b95ff428d39f..fd4be9238aaf 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.7"; + version = "4.0.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-yN47HwIHGciE4w0xN+l/dOsbHNf5DZrYjrmJgZeWlE0="; + hash = "sha256-FejU0k2/fmR5QdAJy2xxx3MKgu89/pOj4cIWsMGUw0M="; }; pythonRelaxDeps = [ "tablib" ]; From 7af35f2cc49283748684d89c7e95fb03270dbede Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 16 Jun 2024 19:29:43 +0200 Subject: [PATCH 106/233] python3Packages.pyreqwest-impersonate: init at 0.4.7 --- .../pyreqwest-impersonate/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/pyreqwest-impersonate/default.nix diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix new file mode 100644 index 000000000000..39e57b633170 --- /dev/null +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytest, + runCommand, + boringssl, +}: + +let + # boring-sys expects the static libraries in build/ instead of lib/ + boringssl-wrapper = runCommand "boringssl-wrapper" { } '' + mkdir $out + cd $out + ln -s ${boringssl.out}/lib build + ln -s ${boringssl.dev}/include include + ''; +in +buildPythonPackage rec { + pname = "pyreqwest-impersonate"; + version = "0.4.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "deedy5"; + repo = "pyreqwest_impersonate"; + rev = "v${version}"; + hash = "sha256-ck5RqSUgnLAjZ+1A1wQRyRMahJRq3nzYvE+WBpu6wk0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-eGmx4ftS1D7qb2pPZxp4XE44teXcRwKs3tcKm8otsaM="; + }; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + env.BORING_BSSL_PATH = boringssl-wrapper; + + optional-dependencies = { + dev = [ pytest ]; + }; + + # Test use network + doCheck = false; + + pythonImportsCheck = [ "pyreqwest_impersonate" ]; + + meta = { + description = "HTTP client that can impersonate web browsers (Chrome/Edge/OkHttp/Safari), mimicking their headers and TLS/JA3/JA4/HTTP2 fingerprints"; + homepage = "https://github.com/deedy5/pyreqwest_impersonate"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 483cb05e6996..001e1d52423d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10087,6 +10087,8 @@ self: super: with self; { pyrender = callPackage ../development/python-modules/pyrender { }; + pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; From 61f63be6d860ee3bba291830270118522a240661 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 16 Jun 2024 19:30:39 +0200 Subject: [PATCH 107/233] python3Packages.duckduckgo-search: fix dependencies --- pkgs/development/python-modules/duckduckgo-search/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index c97b3fc9c551..f39a99ed5f30 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -6,6 +6,7 @@ pythonOlder, setuptools, orjson, + pyreqwest-impersonate, curl-cffi, # Optional dependencies @@ -32,6 +33,7 @@ buildPythonPackage rec { click curl-cffi orjson + pyreqwest-impersonate ]; passthru.optional-dependencies = { From d3752b00c2785c3db32a56cc725710cc6ba25966 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 16 Jun 2024 19:30:16 +0200 Subject: [PATCH 108/233] python3Packages.curl-cffi: fix version string --- pkgs/development/python-modules/curl-cffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 76a4566cce7c..82a521898a63 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.7.0"; + version = "0.7.0b4"; src = fetchFromGitHub { owner = "yifeikong"; From 53cede6f86f67e48a18fa17b38ba6b6c671bc96a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 16 Jun 2024 22:13:30 +0200 Subject: [PATCH 109/233] ananicy-cpp: fix license --- pkgs/by-name/an/ananicy-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index 36f56c6dffaf..8d3416f69c57 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -75,7 +75,7 @@ clangStdenv.mkDerivation rec { meta = { homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp"; description = "Rewrite of ananicy in c++ for lower cpu and memory usage"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ artturin From 10318b71e8132fd91b9341e6bcc06184897d5608 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 20:13:46 +0000 Subject: [PATCH 110/233] nickel: 1.6.0 -> 1.7.0 --- pkgs/by-name/ni/nickel/Cargo.lock | 60 ++++++++++++++++++------------ pkgs/by-name/ni/nickel/package.nix | 8 +--- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ni/nickel/Cargo.lock b/pkgs/by-name/ni/nickel/Cargo.lock index a9577c251fd7..2bc24165ac01 100644 --- a/pkgs/by-name/ni/nickel/Cargo.lock +++ b/pkgs/by-name/ni/nickel/Cargo.lock @@ -1287,33 +1287,33 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", "bit-set", - "diff", "ena", - "is-terminal", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop-util", "petgraph", + "pico-args", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.8.2", "string_cache", "term", "tiny-keccak", "unicode-xid 0.2.4", + "walkdir", ] [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex", + "regex-automata", ] [[package]] @@ -1649,7 +1649,7 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.6.0" +version = "1.7.0" dependencies = [ "clap 4.5.2", "clap_complete", @@ -1667,7 +1667,7 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.7.0" +version = "0.8.0" dependencies = [ "ansi_term", "assert_matches", @@ -1722,7 +1722,7 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.6.0" +version = "1.7.0" dependencies = [ "anyhow", "assert_cmd", @@ -1736,6 +1736,7 @@ dependencies = [ "csv", "derive_more", "env_logger", + "git-version", "glob", "insta", "lalrpop", @@ -1769,7 +1770,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.7.0" +version = "0.8.0" dependencies = [ "nickel-lang-core", ] @@ -1935,6 +1936,12 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + [[package]] name = "pin-project-lite" version = "0.2.13" @@ -2114,7 +2121,7 @@ dependencies = [ [[package]] name = "pyckel" -version = "1.6.0" +version = "1.7.0" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -3010,8 +3017,9 @@ dependencies = [ [[package]] name = "topiary-core" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b26541394bdbcd5a039deb917b2096a69c6604f733f0d41f534fc6975987040d" dependencies = [ "futures", "itertools 0.11.0", @@ -3028,13 +3036,15 @@ dependencies = [ [[package]] name = "topiary-queries" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89106b9c504a9e3247b8e40f879a73a922f0d516e1051a6ef739b4cf7d54c8d9" [[package]] name = "topiary-tree-sitter-facade" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea7c870d9a844bbba0f55be40eaa89624a9f627c155cd22eea70dd808bd71b3d" dependencies = [ "js-sys", "topiary-web-tree-sitter-sys", @@ -3045,8 +3055,9 @@ dependencies = [ [[package]] name = "topiary-web-tree-sitter-sys" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9e35caeeb7f07e97b71ee7ea204c89516e7cc490d1c2ae318eca3ff3c08d46" dependencies = [ "js-sys", "wasm-bindgen", @@ -3066,8 +3077,9 @@ dependencies = [ [[package]] name = "tree-sitter-nickel" -version = "0.1.0" -source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=58baf89db8fdae54a84bcf22c80ff10ee3f929ed#58baf89db8fdae54a84bcf22c80ff10ee3f929ed" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449daa9ac0e2a18d7243eaf21d7299d6683ce6750ca225ebd557412d22d106cf" dependencies = [ "cc", "tree-sitter", diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index bd829aa6ba43..c55cc55cf3ea 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -8,21 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-AL5YkdITO9CPFYzMGQwHbuFZrMDUvF1yTt2XTotoymM="; + hash = "sha256-EwiZg0iyF9EQ0Z65Re5WgeV7xgs/wPtTQ9XA0iEMEIQ="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "topiary-core-0.3.0" = "sha256-KWfgbVFV2zbCuNNFp9yeSgAa0Cc7cT090KK2J1ynfKg="; - "tree-sitter-nickel-0.1.0" = "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg="; - }; }; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; From 8a862af4610a6c8183040002be7a0dec1aa1e0b6 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 17 Jun 2024 04:20:28 +0800 Subject: [PATCH 111/233] media-downloader: disable automatically update --- pkgs/by-name/me/media-downloader/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index bb4375f467cb..6beb44fda24d 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; }; + # Disable automatically updating extensions when starting the program because this will + # invalidate the dependence on extensions and may cause potential security issues + # Can still be enabled in Configure > Actions At Startup + postPatch = '' + substituteInPlace src/settings.cpp \ + --replace-fail '"ShowVersionInfoAndAutoDownloadUpdates",true' '"ShowVersionInfoAndAutoDownloadUpdates",false' \ + ''; + nativeBuildInputs = [ cmake libsForQt5.wrapQtAppsHook From 59bc5093bf5d2d3da2e2efeca9322ce3ac3b6c03 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 17 Jun 2024 04:20:49 +0800 Subject: [PATCH 112/233] media-downloader: allow wrapping with more extensions --- pkgs/by-name/me/media-downloader/package.nix | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 6beb44fda24d..3c75c0c3c53d 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -1,6 +1,13 @@ { aria2, cmake, + # https://github.com/mhogomchungu/media-downloader?tab=readme-ov-file#extensions + extraPackages ? [ + aria2 + yt-dlp + ffmpeg + python3 + ], fetchFromGitHub, ffmpeg, lib, @@ -36,19 +43,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsForQt5.qtbase ]; - qtWrapperArgs = [ - "--prefix PATH : ${ - lib.makeBinPath [ - aria2 - ffmpeg - python3 - yt-dlp - ] - }" - ]; + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath extraPackages}" ]; meta = { description = "Qt/C++ GUI front end for yt-dlp and others"; + longDescription = '' + Media Downloader is a GUI front end to yt-dlp, youtube-dl, gallery-dl, + lux, you-get, svtplay-dl, aria2c, wget and safari books. + + Read https://github.com/mhogomchungu/media-downloader/wiki/Extensions + for further information. We have packaged most of them, and they can + be added by overriding `extraPackages`. + ''; homepage = "https://github.com/mhogomchungu/media-downloader"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ zendo ]; From d17b2be69b1bab6b6f2a91de407ac736fe269a4d Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 17 Jun 2024 04:30:50 +0800 Subject: [PATCH 113/233] media-downloader: add aleksana as maintainer --- pkgs/by-name/me/media-downloader/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 3c75c0c3c53d..8053f6a93ada 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -57,7 +57,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/mhogomchungu/media-downloader"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ zendo ]; + maintainers = with lib.maintainers; [ + zendo + aleksana + ]; platforms = lib.platforms.linux; mainProgram = "media-downloader"; }; From b784eb33af3bd11e3bcbb8e03fd95bb10d72d4e4 Mon Sep 17 00:00:00 2001 From: eriedaberrie Date: Sun, 16 Jun 2024 14:29:56 -0700 Subject: [PATCH 114/233] vesktop: fix icon file locations --- pkgs/by-name/ve/vesktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 6998f0ab8847..2c60537b0cb4 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r dist/*unpacked/resources $out/opt/Vesktop/ for file in build/icon_*x32.png; do - file_suffix=''${file//icon_} + file_suffix=''${file//build\/icon_} install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png done '' From 391c730310782ac9d69e913ae72824be86990f18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 23:30:15 +0200 Subject: [PATCH 115/233] poutine: init at 0.11.0 Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories https://github.com/boostsecurityio/poutine --- pkgs/by-name/po/poutine/package.nix | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/po/poutine/package.nix diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix new file mode 100644 index 000000000000..617454ae468e --- /dev/null +++ b/pkgs/by-name/po/poutine/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "poutine"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "boostsecurityio"; + repo = "poutine"; + rev = "refs/tags/v${version}"; + hash = "sha256-T81Qi79VaZzfKL4niTZQW+gwwiBcyInALrvyUg1V4Ck="; + }; + + vendorHash = "sha256-/chq40j+puAI3KdI15vbZwrnzCKrU7g+Z/t9aOXQ1Sg="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories"; + homepage = "https://github.com/boostsecurityio/poutine"; + changelog = "https://github.com/boostsecurityio/poutine/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "poutine"; + }; +} From 024b429c7a243e9d20cac066006e66ff513af930 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jun 2024 23:40:55 +0200 Subject: [PATCH 116/233] python311Packages.sqlite-anyio: add changelog to meta --- pkgs/development/python-modules/sqlite-anyio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix index 6b09c3557697..bc9fd2ffcb23 100644 --- a/pkgs/development/python-modules/sqlite-anyio/default.nix +++ b/pkgs/development/python-modules/sqlite-anyio/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous client for SQLite using AnyIO"; homepage = "https://github.com/davidbrochart/sqlite-anyio"; + changelog = "https://github.com/davidbrochart/sqlite-anyio/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 773f17e1df61c9cdf0b03d984b89131f03f9754f Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 16 Jun 2024 18:03:18 +0100 Subject: [PATCH 117/233] quickwit: Enable building UI Based on patch by Thomas Cheronneau --- pkgs/servers/search/quickwit/default.nix | 52 ++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index 095bfc679aa4..ece87aa43ae2 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -7,14 +7,20 @@ , protobuf , rust-jemalloc-sys , Security +, nodejs +, yarn +, fetchYarnDeps +, fixup-yarn-lock }: let pname = "quickwit"; version = "0.8.1"; -in -rustPlatform.buildRustPackage rec { - inherit pname version; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/quickwit/quickwit-ui/yarn.lock"; + hash = "sha256-HppK9ycUxCOIagvzCmE+VfcmfMQfPIC8WeWM6WbA6fQ="; + }; src = fetchFromGitHub { owner = "quickwit-oss"; @@ -23,6 +29,41 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B5U9nzXh6kj3/UnQzM3//h4hn9ippWHbeDMcMTP9XfM="; }; + quickwit-ui = stdenv.mkDerivation { + name = "quickwit-ui"; + src = "${src}/quickwit/quickwit-ui"; + + nativeBuildInputs = [ + nodejs + yarn + fixup-yarn-lock + ]; + + configurePhase = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = '' + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + fixup-yarn-lock yarn.lock + + yarn install --offline \ + --frozen-lockfile --no-progress \ + --ignore-engines --ignore-scripts + patchShebangs . + + yarn build + ''; + + installPhase = '' + mkdir $out + mv build/* $out + ''; + }; +in +rustPlatform.buildRustPackage rec { + inherit pname version src; + postPatch = '' substituteInPlace ./quickwit-ingest/build.rs \ --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' @@ -34,6 +75,11 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/quickwit"; + preBuild = '' + mkdir -p quickwit-ui/build + cp -r ${quickwit-ui}/* quickwit-ui/build + ''; + buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Security ]; From d7581094f9f797a0040d4fb1a46633c9b7efdb67 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 16 Jun 2024 19:57:49 +0100 Subject: [PATCH 118/233] nixos/quickwit: Created subtest for verifying UI installation --- nixos/tests/quickwit.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/quickwit.nix b/nixos/tests/quickwit.nix index 145959f7d3f5..3edf231334fd 100644 --- a/nixos/tests/quickwit.nix +++ b/nixos/tests/quickwit.nix @@ -24,6 +24,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: "journalctl -o cat -u quickwit.service | grep 'transitioned to ready state'" ) + with subtest("verify UI installed"): + machine.succeed("curl -sSf http://127.0.0.1:7280/ui/") + quickwit.log(quickwit.succeed( "systemd-analyze security quickwit.service | grep -v '✓'" )) From 87bded6713aae23d5a2cd2229839e002a516d5ce Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 16 Jun 2024 18:41:07 +0100 Subject: [PATCH 119/233] nixos/quickwit: Added ingest/query test by Thomas Cheronneau --- nixos/tests/quickwit.nix | 69 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/nixos/tests/quickwit.nix b/nixos/tests/quickwit.nix index 3edf231334fd..7e617c63d797 100644 --- a/nixos/tests/quickwit.nix +++ b/nixos/tests/quickwit.nix @@ -1,5 +1,54 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: +let + # Define an example Quickwit index schema, + # and some `exampleDocs` below, to test if ingesting + # and querying works as expected. + index_yaml = '' + version: 0.7 + index_id: example_server_logs + doc_mapping: + mode: dynamic + field_mappings: + - name: datetime + type: datetime + fast: true + input_formats: + - iso8601 + output_format: iso8601 + fast_precision: seconds + fast: true + - name: git + type: text + tokenizer: raw + - name: hostname + type: text + tokenizer: raw + - name: level + type: text + tokenizer: raw + - name: message + type: text + - name: location + type: text + - name: source + type: text + timestamp_field: datetime + + search_settings: + default_search_fields: [message] + + indexing_settings: + commit_timeout_secs: 10 + ''; + + exampleDocs = '' + {"datetime":"2024-05-03T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Processing request done","location":"path/to/server.c:6442:32","source":""} + {"datetime":"2024-05-04T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""} + {"datetime":"2024-05-05T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""} + {"datetime":"2024-05-06T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-2","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""} + ''; +in { name = "quickwit"; meta.maintainers = [ pkgs.lib.maintainers.happysalada ]; @@ -27,6 +76,26 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: with subtest("verify UI installed"): machine.succeed("curl -sSf http://127.0.0.1:7280/ui/") + with subtest("injest and query data"): + import json + + # Test CLI ingestion + print(machine.succeed('${pkgs.quickwit}/bin/quickwit index create --index-config ${pkgs.writeText "index.yaml" index_yaml}')) + # Important to use `--wait`, otherwise the queries below race with index processing. + print(machine.succeed('${pkgs.quickwit}/bin/quickwit index ingest --index example_server_logs --input-path ${pkgs.writeText "exampleDocs.json" exampleDocs} --wait')) + + # Test CLI query + cli_query_output = machine.succeed('${pkgs.quickwit}/bin/quickwit index search --index example_server_logs --query "exception"') + print(cli_query_output) + + # Assert query result is as expected. + num_hits = len(json.loads(cli_query_output)["hits"]) + assert num_hits == 3, f"cli_query_output contains unexpected number of results: {num_hits}" + + # Test API query + api_query_output = machine.succeed('curl --fail http://127.0.0.1:7280/api/v1/example_server_logs/search?query=exception') + print(api_query_output) + quickwit.log(quickwit.succeed( "systemd-analyze security quickwit.service | grep -v '✓'" )) From 6e577b6da1bcbf7c8463805d88518e15561071dc Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 16 Jun 2024 19:10:24 +0100 Subject: [PATCH 120/233] quickwit: Enable full LTO build --- pkgs/servers/search/quickwit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index ece87aa43ae2..e99289b08954 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -96,6 +96,9 @@ rustPlatform.buildRustPackage rec { }; }; + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; From 7789a9b522a359a1305582a5bac3910cee049c88 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Mon, 17 Jun 2024 00:55:40 +0200 Subject: [PATCH 121/233] nom: 2.5.0 -> 2.5.1 Changelog: https://github.com/guyfedwards/nom/releases/tag/v2.5.1 --- pkgs/by-name/no/nom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 4e9e9c844064..deeb3df4291b 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-uy4c3NLBZY0ybjoK/AYilAZ4bA0+Jkh7OLScH5cVRHI="; + hash = "sha256-kIm0q4/D80skFjlj2ABq4d2PKnATDt53x4fLU6kmA9U="; }; vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M="; From 0f5b04859037f59a0df1dd7e62cba4994b6f1ed3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 01:03:43 +0200 Subject: [PATCH 122/233] nspr: update homepage --- pkgs/development/libraries/nspr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 59a3b4975793..586c4ddb94fc 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; + homepage = "https://firefox-source-docs.mozilla.org/nspr/index.html"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; maintainers = with maintainers; [ ajs124 hexa ]; platforms = platforms.all; From e3a9b942b8b49cda4cfe046bd6c426f5cdd405ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 01:04:36 +0200 Subject: [PATCH 123/233] pinnwand: update homepage --- pkgs/servers/pinnwand/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index a0bfe6559a3e..c7549e1913a1 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -58,7 +58,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with lib; { changelog = "https://github.com/supakeen/pinnwand/releases/tag/v${version}"; description = "Python pastebin that tries to keep it simple"; - homepage = "https://supakeen.com/project/pinnwand/"; + homepage = "https://github.com/supakeen/pinnwand"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; mainProgram = "pinnwand"; From 5b7eece87ae950a6dda9af3e611ee5b039adca3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 01:05:10 +0200 Subject: [PATCH 124/233] python311Packages.tlds: update homepage This was temporarily a fork, but the changes have since been merged upstream. --- pkgs/development/python-modules/tlds/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 5efe067d2ed3..b1248d18b283 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically updated list of valid TLDs taken directly from IANA"; - homepage = "https://github.com/mweinelt/tlds"; + homepage = "https://github.com/kichik/tlds"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From 4a7043fd6c6d1293b00aa13d2f57f592fa6c4cf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 23:54:17 +0000 Subject: [PATCH 125/233] mdbook-graphviz: 0.1.7 -> 0.2.0 --- pkgs/tools/text/mdbook-graphviz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 721beb6ac179..9dc9f1df0e02 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dylanowen"; repo = pname; rev = "v${version}"; - hash = "sha256-FuAjuU4IXXuas+ubSuTMrZiYTGcZCuLTCSTJXtY2nlw="; + hash = "sha256-myASia/nkZmAf00lZ357Sh3YV73pCBrZAIRhSzFkZa0="; }; - cargoHash = "sha256-d4s9wmjqMHjev1Y4nAobFnCc5NTdklXcs7XTRXFMEjU="; + cargoHash = "sha256-UB/l+rcVHkrHv/fybDy/UjrJbVksWgt9JRQC118/kGM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From a460dbac5030504b2687a0176ffb83de7cd1fcdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 23:54:26 +0000 Subject: [PATCH 126/233] wlr-which-key: 0.1.1 -> 0.1.3 --- pkgs/tools/wayland/wlr-which-key/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/tools/wayland/wlr-which-key/default.nix index bef65f8bc9db..3eaa2822c190 100644 --- a/pkgs/tools/wayland/wlr-which-key/default.nix +++ b/pkgs/tools/wayland/wlr-which-key/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "wlr-which-key"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "wlr-which-key"; rev = "v${version}"; - hash = "sha256-FVpPS5EQ6+xZIBtdS18SdVx0TK9/ikryU9mtm5JvDgk="; + hash = "sha256-DedmLWjK0a6AoGaKGRKfsmK/NIAFV2EYY8MgfiEj4+o="; }; - cargoHash = "sha256-JELvmG2CiknBP3QbaXSl1uj6wEgLaDFVFBuS1l5SUk4="; + cargoHash = "sha256-ZGaQX5raMSCwt88xhctwCxGWa9HZtcNqTKM35Z8QvAc="; nativeBuildInputs = [ pkg-config From 97b983d0d803123130281ef77be2c534577ce267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 23:54:38 +0000 Subject: [PATCH 127/233] ols: 0-unstable-2024-06-05 -> 0-unstable-2024-06-13 --- pkgs/by-name/ol/ols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 46e0dec0d111..26d4ff979645 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-06-05"; + version = "0-unstable-2024-06-13"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "c4996b10d88aed9a0028c92ea54c42e4e9aeb39f"; - hash = "sha256-PnajCKfk4XVR1FwG5ySzL/ibpwie+Xhr6MxHeXZiKmg="; + rev = "09f865e685f8ebddaf994e51baeabed795e7f849"; + hash = "sha256-JdKmXMyRZCf6UYo5sKmiIaeZNgnbUm5ALP39tf6z36w="; }; postPatch = '' From a9dd28fb99a5f4872f155c25dec864662a1449d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 00:10:03 +0000 Subject: [PATCH 128/233] python311Packages.django-crispy-forms: 2.1 -> 2.2 --- .../python-modules/django-crispy-forms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix index 3437a6474a1b..823bf6efd994 100644 --- a/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2.1"; + version = "2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; rev = "refs/tags/${version}"; - hash = "sha256-UQ5m0JWir20TdLgS+DVVLcMBlIEIfmzv8pkMJtaC0LA="; + hash = "sha256-6S/Pscwi6AEQnmJf6JTT5Q5vxoZ3PC65ZjT2XszwVZM="; }; propagatedBuildInputs = [ From 0c8e888c9fab8add5ba597a495e097a315560614 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 00:23:27 +0000 Subject: [PATCH 129/233] pyprland: 2.3.7 -> 2.3.8 --- pkgs/by-name/py/pyprland/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 34718ddaddab..9162724b7a75 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.3.7"; + version = "2.3.8"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-Mcn5d0p+vu1I9oKHUdOH/v1+wC9UTGZaejbsgurrrhg="; + hash = "sha256-0YUI2/gJmBoummiHGpq2p2sT25SwCdnsRwfGK2pcm4s="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; From debfb4aaf5b035b039239b0db6d0aba3c070648a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 00:33:27 +0000 Subject: [PATCH 130/233] python311Packages.psd-tools: 1.9.32 -> 1.9.33 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 9250aaacc471..1f28bf2a244d 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.32"; + version = "1.9.33"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H235bZOzTxmmLEFje8hhYxrN4l1S34tD1LMhsymRy9w="; + hash = "sha256-4Y4VLfGwopfeIppxwvGKSuelUDAXg67rM/ES9BrTP24="; }; postPatch = '' From 75c1d9bf299b56d2c6cc0fc00b3121675eb02c97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 00:45:09 +0000 Subject: [PATCH 131/233] ghciwatch: 0.5.16 -> 1.0.0 --- pkgs/by-name/gh/ghciwatch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index cf01e89b4c34..55ee9b79ea9d 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ghciwatch"; - version = "0.5.16"; + version = "1.0.0"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "ghciwatch"; rev = "v${version}"; - hash = "sha256-XKR/X27oScB9XdyXeYKD6nlnkBTLJLXkzsRgfS3ygVE="; + hash = "sha256-SV2QRFXXXwWZGd2pe+7aK+p3X+EviDrykqceZ+24t4I="; }; - cargoHash = "sha256-BKPzOv2RtcE4MzRyvHs3VmNME2uKtGXCqGrULfryacM="; + cargoHash = "sha256-/N1R8/qRIt0AiIzTKt/vPlSLxPdKU+oeuE4eZTjwJlA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation From fb008aa9d56e8bfb16598ef1b2bf2e88d3133415 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 23:53:43 +0000 Subject: [PATCH 132/233] python311Packages.mplhep: 0.3.48 -> 0.3.49 --- pkgs/development/python-modules/mplhep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index bda83366dd6b..1daa1bc2170f 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.48"; + version = "0.3.49"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rAIiaTTSf1xINdadjHk32KOpW4SMg8jdwFt8z1oiLis="; + hash = "sha256-Hxqk0eSEOWSpomrS/vTdJV9/1mKQ/yCJQOBpm9tAvqo="; }; nativeBuildInputs = [ From 0b0a11c94f37be413078bb8e6936293e4b5fd50d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 01:01:55 +0000 Subject: [PATCH 133/233] gitu: 0.20.1 -> 0.21.0 --- pkgs/by-name/gi/gitu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 51724f268573..c5729b5dbe74 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-H1REl6DkWYwZ1s8FLyHlsFi1DQY0C3Zizz/o9KUO7XQ="; + hash = "sha256-2YcQl9aPFPE/t/Pzoo0mWkCjOE6b4BJH0oT8Gbx+vIg="; }; - cargoHash = "sha256-/u6VmcaQpVagz7W/eAFql9sKF+9dn/o1VGvFGJAJkaA="; + cargoHash = "sha256-RldCa0UITX8zj5tliww1xiL1Y60t9EN6o1ZA5eVEaT4="; nativeBuildInputs = [ pkg-config From 95fb89c6523d78d4fc4caf4ef40313735287bbfe Mon Sep 17 00:00:00 2001 From: Zitrone <74491719+quantenzitrone@users.noreply.github.com> Date: Mon, 17 Jun 2024 01:09:50 +0000 Subject: [PATCH 134/233] Sylk: rename to sylk (#320306) * Sylk: rename to sylk * sylk: fix meta.sourceProvenance --------- Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- .../sy/sylk/package.nix} | 19 ++++++++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 9 insertions(+), 13 deletions(-) rename pkgs/{applications/networking/Sylk/default.nix => by-name/sy/sylk/package.nix} (62%) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/by-name/sy/sylk/package.nix similarity index 62% rename from pkgs/applications/networking/Sylk/default.nix rename to pkgs/by-name/sy/sylk/package.nix index a83742cf937c..ab32ef5463ff 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/by-name/sy/sylk/package.nix @@ -1,12 +1,8 @@ { appimageTools, fetchurl, lib }: -let - pname = "Sylk"; - version = "3.0.1"; -in - appimageTools.wrapType2 rec { - inherit pname version; + pname = "sylk"; + version = "3.0.1"; src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; @@ -17,12 +13,13 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - meta = with lib; { - description = "Sylk WebRTC client"; + meta = { + description = "Desktop client for SylkServer, a multiparty conferencing tool"; homepage = "https://sylkserver.com/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ zimbatm ]; - platforms = [ "i386-linux" "x86_64-linux" ]; + license = lib.licenses.agpl3Plus; mainProgram = "Sylk"; + maintainers = with lib.maintainers; [ zimbatm ]; + platforms = [ "i386-linux" "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 213afdf99d9a..49918da44dba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1277,6 +1277,7 @@ mapAliases ({ supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 + Sylk = sylk; # Added 2024-06-12 syncthing-cli = syncthing; # Added 2021-04-06 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a867078fdbf..c8420c32a01e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13325,8 +13325,6 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - Sylk = callPackage ../applications/networking/Sylk { }; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; From 28f1697741e6add7c62abca1e75c265a36b8d086 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 01:12:11 +0000 Subject: [PATCH 135/233] libreddit: 0.30.0 -> 0.30.1 --- pkgs/servers/libreddit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 246697c937f4..c27ea94a7b0c 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jV8U7znBFCYBmtI6fm+/5oKsLJ3/tQG16GUvNnBlp7A="; + hash = "sha256-Z+COSDiJoWHHZQM4BJca0JA5RrJKYjhfkFj8yx/0gZA="; }; - cargoHash = "sha256-V7bT1uwSk9IW5rhKHW+6yHv+o+H3w7O/yuRpPDrcFic="; + cargoHash = "sha256-42xtt5dCcV6+TcssFjufkVtDSRiDGaatAaiP6K8DT8I="; buildInputs = lib.optionals stdenv.isDarwin [ Security From 3bc13a61700f4b6c41a8daa4539cbe7dd030a92c Mon Sep 17 00:00:00 2001 From: Nydragon Date: Sat, 8 Jun 2024 19:17:27 +0900 Subject: [PATCH 136/233] cliphist: add contribution scripts cliphist has some scrips that do some of the work of integrating it with fzf, rofi & wofi. They weren't present in the derivation yet, so this commit is adding them. scripts: https://github.com/sentriz/cliphist/tree/master/contrib --- pkgs/tools/wayland/cliphist/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/tools/wayland/cliphist/default.nix index 7485d79bf7bc..0cbb856162b2 100644 --- a/pkgs/tools/wayland/cliphist/default.nix +++ b/pkgs/tools/wayland/cliphist/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "cliphist"; @@ -13,6 +17,10 @@ buildGoModule rec { vendorHash = "sha256-O4jOFWygmFxm8ydOq1xtB1DESyWpFGXeSp8a6tT+too="; + postInstall = '' + cp ${src}/contrib/* $out/bin/ + ''; + meta = with lib; { description = "Wayland clipboard manager"; homepage = "https://github.com/sentriz/cliphist"; From b1dd5f01ff7cd4b9333765306d0a488dcc6702ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 01:20:20 +0000 Subject: [PATCH 137/233] mermerd: 0.10.0 -> 0.11.0 --- pkgs/development/tools/database/mermerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 7331f5f61750..f73cca5d01ec 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mermerd"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "KarnerTh"; repo = "mermerd"; rev = "refs/tags/v${version}"; - hash = "sha256-SzDwVkV7rV/pctFNWzgCfsDAHqcf/R5UMRJ48o+Iel0="; + hash = "sha256-7oBN9EeF3JBrOFuIM3lkNR2WMZA8PNDaKqdsVPawHBE="; }; - vendorHash = "sha256-rLOYJ/do4HSztnHrQZOUOG0Y3e3BupUGlijP5x8WtZc="; + vendorHash = "sha256-bd/1LT0Pw25NhbnwQH3nmuCm3m8jBKPOYGRIRpcOGQI="; ldflags = [ "-s" From b51d1c7259c7fd50b5dbb4b36218fbbbe5a3cf66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 01:25:35 +0000 Subject: [PATCH 138/233] miru: 5.1.0 -> 5.1.3 --- pkgs/by-name/mi/miru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index e8bcb7729d99..c96def129eb0 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -5,12 +5,12 @@ appimageTools.wrapType2 rec { pname = "miru"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-N9I5YNFIfBmANCnJA3gUmgq04cc5LLfOsYiEdwJupf8="; + sha256 = "sha256-F2wFCZvuANoeBNO+o3Rs/DJtyIVQl46MQCpXQcRiDHs="; }; extraInstallCommands = From 2f9a552b3f55fecd8d2d76667f7704d65ee4428f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 02:11:03 +0000 Subject: [PATCH 139/233] sslscan: 2.1.3 -> 2.1.4 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 43e2b8ace717..ab699f8f02b7 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-oLlMeFVicDwr2XjCX/0cBMTXLKB8js50646uAf3tP9k="; + hash = "sha256-we55Oo9sIZ1FQn94xejlCKwlZBDMrQs/1f++blXTTUM="; }; buildInputs = [ openssl ]; From ca4f0becf996b69b22598649b0bc9b52ef9f7b5d Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 17 Jun 2024 04:23:14 +0200 Subject: [PATCH 140/233] nixos/oauth2-proxy: restart service when keyFile option changes (#320325) --- nixos/modules/services/security/oauth2-proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/oauth2-proxy.nix b/nixos/modules/services/security/oauth2-proxy.nix index 3079a1d030c5..a897f04ea633 100644 --- a/nixos/modules/services/security/oauth2-proxy.nix +++ b/nixos/modules/services/security/oauth2-proxy.nix @@ -586,11 +586,11 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ]; after = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ]; - + restartTriggers = [ cfg.keyFile ]; serviceConfig = { User = "oauth2-proxy"; Restart = "always"; - ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}"; + ExecStart = "${lib.getExe cfg.package} ${configString}"; EnvironmentFile = lib.mkIf (cfg.keyFile != null) cfg.keyFile; }; }; From ecdae5aa8caa25014127642e0abb4408647b3343 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 03:33:28 +0000 Subject: [PATCH 141/233] python311Packages.tabcmd: 2.0.13 -> 2.0.14 --- pkgs/development/python-modules/tabcmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index fca958dbf1cd..e713fef830a7 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "tabcmd"; - version = "2.0.13"; + version = "2.0.14"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f9zoYeb4RzcCtgcCYYvvuCuFrjqpP3Fhv38bUWH24+g="; + hash = "sha256-wyfKy0g2btdNMNviCd7brB+lwZvPcZ3/DnymdVjCGFg="; }; prePatch = '' From 8e8aa62fe86f8c9a2b82733af07d5375f5acc646 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 04:18:45 +0000 Subject: [PATCH 142/233] neocmakelsp: 0.7.3 -> 0.7.4 --- .../tools/language-servers/neocmakelsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 53e17e4da820..6797c2d43250 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-rMonXAggCsMWvyNmGu+crtw0a4zfhKJOR5GnIULWe1g="; + hash = "sha256-oYvjMpZcXIpOA/osVCOy2NxkFnEQePGf4le22M1bFPA="; }; - cargoHash = "sha256-09mpr7ncqK9c5AMhRSAe/K9pE3vXC3bxEXX3hIx3E7c="; + cargoHash = "sha256-kcqq4xnCxGIGCFlmm4EDc9ZfQHBi6k/xrhIyZ+eKs34="; meta = with lib; { description = "Cmake lsp based on tower-lsp and treesitter"; From 31099084c7b4d3c634156952ba0b93be1a491bf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 04:23:33 +0000 Subject: [PATCH 143/233] scaleway-cli: 2.27.0 -> 2.31.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index ec5f92c74018..ba65217d59c7 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.27.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-brcsscNRftlpx73Q6lnbwvFiKoY6csERUUnAsiXwhF0="; + sha256 = "sha256-v8KkF5GShMDVjeAoe/bvoqHIBKDJ1hd6RIpu9Zugc6w="; }; - vendorHash = "sha256-GDV7BDZb0oHQUbA/Ojx6kzh9kBh0C5RbjYDDzX16LmQ="; + vendorHash = "sha256-Oprca0JX8SmrEGrnalzKt89qrXa5UEbErl8BOFJlHGI="; ldflags = [ "-w" From 678d20a7050ba795f9f9b272fad3c0542df045f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 04:32:25 +0000 Subject: [PATCH 144/233] clickhouse-backup: 2.5.12 -> 2.5.14 --- pkgs/development/tools/database/clickhouse-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index e3aba018735c..2b7a31d05f2e 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.12"; + version = "2.5.14"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-qLBx1QhIefZbENEtJiVHoAMsxM9SqiCnPQpotIAJy5Y="; + hash = "sha256-y57P6AM0w1AaOxCOHPjdgyhvqP/yasOP46JdErnYEvg="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; From d2b892c753ec8ef2bb7d491f0453a6ef517961f1 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Mon, 17 Jun 2024 03:05:58 +0000 Subject: [PATCH 145/233] faiss: refactor buildPhase, installPhase and fixupPhase use buildFlags to specify the targets and eliminate the need for custom phases. Move remaining code from {build,install,fixup}Phase to post{Build,Install,Fixup) --- .../libraries/science/math/faiss/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index aedb240caadd..59494fadfd90 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -97,20 +97,21 @@ stdenv.mkDerivation { "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; + buildFlags = [ + "faiss" + "demo_ivfpq_indexing" + ] ++ lib.optionals pythonSupport [ + "swigfaiss" + ]; # pip wheel->pip install commands copied over from opencv4 - buildPhase = '' - make -j faiss - make demo_ivfpq_indexing - '' + lib.optionalString pythonSupport '' - make -j swigfaiss + postBuild = lib.optionalString pythonSupport '' (cd faiss/python && python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - installPhase = '' - make install + postInstall = '' mkdir -p $demos/bin cp ./demos/demo_ivfpq_indexing $demos/bin/ '' + lib.optionalString pythonSupport '' @@ -118,7 +119,7 @@ stdenv.mkDerivation { (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache) ''; - fixupPhase = lib.optionalString (pythonSupport && cudaSupport) '' + postFixup = lib.optionalString (pythonSupport && cudaSupport) '' addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so addOpenGLRunpath $demos/bin/* ''; From f2bc52d157ba63fcd7a4029217efe6e6a880457c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 05:14:24 +0000 Subject: [PATCH 146/233] arxiv-latex-cleaner: 1.0.5 -> 1.0.6 --- pkgs/by-name/ar/arxiv-latex-cleaner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix index bae622f00fd2..608a02d70bf0 100644 --- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix +++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "arxiv-latex-cleaner"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "google-research"; repo = "arxiv-latex-cleaner"; rev = "refs/tags/v${version}"; - hash = "sha256-Yxp8XtlISVZfEjCEJ/EXsIGMCHDPOwPcjkJxECeXvYk="; + hash = "sha256-S/r5riFIsRG+5za+4kVvUXOLIJ3ELCDWlSpYeSuNs+s="; }; propagatedBuildInputs = with python3Packages; [ From f6e67788cb770eb213a06b7de8e769256e991fe9 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 7 Jun 2024 20:07:54 -0700 Subject: [PATCH 147/233] perl: explicitly tell FreeBSD cross that crypt is available --- pkgs/development/interpreters/perl/interpreter.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index 95ddc5a543cf..34e4dcc0055d 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -115,6 +115,11 @@ stdenv.mkDerivation (rec { "-Dprefix=${placeholder "out"}" "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" + ] + ++ lib.optionals (stdenv.isFreeBSD && crossCompiling && enableCrypt) [ + # https://github.com/Perl/perl5/issues/22295 + # configure cannot figure out that we have crypt automatically, but we really do + "-Dd_crypt" ]; configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; From ffc1f8e29f143f235b3af56ae412400e462a9123 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 17 Jun 2024 14:58:40 +0900 Subject: [PATCH 148/233] meilisearch: 1.7.6 -> 1.8.2 Signed-off-by: Ludovico Piero --- pkgs/servers/search/meilisearch/Cargo.lock | 898 +++++++++++--------- pkgs/servers/search/meilisearch/default.nix | 8 +- 2 files changed, 521 insertions(+), 385 deletions(-) diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 2ec78384a3b4..b7419052a84b 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -47,7 +47,7 @@ dependencies = [ "actix-utils", "ahash", "base64 0.21.7", - "bitflags 2.4.1", + "bitflags 2.5.0", "brotli", "bytes", "bytestring", @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -149,10 +149,10 @@ dependencies = [ "impl-more", "pin-project-lite", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.22.6", + "webpki-roots 0.25.3", ] [[package]] @@ -246,9 +246,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -306,9 +306,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.7" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -320,9 +320,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" dependencies = [ "backtrace", ] @@ -386,7 +386,7 @@ dependencies = [ "byteorder", "heed", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "ordered-float", "rand", "rayon", @@ -424,7 +424,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -435,7 +435,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" @@ -494,7 +494,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "bytes", @@ -541,7 +541,7 @@ version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", "lazy_static", @@ -552,7 +552,18 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" +dependencies = [ + "glob", + "num_cpus", + "rayon", ] [[package]] @@ -578,9 +589,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -628,7 +639,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "time", @@ -637,9 +648,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "byte-unit" @@ -659,22 +670,22 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -730,15 +741,16 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.3.3" -source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f1b20174c1707e20f4cb364a355b449803c03e9b0c9193324623cf9787a4e00" dependencies = [ "byteorder", "candle-kernels", "cudarc", "gemm", - "half 2.3.1", - "memmap2 0.9.3", + "half 2.4.0", + "memmap2 0.9.4", "num-traits", "num_cpus", "rand", @@ -752,21 +764,21 @@ dependencies = [ [[package]] name = "candle-kernels" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5845911a44164ebb73b56a0e23793ba1b583bad102af7400fe4768babc5815b2" dependencies = [ - "anyhow", - "glob", - "rayon", + "bindgen_cuda", ] [[package]] name = "candle-nn" -version = "0.3.3" -source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66a27533c8edfc915a6459f9850641ef523a829fa1a181c670766c1f752d873a" dependencies = [ "candle-core", - "half 2.3.1", + "half 2.4.0", "num-traits", "rayon", "safetensors", @@ -776,8 +788,9 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.3" -source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5847699f0643da05e57fc473672566e93dc36d82c1b7eeb970c6154d3434fe1" dependencies = [ "byteorder", "candle-core", @@ -789,7 +802,6 @@ dependencies = [ "serde_json", "serde_plain", "tracing", - "wav", ] [[package]] @@ -833,9 +845,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -877,9 +889,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.7" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9071b1586dd067b5fdfd2069fab932c047ca5bbce4bd2bdee8af0f4b155053" +checksum = "933f20f2269b24d32fd5503e7b3c268af902190daf8d9d2b73ed2e75d77c00b4" dependencies = [ "aho-corasick", "cow-utils", @@ -889,9 +901,7 @@ dependencies = [ "fst", "irg-kvariants", "jieba-rs", - "lindera-core", - "lindera-dictionary", - "lindera-tokenizer", + "lindera", "litemap", "once_cell", "pinyin", @@ -982,7 +992,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1089,18 +1099,18 @@ checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -1246,7 +1256,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9395df0cab995685664e79cc35ad6302bf08fb9c5d82301875a183affe1278b1" dependencies = [ - "half 2.3.1", + "half 2.4.0", ] [[package]] @@ -1294,7 +1304,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1316,7 +1326,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1330,9 +1340,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1346,7 +1356,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1450,7 +1460,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1529,7 +1539,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "big_s", @@ -1564,9 +1574,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" dependencies = [ "serde", ] @@ -1643,9 +1653,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1668,7 +1678,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1688,20 +1698,30 @@ checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1761,13 +1781,13 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "uuid", ] [[package]] name = "file-store" -version = "1.7.6" +version = "1.8.2" dependencies = [ "faux", "tempfile", @@ -1790,7 +1810,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.7.6" +version = "1.8.2" dependencies = [ "insta", "nom", @@ -1810,7 +1830,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.7.6" +version = "1.8.2" dependencies = [ "criterion", "serde_json", @@ -1893,7 +1913,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1928,7 +1948,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.7.6" +version = "1.8.2" dependencies = [ "arbitrary", "clap", @@ -1954,7 +1974,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "debugid", "fxhash", "serde", @@ -1963,9 +1983,9 @@ dependencies = [ [[package]] name = "gemm" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97d506c68f4fb12325b52a638e7d54cc87e3593a4ded0de60218b6dfd65f645" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" dependencies = [ "dyn-stack", "gemm-c32", @@ -1983,9 +2003,9 @@ dependencies = [ [[package]] name = "gemm-c32" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd16f26e8f34661edc906d8c9522b59ec1655c865a98a58950d0246eeaca9da" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" dependencies = [ "dyn-stack", "gemm-common", @@ -1998,9 +2018,9 @@ dependencies = [ [[package]] name = "gemm-c64" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e34381bc060b47fbd25522a281799ef763cd27f43bbd1783d935774659242a" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" dependencies = [ "dyn-stack", "gemm-common", @@ -2013,13 +2033,13 @@ dependencies = [ [[package]] name = "gemm-common" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22518a76339b09276f77c3166c44262e55f633712fe8a44fd0573505887feeab" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" dependencies = [ "bytemuck", "dyn-stack", - "half 2.3.1", + "half 2.4.0", "num-complex", "num-traits", "once_cell", @@ -2033,14 +2053,14 @@ dependencies = [ [[package]] name = "gemm-f16" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70409bbf3ef83b38cbe4a58cd4b797c1c27902505bdd926a588ea61b6c550a84" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" dependencies = [ "dyn-stack", "gemm-common", "gemm-f32", - "half 2.3.1", + "half 2.4.0", "num-complex", "num-traits", "paste", @@ -2051,9 +2071,9 @@ dependencies = [ [[package]] name = "gemm-f32" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3068edca27f100964157211782eba19e961aa4d0d2bdac3e1775a51aa7680" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" dependencies = [ "dyn-stack", "gemm-common", @@ -2066,9 +2086,9 @@ dependencies = [ [[package]] name = "gemm-f64" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd41e8f5a60dce8d8acd852a3f4b22f8e18be957e1937731be692c037652510" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" dependencies = [ "dyn-stack", "gemm-common", @@ -2097,13 +2117,15 @@ checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2130,7 +2152,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -2182,9 +2204,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "bytemuck", "cfg-if", @@ -2222,7 +2244,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -2238,7 +2260,7 @@ version = "0.20.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9648a50991c86df7d00c56c268c27754fcf4c80be2ba57fc4a00dc928c6fe934" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bytemuck", "byteorder", "heed-traits", @@ -2272,9 +2294,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2393,7 +2415,7 @@ dependencies = [ "hyper", "rustls 0.21.10", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2420,7 +2442,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "big_s", @@ -2453,9 +2475,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -2567,10 +2589,19 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.9" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jieba-rs" @@ -2589,25 +2620,25 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-depth-checker" -version = "1.7.6" +version = "1.8.2" dependencies = [ "criterion", "serde_json", @@ -2615,18 +2646,28 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ "base64 0.21.7", + "js-sys", "pem", - "ring 0.16.20", + "ring", "serde", "serde_json", "simple_asn1", ] +[[package]] +name = "kanaria" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f9d9652540055ac4fded998a73aca97d965899077ab1212587437da44196ff" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "kstring" version = "2.0.0" @@ -2694,9 +2735,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" @@ -2732,10 +2773,67 @@ dependencies = [ ] [[package]] -name = "lindera-cc-cedict-builder" -version = "0.27.2" +name = "lindera" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90d23f7cef31c6ab7ac0d4f3b23940754207f7b5a80b080c39193caffe99ac2" +checksum = "a1bbf252ea3490053dc397539ece0b510924f2f72605fa28d3e858d86f43ec88" +dependencies = [ + "lindera-analyzer", + "lindera-core", + "lindera-dictionary", + "lindera-filter", + "lindera-tokenizer", +] + +[[package]] +name = "lindera-analyzer" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87febfec0e2859ce2154fb90dd6f66b774ddb0b6e264b44f8e3d1303c9dcedd7" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "encoding", + "kanaria", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-dictionary", + "lindera-filter", + "lindera-ipadic-builder", + "lindera-ko-dic-builder", + "lindera-tokenizer", + "lindera-unidic-builder", + "once_cell", + "regex", + "serde", + "serde_json", + "thiserror", + "unicode-blocks", + "unicode-normalization", + "unicode-segmentation", + "yada", +] + +[[package]] +name = "lindera-cc-cedict" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb91bb8a93ab0f95dbc3c43b5105354bb059134ef731154f75a64b5d919e71d" +dependencies = [ + "bincode", + "byteorder", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-decompress", + "once_cell", +] + +[[package]] +name = "lindera-cc-cedict-builder" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6022a8309a287dbef425fd09a61585351670c83001d74f6c089979e2330b683" dependencies = [ "anyhow", "bincode", @@ -2744,6 +2842,7 @@ dependencies = [ "encoding", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2752,9 +2851,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1927b7d2bd4ffc19e07691bf8609722663c341f80260a1c636cee8f1ec420dce" +checksum = "32363cbcf433f915e7d77c2a0c410db2d6b23442e80715cf2cf6b9864078a500" dependencies = [ "anyhow", "flate2", @@ -2763,9 +2862,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3299caa2b81c9a076535a4651a83bf7d624c15f2349f243187fffc64b5a78251" +checksum = "d9a0e858753a02b1a3524fae4fbb11ca4b3a947128fd7854b797386562678be8" dependencies = [ "anyhow", "bincode", @@ -2780,9 +2879,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b82b8d2323a67dc8ff0c40751d199b7ba94cd5e3c13a5b31622d318acc79e5b" +checksum = "0e406345f6f8b665b9a129c67079c18ca9d97e9d171d102b4106a64a592c285e" dependencies = [ "anyhow", "flate2", @@ -2791,29 +2890,73 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddf783b459d54b130d956889bec052c25fcb478a304e03fa9b2289387572bc5" +checksum = "3e2a3ec0e5fd6768a27c6ec1040e8470d3a5926418f7afe065859e98aabb3bfe" dependencies = [ "anyhow", "bincode", "byteorder", + "lindera-cc-cedict", "lindera-cc-cedict-builder", "lindera-core", + "lindera-ipadic", "lindera-ipadic-builder", + "lindera-ipadic-neologd", "lindera-ipadic-neologd-builder", "lindera-ko-dic", "lindera-ko-dic-builder", "lindera-unidic", "lindera-unidic-builder", "serde", + "strum", + "strum_macros", +] + +[[package]] +name = "lindera-filter" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1badaf51bad051185ea4917ba91bbbf2d6f8167e155647e21e0eaaef0982a95d" +dependencies = [ + "anyhow", + "csv", + "kanaria", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-dictionary", + "lindera-ipadic-builder", + "lindera-ko-dic-builder", + "lindera-unidic-builder", + "once_cell", + "regex", + "serde", + "serde_json", + "unicode-blocks", + "unicode-normalization", + "unicode-segmentation", + "yada", +] + +[[package]] +name = "lindera-ipadic" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129ec16366354998f9791467ad38731539197747f649e573ead845358271ce25" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-decompress", + "lindera-ipadic-builder", + "once_cell", ] [[package]] name = "lindera-ipadic-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c708f08f14b0806f6c4cce5324b4bcba27209463026b78c31f399f8be9d30d" +checksum = "7f0979a56bc57e9c9be2996dff232c47aa146a2e7baebf5dd567e388eba3dd90" dependencies = [ "anyhow", "bincode", @@ -2823,6 +2966,7 @@ dependencies = [ "encoding_rs_io", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2831,10 +2975,24 @@ dependencies = [ ] [[package]] -name = "lindera-ipadic-neologd-builder" -version = "0.27.2" +name = "lindera-ipadic-neologd" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e67eb91652203d202f7d27ead220d1d8c9099552709b8429eae9c70f2312fb" +checksum = "20076660c4e79ef0316735b44e18ec7644e54786acdee8946c972d5f97086d0f" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-decompress", + "lindera-ipadic-neologd-builder", + "once_cell", +] + +[[package]] +name = "lindera-ipadic-neologd-builder" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eccd18ed5f65d1d64ac0cbfa1d6827bfbbaf6530520ae6847e6a91ee38f47e20" dependencies = [ "anyhow", "bincode", @@ -2844,6 +3002,7 @@ dependencies = [ "encoding_rs_io", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2853,9 +3012,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d45da8d9a5888f4d4e78bb29fc82ff9ae519962efb0d2d92343b6cf8e373952f" +checksum = "59073171566c3e498ca048e84c2d0a7e117a42f36c8eb7d7163e65ac38bd6d48" dependencies = [ "bincode", "byteorder", @@ -2866,13 +3025,14 @@ dependencies = [ "lindera-ko-dic-builder", "once_cell", "tar", + "ureq", ] [[package]] name = "lindera-ko-dic-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c0933295dc945178bbc08f34111dc3ef22bfee38820f78453c8f8d4f3463d1" +checksum = "ae176afa8535ca2a5ee9471873f85d531db0a6c32a3c42b41084506aac22b577" dependencies = [ "anyhow", "bincode", @@ -2890,12 +3050,11 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348ce9bb3f2e5edc577420b98cca05b2177f3af50ef5ae278a1d8a1351d56197" +checksum = "457285bdde84571aa510c9e05371904305a55e8a541fa1473d4393062f06932d" dependencies = [ "bincode", - "byteorder", "lindera-core", "lindera-dictionary", "once_cell", @@ -2905,26 +3064,27 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74022a57c395ed7e213a9cd5833207e3c583145078ee9a164aeaec68b30c9d8e" +checksum = "5839980be552dfa639b70964c61914a9ad014148663679b0e148aa72e5e30f23" dependencies = [ "bincode", "byteorder", "encoding", + "flate2", "lindera-core", "lindera-decompress", "lindera-unidic-builder", "once_cell", + "tar", "ureq", - "zip", ] [[package]] name = "lindera-unidic-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34e5564ee81af82603cd6a03c3abe6e17cc0ae598bfa5078809f06e59e96e08" +checksum = "dcaab8f061d5b944b1e424f49c7efbf8f276e8a72e4f4ff956d01e46d481f008" dependencies = [ "anyhow", "bincode", @@ -2997,7 +3157,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3063,9 +3223,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lz4_flex" @@ -3098,7 +3258,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3115,7 +3275,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.7.6" +version = "1.8.2" dependencies = [ "insta", "md5", @@ -3124,7 +3284,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.7.6" +version = "1.8.2" dependencies = [ "actix-cors", "actix-http", @@ -3182,7 +3342,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.20.9", + "rustls 0.21.10", "rustls-pemfile", "segment", "serde", @@ -3217,7 +3377,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.7.6" +version = "1.8.2" dependencies = [ "base64 0.21.7", "enum-iterator", @@ -3236,7 +3396,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.7.6" +version = "1.8.2" dependencies = [ "actix-web", "anyhow", @@ -3266,7 +3426,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "clap", @@ -3295,9 +3455,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", "stable_deref_trait", @@ -3305,7 +3465,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.7.6" +version = "1.8.2" dependencies = [ "arroy", "big_s", @@ -3326,7 +3486,6 @@ dependencies = [ "filter-parser", "flatten-serde-json", "fst", - "futures", "fxhash", "geoutils", "grenad", @@ -3350,7 +3509,6 @@ dependencies = [ "rand", "rand_pcg", "rayon", - "reqwest", "roaring", "rstar", "serde", @@ -3364,8 +3522,9 @@ dependencies = [ "tiktoken-rs", "time", "tokenizers", - "tokio", "tracing", + "ureq", + "url", "uuid", ] @@ -3402,9 +3561,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -3439,7 +3598,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3501,9 +3660,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "bytemuck", "num-traits", @@ -3527,9 +3686,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3731,11 +3890,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", + "serde", ] [[package]] @@ -3746,7 +3906,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.7.6" +version = "1.8.2" dependencies = [ "big_s", "serde_json", @@ -3782,7 +3942,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3836,7 +3996,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3865,7 +4025,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3888,9 +4048,9 @@ checksum = "16f2611cd06a1ac239a0cea4521de9eb068a6ca110324ee00631aa68daa74fc0" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-dirs" @@ -3973,9 +4133,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4035,9 +4195,9 @@ dependencies = [ [[package]] name = "pulp" -version = "0.18.4" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +checksum = "03457ac216146f43f921500bac4e892d5cd32b0479b929cbfc90f95cd6c599c2" dependencies = [ "bytemuck", "libm", @@ -4115,9 +4275,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4181,33 +4341,27 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -4244,7 +4398,7 @@ dependencies = [ "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -4262,39 +4416,19 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" -[[package]] -name = "riff" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" - [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", + "spin", + "untrusted", + "windows-sys 0.52.0", ] [[package]] @@ -4362,25 +4496,13 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.12", "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.10" @@ -4388,11 +4510,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.7", - "rustls-webpki", + "ring", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -4402,14 +4538,31 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -4420,15 +4573,15 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safetensors" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1659ef1c27917eb58c2d53664b5506d0b68c9cb9b460d3e0901011cf71269a8e" +checksum = "8d980e6bfb34436fb0a81e42bc41af43f11805bbbca443e7f68e9faaabe669ed" dependencies = [ "serde", "serde_json", @@ -4455,8 +4608,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -4490,9 +4643,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -4508,20 +4661,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "indexmap", "itoa", @@ -4572,9 +4725,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -4719,12 +4872,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -4775,6 +4922,28 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.58", +] + [[package]] name = "subtle" version = "2.5.0" @@ -4794,9 +4963,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -4814,14 +4983,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", - "unicode-xid", + "syn 2.0.58", ] [[package]] @@ -4830,7 +4998,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "byteorder", "enum-as-inner", "libc", @@ -4917,22 +5085,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5020,14 +5188,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenizers" -version = "0.14.1" -source = "git+https://github.com/huggingface/tokenizers.git?tag=v0.14.1#6357206cdcce4d78ffb1e0372feb456caea09375" +version = "0.15.2" +source = "git+https://github.com/huggingface/tokenizers.git?tag=v0.15.2#701a73b869602b5639589d197e805349cdba3223" dependencies = [ "aho-corasick", "derive_builder 0.12.0", "esaxx-rs", "getrandom", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "log", "macro_rules_attribute", @@ -5038,7 +5206,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "regex-syntax 0.7.4", + "regex-syntax", "serde", "serde_json", "spm_precompiled", @@ -5075,18 +5243,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", + "syn 2.0.58", ] [[package]] @@ -5197,7 +5354,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5282,9 +5439,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -5317,16 +5474,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] -name = "unicode-ident" -version = "1.0.11" +name = "unicode-blocks" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "6b12e05d9e06373163a9bb6bb8c263c261b396643a99445fe6b9811fd376581b" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -5342,9 +5505,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5352,24 +5515,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -5378,21 +5529,22 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ "base64 0.21.7", "flate2", "log", "once_cell", - "rustls 0.21.10", - "rustls-webpki", + "rustls 0.22.2", + "rustls-pki-types", + "rustls-webpki 0.102.2", "serde", "serde_json", "socks", "url", - "webpki-roots 0.25.3", + "webpki-roots 0.26.1", ] [[package]] @@ -5496,9 +5648,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5532,9 +5684,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5542,16 +5694,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -5569,9 +5721,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5579,22 +5731,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -5609,15 +5761,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wav" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65e199c799848b4f997072aa4d673c034f80f40191f97fe2f0a23f410be1609" -dependencies = [ - "riff", -] - [[package]] name = "web-sys" version = "0.3.64" @@ -5628,31 +5771,21 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "whatlang" version = "0.16.4" @@ -5681,9 +5814,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -5941,7 +6074,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "build-info", @@ -5964,9 +6097,9 @@ dependencies = [ [[package]] name = "yada" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1" +checksum = "aed111bd9e48a802518765906cbdadf0b45afb72b9c81ab049a3b86252adffdd" [[package]] name = "yaml-rust" @@ -5989,9 +6122,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -6001,13 +6134,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "synstructure", ] @@ -6028,7 +6161,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -6048,10 +6181,16 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "synstructure", ] +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + [[package]] name = "zerovec" version = "0.10.1" @@ -6102,11 +6241,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 1846775194f0..933e11075fcb 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nix-update-script }: -let version = "1.7.6"; +let version = "1.8.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-LsJM7zkoiu5LZb/rhnZaAS/wVNH8b6YZ+vNEE1wVIIk="; + hash = "sha256-x5hHgEhM3iljB7KoJcRoEEZm5bc/lZevT9x/bf2mEMI="; }; cargoBuildFlags = [ @@ -29,10 +29,8 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII="; - "candle-core-0.3.3" = "sha256-umWvG+82B793PQtY9VeHjPTtTVmSPdts25buw4v4TQc="; - "candle-kernels-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA="; "hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54="; - "tokenizers-0.14.1" = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; + "tokenizers-0.15.2" = "sha256-lWvCu2hDJFzK6IUBJ4yeL4eZkOA08LHEMfiKXVvkog8="; }; }; From 7d5124477fff42a932a59a3027c74e8be5e07615 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 17 Jun 2024 15:00:28 +0900 Subject: [PATCH 149/233] meilisearch: remove `with lib;` Signed-off-by: Ludovico Piero --- pkgs/servers/search/meilisearch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 933e11075fcb..384cb9b59822 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -55,13 +55,13 @@ rustPlatform.buildRustPackage { # Tests will try to compile with mini-dashboard features which downloads something from the internet. doCheck = false; - meta = with lib; { + meta = { description = "Powerful, fast, and an easy to use search engine"; mainProgram = "meilisearch"; homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; platforms = [ "aarch64-linux" "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; }; } From 2493437974528e955d3199765cf9a03a94162f64 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 17 Jun 2024 15:00:57 +0900 Subject: [PATCH 150/233] meilisearch: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/servers/search/meilisearch/default.nix | 38 ++++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 384cb9b59822..55810cf58997 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,14 +1,16 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, Security -, SystemConfiguration -, nixosTests -, nix-update-script +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + Security, + SystemConfiguration, + nixosTests, + nix-update-script, }: -let version = "1.8.2"; +let + version = "1.8.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -21,9 +23,7 @@ rustPlatform.buildRustPackage { hash = "sha256-x5hHgEhM3iljB7KoJcRoEEZm5bc/lZevT9x/bf2mEMI="; }; - cargoBuildFlags = [ - "--package=meilisearch" - ]; + cargoBuildFlags = [ "--package=meilisearch" ]; cargoLock = { lockFile = ./Cargo.lock; @@ -37,12 +37,11 @@ rustPlatform.buildRustPackage { # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; - nativeBuildInputs = [ - rustPlatform.bindgenHook - ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ - Security SystemConfiguration + Security + SystemConfiguration ]; passthru = { @@ -62,6 +61,11 @@ rustPlatform.buildRustPackage { changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; - platforms = [ "aarch64-linux" "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; }; } From d7e3fe582aefdf12565648e8a1be87bc341e2388 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Mon, 17 Jun 2024 11:37:43 +0530 Subject: [PATCH 151/233] nixci: 0.4.0 -> 0.5.0 --- pkgs/tools/nix/nixci/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index dbbc7ae1cc4f..e84e21f4c83f 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "nixci"; - version = "0.4.0"; + version = "0.5.0"; src = fetchCrate { inherit version; pname = "nixci"; - hash = "sha256-JC1LUny8UKflANlcx6Hcgx39CRry+ossnp/RQK36oaI="; + hash = "sha256-XbPXS29zqg+pOs/JRRB2bRPdMTDy/oKLM41UomSZTN0="; }; - cargoHash = "sha256-pYPzM7QlQ2EXwrvuXMa1qs0m7cmumh1iPesgJZ0H2kg="; + cargoHash = "sha256-+ed/XsEAwp7bsZOb+bOailpgSFnKvwoHR0QptnGeulk="; nativeBuildInputs = [ pkg-config ]; @@ -37,8 +37,8 @@ rustPlatform.buildRustPackage rec { env.DEVOUR_FLAKE = fetchFromGitHub { owner = "srid"; repo = "devour-flake"; - rev = "v3"; - hash = "sha256-O51F4YFOzlaQAc9b6xjkAqpvrvCtw/Os2M7TU0y4SKQ="; + rev = "v4"; + hash = "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0="; }; meta = with lib; { From a85f4e11a81ece8dc32f7d05c8bda813d2f027f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:21:04 +0200 Subject: [PATCH 152/233] python312Packages.tencentcloud-sdk-python: 3.0.1168 -> 3.0.1169 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1168...3.0.1169 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1169/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 34356e2d11da..f434bdc53ec6 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1168"; + version = "3.0.1169"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-Y9H+PV4PAUXCI2/kCVZhwMCvaIjDN+OThAVMoosQ5u0="; + hash = "sha256-kxpkVmP9/WAHfiul/+9HZTC25yp0jDsF+vu6OMBCl5Q="; }; build-system = [ setuptools ]; From afc6d0d4ca63c2aa10d92fabd467f8f314588a3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:22:42 +0200 Subject: [PATCH 153/233] checkov: 3.2.136 -> 3.2.137 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.136...3.2.137 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.137 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 28c9d5256d91..9f967bd59b00 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.136"; + version = "3.2.137"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-YpzaIwrGNwlK0PgyOw3InOFKOddMFggM7JSC1H8mApQ="; + hash = "sha256-gI9x2QYrpludcIAmxSB1/Bhy/O+ZPt1EKI6FgNm85Yo="; }; patches = [ ./flake8-compat-5.x.patch ]; From b98d46c3e7d56d59fb706e0ff1f00365708ed515 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:23:50 +0200 Subject: [PATCH 154/233] python312Packages.py-canary: 0.5.3 -> 0.5.4 Diff: https://github.com/snjoetw/py-canary/compare/refs/tags/0.5.3...0.5.4 --- pkgs/development/python-modules/py-canary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 44db50c93bfe..ecfb6a8d072a 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-canary"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "snjoetw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE="; + hash = "sha256-zylWkssU85eSfR+Di7vQGTr6hOQkqXCObv/PCDHoKHA="; }; nativeBuildInputs = [ setuptools ]; From 44bea16be0d0724cb76204d643065b1302565d34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:24:31 +0200 Subject: [PATCH 155/233] python312Packages.plugwise: 0.38.2 -> 0.38.3 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.38.2...v0.38.3 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.38.3 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 1979066c8fab..75c281ae22b9 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.38.2"; + version = "0.38.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-OURmdTxSxgEh0OsRnbznZB6uy+J/CkwaMD+e/tlv7nk="; + hash = "sha256-DFHKycFWtR8moLyGaiDVqnrlg+ydgR8/UVgkUpzqAuY="; }; postPatch = '' From dd50a3df60f30f5ef1285c2092ec55c9c33e606c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Jun 2024 08:13:42 +0200 Subject: [PATCH 156/233] tinymist: 0.11.10 -> 0.11.11 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.11.10...v0.11.11 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/refs/tags/v0.11.11/CHANGELOG.md --- .../extensions/myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/Cargo.lock | 12 ++++++------ pkgs/by-name/ti/tinymist/package.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index ea2276c7e7a3..99878c88568e 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-etPjbmcBhS1dgq5wEoRIekZlRxYoC6KrsV/+owjHu4I="; + hash = "sha256-Oama8FkRhEY4yza77RpWHg0Aeo9WFhveucJqJvCYMJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 917c5358bf46..ae658912bf60 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -3743,7 +3743,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.10" +version = "0.11.11" dependencies = [ "insta", "lsp-server", @@ -3840,7 +3840,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.10" +version = "0.11.11" dependencies = [ "anyhow", "async-trait", @@ -3891,7 +3891,7 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.10" +version = "0.11.11" dependencies = [ "anyhow", "biblatex", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.10" +version = "0.11.11" dependencies = [ "base64 0.22.1", "log", @@ -4530,9 +4530,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.23" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb15ec2ba1f804eab4f8f2ae1bbbe8a7d2f882bb8acabaee0b101de46ee28c56" +checksum = "b08c00b01698330e3c46dd9454c3472e4107866de14fc52aeb1a55aa260bfc7b" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 702ac9abbe8c..7d1397d91ea9 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-lmT0da517dVaXGeObyCXZyte8DNBh+/vaqV7hA+SJR4="; + hash = "sha256-uXrV3tvv9fXoEdFH+ajHECfNy4uTvUZBkhkfzGzj3HE="; }; cargoLock = { From 00ca87c89445bfc5ccf3d95b53cefa366725731a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:25:40 +0200 Subject: [PATCH 157/233] python312Packages.aiortm: 0.8.13 -> 0.8.14 Diff: https://github.com/MartinHjelmare/aiortm/compare/refs/tags/v0.8.13...v0.8.14 Changelog: https://github.com/MartinHjelmare/aiortm/blob/v0.8.14/CHANGELOG.md --- pkgs/development/python-modules/aiortm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 9e1384acc679..4498c27080c3 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.13"; + version = "0.8.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-JoolmxZFN0UG8wAMxMAYL8APFjpEcMECirCKUA/UBlY="; + hash = "sha256-x/QTmFNPnazyAmJQ9zLzAFB9V3NUwDeTJdrJqQ54jGE="; }; postPatch = '' From 5366a8da50e54d98ea6b80a2935a306dfbb3e9de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:26:13 +0200 Subject: [PATCH 158/233] python312Packages.asyncwhois: 1.1.3 -> 1.1.4 Diff: https://github.com/pogzyb/asyncwhois/compare/refs/tags/v1.1.3...v1.1.4 Changelog: https://github.com/pogzyb/asyncwhois/releases/tag/v1.1.4 --- pkgs/development/python-modules/asyncwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index cc8879e35df4..f2c341a3b593 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-+FSf2H+IlLJlbZvzSH/Speyt+D2ZdXhQIKJpZYRfIyg="; + hash = "sha256-BjHGp94vad5qTvffiU8ZEOxYeXNzQHlNq1SaxviYfps="; }; postPatch = '' From ea0a49e266d29a59de39e3238032e05db0aa583e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:27:59 +0200 Subject: [PATCH 159/233] python312Packages.fastcore: 1.5.45 -> 1.5.46 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.5.45...1.5.46 Changelog: https://github.com/fastai/fastcore/blob/1.5.46/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index ae6b255259fe..4bd725f1865d 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.45"; + version = "1.5.46"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-8fpH676g36d+VgJNmlGQf4uwPMAXQpxq7F4fwO0PsZk="; + hash = "sha256-Jcnex5gDNTQqF0cL9FEdLx5vuNSsAicl0RvivC8QwSM="; }; build-system = [ setuptools ]; From 12ba19a808bd25fb524a54fac00aaf196181a8e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:28:40 +0200 Subject: [PATCH 160/233] python312Packages.griffe: 0.45.3 -> 0.46.0 Diff: https://github.com/mkdocstrings/griffe/compare/refs/tags/0.45.3...0.46.0 Changelog: https://github.com/mkdocstrings/griffe/blob/0.46.0/CHANGELOG.md --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 640d4ec5f29c..9bc64d3700be 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.45.3"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-iJ/yovyaLS2zdXbqUZU8lY59EHZZoSxQGDOS5JW0jt0="; + hash = "sha256-ZvOH2MF9MH7FB5DDQ70rYB7fgqoffbqZhKgpWYtChck="; }; build-system = [ pdm-backend ]; From b6a9188c530d3d486cc435d79724669e2e5d1da0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:29:10 +0200 Subject: [PATCH 161/233] python312Packages.frigidaire: 0.18.16 -> 0.18.19 Diff: https://github.com/bm1549/frigidaire/compare/refs/tags/0.18.16...0.18.19 Changelog: https://github.com/bm1549/frigidaire/releases/tag/0.18.19 --- pkgs/development/python-modules/frigidaire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index b8c82f26cb2f..89140e97a432 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.16"; + version = "0.18.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-PQrQM9AuudDmmsmMcZJjBm+rLA/juDgr3+SORuVurqQ="; + hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs="; }; postPatch = '' From 824d4778d33f4908a7429881a2730ce9d75f64dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:30:17 +0200 Subject: [PATCH 162/233] python312Packages.elastic-apm: 6.22.2 -> 6.22.3 Diff: https://github.com/elastic/apm-agent-python/compare/refs/tags/v6.22.2...v6.22.3 Changelog: https://github.com/elastic/apm-agent-python/releases/tag/v6.22.3 --- pkgs/development/python-modules/elastic-apm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index a9eccc7bbbc6..93fd450edfa4 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.22.2"; + version = "6.22.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AHKF+o0iZ+c1JFq3lL5XdHBDAae9qTR1OJvwuUVsaeU="; + hash = "sha256-nA+c2ycSVVJyfcNcj5W7Z2VSVcCzyCtoi3B/T4QZWnw="; }; pythonRelaxDeps = [ "wrapt" ]; From 23903f0c5d4ca75a88a00eb3fa96811bb0d0a48a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:30:51 +0200 Subject: [PATCH 163/233] python312Packages.monzopy: 1.3.0 -> 1.3.1 Diff: https://github.com/JakeMartin-ICL/monzopy/compare/refs/tags/v1.3.0...v1.3.1 Changelog: https://github.com/JakeMartin-ICL/monzopy/releases/tag/v1.3.1 --- pkgs/development/python-modules/monzopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix index d0ba25067131..78b46a115f53 100644 --- a/pkgs/development/python-modules/monzopy/default.nix +++ b/pkgs/development/python-modules/monzopy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "monzopy"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JakeMartin-ICL"; repo = "monzopy"; rev = "refs/tags/v${version}"; - hash = "sha256-IphTVtmoeqRe6EJRpI0Y0R9NzxgfAOtpXrUpq7oAUBU="; + hash = "sha256-AoBfcQ0rilUPMvLCjU2Y+P/wVnb+I40vmq+5lS5eSto="; }; build-system = [ setuptools ]; From 6218652cda6e12f2b7a484a93ba3233d6553228c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:32:19 +0200 Subject: [PATCH 164/233] python312Packages.mkdocs-rss-plugin: 1.13.0 -> 1.13.1 Changelog: https://github.com/Guts/mkdocs-rss-plugin/blob/refs/tags/1.13.1/CHANGELOG.md --- .../python-modules/mkdocs-rss-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index ef9aaa6d1a9f..f35fa16cd400 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-CUgUiLVrKI+i9F+Bc0a4r2jaW7e65JHGxOi8xGhZxWI="; + hash = "sha256-FxVyPks42hoj2y2epZjSNuTOvhDk3Vxm895a4teeSuw="; }; postPatch = '' @@ -49,7 +49,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_plugin_config_through_mkdocs" - "test_remote_image_ok" + "test_remote_image" ]; disabledTestPaths = [ From 1b57b8ad823c29a8d814e3acd26397d166c000a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:39:30 +0200 Subject: [PATCH 165/233] python312Packages.deebot-client: 7.3.0 -> 8.0.0 Diff: https://github.com/DeebotUniverse/client.py/compare/refs/tags/7.3.0...8.0.0 Changelog: https://github.com/DeebotUniverse/client.py/releases/tag/8.0.0 --- pkgs/development/python-modules/deebot-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index f075b767500e..697758093fef 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "7.3.0"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-zXe110cGrrnwZvQ3pI9Zka7bcuUS/Js+7A3k6OljAYI="; + hash = "sha256-iAUGk7ErRG7ZgvjbmEZRLAOFlMHKZ/iM8pkwAtFla2E="; }; build-system = [ From 21fa9a03f0169d4ee4c73ca0b0d79bffd583417d Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 9 Jun 2024 23:27:33 +0200 Subject: [PATCH 166/233] kontemplate: migrate to buildGoModule Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --- .../cluster/kontemplate/default.nix | 35 ------ .../networking/cluster/kontemplate/deps.nix | 111 ------------------ pkgs/by-name/ko/kontemplate/package.nix | 37 ++++++ pkgs/top-level/all-packages.nix | 2 - 4 files changed, 37 insertions(+), 148 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/kontemplate/default.nix delete mode 100644 pkgs/applications/networking/cluster/kontemplate/deps.nix create mode 100644 pkgs/by-name/ko/kontemplate/package.nix diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix deleted file mode 100644 index 14e75829e401..000000000000 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "kontemplate"; - version = "1.8.0"; - goPackagePath = "github.com/tazjin/kontemplate"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "tazjin"; - repo = "kontemplate"; - rev = "v${version}"; - sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1"; - }; - - meta = with lib; { - description = "Extremely simple Kubernetes resource templates"; - mainProgram = "kontemplate"; - homepage = "http://kontemplate.works"; - downloadPage = "https://github.com/tazjin/kontemplate/releases"; - license = licenses.gpl3; - maintainers = with maintainers; [ mbode tazjin ]; - platforms = platforms.unix; - - longDescription = '' - Kontemplate is a simple CLI tool that can take sets of - Kubernetes resource files with placeholders and insert values - per environment. - - It can be used as a simple way of deploying the same set of - resources to different Kubernetes contexts with context-specific - configuration. - ''; - }; -} diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix deleted file mode 100644 index 7693968bd550..000000000000 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/Masterminds/goutils"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/goutils"; - rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"; - sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "5bc3b9184d48f1412b300b87a200cf020d9254cf"; - sha256 = "1vdfm653v50jf63cw0kg2hslx50cn4mk6lj3p51bi11jrg48kfng"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "6f509977777c33eae63b2136d97f7b976cb971cc"; - sha256 = "05h9k6fhjxnpwlihj3z02q9kvqvnq53jix0ab84sx0666bci3cdh"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4bdb4dadffab9805ec00426c505f7"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; - sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "c2e93f3ae59f2904160ceaab466009f965df46d6"; - sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d"; - sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d"; - sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc24725223350eb3266ffb92590d28f278"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/by-name/ko/kontemplate/package.nix b/pkgs/by-name/ko/kontemplate/package.nix new file mode 100644 index 000000000000..6ab1a96f3ad2 --- /dev/null +++ b/pkgs/by-name/ko/kontemplate/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchgit +}: +buildGoModule { + pname = "kontemplate"; + version = "1.8.0-unstable-2024-06-09"; + + src = fetchgit { + url = "https://code.tvl.fyi/depot.git"; + sha256 = "sha256-Cv/y1Tj+hUKP0gi9ceS1Gml1WRYbUGSeWfJfXyX6dLA="; + rev = "b16ddb54b0327606cec2df220eaabb1328e18e3e"; + }; + + modRoot = "ops/kontemplate"; + + vendorHash = "sha256-xPGVM2dq5fAVOiuodOXhDm3v3k+ncNLhlk6aCtF5S9E="; + + meta = { + description = "Extremely simple Kubernetes resource templates"; + mainProgram = "kontemplate"; + homepage = "https://code.tvl.fyi/about/ops/kontemplate"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ mbode tazjin ]; + platforms = lib.platforms.unix; + + longDescription = '' + Kontemplate is a simple CLI tool that can take sets of + Kubernetes resource files with placeholders and insert values + per environment. + + It can be used as a simple way of deploying the same set of + resources to different Kubernetes contexts with context-specific + configuration. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfafa2ffcc0c..d96a8482cdfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39396,8 +39396,6 @@ with pkgs; fmt = fmt_8; }; - kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - # In general we only want keep the last three minor versions around that # correspond to the last three supported kubernetes versions: # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions From 4877161768a5a0fd68f65a152fad30330a047cde Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jun 2024 08:50:18 +0200 Subject: [PATCH 167/233] python312Packages.elasticsearch8: 8.13.2 -> 8.14.0 Changelog: https://github.com/elastic/elasticsearch-py/releases/tag/v8.14.0 --- pkgs/development/python-modules/elasticsearch8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index e36ec5eab06c..8c36c4af08d6 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.13.2"; + version = "8.14.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rl8IoV8kt68AJSkPMDx3d9eB6+2yPBgFpGEU6g+RjQ4="; + hash = "sha256-JiiJSjdWAocHvQ9RCGTUJD05hoSE23LYxvzMlELJUfM="; }; build-system = [ setuptools ]; From f564dbf8af8567b7c600923a25c58f02dbb68422 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Fri, 14 Jun 2024 10:06:09 +0200 Subject: [PATCH 168/233] rgbds: 0.6.1 -> 0.7.0 rgbds: use postPatch rather than patchPhase Co-authored-by: Pol Dellaiera --- pkgs/development/compilers/rgbds/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index e4eb62f73619..89e68ece7e6b 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-3mx4yymrOQnP5aJCzPWl5G96WBxt1ixU6tdzhhOsF04="; + hash = "sha256-aktKJlwXpHpjSFxoz5wZJPGWZIcn4ax5iBP0GQEux78="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; + postPatch = '' + patchShebangs --host src/bison.sh + ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; installFlags = [ "PREFIX=${placeholder "out"}" ]; From 8abb1f5afba9aea806f7c214b035834b16240295 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Jun 2024 14:11:36 +0200 Subject: [PATCH 169/233] compcert: add support for Coq 8.19.2 --- pkgs/development/coq-modules/VST/default.nix | 2 +- pkgs/development/coq-modules/compcert/default.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 706d11786354..8cfe5e9f764e 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -43,7 +43,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 1f2ec1cdfd1c..59cfd680427b 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -193,6 +193,20 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/a2e4ed62fc558d565366845f9d135bd7db5e23c4.patch"; hash = "sha256-ufk0bokuayLfkSvK3cK4E9iXU5eZpp9d/ETSa/zCfMg="; }) + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) + ]; + } + { cases = [ (isEq "8.19") (isEq "3.14") ]; + out = [ + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) ]; } ] []; From f7ff7d4e9b2d589f80ca85a91e4423f76444c2d8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Jun 2024 13:52:04 +0200 Subject: [PATCH 170/233] =?UTF-8?q?coq:=208.19.1=20=E2=86=92=208.19.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 68b424b32fb4..af672d500fa6 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -58,6 +58,7 @@ let "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; + "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From 47ff65252a9f794b6a45ca70c958729e05a42e51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 07:28:38 +0000 Subject: [PATCH 171/233] prqlc: 0.12.1 -> 0.12.2 --- pkgs/development/tools/database/prqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index 28664a88ae2f..f929704d3dd4 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-FUF0O1Z5v9FRLfb1Ms6r2FM/Omc1AO+S7MxvmZ9SHSk="; + hash = "sha256-nD3B4R2eBX52wekBrBT3jiIYdE/p6xgnHrvDFFofl/s="; }; - cargoHash = "sha256-A3tFoRNmRDMYJyHYdgXHrlszW0D30EMk7hSo/8Z5gvk="; + cargoHash = "sha256-Rhvl9rqtJyEpZZYUaN+ih6KXgEVKZCyovf34l883bZM="; nativeBuildInputs = [ pkg-config From 6c30154ee45e8333552fa9756c96307632e6e26a Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Mon, 17 Jun 2024 09:30:48 +0200 Subject: [PATCH 172/233] snx-rs: 2.2.0 -> 2.2.3 --- pkgs/by-name/sn/snx-rs/Cargo.lock | 862 +++++++++++++++++++---------- pkgs/by-name/sn/snx-rs/package.nix | 8 +- 2 files changed, 570 insertions(+), 300 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/Cargo.lock b/pkgs/by-name/sn/snx-rs/Cargo.lock index e14f3e3e6c57..6ae6f4b141f8 100644 --- a/pkgs/by-name/sn/snx-rs/Cargo.lock +++ b/pkgs/by-name/sn/snx-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,14 +19,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] @@ -85,9 +84,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -104,9 +103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" @@ -120,25 +119,24 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener 5.3.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -165,17 +163,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.1", "rustix 0.38.34", "slab", "tracing", @@ -193,12 +191,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -221,18 +219,18 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-lite 2.3.0", "rustix 0.38.34", "tracing", @@ -247,17 +245,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -282,7 +280,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -322,9 +320,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -372,29 +370,21 @@ dependencies = [ ] [[package]] -name = "block-modes" -version = "0.8.1" +name = "block-padding" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "block-padding", - "cipher", + "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -476,10 +466,19 @@ dependencies = [ ] [[package]] -name = "cc" -version = "1.0.97" +name = "cbc" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cfg-expr" @@ -503,6 +502,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -520,18 +525,19 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -539,9 +545,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -551,21 +557,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "cocoa" @@ -663,27 +669,27 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -762,13 +768,24 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", ] [[package]] @@ -782,6 +799,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "dpi" version = "0.1.1" @@ -790,9 +818,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -818,14 +846,14 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -833,13 +861,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -877,43 +905,22 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -994,7 +1001,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1102,7 +1109,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1216,9 +1223,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" @@ -1286,7 +1293,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1359,20 +1366,20 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap", "slab", @@ -1452,12 +1459,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1465,9 +1472,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "9f3935c160d00ac752e09787e6e6bfc26494c2183cc922f1bc678a60d4733bc2" [[package]] name = "hyper" @@ -1507,9 +1514,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -1549,13 +1556,133 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.5.0" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "idna" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] @@ -1569,10 +1696,20 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1612,7 +1749,7 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "isakmp" version = "0.1.0" -source = "git+https://github.com/ancwrd1/isakmp.git#4733332e4a532c9d222fe16a7182d6787269c801" +source = "git+https://github.com/ancwrd1/isakmp.git#f958a02bd70bcaae8556ec9d5f8c0bdc97957cbd" dependencies = [ "anyhow", "async-trait", @@ -1632,9 +1769,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1720,9 +1857,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -1772,9 +1909,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "lock_api" @@ -1833,9 +1976,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -1854,9 +1997,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.2" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fde56ead0971b4caae4aa0f19502e49d1fac2af9d0c60068e2d235e26ce709" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ "cocoa", "crossbeam-channel", @@ -1872,11 +2015,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1908,11 +2050,23 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "memoffset 0.9.1", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + [[package]] name = "normpath" version = "1.2.0" @@ -2026,9 +2180,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -2039,17 +2193,11 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - [[package]] name = "opener" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9901cb49d7fc923b256db329ee26ffed69130bf05d74b9efdd1875c92d6af01" +checksum = "f8df34be653210fbe9ffaff41d3b92721c56ce82dfee58ee684f9afb5e3a90c0" dependencies = [ "bstr", "dbus", @@ -2080,7 +2228,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2101,6 +2249,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-stream" version = "0.2.0" @@ -2150,9 +2304,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2232,7 +2386,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2263,7 +2417,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2280,9 +2434,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -2326,9 +2480,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", @@ -2399,9 +2553,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -2467,9 +2621,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2479,9 +2633,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2490,9 +2644,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -2574,7 +2728,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -2626,12 +2780,12 @@ dependencies = [ [[package]] name = "secret-service" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da1a5ad4d28c03536f82f77d9f36603f5e37d8869ac98f0a750d5b5686d8d95" +checksum = "b5204d39df37f06d1944935232fd2dfe05008def7ca599bf28c0800366c8a8f9" dependencies = [ "aes", - "block-modes", + "cbc", "futures-util", "generic-array", "hkdf", @@ -2640,7 +2794,7 @@ dependencies = [ "rand", "serde", "sha2", - "zbus 3.15.1", + "zbus 3.15.2", ] [[package]] @@ -2674,22 +2828,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2711,14 +2865,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2746,6 +2900,12 @@ dependencies = [ "digest", ] +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + [[package]] name = "sha2" version = "0.10.8" @@ -2798,7 +2958,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snx-rs" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "clap", @@ -2813,11 +2973,12 @@ dependencies = [ [[package]] name = "snx-rs-gui" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "async-channel", "clap", + "futures", "gtk", "hex", "ipnet", @@ -2829,11 +2990,12 @@ dependencies = [ "tracing-subscriber", "tray-icon", "webkit2gtk", + "zbus 4.2.2", ] [[package]] name = "snxcore" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "async-recursion", @@ -2849,7 +3011,7 @@ dependencies = [ "ipnet", "isakmp", "libc", - "nix 0.28.0", + "nix 0.29.0", "num-traits", "once_cell", "parking_lot", @@ -2868,12 +3030,13 @@ dependencies = [ "tokio-util", "tracing", "tun", - "zbus 4.2.1", + "uuid", + "zbus 4.2.2", ] [[package]] name = "snxctl" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "clap", @@ -2930,6 +3093,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -2961,9 +3130,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2976,6 +3145,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -3030,22 +3210,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3059,25 +3239,20 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3094,13 +3269,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3128,21 +3303,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -3182,15 +3357,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] [[package]] @@ -3206,7 +3381,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -3227,7 +3401,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3241,7 +3414,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3281,14 +3454,14 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39240037d755a1832e752d64f99078c3b0b21c09a71c12405070c75ef4e7cd3c" +checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60" dependencies = [ "cocoa", "core-graphics", "crossbeam-channel", - "dirs-next", + "dirs", "libappindicator", "muda", "objc", @@ -3345,27 +3518,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -3374,9 +3532,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", "idna", @@ -3384,10 +3542,32 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", + "sha1_smol", +] [[package]] name = "valuable" @@ -3455,7 +3635,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3489,7 +3669,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3754,9 +3934,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -3785,20 +3965,56 @@ dependencies = [ ] [[package]] -name = "xdg-home" -version = "1.1.0" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", ] [[package]] name = "zbus" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", "async-process 1.8.1", @@ -3825,23 +4041,23 @@ dependencies = [ "uds_windows", "winapi", "xdg-home", - "zbus_macros 3.15.1", + "zbus_macros 3.15.2", "zbus_names 2.6.1", - "zvariant 3.15.1", + "zvariant 3.15.2", ] [[package]] name = "zbus" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" dependencies = [ - "async-broadcast 0.7.0", - "async-process 2.2.2", + "async-broadcast 0.7.1", + "async-process 2.2.3", "async-recursion", "async-trait", "enumflags2", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", @@ -3858,36 +4074,36 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.2.1", + "zbus_macros 4.2.2", "zbus_names 3.0.0", - "zvariant 4.1.0", + "zvariant 4.1.1", ] [[package]] name = "zbus_macros" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", ] [[package]] name = "zbus_macros" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils", + "syn 2.0.66", + "zvariant_utils 2.0.0", ] [[package]] @@ -3898,7 +4114,7 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", - "zvariant 3.15.1", + "zvariant 3.15.2", ] [[package]] @@ -3909,75 +4125,129 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.0", + "zvariant 4.1.1", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "zvariant" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", "serde", "static_assertions", - "zvariant_derive 3.15.1", + "zvariant_derive 3.15.2", ] [[package]] name = "zvariant" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877ef94e5e82b231d2a309c531f191a8152baba8241a7939ee04bd76b0171308" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", - "zvariant_derive 4.1.0", + "zvariant_derive 4.1.1", ] [[package]] name = "zvariant_derive" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", ] [[package]] name = "zvariant_derive" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils", + "syn 2.0.66", + "zvariant_utils 2.0.0", ] [[package]] name = "zvariant_utils" -version = "1.1.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 65bf8ee2d104..ff8ee2deb50e 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -1,13 +1,13 @@ { fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }: rustPlatform.buildRustPackage { pname = "snx-rs"; - version = "2.2.0"; + version = "2.2.3"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; - rev = "v2.2.0"; - hash = "sha256-9aBJM20+G1U2NuJXBmax50o3M/lwRpLeqdcHCA28iAw="; + rev = "v2.2.3"; + hash = "sha256-tBl67uDeYVmVBwi8NQVclfFQ0Sj1dl+hR8Jct1iE2LI="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "isakmp-0.1.0" = "sha256-Gk0/tyIQ62kH6ZSW6ov8SMVR2UBEWkz8HfqeWjSXmlY="; + "isakmp-0.1.0" = "sha256-6v5xhkt9iaQg3Eh8S1tXW55oLv4YFDYvY0cfsepMuIM="; }; }; From da4b39656d243dea24bd321a9634fd01e10a2a2e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Jun 2024 10:14:47 +0200 Subject: [PATCH 173/233] open-webui: 0.3.4 -> 0.3.5 diff: https://github.com/open-webui/open-webui/compare/v0.3.4..v0.3.5 changelog: https://github.com/open-webui/open-webui/releases/tag/v0.3.5 --- pkgs/by-name/op/open-webui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 353984f5fbc2..f0022b07dcfd 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-HO7kvJB4GDdAtb0jq8XPU94sP8QbyYlxAmhpLAshMng="; + hash = "sha256-copxy9fgHTHfF14bh9ddF4eTWx2GP2Mkw3lr+1NKKkI="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-EZvFslntBjpxsjXYyfPGNa2SmYth56cjy8zg+fmiCGo="; + npmDepsHash = "sha256-whddW3ThC/zlttqhV3wf15roaCgp0H/BELWLs9/c5Jc="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From fae942daaf739dd34052778c5d21486f6adb75e6 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 17 Jun 2024 10:16:04 +0200 Subject: [PATCH 174/233] outline: 0.76.1 -> 0.77.1 Changelog: - https://github.com/outline/outline/releases/tag/v0.77.0 - https://github.com/outline/outline/releases/tag/v0.77.1 --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index a245f003e789..089cd5a0c56d 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.76.1"; + version = "0.77.1"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-i+1Bd9equlYxxdmvoUim31SM5ymJjnauvqGOmnPmTWA="; + hash = "sha256-n2TGbCRe/NSX+4lSmLGs2WUh44s+Hr6eblsqnzYNeSs="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-xR6W9Kclgt7YZvkqNg7hOtY39mMNZvtDR/a1aOgD2Ko="; + hash = "sha256-wxXnvi58mBfAQiMSxhXWK7sYLvr8nfQ+u6kMYnRWI3s="; }; configurePhase = '' From e05182c4e83b6e4d3a6f5d696ca4f4dd1bfeeb81 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 17 Jun 2024 01:30:34 -0700 Subject: [PATCH 175/233] libpng: force-declare feenableexcept on FreeBSD --- pkgs/development/libraries/libpng/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 4a8c52ae279d..11e3fb31604f 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,7 +20,11 @@ in stdenv.mkDerivation (finalAttrs: { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; - postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; + postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" + + lib.optionalString stdenv.isFreeBSD '' + + sed -i 1i'int feenableexcept(int __mask);' contrib/libtests/pngvalid.c + ''; outputs = [ "out" "dev" "man" ]; outputBin = "dev"; From 08bbde2a59cab76e2bf0b7e5a6470bfa263f1ecd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Jun 2024 11:03:36 +0200 Subject: [PATCH 176/233] python311Packages.llama-index: relax dependency llama-index-core --- .../python-modules/llama-index/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 800143b8277a..575c61c89f41 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,6 +1,8 @@ { lib, buildPythonPackage, + poetry-core, + pythonRelaxDepsHook, llama-index-agent-openai, llama-index-cli, llama-index-core, @@ -13,19 +15,26 @@ llama-index-question-gen-openai, llama-index-readers-file, llama-index-readers-llama-parse, - poetry-core, }: -buildPythonPackage rec { +buildPythonPackage { pname = "llama-index"; inherit (llama-index-core) version src meta; pyproject = true; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "llama-index-core" + ]; + + dependencies = [ llama-index-agent-openai llama-index-cli llama-index-core From d1b5c45553e33bd41ce99bfe8d2560d20352c8a8 Mon Sep 17 00:00:00 2001 From: Michael Lohmann Date: Mon, 17 Jun 2024 09:37:32 +0200 Subject: [PATCH 177/233] mattermost: use electron instead of deprecated electron_28 --- .../instant-messengers/mattermost-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 20dc2bfafb80..8a1052d04df4 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, electron_28 +, electron , makeWrapper }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \ + makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/${pname}/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" From 1a13c9a2fe945ce844a04568e2a3a95dce34a462 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 09:24:06 +0000 Subject: [PATCH 178/233] sonic-server: 1.4.8 -> 1.4.9 --- pkgs/servers/search/sonic-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index cbe8b431fa93..cb5521e9dfe8 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "sonic-server"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "valeriansaliou"; repo = "sonic"; rev = "refs/tags/v${version}"; - hash = "sha256-kNuLcImowjoptNQI12xHD6Tv+LLYdwlpauqYviKw6Xk="; + hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM="; }; - cargoHash = "sha256-9XSRb5RB82L72RzRWPJ45AJahkRnLwAL7lI2QFqbeko="; + cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; From e329e660bb118da12c305419d3f5eb2fc72fd0f0 Mon Sep 17 00:00:00 2001 From: vigress8 <150687949+vigress8@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:22:06 +0400 Subject: [PATCH 179/233] skia-aseprite: init at m102-861e4743af --- .../editors/aseprite/skia-make-deps.sh | 37 ------ pkgs/applications/editors/aseprite/skia.nix | 80 ------------ .../sk/skia-aseprite/deps.nix} | 8 +- pkgs/by-name/sk/skia-aseprite/package.nix | 115 ++++++++++++++++++ pkgs/by-name/sk/skia-aseprite/update.sh | 71 +++++++++++ 5 files changed, 190 insertions(+), 121 deletions(-) delete mode 100755 pkgs/applications/editors/aseprite/skia-make-deps.sh delete mode 100644 pkgs/applications/editors/aseprite/skia.nix rename pkgs/{applications/editors/aseprite/skia-deps.nix => by-name/sk/skia-aseprite/deps.nix} (69%) create mode 100644 pkgs/by-name/sk/skia-aseprite/package.nix create mode 100755 pkgs/by-name/sk/skia-aseprite/update.sh diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh deleted file mode 100755 index bee69cc40d9d..000000000000 --- a/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -FILTER=$1 -OUT=skia-deps.nix -REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 -DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) -THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') - -function write_fetch_defs () -{ - while read -r DEP; do - NAME=$(echo "$DEP" | cut -d: -f1 | cut -d/ -f3 | sed 's/ //g') - URL=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f1 | sed 's/ //g') - REV=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f2 | sed 's/[ ,]//g') - - echo "Fetching $NAME@$REV" - PREFETCH=$(nix-prefetch-git --rev "$REV" "$URL") - -( -cat <> "$OUT" - - echo "----------" - echo - done <<< "$1" -} - -echo "{ fetchgit }:" > "$OUT" -echo "{" >> "$OUT" -write_fetch_defs "$(echo "$THIRD_PARTY_DEPS" | grep -E "$FILTER")" -echo "}" >> "$OUT" diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix deleted file mode 100644 index 03487aa8941e..000000000000 --- a/pkgs/applications/editors/aseprite/skia.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja -, fontconfig, expat, icu, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11, harfbuzzFull -}: - -let - # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' - depSrcs = import ./skia-deps.nix { inherit fetchgit; }; -in -stdenv.mkDerivation { - pname = "skia"; - version = "aseprite-m102"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "skia"; - # latest commit from aseprite-m102 branch - rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; - hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; - }; - - nativeBuildInputs = [ python3 gn ninja ]; - - buildInputs = [ - fontconfig expat icu libglvnd libjpeg libpng libwebp zlib - mesa libX11 harfbuzzFull - ]; - - preConfigure = with depSrcs; '' - mkdir -p third_party/externals - ln -s ${angle2} third_party/externals/angle2 - ln -s ${dng_sdk} third_party/externals/dng_sdk - ln -s ${piex} third_party/externals/piex - ln -s ${sfntly} third_party/externals/sfntly - ''; - - configurePhase = '' - runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - ninja -C out/Release skia modules - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out - - # Glob will match all subdirs. - shopt -s globstar - - # All these paths are used in some way when building aseprite. - cp -r --parents -t $out/ \ - include/codec \ - include/config \ - include/core \ - include/effects \ - include/gpu \ - include/private \ - include/utils \ - include/third_party/skcms/*.h \ - out/Release/*.a \ - src/gpu/**/*.h \ - src/core/*.h \ - modules/skshaper/include/*.h \ - third_party/externals/angle2/include \ - third_party/skcms/**/*.h - ''; - - meta = with lib; { - description = "Skia is a complete 2D graphic library for drawing Text, Geometries, and Images"; - homepage = "https://skia.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/by-name/sk/skia-aseprite/deps.nix similarity index 69% rename from pkgs/applications/editors/aseprite/skia-deps.nix rename to pkgs/by-name/sk/skia-aseprite/deps.nix index 3c92c649bebf..a51fe82d9bce 100644 --- a/pkgs/applications/editors/aseprite/skia-deps.nix +++ b/pkgs/by-name/sk/skia-aseprite/deps.nix @@ -3,21 +3,21 @@ angle2 = fetchgit { url = "https://chromium.googlesource.com/angle/angle.git"; rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; - sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; + hash = "sha256-UXYCqn++WCyncwNyuuq8rIkxlB7koMK9Ynx7TRzCIDE="; }; dng_sdk = fetchgit { url = "https://android.googlesource.com/platform/external/dng_sdk.git"; rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; - sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; + hash = "sha256-lTtvBUGaia0jhrxpw7k7NIq2SVyGmBJPCvjIqAQCmNo="; }; piex = fetchgit { url = "https://android.googlesource.com/platform/external/piex.git"; rev = "bb217acdca1cc0c16b704669dd6f91a1b509c406"; - sha256 = "05ipmag6k55jmidbyvg5mkqm69zfw03gfkqhi9jnjlmlbg31y412"; + hash = "sha256-IhAfxlu0UmllihBP9wbg7idT8azlbb9arLKUaZ6qNxY="; }; sfntly = fetchgit { url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; - sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; + hash = "sha256-/zp1MsR31HehoC5OAI4RO8QBlm7mldQNiTI7Xr/LJeI="; }; } diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix new file mode 100644 index 000000000000..3b34ad631862 --- /dev/null +++ b/pkgs/by-name/sk/skia-aseprite/package.nix @@ -0,0 +1,115 @@ +{ + aseprite, + clangStdenv, + expat, + fetchFromGitHub, + fetchgit, + fontconfig, + gn, + harfbuzzFull, + icu, + lib, + libglvnd, + libjpeg, + libpng, + libwebp, + libX11, + mesa, + ninja, + python3, + zlib, +}: + +let + # deps.nix is generated by ./update.sh + depSrcs = import ./deps.nix { inherit fetchgit; }; +in +clangStdenv.mkDerivation (finalAttrs: { + pname = "skia-aseprite"; + version = "m102-861e4743af"; + + src = fetchFromGitHub { + owner = "aseprite"; + repo = "skia"; + rev = finalAttrs.version; + hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; + }; + + nativeBuildInputs = [ + gn + ninja + python3 + ]; + + preConfigure = with depSrcs; '' + mkdir -p third_party/externals + ln -s ${angle2} third_party/externals/angle2 + ln -s ${dng_sdk} third_party/externals/dng_sdk + ln -s ${piex} third_party/externals/piex + ln -s ${sfntly} third_party/externals/sfntly + ''; + + configurePhase = '' + runHook preConfigure + gn gen lib --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" + runHook postConfigure + ''; + + buildInputs = [ + expat + fontconfig + harfbuzzFull + icu + libglvnd + libjpeg + libpng + libwebp + libX11 + mesa + zlib + ]; + + buildPhase = '' + runHook preBuild + ninja -C lib skia modules + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + + # Glob will match all subdirs. + shopt -s globstar + + # All these paths are used in some way when building Aseprite. + cp -r --parents -t $out/ \ + include/codec \ + include/config \ + include/core \ + include/effects \ + include/gpu \ + include/private \ + include/utils \ + include/third_party/skcms/*.h \ + lib/*.a \ + modules/skshaper/include/*.h \ + src/core/*.h \ + src/gpu/**/*.h \ + third_party/externals/angle2/include \ + third_party/skcms/**/*.h + + runHook postInstall + ''; + + passthru.updateScript = [ ./update.sh ] ++ builtins.attrNames depSrcs; + + meta = { + description = "Complete 2D graphic library for drawing Text, Geometries, and Images (Aseprite's fork)"; + homepage = "https://skia.org/"; + downloadPage = "https://github.com/aseprite/skia"; + license = lib.licenses.bsd3; + inherit (aseprite.meta) maintainers; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sk/skia-aseprite/update.sh b/pkgs/by-name/sk/skia-aseprite/update.sh new file mode 100755 index 000000000000..78f7e67da6e9 --- /dev/null +++ b/pkgs/by-name/sk/skia-aseprite/update.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash +#!nix-shell -p cacert curl git jq nix-prefetch-git +# shellcheck shell=bash +# vim: set tabstop=2 shiftwidth=2 expandtab: +set -euo pipefail +shopt -s inherit_errexit + +[ $# -gt 0 ] || { + printf >&2 'usage: %s ' "$0" + exit 1 +} + +pkgpath=$(git rev-parse --show-toplevel)/pkgs/by-name/sk/skia-aseprite +depfilter=$(tr ' ' '|' <<< "$*") +depfile=$pkgpath/deps.nix +pkgfile=$pkgpath/package.nix + +update_deps() { + local deps third_party_deps name url rev hash prefetch + + version=$(sed -n 's|.*version = "\(.*\)".*|\1|p' < "$pkgfile") + deps=$(curl -fsS https://raw.githubusercontent.com/aseprite/skia/$version/DEPS) + third_party_deps=$(sed -n 's|[ ",]||g; s|:| |; s|@| |; s|^third_party/externals/||p' <<< "$deps") + filtered=$(grep -E -- "$depfilter" <<< "$third_party_deps") + if [[ -z $filtered ]]; then + printf >&2 '%s: error: filter "%s" matched nothing' "$0" "$depfilter" + return 1 + fi + + printf '{ fetchgit }:\n{\n' + while read -r name url rev; do + printf >&2 'Fetching %s@%s\n' "$name" "$rev" + prefetch=$(nix-prefetch-git --quiet --rev "$rev" "$url") + hash=$(jq -r '.hash' <<< "$prefetch") + + cat << EOF + $name = fetchgit { + url = "$url"; + rev = "$rev"; + hash = "$hash"; + }; +EOF + # `read` could exit with a non-zero code without a newline at the end + done < <(printf '%s\n' "$filtered") + printf '}\n' +} + +update_version() { + local newver newrev + newver=$( + curl --fail \ + --header 'Accept: application/vnd.github+json' \ + --location --show-error --silent \ + ${GITHUB_TOKEN:+ --user \":$GITHUB_TOKEN\"} \ + https://api.github.com/repos/aseprite/skia/releases/latest \ + | jq -r .tag_name + ) + newhash=$(nix-prefetch-git --quiet --rev "$newver" https://github.com/aseprite/skia.git | jq -r '.hash') + sed \ + -e 's|version = ".*"|version = "'$newver'"|' \ + -e 's|hash = ".*"|hash = "'$newhash'"|' \ + -- "$pkgfile" +} + +temp=$(mktemp) +trap 'ret=$?; rm -rf -- "$temp"; exit $ret' EXIT +update_version > "$temp" +cp "$temp" "$pkgfile" +update_deps > "$temp" +cp "$temp" "$depfile" From f6b705d0bfb4740ff9ac2e4d4096a02cbd47ba59 Mon Sep 17 00:00:00 2001 From: vigress8 <150687949+vigress8@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:29:11 +0400 Subject: [PATCH 180/233] aseprite: 1.3.6 -> 1.3.7 * use clangStdenv * update deps (pcre -> pcre2, tinyxml -> tinyxml-2) * add patch to use shared `fmt` dependency * format with nixfmt * remove usage of "with lib;" --- .../applications/editors/aseprite/default.nix | 112 ------------ pkgs/by-name/as/aseprite/package.nix | 170 ++++++++++++++++++ pkgs/by-name/as/aseprite/shared-fmt.patch | 71 ++++++++ .../as}/aseprite/shared-libwebp.patch | 0 .../as}/aseprite/shared-skia-deps.patch | 0 pkgs/top-level/all-packages.nix | 2 - 6 files changed, 241 insertions(+), 114 deletions(-) delete mode 100644 pkgs/applications/editors/aseprite/default.nix create mode 100644 pkgs/by-name/as/aseprite/package.nix create mode 100644 pkgs/by-name/as/aseprite/shared-fmt.patch rename pkgs/{applications/editors => by-name/as}/aseprite/shared-libwebp.patch (100%) rename pkgs/{applications/editors => by-name/as}/aseprite/shared-skia-deps.patch (100%) diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix deleted file mode 100644 index e41edcdd66b8..000000000000 --- a/pkgs/applications/editors/aseprite/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib -, harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi -, cmark -}: - -# Unfree version is not redistributable: -# https://dev.aseprite.org/2016/09/01/new-source-code-license/ -# Consider supporting the developer: https://aseprite.org/#buy - -let - skia = callPackage ./skia.nix {}; -in -stdenv.mkDerivation rec { - pname = "aseprite"; - version = "1.3.6"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "aseprite"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-17f6pIGsOIswnyY63pjHKEEYuCo43kf25mPLBv4vQAs="; - }; - - nativeBuildInputs = [ - cmake pkg-config ninja - ]; - - buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib - libX11 libXext libXcursor libXxf86vm - cmark - harfbuzzFull glib fontconfig pcre - skia libGL libXi - ]; - - patches = [ - ./shared-libwebp.patch - ./shared-skia-deps.patch - ]; - - postPatch = '' - sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" - ''; - - cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - "-DUSE_SHARED_CURL=ON" - "-DUSE_SHARED_FREETYPE=ON" - "-DUSE_SHARED_GIFLIB=ON" - "-DUSE_SHARED_JPEGLIB=ON" - "-DUSE_SHARED_LIBPNG=ON" - "-DUSE_SHARED_LIBWEBP=ON" - "-DUSE_SHARED_PIXMAN=ON" - "-DUSE_SHARED_TINYXML=ON" - "-DUSE_SHARED_ZLIB=ON" - "-DUSE_SHARED_CMARK=ON" - "-DUSE_SHARED_HARFBUZZ=ON" - "-DUSE_SHARED_WEBP=ON" - # Disable libarchive programs. - "-DENABLE_CAT=OFF" - "-DENABLE_CPIO=OFF" - "-DENABLE_TAR=OFF" - # UI backend. - "-DLAF_WITH_EXAMPLES=OFF" - "-DLAF_OS_BACKEND=skia" - "-DENABLE_DESKTOP_INTEGRATION=ON" - "-DSKIA_DIR=${skia}" - "-DSKIA_LIBRARY_DIR=${skia}/out/Release" - ]; - - postInstall = '' - # Install desktop icons. - src="$out/share/aseprite/data/icons" - for size in 16 32 48 64; do - dst="$out"/share/icons/hicolor/"$size"x"$size" - install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png - install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png - done - # Delete unneeded artifacts of bundled libraries. - rm -rf "$out"/include "$out"/lib - ''; - - passthru = { inherit skia; }; - - meta = with lib; { - homepage = "https://www.aseprite.org/"; - description = "Animated sprite editor & pixel art tool"; - license = licenses.unfree; - longDescription = - ''Aseprite is a program to create animated sprites. Its main features are: - - - Sprites are composed by layers & frames (as separated concepts). - - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. - - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). - - Export/import animations to/from Sprite Sheets. - - Tiled drawing mode, useful to draw patterns and textures. - - Undo/Redo for every operation. - - Real-time animation preview. - - Multiple editors support. - - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - - Onion skinning. - - This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ - Consider supporting the developer: https://aseprite.org/#buy - ''; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix new file mode 100644 index 000000000000..6aae1d237f64 --- /dev/null +++ b/pkgs/by-name/as/aseprite/package.nix @@ -0,0 +1,170 @@ +{ + clangStdenv, + cmake, + cmark, + curl, + fetchFromGitHub, + fetchpatch, + fmt, + fontconfig, + freetype, + giflib, + gitUpdater, + glib, + harfbuzzFull, + lib, + libGL, + libjpeg, + libpng, + libwebp, + libX11, + libXcursor, + libXext, + libXi, + libXxf86vm, + ninja, + pcre2, + pixman, + pkg-config, + skia-aseprite, + tinyxml-2, + zlib, +}: + +clangStdenv.mkDerivation (finalAttrs: { + pname = "aseprite"; + version = "1.3.7"; + + src = fetchFromGitHub { + owner = "aseprite"; + repo = "aseprite"; + rev = "v" + finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-75kYJXmyags0cW2D5Ksq1uUrFSCAkFOdmn7Ya/6jLXc="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + cmark + curl + fmt + fontconfig + freetype + giflib + glib + harfbuzzFull + libGL + libjpeg + libpng + libwebp + libX11 + libXcursor + libXext + libXi + libXxf86vm + pcre2 + pixman + skia-aseprite + tinyxml-2 + zlib + ]; + + patches = [ + # https://github.com/aseprite/aseprite/issues/4486 + # FIXME: remove on next release. + (fetchpatch { + name = "ENABLE_UPDATER-fix.patch"; + url = "https://github.com/aseprite/aseprite/commit/8fce589.patch"; + hash = "sha256-DbL6kK//gQXbsXEn/t+KTuoM7E9ocPAsVqEO+lYrka4="; + }) + ./shared-fmt.patch + ./shared-libwebp.patch + ./shared-skia-deps.patch + ]; + + postPatch = + let + # Translation strings + strings = fetchFromGitHub { + owner = "aseprite"; + repo = "strings"; + rev = "e18a09fefbb6cd904e506183d5fbe08558a52ed4"; + hash = "sha256-GyCCxbhgf0vST20EH/+KkNLrF+U9Xzgpxlao8s925PQ="; + }; + in + '' + sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" + rm -rf data/strings + cp -r ${strings} data/strings + ''; + + cmakeFlags = [ + "-DENABLE_DESKTOP_INTEGRATION=ON" + "-DENABLE_UPDATER=OFF" + "-DUSE_SHARED_CMARK=ON" + "-DUSE_SHARED_CURL=ON" + "-DUSE_SHARED_FMT=ON" + "-DUSE_SHARED_FREETYPE=ON" + "-DUSE_SHARED_GIFLIB=ON" + "-DUSE_SHARED_HARFBUZZ=ON" + "-DUSE_SHARED_JPEGLIB=ON" + "-DUSE_SHARED_LIBPNG=ON" + "-DUSE_SHARED_LIBWEBP=ON" + "-DUSE_SHARED_PIXMAN=ON" + "-DUSE_SHARED_TINYXML=ON" + "-DUSE_SHARED_WEBP=ON" + "-DUSE_SHARED_ZLIB=ON" + # Disable libarchive programs. + "-DENABLE_CAT=OFF" + "-DENABLE_CPIO=OFF" + "-DENABLE_TAR=OFF" + # UI backend. + "-DLAF_OS_BACKEND=skia" + "-DLAF_WITH_EXAMPLES=OFF" + "-DSKIA_DIR=${skia-aseprite}" + "-DSKIA_LIBRARY_DIR=${skia-aseprite}/lib" + ]; + + postInstall = '' + # Install desktop icons. + src="$out/share/aseprite/data/icons" + for size in 16 32 48 64 128 256; do + dst="$out"/share/icons/hicolor/"$size"x"$size" + install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png + install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/image-x-aseprite.png + done + # Delete unneeded artifacts of bundled libraries. + rm -rf "$out"/{include,lib,man} + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + homepage = "https://www.aseprite.org/"; + description = "Animated sprite editor & pixel art tool"; + license = lib.licenses.unfree; + longDescription = '' + Aseprite is a program to create animated sprites. Its main features are: + + - Sprites are composed by layers & frames (as separated concepts). + - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. + - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). + - Export/import animations to/from Sprite Sheets. + - Tiled drawing mode, useful to draw patterns and textures. + - Undo/Redo for every operation. + - Real-time animation preview. + - Multiple editors support. + - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. + - Onion skinning. + ''; + maintainers = with lib.maintainers; [ + orivej + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/as/aseprite/shared-fmt.patch b/pkgs/by-name/as/aseprite/shared-fmt.patch new file mode 100644 index 000000000000..794d8a4adcc1 --- /dev/null +++ b/pkgs/by-name/as/aseprite/shared-fmt.patch @@ -0,0 +1,71 @@ +--- a/CMakeLists.txt 2022-01-08 00:37:08.165330523 +0100 ++++ b/CMakeLists.txt 2022-01-08 00:52:41.163585173 +0100 +@@ -54,6 +54,7 @@ + + option(USE_SHARED_CMARK "Use your installed copy of cmark" off) + option(USE_SHARED_CURL "Use your installed copy of curl" off) ++option(USE_SHARED_FMT "Use your installed copy of fmt" off) + option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) + option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) + option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) +@@ -165,6 +165,7 @@ + set(SOURCE_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data) + set(CMARK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmark) + set(CURL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/curl) ++set(FMT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt) + set(GIFLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/giflib) + set(LIBJPEG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jpeg) + set(LIBPNG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libpng) +@@ -204,6 +205,15 @@ + set(CURL_STATICLIB ON BOOL) + endif() + ++if(USE_SHARED_FMT) ++ find_package(FMT REQUIRED) ++ set(FMT_LIBRARIES fmt::fmt) ++else() ++ set(FMT_FOUND) ++ set(FMT_LIBRARIES fmt) ++ # No need to include extra directories, actually ++endif() ++ + # zlib + if(USE_SHARED_ZLIB) + find_package(ZLIB REQUIRED) +--- a/src/app/CMakeLists.txt 2022-01-08 00:37:07.378671200 +0100 ++++ b/src/app/CMakeLists.txt 2022-01-08 00:53:13.669969512 +0100 +@@ -741,7 +741,7 @@ target_link_libraries(app-lib + ${HARFBUZZ_LIBRARIES} + json11 + archive_static +- fmt ++ ${FMT_LIBRARIES} + tinyexpr + qoi) + + if(ENABLE_PSD) +--- a/src/dio/CMakeLists.txt 2022-01-08 00:41:50.712726972 +0100 ++++ b/src/dio/CMakeLists.txt 2022-01-08 00:53:39.936408022 +0100 +@@ -10,7 +10,7 @@ + + target_link_libraries(dio-lib + ${ZLIB_LIBRARIES} +- fmt ++ ${FMT_LIBRARIES} + flic-lib + laf-base + fixmath-lib +--- a/third_party/CMakeLists.txt 2022-01-08 00:37:08.165330523 +0100 ++++ b/third_party/CMakeLists.txt 2022-01-08 00:54:30.455969136 +0100 +@@ -106,7 +106,10 @@ + endif() + + add_subdirectory(simpleini) +-add_subdirectory(fmt) ++ ++if(NOT USE_SHARED_FMT) ++ add_subdirectory(fmt) ++endif() + + # Add cmark without tests + if(NOT USE_SHARED_CMARK) diff --git a/pkgs/applications/editors/aseprite/shared-libwebp.patch b/pkgs/by-name/as/aseprite/shared-libwebp.patch similarity index 100% rename from pkgs/applications/editors/aseprite/shared-libwebp.patch rename to pkgs/by-name/as/aseprite/shared-libwebp.patch diff --git a/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/pkgs/by-name/as/aseprite/shared-skia-deps.patch similarity index 100% rename from pkgs/applications/editors/aseprite/shared-skia-deps.patch rename to pkgs/by-name/as/aseprite/shared-skia-deps.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68a09b0f9121..1efa56e3f599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29587,8 +29587,6 @@ with pkgs; asap = callPackage ../tools/audio/asap { }; - aseprite = callPackage ../applications/editors/aseprite { }; - assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; astroid = callPackage ../applications/networking/mailreaders/astroid { From 63b0d8645b7330327d379caa518222d44b1c2cce Mon Sep 17 00:00:00 2001 From: vigress8 <150687949+vigress8@users.noreply.github.com> Date: Thu, 13 Jun 2024 21:32:56 +0400 Subject: [PATCH 181/233] aseprite: add vigress8 to maintainers --- pkgs/by-name/as/aseprite/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix index 6aae1d237f64..13cd6e6bb0dd 100644 --- a/pkgs/by-name/as/aseprite/package.nix +++ b/pkgs/by-name/as/aseprite/package.nix @@ -164,6 +164,7 @@ clangStdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ orivej + vigress8 ]; platforms = lib.platforms.linux; }; From 6c4150f15ae37f2a7f6a1e43a94478485518f708 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 17 Jun 2024 12:12:30 +0200 Subject: [PATCH 182/233] harminv: fix wrong hash (copy of libgdsii) enable maintainer mode to create copyright.h remove wrong main program meta --- .../libraries/science/chemistry/harminv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/development/libraries/science/chemistry/harminv/default.nix index dc8289e14ce9..f9d8573ca6d5 100644 --- a/pkgs/development/libraries/science/chemistry/harminv/default.nix +++ b/pkgs/development/libraries/science/chemistry/harminv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "NanoComp"; repo = pname; rev = "v${version}"; - hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0="; }; # File is missing in the git checkout but required by autotools @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack ]; - configureFlags = [ "--enable-shared" ]; + configureFlags = [ + "--enable-shared" + "--enable-maintainer-mode" + ]; meta = with lib; { description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; - mainProgram = "GDSIIConvert"; homepage = "https://github.com/NanoComp/harminv"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ sheepforce markuskowa ]; From 71c40dae30c7db4ba389ba6a149139482b6fdb7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 10:36:40 +0000 Subject: [PATCH 183/233] lefthook: 1.6.15 -> 1.6.16 --- pkgs/by-name/le/lefthook/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 8655d31e6726..2931a41cc3ef 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.15"; + version = "1.6.16"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-Pc4m4T/+hABX3eGgni12EC8lD9xl5j/eALhfuSVbEJc="; + hash = "sha256-5sGhm+ioH9hQLDuk7a0oUB1CqiiTt88UKAmBqUeCfic="; }; vendorHash = "sha256-ralnfqrP6R58Wjc/AWRf1motWZICPagZxHCkqVcwYoo="; From 587b00cb7a1fa19ce363a54a0b113b04e5b77458 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 10:50:30 +0000 Subject: [PATCH 184/233] debianutils: 5.18 -> 5.19 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 5696499777fa..c4e968902cba 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.18"; + version = "5.19"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-rZEDUwx8ldCTVUB1CqghYgaZ4kMGxWCtiFCdoxQDwpo="; + hash = "sha256-2YJgHwjD1JyqzdYaicrgKHA/a5KdkdPJnhGQxoq/KpU="; }; nativeBuildInputs = [ From 58739f9d1a115c1f0cde96ffc04737eadb259d31 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Jun 2024 10:58:15 +0200 Subject: [PATCH 185/233] python311Packages.pyfftw: remove --- .../python-modules/pyfftw/default.nix | 53 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/development/python-modules/pyfftw/default.nix diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix deleted file mode 100644 index 5d5182da0ccd..000000000000 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - fftw, - fftwFloat, - fftwLongDouble, - numpy, - scipy, - cython_0, - dask, -}: - -buildPythonPackage rec { - version = "0.13.1"; - pname = "pyFFTW"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-CRVekKDG0MHy0fNmgYCn3pX7n4P+9RN6ES+wWXjocyA="; - }; - - preConfigure = '' - export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib" - export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include" - ''; - - buildInputs = [ - fftw - fftwFloat - fftwLongDouble - ]; - - propagatedBuildInputs = [ - numpy - scipy - cython_0 - dask - ]; - - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; - pythonImportsCheck = [ "pyfftw" ]; - - meta = with lib; { - description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = "http://hgomersall.github.com/pyFFTW/"; - license = with licenses; [ - bsd2 - bsd3 - ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 176b7f7b82e1..268595503756 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -365,6 +365,7 @@ mapAliases ({ pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 PyChromecast = pychromecast; # added 2023-02-19 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 + pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17 pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 001e1d52423d..ed6b63eaad2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11060,8 +11060,6 @@ self: super: with self; { pyfcm = callPackage ../development/python-modules/pyfcm { }; - pyfftw = callPackage ../development/python-modules/pyfftw { }; - pyfido = callPackage ../development/python-modules/pyfido { }; pyfiglet = callPackage ../development/python-modules/pyfiglet { }; From cc115b00946799895b3001c32d25de3dc593d217 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 17 Jun 2024 17:11:55 +0800 Subject: [PATCH 186/233] starlark: 0-unstable-2023-11-21 -> 0-unstable-2024-05-21 https://github.com/google/starlark-go/compare/90ade8b19d09805d1b91a9687198869add6dfaa1...046347dcd1044f5e568fcf64884b0344f27910c0 --- pkgs/by-name/st/starlark/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 060a9013a05e..214c97edf5bf 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "starlark"; - version = "0-unstable-2023-11-21"; + version = "0-unstable-2024-05-21"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "90ade8b19d09805d1b91a9687198869add6dfaa1"; - hash = "sha256-ZNOPx7L21A4BR5WshMMAHGm6j1ukWC9waJ1lYLvxBw0="; + rev = "046347dcd1044f5e568fcf64884b0344f27910c0"; + hash = "sha256-qpJPCcMxrsspiN5FeQDZRaNchYPawMNJHtKK8fmrRug="; }; - vendorHash = "sha256-jQE5fSqJeiDV7PW7BY/dzCxG6b/KEVIobcjJsaL2zMw="; + vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; ldflags = [ "-s" "-w" ]; From 3397d4cfd141a765db0d0db9f79a6dcabd849c59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 11:16:30 +0000 Subject: [PATCH 187/233] qtcreator: 13.0.1 -> 13.0.2 --- pkgs/development/tools/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index a76d4e824434..ef3d61e60f77 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-gZAG0ZIfYcxnWYC8ydeVoiSM/XlhFdrUZqRFR1nasy4="; + hash = "sha256-wSXMVSJhnH+PwoBadQq5bLu1al/fw4i2yxWrda9+wM4="; }; nativeBuildInputs = [ From 05e03dbdc709c8c522b7aed04010bd7da9febee8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 17 Jun 2024 14:00:55 +0200 Subject: [PATCH 188/233] python311Packages.insightface: mark as broken on aarch64-linux --- .../python-modules/insightface/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 1403f094807a..1199e09eae0d 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -19,12 +19,13 @@ tensorboard, testers, tqdm, + stdenv, }: buildPythonPackage rec { pname = "insightface"; version = "0.7.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -33,9 +34,9 @@ buildPythonPackage rec { hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; }; - nativeBuildInputs = [ cython ]; + build-system = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ easydict matplotlib mxnet @@ -67,11 +68,13 @@ buildPythonPackage rec { doCheck = false; # Upstream has no tests - meta = with lib; { + meta = { description = "State-of-the-art 2D and 3D Face Analysis Project"; mainProgram = "insightface-cli"; homepage = "https://github.com/deepinsight/insightface"; - license = licenses.mit; - maintainers = with maintainers; [ oddlama ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oddlama ]; + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + broken = stdenv.system == "aarch64-linux"; }; } From 6c3770aeca54660e50abf109886adebce14359f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 12:01:26 +0000 Subject: [PATCH 189/233] dmarc-report-converter: 0.8.0 -> 0.8.1 --- pkgs/by-name/dm/dmarc-report-converter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index e91c35698cc5..8121f554a291 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dmarc-report-converter"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "tierpod"; repo = "dmarc-report-converter"; rev = "v${version}"; - hash = "sha256-TqvAqMZEXhMO3/0VNY3Mr/E15QQbucuKyG95j2jWU5g="; + hash = "sha256-j1uFPCyxLqO3BMxl/02wILj5HGag9qjxCTB8ZxZHEGo="; }; vendorHash = null; From 58e03a2ecc4500b31b5a77420f8b51af1935145d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Jun 2024 14:17:16 +0200 Subject: [PATCH 190/233] ollama: fix `ldflags` This fix https://github.com/NixOS/nixpkgs/issues/320503 --- pkgs/by-name/ol/ollama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 207376325748..95c79f3c5b50 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -192,8 +192,8 @@ goBuild ((lib.optionalAttrs enableRocm { ldflags = [ "-s" "-w" - "-X=github.com/jmorganca/ollama/version.Version=${version}" - "-X=github.com/jmorganca/ollama/server.mode=release" + "-X=github.com/ollama/ollama/version.Version=${version}" + "-X=github.com/ollama/ollama/server.mode=release" ]; passthru.tests = { From 039a9fe6dd1d6905ab4c7d43e1c87759abf97e82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 12:37:49 +0000 Subject: [PATCH 191/233] exfatprogs: 1.2.3 -> 1.2.4 --- pkgs/tools/filesystems/exfatprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix index 9b5ca5eca7b5..997aeec80fa7 100644 --- a/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/pkgs/tools/filesystems/exfatprogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-v/SN2RAX+RjNReYkbXYy5Lm/NgIeDeLnAVx5cWo01tM="; + sha256 = "sha256-SrkRPDyASXpUAKapwcfaJSlUJBcVNtYZltdPzuhpvYM="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; From d39de77d625f6795dec0d82c78e8e5181ffb5508 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 12:40:39 +0000 Subject: [PATCH 192/233] flashmq: 1.14.0 -> 1.15.1 --- pkgs/by-name/fl/flashmq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index eddaf63f3060..4cf312476d80 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-rOhH3mRPW4LweQmzztr6/xGqSfo02nFBWrAVd0/oQGA="; + hash = "sha256-6ShMYTynqIVm7EH3b9Jzy5UKE7SH/Lq5uWV3VaDVREQ="; }; nativeBuildInputs = [ cmake installShellFiles ]; From b59dfac3c65d7ccc12426527553c9250cb71e90a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 15 Jun 2024 09:47:26 -0300 Subject: [PATCH 193/233] pkgs/README.md: cite adoption as an alternative --- pkgs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/README.md b/pkgs/README.md index 7c79931ae445..7c99f3f4418f 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -32,6 +32,7 @@ Before adding a new package, please consider the following questions: * Does the project have a clear license statement? Remember that software is unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream. * How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small. * Are you willing to maintain the package? You should care enough about the package to be willing to keep it up and running for at least one complete Nixpkgs' release life-cycle. + * In case you are not able to maintain the package you wrote, you can seek someone to fill that role, effectively adopting the package. If any of these questions' answer is no, then you should probably not add the package. From 038eda3399d627a37ec2284fb240210585f9314b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 13:17:06 +0000 Subject: [PATCH 194/233] kyverno: 1.12.3 -> 1.12.4 --- pkgs/applications/networking/cluster/kyverno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 86c1d41d05dc..f9becbdf5bad 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-vJ9HXpvkuZWOZtsoJhcpM0KGGiyd+D5HTQBHwb8l/II="; + hash = "sha256-TVtE1mdOai2G2+KCp9r5G+E9QhGQ5TmUFCN9x5EKM7o="; }; ldflags = [ From 7f5a9c330916705a07d376394c18282e6f666abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 13:34:15 +0000 Subject: [PATCH 195/233] orbiton: 2.65.11 -> 2.65.12 --- pkgs/applications/editors/orbiton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 1e64c5950798..f8fbc3484e12 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.65.11"; + version = "2.65.12"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-eb7Ku1hgvYdmRgemXcEZMl53oNXYcomh4wYHpRzLTUc="; + hash = "sha256-1KVw2dj//6vwUUj1jVWe2J/9F6J8BQsvCAEbJZnW26c="; }; vendorHash = null; From f49c76b58c5da1904dca33cf90add7094b0bbbd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 13:42:36 +0000 Subject: [PATCH 196/233] litmusctl: 1.6.0 -> 1.7.0 --- pkgs/by-name/li/litmusctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 4cdfe6384b5b..a1ed962521ce 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.6.0"; + version = "1.7.0"; nativeBuildInputs = [ installShellFiles @@ -21,10 +21,10 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-aJcnK4VhtqVFaSUf0A40qGb0TBKiqlgkwY2nRdfTl2E="; + hash = "sha256-g3g0wVjtVIF56N1gTillHMkNDHt58tpRQa2ds+3rHAE="; }; - vendorHash = "sha256-U4dp2E2TZ3rds63PS6GzUVhb2qDSv92bf9JCkWpdLew="; + vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; postInstall = '' installShellCompletion --cmd litmusctl \ From afa6cfe53882a6105555d8cea0071335cbaa5819 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 13:52:27 +0000 Subject: [PATCH 197/233] php83Extensions.mongodb: 1.19.2 -> 1.19.3 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index c4b395369b39..95b2929abca0 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-dsX7AMcbSfgzN6TfpJTaRAbhyBpOECvaok+CCOb4hyI="; + hash = "sha256-gpnL4mXOD/MDG7xWxUpLLKfRD2w6HqNokC5358OkFSg="; fetchSubmodules = true; }; From 04ed83be0ac66fdab204624ee3df167482acef8a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 17 Jun 2024 18:00:30 +0400 Subject: [PATCH 198/233] orbiton: migrate to by-name --- .../orbiton/default.nix => by-name/or/orbiton/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/editors/orbiton/default.nix => by-name/or/orbiton/package.nix} (90%) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/by-name/or/orbiton/package.nix similarity index 90% rename from pkgs/applications/editors/orbiton/default.nix rename to pkgs/by-name/or/orbiton/package.nix index f8fbc3484e12..eedbfac9e8a6 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config +{ lib, stdenv, buildGo122Module, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config , withGui ? true, vte }: -buildGoModule rec { +buildGo122Module rec { pname = "orbiton"; version = "2.65.12"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330ba..f01132e05fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30372,10 +30372,6 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - orbiton = callPackage ../applications/editors/orbiton { - buildGoModule = buildGo122Module; - }; - oed = callPackage ../applications/editors/oed { }; ekho = callPackage ../applications/audio/ekho { From 336d911fa6fd09079abff48c92dbd891aec48e31 Mon Sep 17 00:00:00 2001 From: Nicolas Goudry Date: Mon, 17 Jun 2024 16:02:26 +0200 Subject: [PATCH 199/233] vimPlugins: fix corrupted csv file --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fa6a8ac6848f..25b19fcf8f8d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,5 +1,4 @@ repo,branch,alias -https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, https://github.com/jackMort/ChatGPT.nvim/,HEAD, @@ -132,11 +131,8 @@ https://github.com/laytan/cloak.nvim/,HEAD, https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, -<<<<<<< HEAD https://github.com/tzachar/cmp-ai/,HEAD, https://codeberg.org/FelipeLema/cmp-async-path/,, -======= ->>>>>>> 8c49439301ad (vimPlugins.nvim-genghis: init at 2024-05-21) https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, From 0fa56095a2c153a1133bfb874b118702518b612a Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:32:05 -0400 Subject: [PATCH 200/233] vscode-extensions.bierner.comment-tagged-templates: init at 0.3.3 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2c033a5f1e05..57c26ee7b548 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -542,6 +542,22 @@ let betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { }; + bierner.comment-tagged-templates = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "comment-tagged-templates"; + publisher = "bierner"; + version = "0.3.3"; + hash = "sha256-M2XdMQ2l6oMYiHTdfRJ/n/Ys3LecEPwAozQtLBcn7FY="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.comment-tagged-templates/changelog"; + description = "VS Code extension that adds basic syntax highlighting for JavaScript and TypeScript tagged template strings using language identifier comments"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates"; + homepage = "https://github.com/mjbvz/vscode-comment-tagged-templates"; + license = lib.licenses.mit; + }; + }; + bierner.docs-view = buildVscodeMarketplaceExtension { mktplcRef = { name = "docs-view"; From 4e5f32c2cb6e1d52f73138839f8c74c23ffdf3fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 02:21:18 +0000 Subject: [PATCH 201/233] cinnamon.mint-x-icons: 1.6.8 -> 1.6.9 --- pkgs/desktops/cinnamon/mint-x-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 50819783db57..8b045980c44a 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-cxBZsAcGgoIY9KhjR/BWnMcttrywN6qap4lu5b2hauo="; + hash = "sha256-J5Osy+VosyBhwiiwELMtjDTf3/J6DpuQ4c9DO06fo+4="; }; propagatedBuildInputs = [ From 8aaa1301184c49bb42e840b389c9bb5f0da80d38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 01:53:18 +0000 Subject: [PATCH 202/233] cinnamon.mint-y-icons: 1.7.5 -> 1.7.6 --- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index a5b9911045c8..f12800e384b4 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ZStRvT0qP8W1RCSJoXZHMrECp6k8dh/18UvgmV87oNQ="; + hash = "sha256-baBacAatUP/jtU/SEVRa6HceGooMwI9N9arDWqPHR2Y="; }; propagatedBuildInputs = [ From fff8f14a8c9d2a12d1ceb1d4ba5f2e31754c6721 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 14:42:40 +0000 Subject: [PATCH 203/233] vscode-extensions.chenglou92.rescript-vscode: 1.52.0 -> 1.54.0 --- .../vscode/extensions/chenglou92.rescript-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 77f122eb2c58..d0b27457b68a 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,7 +5,7 @@ callPackage, }: let - version = "1.52.0"; + version = "1.54.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-3H7JgdmrGMdirVpT08wmwy4G6QLt0H65d3l7o/DuvpI="; + hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; }; postPatch = '' rm -r ${analysisDir} From 7a1fd887da34ccb19ee2490500ec67fc33bd01a1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Jun 2024 01:12:49 +1000 Subject: [PATCH 204/233] h: 1.0.4 -> 1.1.0 (#320533) --- pkgs/tools/misc/h/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 6e4ae6381e75..6d65accc51d5 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - hash = "sha256-eitUKOo2c1c+SyctkUW/SUb2RCKUoU6nJplfJVdwBSs="; + hash = "sha256-4rhol8a+OMX2+MxFPEM1WzM/70C7sye8jw4pg7CujRo="; }; buildInputs = [ ruby ]; From 13c48eb226107925c5fcd41f68710f57af305581 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Mon, 17 Jun 2024 16:13:15 +0100 Subject: [PATCH 205/233] treefmt2: 2.0.0-rc4 -> 2.0.0-rc5 (#320482) --- pkgs/by-name/tr/treefmt2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index 036f9875b979..ab61349bcf7f 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.0-rc4"; + version = "2.0.0-rc5"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-8l4d3ABd7XEu3ZrtBPS15N0zNHcb+A36j2EV/QZmA9U="; + hash = "sha256-Ckvpb2at7lg7AB0XNtIxeo8lWXX+04MVHHKoUs876dg="; }; vendorHash = "sha256-rjdGNfR2DpLZCzL/+3xiZ7gGDd4bPyBT5qMCO+NyWbg="; From d6e9159112b3f5a8a25edecf5325dade3e982104 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 17 Jun 2024 16:37:56 +0100 Subject: [PATCH 206/233] bitcoin: 27.0 -> 27.1 --- pkgs/applications/blockchains/bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7385d4bd9c45..7e995ad60a8c 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "27.0"; + version = "27.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b"; + sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da"; }; nativeBuildInputs = From fc57dc5e872dc288fffabb6d18289bb4fa935a14 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 13 Jun 2024 17:18:23 -0700 Subject: [PATCH 207/233] python312Packages.genie-partner-sdk: init at 1.0.3 --- .../genie-partner-sdk/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/genie-partner-sdk/default.nix diff --git a/pkgs/development/python-modules/genie-partner-sdk/default.nix b/pkgs/development/python-modules/genie-partner-sdk/default.nix new file mode 100644 index 000000000000..0a70a198e25a --- /dev/null +++ b/pkgs/development/python-modules/genie-partner-sdk/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + hatchling, + aiohttp, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "genie-partner-sdk"; + version = "1.0.3"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit version; + pname = "genie_partner_sdk"; + hash = "sha256-/Pu0pULepRpAdUfu2SQjK4xCSe3FWWNT9AqZEASoZSE="; + }; + + nativeBuildInputs = [ hatchling ]; + + propagatedBuildInputs = [ aiohttp ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "genie_partner_sdk" ]; + + meta = with lib; { + description = "An SDK to interact with the AladdinConnect (or OHD) partner API"; + homepage = "https://github.com/Genie-Garage/aladdin-python-sdk"; + license = licenses.unfree; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed6b63eaad2b..1427f0f8ec9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4709,6 +4709,8 @@ self: super: with self; { generic = callPackage ../development/python-modules/generic { }; + genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { }; + geniushub-client = callPackage ../development/python-modules/geniushub-client { }; genome-collector = callPackage ../development/python-modules/genome-collector { }; From 8f2ca6eeb420c9b474f1587465211cfa8044bccf Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Mon, 17 Jun 2024 08:43:15 -0700 Subject: [PATCH 208/233] home-assistant: update component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ac2526035c87..1fe093dfb2d0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -112,9 +112,10 @@ ]; "aladdin_connect" = ps: with ps; [ fnv-hash-fast + genie-partner-sdk psutil-home-assistant sqlalchemy - ]; # missing inputs: genie-partner-sdk + ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ @@ -5251,6 +5252,7 @@ "airvisual_pro" "airzone" "airzone_cloud" + "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" From 1276d53b7f2a1f7ef35c4071abd96439372e76ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 15:47:20 +0000 Subject: [PATCH 209/233] marwaita-x: 1.2 -> 1.2.1 --- pkgs/by-name/ma/marwaita-x/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-x/package.nix b/pkgs/by-name/ma/marwaita-x/package.nix index 794e9f07acb2..ddeeb5e39b51 100644 --- a/pkgs/by-name/ma/marwaita-x/package.nix +++ b/pkgs/by-name/ma/marwaita-x/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "marwaita-x"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-x"; rev = finalAttrs.version; - sha256 = "sha256-HQsIF9CNFROaxl5hnmat2VWEXFT8gW4UWSi/A1dFi6Y="; + sha256 = "sha256-x5b3aaasYbxFGvdNNF6vIrF/ZZWBGbdS2kEuB1rwOlA="; }; buildInputs = [ From 4714bfa3f3b6b19b7a7b61feae99374e423f82e0 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:49:39 -0400 Subject: [PATCH 210/233] vscode-extensions.yoavbls.pretty-ts-errors: init at 0.5.3 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 57c26ee7b548..7259ac45de8e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4872,6 +4872,22 @@ let }; }; + yoavbls.pretty-ts-errors = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pretty-ts-errors"; + publisher = "yoavbls"; + version = "0.5.3"; + hash = "sha256-JSCyTzz10eoUNu76wNUuvPVVKq4KaVKobS1CAPqgXUA="; + }; + meta = { + description = "Make TypeScript errors prettier and human-readable in VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors"; + homepage = "https://github.com/yoavbls/pretty-ts-errors"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + yzhang.dictionary-completion = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "yzhang"; From 3a2ad850fdb0eb0c2223f92ea69ee84538ff3970 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:51:30 -0400 Subject: [PATCH 211/233] vscode-extensions.bierner.markdown-footnotes: init at 0.1.1 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 57c26ee7b548..dec38fdf7395 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -626,6 +626,23 @@ let }; }; + bierner.markdown-footnotes = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-footnotes"; + publisher = "bierner"; + version = "0.1.1"; + hash = "sha256-h/Iyk8CKFr0M5ULXbEbjFsqplnlN7F+ZvnUTy1An5t4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-footnotes/changelog"; + description = "Adds [^1] footnote syntax support to VS Code's built-in Markdown preview"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes"; + homepage = "https://github.com/mjbvz/vscode-markdown-footnotes"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bierner.markdown-mermaid = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-mermaid"; From 96e4dcfffb5bed276ee81f52d9c6af042c1131af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 16:59:17 +0000 Subject: [PATCH 212/233] python311Packages.amaranth-soc: 0.1a-unstable-2024-05-17 -> 0.1a-unstable-2024-06-10 --- pkgs/development/python-modules/amaranth-soc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index aee85e709aff..597a1829161f 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-05-17"; + version = "0.1a-unstable-2024-06-10"; pyproject = true; # from `pdm show` realVersion = let @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "45ff663b83694b09b2b8f3fc0f10c555a12ba987"; - hash = "sha256-Ql8XYC13wscPL96HY0kXselq78D747BpLK8X1sxpwz0="; + rev = "e1b842800533f44924f21c3867bc2290084d100f"; + hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y="; }; nativeBuildInputs = [ pdm-backend ]; From 02f4e7f5238df2077727b3e7426e24d1e57ee291 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 17 Jun 2024 10:11:50 -0700 Subject: [PATCH 213/233] yarn2nix: avoid appearing to include src This expression didn't actually include src, but it looked like it did. Make it like others by using a fileset (for instance, #319883) --- .../yarn2nix-moretea/yarn2nix/default.nix | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b43bc40c85f6..3cc5e31c3c15 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -398,25 +398,15 @@ in rec { }); yarn2nix = mkYarnPackage { - src = - let - src = ./.; - - mkFilter = { dirsToInclude, filesToInclude, root }: path: type: - let - inherit (lib) elem elemAt splitString; - - subpath = elemAt (splitString "${toString root}/" path) 1; - spdir = elemAt (splitString "/" subpath) 0; - in elem spdir dirsToInclude || - (type == "regular" && elem subpath filesToInclude); - in builtins.filterSource - (mkFilter { - dirsToInclude = ["bin" "lib"]; - filesToInclude = ["package.json" "yarn.lock"]; - root = src; - }) - src; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./bin + ./lib + ./package.json + ./yarn.lock + ]; + }; # yarn2nix is the only package that requires the yarnNix option. # All the other projects can auto-generate that file. From e4556a5877ec50c2bbae7f7018e70285e0e08542 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 17 Jun 2024 13:26:17 -0400 Subject: [PATCH 214/233] julia-top-n: fix self-inclusive src --- .../julia-modules/tests/julia-top-n/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/julia-modules/tests/julia-top-n/default.nix b/pkgs/development/julia-modules/tests/julia-top-n/default.nix index ab8ed948e1ea..9e42e19dd309 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/default.nix +++ b/pkgs/development/julia-modules/tests/julia-top-n/default.nix @@ -4,7 +4,16 @@ mkDerivation { pname = "julia-top-n"; version = "0.1.0.0"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./app + ./julia-top-n.cabal + ./package.yaml + ./stack.yaml + ./stack.yaml.lock + ]; + }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ From 30a6b9ebbba9af565a017ae21df4a34ce9f357dc Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 17 Jun 2024 13:30:05 -0400 Subject: [PATCH 215/233] libtorch: fix tests having self-inclusive src --- .../libraries/science/math/libtorch/test/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix index a7940cd1db8d..a4b8c2f79140 100644 --- a/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -27,7 +27,13 @@ in stdenv.mkDerivation { pname = "libtorch-test"; version = libtorch-bin.version; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./CMakeLists.txt + ./test.cpp + ]; + }; nativeBuildInputs = [ cmake ]; From ceecacc61269e4fed1b652c963a9d61510251f9e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 17 Jun 2024 13:57:10 -0400 Subject: [PATCH 216/233] beamPackages.hex: 2.0.6 -> 2.1.1 https://github.com/hexpm/hex/releases/tag/v2.1.0 https://github.com/hexpm/hex/releases/tag/v2.1.1 --- pkgs/development/beam-modules/hex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 32628886f11f..66462f639f1e 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { pname = "hex"; - version = "2.0.6"; + version = "2.1.1"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "v${version}"; - sha256 = "sha256-fSADQDrqh5U/TdhaHXsMiLMk1wtQ0gEiTqEclJ2w2nY="; + sha256 = "sha256-pEfd2BqkVwZVbnka98MafJ/NRn94BHh+wM0i2Q5duTo="; }; setupHook = writeText "setupHook.sh" '' From bc53eed589656a2c9844572aed262ec075000d2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 18:00:07 +0000 Subject: [PATCH 217/233] emacsPackages.lsp-bridge: 20240609.1553 -> 20240615.2321 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 386076cbd7d7..62048d867619 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "e5cf0b704274d3deae8f4a3b6a3d0664a176bc8b"; + rev = "152431c0b1d731d0302e1849690e2361f3caf7c1"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240609.1553"; + version = "20240615.2321"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-96GgMJPLFoabhlvjTMWKtEpGuctjlcRuChvzDziaq8g="; + hash = "sha256-LIjqr1IntQ6WTFOO3b6cAuB6LslG1HzVa9C+GYUyQOU="; }; commit = rev; From 9e732be6c84b6f511da036c965fd2ac09e5de732 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Tue, 11 Jun 2024 14:35:25 +0200 Subject: [PATCH 218/233] python3Packages.rapidocr-onnxruntime: init at 1.3.22 --- .../rapidocr-onnxruntime/default.nix | 129 ++++++++++++++++++ .../setup-py-override-version-checking.patch | 30 ++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 161 insertions(+) create mode 100644 pkgs/development/python-modules/rapidocr-onnxruntime/default.nix create mode 100644 pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix new file mode 100644 index 000000000000..48209fc9efca --- /dev/null +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + fetchzip, + substitute, + pythonRelaxDepsHook, + pytestCheckHook, + + setuptools, + pyclipper, + opencv4, + numpy, + six, + shapely, + pyyaml, + pillow, + onnxruntime, +}: +let + version = "1.3.22"; + + src = fetchFromGitHub { + owner = "RapidAI"; + repo = "RapidOCR"; + rev = "v${version}"; + hash = "sha256-8h4DFhnI9imr+bYQZdlrl8UKUdpwnGK+SGxLXSMmcag="; + }; + + models = fetchzip { + url = "https://github.com/RapidAI/RapidOCR/releases/download/v1.1.0/required_for_whl_v1.3.0.zip"; + hash = "sha256-j/0nzyvu/HfNTt5EZ+2Phe5dkyPOdQw/OZTz0yS63aA="; + stripRoot = false; + } + "/required_for_whl_v1.3.0/resources/models"; +in +buildPythonPackage { + pname = "rapidocr-onnxruntime"; + inherit version src; + pyproject = true; + + sourceRoot = "${src.name}/python"; + + # HACK: + # Upstream uses a very unconventional structure to organize the packages, and we have to coax the + # existing infrastructure to work with it. + # See https://github.com/RapidAI/RapidOCR/blob/02829ef986bc2a5c4f33e9c45c9267bcf2d07a1d/.github/workflows/gen_whl_to_pypi_rapidocr_ort.yml#L80-L92 + # for the "intended" way of building this package. + + # The setup.py supplied by upstream tries to determine the current version by + # fetching the latest version of the package from PyPI, and then bumping the version number. + # This is not allowed in the Nix build environment as we do not have internet access, + # hence we patch that out and get the version from the build environment directly. + patches = [ + (substitute { + src = ./setup-py-override-version-checking.patch; + substitutions = [ + "--subst-var-by" + "version" + version + ]; + }) + ]; + + postPatch = '' + mv setup_onnxruntime.py setup.py + mkdir -p rapidocr_onnxruntime/models + + ln -s ${models}/* rapidocr_onnxruntime/models + + # Magic patch from upstream - what does this even do?? + echo "from .rapidocr_onnxruntime.main import RapidOCR, VisRes" > __init__.py + ''; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + # Upstream expects the source files to be under rapidocr_onnxruntime/rapidocr_onnxruntime + # instead of rapidocr_onnxruntime for the wheel to build correctly. + preBuild = '' + mkdir rapidocr_onnxruntime_t + mv rapidocr_onnxruntime rapidocr_onnxruntime_t + mv rapidocr_onnxruntime_t rapidocr_onnxruntime + ''; + + # Revert the above hack + postBuild = '' + mv rapidocr_onnxruntime rapidocr_onnxruntime_t + mv rapidocr_onnxruntime_t/* . + ''; + + build-system = [ setuptools ]; + + dependencies = [ + pyclipper + opencv4 + numpy + six + shapely + pyyaml + pillow + onnxruntime + ]; + + # Remove because we have adopted the `opencv4` as an attribute name. + pythonRemoveDeps = [ "opencv-python" ]; + + pythonImportsCheck = [ "rapidocr_onnxruntime" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # These are tests for different backends. + disabledTestPaths = [ + "tests/test_vino.py" + "tests/test_paddle.py" + ]; + + meta = { + # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 + # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 + broken = (stdenv.isLinux && stdenv.isAarch64); + changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/v${version}"; + description = "Cross platform OCR Library based on OnnxRuntime"; + homepage = "https://github.com/RapidAI/RapidOCR"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "rapidocr_onnxruntime"; + }; +} diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch new file mode 100644 index 000000000000..227618c2a60c --- /dev/null +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch @@ -0,0 +1,30 @@ +diff --git a/setup_onnxruntime.py b/setup_onnxruntime.py +index cd698d1..c6e8a33 100644 +--- a/setup_onnxruntime.py ++++ b/setup_onnxruntime.py +@@ -6,7 +6,6 @@ from pathlib import Path + from typing import List, Union + + import setuptools +-from get_pypi_latest_version import GetPyPiLatestVersion + + + def read_txt(txt_path: Union[Path, str]) -> List[str]: +@@ -26,16 +25,7 @@ def get_readme(): + + MODULE_NAME = "rapidocr_onnxruntime" + +-obtainer = GetPyPiLatestVersion() +-latest_version = obtainer(MODULE_NAME) +-VERSION_NUM = obtainer.version_add_one(latest_version) +- +-if len(sys.argv) > 2: +- match_str = " ".join(sys.argv[2:]) +- matched_versions = obtainer.extract_version(match_str) +- if matched_versions: +- VERSION_NUM = matched_versions +-sys.argv = sys.argv[:2] ++VERSION_NUM = "@version@" + + project_urls = { + "Documentation": "https://rapidai.github.io/RapidOCRDocs/docs/install_usage/rapidocr/usage/", diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bcc8ea7d138..06be5e72ee49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13071,6 +13071,8 @@ self: super: with self; { rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; }; + rapidocr-onnxruntime = callPackage ../development/python-modules/rapidocr-onnxruntime { }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; rarfile = callPackage ../development/python-modules/rarfile { From 08d67477d60b29ee7dd03742daa4f213c017f086 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:38:58 -0400 Subject: [PATCH 219/233] vscode-extensions.meganrogge.template-string-converter: init at 0.6.1 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3228d1e8760b..1a60e9923c39 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2817,6 +2817,23 @@ let }; }; + meganrogge.template-string-converter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "template-string-converter"; + publisher = "meganrogge"; + version = "0.6.1"; + hash = "sha256-w0ppzh0m/9Hw3BPJbAKsNcMStdzoH9ODf3zweRcCG5k="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/meganrogge.template-string-converter/changelog"; + description = "VS Code extension to autocorrect from quotes to backticks"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter"; + homepage = "https://github.com/meganrogge/template-string-converter"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { From 5b616f8e4d5cae51489cb3afb15e77e78c7d6f0e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Jun 2024 21:08:41 +0200 Subject: [PATCH 220/233] python3Packages.open-webui: add `rapidocr-onnxruntime` deps --- pkgs/by-name/op/open-webui/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index f0022b07dcfd..1292ff3c2792 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -59,8 +59,6 @@ python3.pkgs.buildPythonApplication rec { "opencv-python-headless" # using `psycopg2` instead "psycopg2-binary" - # package request: https://github.com/NixOS/nixpkgs/issues/317065 - "rapidocr-onnxruntime" ]; dependencies = with python3.pkgs; [ @@ -106,6 +104,7 @@ python3.pkgs.buildPythonApplication rec { pytube pyxlsb rank-bm25 + rapidocr-onnxruntime requests sentence-transformers unstructured From e44f0528f422979c4877620f29cb155b477a618c Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 6 Jun 2024 18:22:57 -0700 Subject: [PATCH 221/233] c3c: add version check --- pkgs/development/compilers/c3c/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index d394ecbc4c21..440fe155b39b 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -7,6 +7,7 @@ , libxml2 , libffi , xar +, testers }: llvmPackages.stdenv.mkDerivation rec { @@ -50,6 +51,12 @@ llvmPackages.stdenv.mkDerivation rec { runHook postCheck ''; + passthru.tests = { + version = testers.testVersion { + package = c3c; + }; + }; + meta = with lib; { description = "Compiler for the C3 language"; homepage = "https://github.com/c3lang/c3c"; From 3760be881c18292c29354dcba253c0c125ff5858 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Thu, 6 Jun 2024 18:27:51 -0700 Subject: [PATCH 222/233] c3c: migrate to finalAttrs pattern --- pkgs/development/compilers/c3c/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 440fe155b39b..2577f1321d74 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -10,14 +10,14 @@ , testers }: -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c"; version = "0.5.5"; src = fetchFromGitHub { owner = "c3lang"; - repo = pname; - rev = "refs/tags/${version}"; + repo = "c3c"; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk="; }; @@ -53,7 +53,7 @@ llvmPackages.stdenv.mkDerivation rec { passthru.tests = { version = testers.testVersion { - package = c3c; + package = finalAttrs.finalPackage; }; }; @@ -65,4 +65,4 @@ llvmPackages.stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "c3c"; }; -} +}) From c1d8b65552806eddcaa68c7b9287c3a7bc59f950 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 17 Jun 2024 15:46:53 +0100 Subject: [PATCH 223/233] =?UTF-8?q?vector:=200.38.0=20=E2=86=92=200.39.0:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop patch, use variables instead. --- pkgs/tools/misc/vector/Cargo.lock | 1418 +++++++++++++++-------- pkgs/tools/misc/vector/default.nix | 13 +- pkgs/tools/misc/vector/vector-lto.patch | 12 - 3 files changed, 921 insertions(+), 522 deletions(-) delete mode 100644 pkgs/tools/misc/vector/vector-lto.patch diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index 4362aedcf615..dfccefda9e01 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -66,7 +66,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -78,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -93,6 +93,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.16" @@ -227,9 +242,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apache-avro" @@ -359,10 +374,11 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ + "brotli", "flate2", "futures-core", "memchr", @@ -426,21 +442,21 @@ dependencies = [ [[package]] name = "async-graphql" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261fa27d5bff5afdf7beff291b3bc73f99d1529804c70e51b0fbc51e70b1c6a9" +checksum = "bf338d20ba5bab309f55ce8df95d65ee19446f7737f06f4a64593ab2c6b546ad" dependencies = [ "async-graphql-derive", "async-graphql-parser", "async-graphql-value", "async-stream", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bytes 1.6.0", "chrono", "fnv", "futures-util", - "http 1.0.0", + "http 1.1.0", "indexmap 2.2.6", "mime", "multer", @@ -457,26 +473,26 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3188809947798ea6db736715a60cf645ba3b87ea031c710130e1476b48e45967" +checksum = "fc51fd6b7102acda72bc94e8ae1543844d5688ff394a6cf7c21f2a07fe2d64e4" dependencies = [ "Inflector", "async-graphql-parser", "darling 0.20.8", - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.81", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.85", "quote 1.0.36", - "strum 0.26.1", - "syn 2.0.60", + "strum 0.26.2", + "syn 2.0.66", "thiserror", ] [[package]] name = "async-graphql-parser" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e65a0b83027f35b2a5d9728a098bc66ac394caa8191d2c65ed9eb2985cf3d8" +checksum = "75361eefd64e39f89bead4cb45fddbaf60ddb0e7b15fb7c852b6088bcd63071f" dependencies = [ "async-graphql-value", "pest", @@ -486,9 +502,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e40849c29a39012d38bff87bfed431f1ed6c53fbec493294c1045d61a7ae75" +checksum = "c1f665d2d52b41c4ed1f01c43f3ef27a2fe0af2452ed5c8bc7ac9b1a8719afaa" dependencies = [ "bytes 1.6.0", "indexmap 2.2.6", @@ -498,9 +514,9 @@ dependencies = [ [[package]] name = "async-graphql-warp" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e901ea60bac5613a1c824da04c8e72906cf79efde5c56f657e3a4ac89624b0a5" +checksum = "e400c0f2609939f8cec46d8137f0959a49a4a514458f2a43a4ee0b0f6eb20a36" dependencies = [ "async-graphql", "futures-util", @@ -560,11 +576,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.0.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 3.0.1", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -649,9 +665,9 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -689,9 +705,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -706,9 +722,9 @@ version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -723,17 +739,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -1051,9 +1056,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57" +checksum = "31eed8d45759b2c5fe7fd304dd70739060e9e0de509209036eabea14d0720cce" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -1065,7 +1070,7 @@ dependencies = [ "hex", "hmac", "http 0.2.9", - "http 1.0.0", + "http 1.1.0", "once_cell", "percent-encoding", "sha2", @@ -1158,9 +1163,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf64e73ef8d4dac6c933230d56d136b75b252edcf82ed36e37d603090cd7348" +checksum = "db83b08939838d18e33b5dbaf1a0f048f28c10bd28071ab7ce6f245451855414" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1172,6 +1177,7 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "http-body 1.0.0", + "httparse", "hyper 0.14.28", "hyper-rustls 0.24.2", "once_cell", @@ -1184,15 +1190,15 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c19fdae6e3d5ac9cd01f2d6e6c359c5f5a3e028c2d148a8f5b90bf3399a18a7" +checksum = "1b570ea39eb95bd32543f6e4032bce172cb6209b9bc8c83c770d08169e875afc" dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes 1.6.0", "http 0.2.9", - "http 1.0.0", + "http 1.1.0", "pin-project-lite", "tokio", "tracing 0.1.40", @@ -1201,15 +1207,15 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.8" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729" +checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" dependencies = [ "base64-simd", "bytes 1.6.0", "bytes-utils", "http 0.2.9", - "http 1.0.0", + "http 1.1.0", "http-body 0.4.5", "http-body 1.0.0", "http-body-util", @@ -1233,9 +1239,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a43b56df2c529fe44cb4d92bd64d0479883fb9608ff62daede4df5405381814" +checksum = "6f734808d43702a67e57d478a12e227d4d038d0b90c9005a78c87890d3805922" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1303,14 +1309,14 @@ dependencies = [ "bytes 1.6.0", "dyn-clone", "futures 0.3.30", - "getrandom 0.2.14", + "getrandom 0.2.15", "http-types", "log", "paste", "pin-project", "quick-xml", "rand 0.8.5", - "reqwest", + "reqwest 0.11.26", "rustc_version 0.4.0", "serde", "serde_json", @@ -1325,7 +1331,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd7ea32ca7eb66ff4757f83baac702ff11d469e5de365b6bc6f79f9c25d3436" dependencies = [ - "async-lock 3.0.0", + "async-lock 3.4.0", "async-trait", "azure_core", "futures 0.3.30", @@ -1388,7 +1394,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "instant", "rand 0.8.5", ] @@ -1507,12 +1513,12 @@ checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitmask-enum" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" +checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -1584,7 +1590,7 @@ dependencies = [ "futures-util", "hex", "home", - "http 1.0.0", + "http 1.1.0", "http-body-util", "hyper 1.2.0", "hyper-named-pipe", @@ -1640,12 +1646,33 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ "once_cell", "proc-macro-crate 2.0.0", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "syn_derive", ] +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bson" version = "2.8.0" @@ -1712,7 +1739,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -1764,39 +1791,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" -[[package]] -name = "cached" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a7d38ed2761b8a13ce42bc44b09d5a052b88da2f9fead624c779f31ac0729a" -dependencies = [ - "ahash 0.8.11", - "cached_proc_macro", - "cached_proc_macro_types", - "hashbrown 0.14.5", - "instant", - "once_cell", - "thiserror", -] - -[[package]] -name = "cached_proc_macro" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" -dependencies = [ - "darling 0.20.8", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" - [[package]] name = "cargo_toml" version = "0.20.2" @@ -2016,24 +2010,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -2045,15 +2024,15 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb9b20c0dd58e4c2e991c8d203bbeb76c11304d1011659686b5b644bc29aa478" dependencies = [ - "clap 4.5.4", + "clap", "log", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -2064,23 +2043,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" dependencies = [ - "clap 4.5.4", + "clap", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2122,7 +2101,7 @@ dependencies = [ "memchr", "once_cell", "ordered-float 4.2.0", - "prost 0.12.4", + "prost 0.12.6", "prost-reflect", "regex", "rstest", @@ -2227,9 +2206,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -2261,22 +2240,22 @@ dependencies = [ [[package]] name = "console-api" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" dependencies = [ "futures-core", - "prost 0.12.4", - "prost-types 0.12.4", - "tonic", + "prost 0.12.6", + "prost-types 0.12.6", + "tonic 0.11.0", "tracing-core 0.1.32", ] [[package]] name = "console-subscriber" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" dependencies = [ "console-api", "crossbeam-channel", @@ -2284,13 +2263,14 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -2389,9 +2369,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -2405,7 +2385,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.4", + "clap", "criterion-plot", "futures 0.3.30", "is-terminal", @@ -2479,9 +2459,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -2606,9 +2586,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2639,7 +2619,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", @@ -2653,10 +2633,10 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "strsim 0.10.0", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2678,7 +2658,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2714,15 +2694,15 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "databend-client" -version = "0.17.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123d9b08aefcdce56e2379487198c1fb8c439cedf6c31d16c3974f0f9d3e282f" +checksum = "8afe21f4ac2e61c9360d5c1b7cce3ed4392c2a42c6c1dbb1115cc27f25f23b78" dependencies = [ "async-trait", "log", "once_cell", "percent-encoding", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "tokio", @@ -2791,7 +2771,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -2802,9 +2782,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2814,7 +2794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "rustc_version 0.4.0", "syn 1.0.109", @@ -2886,6 +2866,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + [[package]] name = "dns-lookup" version = "2.0.4" @@ -2928,6 +2919,24 @@ dependencies = [ "vector-config-common", ] +[[package]] +name = "domain" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c" +dependencies = [ + "bytes 1.6.0", + "futures-util", + "moka", + "octseq", + "rand 0.8.5", + "serde", + "smallvec", + "time", + "tokio", + "tracing 0.1.40", +] + [[package]] name = "duct" version = "0.13.6" @@ -3040,9 +3049,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", "serde", @@ -3071,7 +3080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -3083,9 +3092,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -3095,29 +3104,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -3217,12 +3226,23 @@ dependencies = [ ] [[package]] -name = "event-listener-strategy" -version = "0.3.0" +name = "event-listener" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ - "event-listener 3.0.1", + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", "pin-project-lite", ] @@ -3524,9 +3544,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -3591,9 +3611,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -3636,7 +3656,7 @@ dependencies = [ "arc-swap", "futures 0.3.30", "log", - "reqwest", + "reqwest 0.11.26", "serde", "serde_derive", "serde_json", @@ -3705,7 +3725,7 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "serde", "serde_json", @@ -3719,7 +3739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "syn 1.0.109", ] @@ -3728,12 +3748,12 @@ name = "greptime-proto" version = "0.1.0" source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.4.1#4306ab645ee55b3f7f2ad3fb7acc5820f967c1aa" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", "serde", "serde_json", "strum 0.25.0", "strum_macros 0.25.3", - "tonic", + "tonic 0.10.2", "tonic-build 0.10.2", ] @@ -3748,12 +3768,12 @@ dependencies = [ "futures-util", "greptime-proto", "parking_lot", - "prost 0.12.4", + "prost 0.12.6", "rand 0.8.5", "snafu 0.7.5", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.2", "tonic-build 0.9.2", "tower", ] @@ -3800,16 +3820,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes 1.6.0", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 1.0.0", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -3895,15 +3915,6 @@ dependencies = [ "http 0.2.9", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -4040,15 +4051,6 @@ dependencies = [ "smol", ] -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.3" @@ -4147,9 +4149,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes 1.6.0", "fnv", @@ -4174,7 +4176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes 1.6.0", - "http 1.0.0", + "http 1.1.0", ] [[package]] @@ -4185,7 +4187,7 @@ checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes 1.6.0", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "pin-project-lite", ] @@ -4278,7 +4280,7 @@ dependencies = [ "bytes 1.6.0", "futures-channel", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "httparse", "itoa", @@ -4361,7 +4363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http 1.0.0", + "http 1.1.0", "hyper 1.2.0", "hyper-util", "log", @@ -4407,7 +4409,7 @@ dependencies = [ "bytes 1.6.0", "futures-channel", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "hyper 1.2.0", "pin-project-lite", @@ -4456,6 +4458,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -4473,6 +4593,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.4.0" @@ -4493,6 +4623,18 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -4543,9 +4685,9 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "infer" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" [[package]] name = "inotify" @@ -4598,7 +4740,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -4621,7 +4763,7 @@ dependencies = [ "socket2 0.5.7", "widestring 1.0.2", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -4648,7 +4790,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -4686,6 +4828,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -4766,7 +4917,7 @@ dependencies = [ "k8s-test-framework", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.11.26", "serde_json", "tokio", "tracing 0.1.40", @@ -5002,9 +5153,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" @@ -5086,6 +5237,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" version = "0.4.11" @@ -5120,9 +5277,9 @@ version = "0.1.0" dependencies = [ "bytes 1.6.0", "chrono", - "prost 0.12.4", - "prost-build 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", "snap", ] @@ -5334,9 +5491,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -5419,9 +5576,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9bed6bce296397a9d6a86f995dd10a547a4e6949825d45225906bdcbfe7367" +checksum = "e340c022072f3208a4105458286f4985ba5355bfe243c3073afe45cbe9ecf491" dependencies = [ "bstr 1.9.1", "mlua-sys", @@ -5433,9 +5590,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2847b42764435201d8cbee1f517edb79c4cca4181877b90047587c89e1b7bce4" +checksum = "5552e7e4e22ada0463dfdeee6caf6dc057a189fdc83136408a8f950a5e5c5540" dependencies = [ "cc", "cfg-if", @@ -5446,24 +5603,48 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaade5f94e5829db58791664ba98f35fea6a3ffebc783becb51dc97c7a21abee" +checksum = "09697a6cec88e7f58a02c7ab5c18c611c6907c8654613df9cc0192658a4fb859" dependencies = [ "itertools 0.12.1", "once_cell", "proc-macro-error", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "regex", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "mock_instant" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c356644192565524790740e4075307c2cfc26d04d2543fb8e3ab9ef43a115ec" +checksum = "cdcebb6db83796481097dedc7747809243cc81d9ed83e6a938b76d4ea0b249cf" + +[[package]] +name = "moka" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e0d88686dc561d743b40de8269b26eaf0dc58781bde087b0984646602021d08" +dependencies = [ + "async-lock 3.4.0", + "async-trait", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "event-listener 5.3.1", + "futures-util", + "once_cell", + "parking_lot", + "quanta 0.12.3", + "rustc_version 0.4.0", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] [[package]] name = "mongodb" @@ -5509,7 +5690,7 @@ dependencies = [ "trust-dns-resolver", "typed-builder 0.10.0", "uuid", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] @@ -5521,7 +5702,7 @@ dependencies = [ "bytes 1.6.0", "encoding_rs", "futures-util", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "memchr", @@ -5650,7 +5831,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.14", + "getrandom 0.2.15", "log", "rand 0.8.5", "signatory", @@ -5665,7 +5846,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.14", + "getrandom 0.2.15", "log", "rand 0.8.5", "signatory", @@ -5839,9 +6020,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -5853,7 +6034,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", ] @@ -5891,7 +6072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -5903,9 +6084,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -5914,10 +6095,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 2.0.0", - "proc-macro2 1.0.81", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -5943,10 +6124,10 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.14", + "getrandom 0.2.15", "http 0.2.9", "rand 0.8.5", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "serde_path_to_error", @@ -5973,6 +6154,17 @@ dependencies = [ "memchr", ] +[[package]] +name = "octseq" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98" +dependencies = [ + "bytes 1.6.0", + "serde", + "smallvec", +] + [[package]] name = "ofb" version = "0.6.1" @@ -6036,14 +6228,14 @@ dependencies = [ "chrono", "flagset", "futures 0.3.30", - "getrandom 0.2.14", + "getrandom 0.2.15", "http 0.2.9", "log", "md-5", "once_cell", "percent-encoding", "quick-xml", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "tokio", @@ -6103,9 +6295,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -6116,9 +6308,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] @@ -6144,9 +6336,9 @@ dependencies = [ "chrono", "hex", "ordered-float 4.2.0", - "prost 0.12.4", - "prost-build 0.12.4", - "tonic", + "prost 0.12.6", + "prost-build 0.12.6", + "tonic 0.10.2", "tonic-build 0.10.2", "vector-core", "vector-lookup", @@ -6218,6 +6410,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "owo-colors" version = "4.0.0" @@ -6268,9 +6466,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -6306,9 +6504,9 @@ checksum = "13242a5ce97f39a8095d03c8b273e91d09f2690c0b7d69a2af844941115bab24" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -6361,9 +6559,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.7" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -6388,9 +6586,9 @@ checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -6476,16 +6674,16 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -6728,14 +6926,13 @@ dependencies = [ [[package]] name = "prettydiff" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" +checksum = "abec3fb083c10660b3854367697da94c674e9e82aa7511014dc958beeb7215e9" dependencies = [ - "ansi_term", + "owo-colors 3.5.0", "pad", "prettytable-rs", - "structopt", ] [[package]] @@ -6744,7 +6941,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "syn 1.0.109", ] @@ -6754,8 +6951,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.81", - "syn 2.0.60", + "proc-macro2 1.0.85", + "syn 2.0.66", ] [[package]] @@ -6800,6 +6997,15 @@ dependencies = [ "toml_edit 0.20.7", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -6807,7 +7013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", "version_check", @@ -6819,7 +7025,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "version_check", ] @@ -6847,9 +7053,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -6861,9 +7067,9 @@ dependencies = [ "indexmap 2.2.6", "nom", "num_enum 0.7.2", - "prost 0.12.4", - "prost-build 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", "snafu 0.7.5", "vector-common", ] @@ -6894,7 +7100,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -6911,12 +7117,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes 1.6.0", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -6943,9 +7149,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes 1.6.0", "heck 0.5.0", @@ -6955,10 +7161,10 @@ dependencies = [ "once_cell", "petgraph", "prettyplease 0.2.15", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "regex", - "syn 2.0.60", + "syn 2.0.66", "tempfile", ] @@ -6970,22 +7176,22 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -6996,8 +7202,8 @@ checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f" dependencies = [ "base64 0.22.1", "once_cell", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "serde", "serde-value", ] @@ -7013,11 +7219,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -7050,16 +7256,26 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] [[package]] -name = "pulsar" -version = "6.1.0" +name = "publicsuffix" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d21c6a837986cf25d22ac5b951c267d95808f3c830ff009c2879fff259a0268" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "pulsar" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a" dependencies = [ "async-trait", "bit-vec", @@ -7164,7 +7380,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -7184,7 +7400,7 @@ version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", ] [[package]] @@ -7268,7 +7484,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", ] [[package]] @@ -7301,21 +7517,21 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" dependencies = [ "bitflags 2.4.1", "cassowary", "compact_str", "crossterm", - "indoc", "itertools 0.12.1", "lru", "paste", "stability", - "strum 0.26.1", + "strum 0.26.2", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] @@ -7471,16 +7687,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -7568,7 +7784,6 @@ dependencies = [ "js-sys", "log", "mime", - "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -7590,8 +7805,52 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.25.2", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes 1.6.0", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-pemfile 2.1.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.25.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 0.26.1", + "winreg 0.52.0", ] [[package]] @@ -7627,7 +7886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.14", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted", @@ -7658,7 +7917,7 @@ version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -7705,9 +7964,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26f4c25a604fcb3a1bcd96dd6ba37c93840de95de8198d94c0d571a74a804d1" +checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8" dependencies = [ "bytemuck", "byteorder", @@ -7715,9 +7974,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rsa" @@ -7741,9 +8000,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures 0.3.30", "futures-timer", @@ -7753,18 +8012,19 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", - "proc-macro2 1.0.81", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.85", "quote 1.0.36", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.60", + "syn 2.0.66", "unicode-ident", ] @@ -7829,7 +8089,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -8005,9 +8265,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -8029,9 +8289,9 @@ dependencies = [ [[package]] name = "sasl2-sys" -version = "0.1.20+2.1.28" +version = "0.1.22+2.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e645bd98535fc8fd251c43ba7c7c1f9be1e0369c99b6a5ea719052a773e655c" +checksum = "05f2a7f7efd9fc98b3a9033272df10709f5ee3fa0eabbd61a527a3a1ed6bd3c6" dependencies = [ "cc", "duct", @@ -8144,9 +8404,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -8159,18 +8419,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde-toml-merge" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88075e75b01384301454b1c188243552c674263c0c0c3c7ed5dd82291b20798f" +checksum = "93b4e415d6bff989e5e48649ca9b8b4d4997cb069a0c90a84bfd38c7df5e3968" dependencies = [ "toml", ] @@ -8207,31 +8467,31 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap 2.2.6", "itoa", @@ -8284,16 +8544,16 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -8345,7 +8605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -8357,9 +8617,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8624,7 +8884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -8636,9 +8896,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8708,9 +8968,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -8767,12 +9033,6 @@ dependencies = [ "vte", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -8785,30 +9045,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 1.0.109", -] - [[package]] name = "strum" version = "0.25.0" @@ -8817,9 +9053,9 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros 0.26.1", ] @@ -8831,10 +9067,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8844,10 +9080,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8883,18 +9119,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "unicode-ident", ] @@ -8906,9 +9142,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8917,6 +9153,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + [[package]] name = "syslog" version = "6.1.1" @@ -8961,6 +9208,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "take_mut" version = "0.2.2" @@ -9050,33 +9303,24 @@ dependencies = [ "syn 0.15.44", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9150,6 +9394,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -9177,9 +9431,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes 1.6.0", @@ -9218,13 +9472,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9374,21 +9628,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.8", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -9417,9 +9671,20 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.8" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.18", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", @@ -9447,7 +9712,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.4", + "prost 0.12.6", "rustls 0.21.11", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.3", @@ -9460,6 +9725,33 @@ dependencies = [ "tracing 0.1.40", ] +[[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes 1.6.0", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.28", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.40", +] + [[package]] name = "tonic-build" version = "0.9.2" @@ -9467,7 +9759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "prost-build 0.11.9", "quote 1.0.36", "syn 1.0.109", @@ -9480,10 +9772,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.81", - "prost-build 0.12.4", + "proc-macro2 1.0.85", + "prost-build 0.12.6", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9584,9 +9876,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9712,6 +10004,12 @@ dependencies = [ "serde_json", ] +[[package]] +name = "triomphe" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" + [[package]] name = "trust-dns-proto" version = "0.21.2" @@ -9791,7 +10089,7 @@ dependencies = [ "byteorder", "bytes 1.6.0", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -9817,7 +10115,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -9837,9 +10135,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9867,9 +10165,9 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9943,6 +10241,16 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "unicode-truncate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" +dependencies = [ + "itertools 0.12.1", + "unicode-width", +] + [[package]] name = "unicode-width" version = "0.1.11" @@ -10005,12 +10313,12 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.0", "percent-encoding", "serde", ] @@ -10027,12 +10335,24 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + [[package]] name = "utf8-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.1" @@ -10046,7 +10366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "atomic", - "getrandom 0.2.14", + "getrandom 0.2.15", "rand 0.8.5", "serde", "wasm-bindgen", @@ -10069,9 +10389,8 @@ name = "vdev" version = "0.1.0" dependencies = [ "anyhow", - "cached", "chrono", - "clap 4.5.4", + "clap", "clap-verbosity-flag", "clap_complete", "confy", @@ -10081,14 +10400,14 @@ dependencies = [ "hex", "indexmap 2.2.6", "indicatif", - "itertools 0.12.1", + "itertools 0.13.0", "log", "once_cell", "os_info", - "owo-colors", + "owo-colors 4.0.0", "paste", "regex", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "serde_yaml 0.9.34+deprecated", @@ -10097,15 +10416,9 @@ dependencies = [ "toml", ] -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "vector" -version = "0.38.0" +version = "0.39.0" dependencies = [ "apache-avro", "approx", @@ -10150,7 +10463,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.5.4", + "clap", "colored", "console-subscriber", "criterion", @@ -10173,7 +10486,7 @@ dependencies = [ "governor", "greptimedb-client", "grok", - "h2 0.4.4", + "h2 0.4.5", "hash_hasher", "hashbrown 0.14.5", "headers", @@ -10189,10 +10502,10 @@ dependencies = [ "hyper-proxy", "indexmap 2.2.6", "indoc", - "infer 0.15.0", + "infer 0.16.0", "inventory", "ipnet", - "itertools 0.12.1", + "itertools 0.13.0", "k8s-openapi 0.18.0", "kube", "lapin", @@ -10225,10 +10538,11 @@ dependencies = [ "portpicker", "postgres-openssl", "proptest", - "prost 0.12.4", - "prost-build 0.12.4", + "proptest-derive", + "prost 0.12.6", + "prost-build 0.12.6", "prost-reflect", - "prost-types 0.12.4", + "prost-types 0.12.6", "pulsar", "quickcheck", "rand 0.8.5", @@ -10237,21 +10551,20 @@ dependencies = [ "rdkafka", "redis", "regex", - "reqwest", + "reqwest 0.11.26", "rmp-serde", "rmpv", "roaring", "rstest", "rumqttc", "seahash", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde-toml-merge", "serde_bytes", "serde_json", "serde_with 3.8.1", "serde_yaml 0.9.34+deprecated", - "sha2", "similar-asserts", "smallvec", "smpl_jwt", @@ -10272,7 +10585,7 @@ dependencies = [ "tokio-tungstenite 0.20.1", "tokio-util", "toml", - "tonic", + "tonic 0.10.2", "tonic-build 0.10.2", "tower", "tower-http", @@ -10301,11 +10614,11 @@ version = "0.1.2" dependencies = [ "anyhow", "chrono", - "clap 4.5.4", + "clap", "futures 0.3.30", "graphql_client", "indoc", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "tokio", @@ -10324,7 +10637,7 @@ dependencies = [ "async-trait", "bytecheck", "bytes 1.6.0", - "clap 4.5.4", + "clap", "crc32fast", "criterion", "crossbeam-queue", @@ -10427,11 +10740,11 @@ dependencies = [ "convert_case 0.6.0", "darling 0.20.8", "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "serde", "serde_json", - "syn 2.0.60", + "syn 2.0.66", "tracing 0.1.40", ] @@ -10440,11 +10753,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "serde", "serde_derive_internals", - "syn 2.0.60", + "syn 2.0.66", "vector-config", "vector-config-common", ] @@ -10489,9 +10802,9 @@ dependencies = [ "parking_lot", "pin-project", "proptest", - "prost 0.12.4", - "prost-build 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", "quanta 0.12.3", "quickcheck", "quickcheck_macros", @@ -10515,7 +10828,7 @@ dependencies = [ "tokio-test", "tokio-util", "toml", - "tonic", + "tonic 0.10.2", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -10584,7 +10897,7 @@ dependencies = [ name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.5.4", + "clap", "vector-vrl-functions", "vrl", ] @@ -10603,7 +10916,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.5.4", + "clap", "enrichment", "glob", "prettydiff", @@ -10622,7 +10935,7 @@ version = "0.1.0" dependencies = [ "cargo_toml", "enrichment", - "getrandom 0.2.14", + "getrandom 0.2.15", "gloo-utils", "serde", "serde-wasm-bindgen", @@ -10645,9 +10958,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cfcc99d9936dc2a8645f049122a5c5d137b066d0ffc48f01203ab2f102ed62" +checksum = "6a714e10e3f6bac2ef76935b9281cc7434cc6f85f6ddab644383454555b63346" dependencies = [ "aes", "ansi_term", @@ -10664,7 +10977,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.5.4", + "clap", "codespan-reporting", "community-id", "crypto_secretbox", @@ -10673,6 +10986,7 @@ dependencies = [ "data-encoding", "digest", "dns-lookup", + "domain", "dyn-clone", "exitcode", "flate2", @@ -10684,7 +10998,7 @@ dependencies = [ "idna 0.5.0", "indexmap 2.2.6", "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "lalrpop", "lalrpop-util", "md-5", @@ -10701,9 +11015,11 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.12.4", + "prost 0.12.6", "prost-reflect", "psl", + "psl-types", + "publicsuffix", "quickcheck", "quoted_printable", "rand 0.8.5", @@ -10755,7 +11071,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", ] @@ -10858,9 +11174,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -10892,9 +11208,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10951,6 +11267,15 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" @@ -11286,6 +11611,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wiremock" version = "0.5.22" @@ -11318,6 +11653,18 @@ dependencies = [ "regex", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -11342,6 +11689,30 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.31" @@ -11357,9 +11728,30 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", + "synstructure", ] [[package]] @@ -11368,6 +11760,28 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +[[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + [[package]] name = "zstd" version = "0.12.4" diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 550fb341474b..9ed2bc9c6e2e 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -36,7 +36,7 @@ let pname = "vector"; - version = "0.38.0"; + version = "0.39.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,15 +45,9 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-sJgryN6/XaM1qXxv76/5RGanUpBYxIsGYGToOCXDvwA="; + hash = "sha256-S6yzh8ISIh6xzw5DwQaoZdpfmDHE9gfjlEtxIZerSak="; }; - patches = [ - # Enable LTO to bring down binary size - # Adapted from https://github.com/vectordotdev/vector/pull/20034 - ./vector-lto.patch - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -83,6 +77,9 @@ rustPlatform.buildRustPackage { # needed to dynamically link rdkafka CARGO_FEATURE_DYNAMIC_LINKING=1; + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + buildNoDefaultFeatures = true; buildFeatures = features; diff --git a/pkgs/tools/misc/vector/vector-lto.patch b/pkgs/tools/misc/vector/vector-lto.patch deleted file mode 100644 index a795c1f16d25..000000000000 --- a/pkgs/tools/misc/vector/vector-lto.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./Cargo.toml 2024-04-10 00:01:12.033806583 +0100 -+++ ./Cargo.toml 2024-04-10 00:01:48.324228125 +0100 -@@ -45,7 +45,8 @@ path = "tests/e2e/mod.rs" - # This results in roughly a 5% reduction in performance when compiling locally vs when - # compiled via the CI pipeline. - [profile.release] --debug = false # Do not include debug symbols in the executable. -+lto = true -+codegen-units = 1 - - [profile.bench] - debug = true From b4bdda60d55cc9420d4566b57fa0fdce22fab6e6 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:59:37 -0400 Subject: [PATCH 224/233] vscode-extensions.fortran-lang.linter-gfortran: init at 3.4.2024061701 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3228d1e8760b..1ec8e30e9c2e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1780,6 +1780,23 @@ let }; }; + fortran-lang.linter-gfortran = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "linter-gfortran"; + publisher = "fortran-lang"; + version = "3.4.2024061701"; + hash = "sha256-i357EzQ8cm8NPsMBbsV5ToMoBDa59Bh6ylC9tNjMY6s="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fortran-lang.linter-gfortran/changelog"; + description = "Fortran language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran"; + homepage = "https://github.com/fortran-lang/vscode-fortran-support"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { From 45037528bfd3644c3845b15241978fb259865523 Mon Sep 17 00:00:00 2001 From: networkException Date: Mon, 17 Jun 2024 22:31:42 +0200 Subject: [PATCH 225/233] ungoogled-chromium: 126.0.6478.55-1 -> 126.0.6478.61-1 https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop_13.html --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 004bd8920eb0..746cc6d6068b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-05-13"; }; ungoogled-patches = { - hash = "sha256-2Yt91vWR5SYLBTO+PIEgFswkvwxJsNpKidOwxUBgLeg="; - rev = "126.0.6478.55-1"; + hash = "sha256-vQrUQMmNSw+b9nPzP1RmkncQHasmZvnxNHjfiPoMUXo="; + rev = "126.0.6478.61-1"; }; }; - hash = "sha256-nXRzISkU37TIgV8rjO0qgnhq8uM37M6IpMoGHdsOGIM="; - version = "126.0.6478.55"; + hash = "sha256-cB2jrasrtaFWM8tpG9leuC+jUAvoU8g5977cn4r7rbw="; + version = "126.0.6478.61"; }; } From 70e7ef6eb159182ddfdcc707dbf9cf3227ff3dc0 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 16:39:43 -0400 Subject: [PATCH 226/233] vscode-extensions.vitaliymaz.vscode-svg-previewer: init at 0.7.0 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3228d1e8760b..472f5a414b7a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4573,6 +4573,23 @@ let }; }; + vitaliymaz.vscode-svg-previewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-svg-previewer"; + publisher = "vitaliymaz"; + version = "0.7.0"; + hash = "sha256-iX+Js2Pqz1gLDwrihuYtDwQG4ek7GiOhL3M0j3jHF/Y="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/vitaliymaz.vscode-svg-previewer/changelog"; + description = "Preview SVGs in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer"; + homepage = "https://github.com/vitaliymaz/vscode-svg-previewer"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; From 1340cddc2e8069e1eba82661c51088bb3dbac85b Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 17 Jun 2024 21:13:03 +0100 Subject: [PATCH 227/233] =?UTF-8?q?quickwit:=200.8.1=20=E2=86=92=200.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/search/quickwit/Cargo.lock | 58 ++++++++++++------------ pkgs/servers/search/quickwit/default.nix | 4 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/servers/search/quickwit/Cargo.lock b/pkgs/servers/search/quickwit/Cargo.lock index 5888255d9182..db5e22e698f2 100644 --- a/pkgs/servers/search/quickwit/Cargo.lock +++ b/pkgs/servers/search/quickwit/Cargo.lock @@ -5441,7 +5441,7 @@ dependencies = [ [[package]] name = "quickwit-actors" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5461,7 +5461,7 @@ dependencies = [ [[package]] name = "quickwit-aws" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "aws-config", @@ -5483,7 +5483,7 @@ dependencies = [ [[package]] name = "quickwit-cli" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5541,7 +5541,7 @@ dependencies = [ [[package]] name = "quickwit-cluster" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5570,7 +5570,7 @@ dependencies = [ [[package]] name = "quickwit-codegen" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "futures", @@ -5587,7 +5587,7 @@ dependencies = [ [[package]] name = "quickwit-codegen-example" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5614,7 +5614,7 @@ dependencies = [ [[package]] name = "quickwit-common" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-speed-limit", @@ -5652,7 +5652,7 @@ dependencies = [ [[package]] name = "quickwit-config" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes", @@ -5686,7 +5686,7 @@ dependencies = [ [[package]] name = "quickwit-control-plane" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5724,7 +5724,7 @@ dependencies = [ [[package]] name = "quickwit-datetime" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "itertools 0.12.1", @@ -5738,7 +5738,7 @@ dependencies = [ [[package]] name = "quickwit-directories" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5759,7 +5759,7 @@ dependencies = [ [[package]] name = "quickwit-doc-mapper" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "base64 0.21.7", @@ -5794,7 +5794,7 @@ dependencies = [ [[package]] name = "quickwit-index-management" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5826,7 +5826,7 @@ dependencies = [ [[package]] name = "quickwit-indexing" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "arc-swap", @@ -5891,7 +5891,7 @@ dependencies = [ [[package]] name = "quickwit-ingest" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5931,7 +5931,7 @@ dependencies = [ [[package]] name = "quickwit-integration-tests" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "quickwit-jaeger" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5998,7 +5998,7 @@ dependencies = [ [[package]] name = "quickwit-janitor" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6035,7 +6035,7 @@ dependencies = [ [[package]] name = "quickwit-lambda" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "aws_lambda_events", @@ -6075,7 +6075,7 @@ dependencies = [ [[package]] name = "quickwit-macros" -version = "0.8.1" +version = "0.8.2" dependencies = [ "proc-macro2", "quote", @@ -6084,7 +6084,7 @@ dependencies = [ [[package]] name = "quickwit-metastore" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6127,7 +6127,7 @@ dependencies = [ [[package]] name = "quickwit-opentelemetry" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6151,7 +6151,7 @@ dependencies = [ [[package]] name = "quickwit-proto" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6188,7 +6188,7 @@ dependencies = [ [[package]] name = "quickwit-query" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "base64 0.21.7", @@ -6214,7 +6214,7 @@ dependencies = [ [[package]] name = "quickwit-rest-client" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes", @@ -6238,7 +6238,7 @@ dependencies = [ [[package]] name = "quickwit-search" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -6290,7 +6290,7 @@ dependencies = [ [[package]] name = "quickwit-serve" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -6359,7 +6359,7 @@ dependencies = [ [[package]] name = "quickwit-storage" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6407,7 +6407,7 @@ dependencies = [ [[package]] name = "quickwit-telemetry" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "encoding_rs", diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index e99289b08954..ccc32cb90056 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -15,7 +15,7 @@ let pname = "quickwit"; - version = "0.8.1"; + version = "0.8.2"; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/quickwit/quickwit-ui/yarn.lock"; @@ -26,7 +26,7 @@ let owner = "quickwit-oss"; repo = pname; rev = "v${version}"; - hash = "sha256-B5U9nzXh6kj3/UnQzM3//h4hn9ippWHbeDMcMTP9XfM="; + hash = "sha256-OrCO0mCFmhYBdpr4Gps56KJJ37uuJpV6ZJHWspOScyw="; }; quickwit-ui = stdenv.mkDerivation { From a654255f86d186eb12fb282fdc873fb5ae6f07b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 21:15:32 +0000 Subject: [PATCH 228/233] python311Packages.ucsmsdk: 0.9.17 -> 0.9.18 --- pkgs/development/python-modules/ucsmsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index 56dcad45e690..667ebeca9341 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.17"; + version = "0.9.18"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Ejn99MArKZjCHsl81WSHfpWV3Kz/mBrItIa0tPVProU="; + hash = "sha256-9LCrjelxx8HxIEiSdsvtvm31XiE11Gnp0suapmo2L5Q="; }; propagatedBuildInputs = [ From 519bd3ba2763cd0785111e7677a9d0ca48ebd968 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 14:33:07 +0200 Subject: [PATCH 229/233] openvino: 2024.1.0 -> 2024.2.0 https://github.com/openvinotoolkit/openvino/compare/refs/tags/2024.1.0...2024.2.0 --- pkgs/development/libraries/openvino/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 280c1b7ef934..2e36cf208fb8 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -54,14 +54,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.1.0"; + version = "2024.2.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-OOSxXpLjmhOgKvrSO6SmY7xLhJSzGXT8w/Y4FnfwTqU="; + hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4="; }; outputs = [ From 04a04bf44a322d134f984d400b12355708250a01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 16:12:24 +0200 Subject: [PATCH 230/233] tbb_2021_5: init --- pkgs/development/libraries/tbb/2021_5.nix | 71 +++++++++++++++++++ .../libraries/tbb/gcc13-fixes-2021.5.0.patch | 13 ++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/development/libraries/tbb/2021_5.nix create mode 100644 pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch diff --git a/pkgs/development/libraries/tbb/2021_5.nix b/pkgs/development/libraries/tbb/2021_5.nix new file mode 100644 index 000000000000..3bfa9278106d --- /dev/null +++ b/pkgs/development/libraries/tbb/2021_5.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tbb"; + version = "2021.5.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w="; + }; + + nativeBuildInputs = [ + cmake + ]; + + patches = [ + # port of https://github.com/oneapi-src/oneTBB/pull/1031 + ./gcc13-fixes-2021.5.0.patch + + (fetchpatch { + # Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958) + url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch"; + hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0="; + }) + ]; + + # Disable failing test on musl + # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace test/CMakeLists.txt \ + --replace-fail 'conformance_resumable_tasks' "" + ''; + + # Fix build with modern gcc + # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" "-Wno-address" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ + # Workaround for gcc-12 ICE when using -O3 + # https://gcc.gnu.org/PR108854 + lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + + + meta = with lib; { + description = "Intel Thread Building Blocks C++ Library"; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; + longDescription = '' + Intel Threading Building Blocks offers a rich and complete approach to + expressing parallelism in a C++ program. It is a library that helps you + take advantage of multi-core processor performance without having to be a + threading expert. Intel TBB is not just a threads-replacement library. It + represents a higher-level, task-based parallelism that abstracts platform + details and threading mechanisms for scalability and performance. + ''; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tmarkus ]; + }; +} diff --git a/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch new file mode 100644 index 000000000000..28b5a0e695f7 --- /dev/null +++ b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch @@ -0,0 +1,13 @@ +diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h +index 33bc8ab4..a3d21baf 100644 +--- a/test/common/utils_assert.h ++++ b/test/common/utils_assert.h +@@ -20,6 +20,8 @@ + #include "config.h" + #include "utils_report.h" + ++#include ++ + #define REPORT_FATAL_ERROR REPORT + + namespace utils { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 676f30a31b52..f47544b67481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16866,6 +16866,7 @@ with pkgs; swiPrologWithGui = swiProlog.override { withGui = true; }; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; + tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ; tbb_2021_11 = callPackage ../development/libraries/tbb { }; # many packages still fail with latest version tbb = tbb_2020_3; From e91df802987b7c83a0462ff7e997b88ed34782a3 Mon Sep 17 00:00:00 2001 From: Matt Leon Date: Sun, 11 Feb 2024 16:02:10 -0500 Subject: [PATCH 231/233] openvino: fix aarch64 build This package was previously marked broken on aarch64. Adding scons as a native build input, blocking scons's build hooks, and removing x86-specific build options (for intel processors) seems to have fixed the build. I noticed a build error when not using the cmake build dir, so I also removed that option. Scons requires an override for python3, so that it doesn't leak the default python interpreter into the build, which means the native cpython library would always be built against the default version. Co-Authored-By: Martin Weinelt --- .../libraries/openvino/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 2e36cf208fb8..14ad6c166e55 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -5,6 +5,7 @@ , cudaSupport ? opencv.cudaSupport or false # build +, scons , addOpenGLRunpath , autoPatchelfHook , cmake @@ -25,7 +26,7 @@ , protobuf , pugixml , snappy -, tbb +, tbb_2021_5 , cudaPackages }: @@ -36,6 +37,9 @@ let stdenv = gcc12Stdenv; + # prevent scons from leaking in the default python version + scons' = scons.override { python3 = python3Packages.python; }; + tbbbind_version = "2_5"; tbbbind = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz"; @@ -78,6 +82,7 @@ stdenv.mkDerivation rec { patchelf pkg-config python + scons' shellcheck ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -91,7 +96,9 @@ stdenv.mkDerivation rec { popd ''; - dontUseCmakeBuildDir = true; + dontUseSconsCheck = true; + dontUseSconsBuild = true; + dontUseSconsInstall = true; cmakeFlags = [ "-Wno-dev" @@ -109,7 +116,7 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SAMPLES" false) # features - (cmakeBool "ENABLE_INTEL_CPU" true) + (cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -125,8 +132,6 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SYSTEM_TBB" true) ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; - autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; @@ -140,7 +145,7 @@ stdenv.mkDerivation rec { opencv.cxxdev pugixml snappy - tbb + tbb_2021_5 ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; @@ -172,8 +177,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory. - || stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } From ac00833e9a3a4a7bed247a362b632def5b3dd60a Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:18:26 -0400 Subject: [PATCH 232/233] vscode-extensions.biomejs.biome: init at 2024.5.251958 --- .../editors/vscode/extensions/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3228d1e8760b..351d5fe61b0d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -655,6 +655,27 @@ let }; }; + biomejs.biome = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "biome"; + publisher = "biomejs"; + version = "2024.5.251958"; + hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + }; + meta = { + changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; + description = "Biome LSP extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=biomejs.biome"; + homepage = "https://github.com/biomejs/biome-vscode"; + license = with lib.licenses; [ + mit + # or + asl20 + ]; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bmalehorn.vscode-fish = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-fish"; From 5abf8384ca65f56a20312aba342bb28c3d6201ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 18 Jun 2024 01:39:05 +0200 Subject: [PATCH 233/233] python312Packages.pyopenweathermap: 0.0.9 -> 0.0.10 https://github.com/freekode/pyopenweathermap/compare/f8541960571591f47d74268d400dfd0d6c9adf67...v0.0.10 --- .../python-modules/pyopenweathermap/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index f0e41e9e3b35..a683857c12bf 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system poetry-core, @@ -17,26 +16,17 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "freekode"; repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 - rev = "f8541960571591f47d74268d400dfd0d6c9adf67"; - hash = "sha256-hQotoRbTbcsDTwZ3/A4HkWi2ma3b9L0vvwH9ej8k1eE="; + rev = "refs/tags/v${version}"; + hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00="; }; - patches = [ - (fetchpatch2 { - # https://github.com/freekode/pyopenweathermap/pull/3 - name = "pytest-network-mark.patch"; - url = "https://github.com/freekode/pyopenweathermap/commit/580ce4317fdffb267fc9122c3c2f8355f1178502.patch"; - hash = "sha256-dHopNTVO1sZgcMUYE1GrrMjbkwSFxNELIfXe2SyQrhw="; - }) - ]; - build-system = [ poetry-core ]; dependencies = [ aiohttp ];