Unverified Commit ce44139e authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f148ad6e efc90c3e

pkgs/applications/audio/tagger/deps.nix

+0 −3
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ 
  (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; })

  (fetchNuGet { pname = "MetaBrainz.MusicBrainz.CoverArt"; version = "6.0.0"; hash = "sha256-yN+godNeB6l8ihNupq9cNe+PaYaPTngHJzwkMH9ySbE="; })

  (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; hash = "sha256-aJyLlVg6jKY2Van0hwAC5JEF/j+YtEq5ZFLkyI3scsY="; })

  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-wvudYblAZ5vOdQ/3Ssl24exAXRkhOG7KBZUjquLGo5o="; })

  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; hash = "sha256-aew8/vRyzCc7MMNHziR8tsg66EFkJC+Snst3F+a3Ehc="; })

  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.6"; hash = "sha256-7kLTos2RiNJOmxg6NcM8QieifWMHgxHgd5e+DBNQI0Q="; })

  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-oAQI/uV0G/uEFp+2yAyhILZ6hr9t+oWh9TEY646Vphk="; })

  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; hash = "sha256-5rFBJ8Fkw7+11iCG9nMVhOqPCpyVIrbUzrFQhc/2eHw="; })

  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; })

  (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; hash = "sha256-us9K5RayuZGe2fkhk/c2Qw45gKmrfvyNBvHdcOnzWj0="; })

pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  mktplcRef = {

    name = "jupyter";

    publisher = "ms-toolsai";

    version = "2024.8.0";

    hash = "sha256-aEDgIDlQfQNcyrgm7MjJjCc6aKWfBNwfKu/t43+VQZk=";

    version = "2024.8.1";

    hash = "sha256-eFInKB1xwVVJFIsXHxsuRJeLKTe3Cb8svquHJOW0P+I=";

  };



  nativeBuildInputs = [

pkgs/applications/misc/ArchiSteamFarm/default.nix

+12 −6
Original line number Diff line number Diff line
@@ -27,22 +27,28 @@ buildDotnetModule rec { 


  projectFile = "ArchiSteamFarm.sln";

  executable = "ArchiSteamFarm";



  enableParallelBuilding = false;



  useAppHost = false;

  dotnetFlags = [

    # useAppHost doesn't explicitly disable this

    "-p:UseAppHost=false"

  ];

  dotnetInstallFlags = [

    "-p:RuntimeIdentifiers="

  ]

  ;

  dotnetBuildFlags = [

    "--framework=net8.0"

  ];

  dotnetInstallFlags = dotnetBuildFlags;



  runtimeDeps = [ libkrb5 zlib openssl ];



  doCheck = true;



  preBuild = ''

  preInstall = ''

    dotnetProjectFiles=(ArchiSteamFarm)

  '';



  preInstall = ''

    # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors.

    makeWrapperArgs+=(

      --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}'
@@ -55,7 +61,7 @@ buildDotnetModule rec { 
      echo "Publishing plugin $1"

      dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \

        --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \

        -p:UseAppHost=false

        $dotnetFlags $dotnetInstallFlags

    }



    buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher

pkgs/applications/misc/pe-bear/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


stdenv.mkDerivation rec {

  pname = "pe-bear";

  version = "0.6.7.3";

  version = "0.7.0";



  src = fetchFromGitHub {

    owner = "hasherezade";

    repo = "pe-bear";

    rev = "v${version}";

    hash = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE=";

    hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk=";

    fetchSubmodules = true;

  };

pkgs/applications/networking/cluster/glooctl/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 


buildGoModule rec {

  pname = "glooctl";

  version = "1.17.6";

  version = "1.17.8";



  src = fetchFromGitHub {

    owner = "solo-io";

    repo = "gloo";

    rev = "v${version}";

    hash = "sha256-uuT/3MU9qdtdCaELkwKCLdif9MqAt2gDnwjH1LrsF8U=";

    hash = "sha256-xHAxrAhKrGyH10yOmXRUnR8iI/Bapjx1XKUfklTZKzw=";

  };



  vendorHash = "sha256-C8zzNMHA4tKIUncqUJRE3VZFJO8KEX8GbOcTvbOnmU0=";

  vendorHash = "sha256-zT6AVDYzDf+8DuPoJxu0RZ4djVIOq9dZDTHcjldE95Y=";



  subPackages = [ "projects/gloo/cli/cmd" ];