Unverified Commit b047a825 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 27c3e944 539624fb

pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -14,19 +14,19 @@ let 
    {

      x86_64-linux = {

        arch = "linux-x64";

        hash = "sha256-DeyQgxfPD7R2OjQZ99PNN7hV0Vt9jk5sw+XcM+yIURI=";

        hash = "sha256-jAQJh1JqomJDUFeb2N452ICo0azFelT8vHvEsBqXi8w=";

      };

      aarch64-linux = {

        arch = "linux-arm64";

        hash = "sha256-A8xjglh1re02mix5BpE00FNyU6Cjj01vz48lmz2acG8=";

        hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY=";

      };

      x86_64-darwin = {

        arch = "darwin-x64";

        hash = "sha256-mK/pLDemgmVuLAMYMEeSvi96ckHNq8ie2Y+JENtaTXA=";

        hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw=";

      };

      aarch64-darwin = {

        arch = "darwin-arm64";

        hash = "sha256-taFeZB00iBoYQULhlRHDjrj/Zm7aXYgbPiPK7xjnsYU=";

        hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA=";

      };

    }

    .${system} or (throw "Unsupported system: ${system}");
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    # Please update the corresponding binary (typos-lsp)

    # when updating this extension.

    # See pkgs/by-name/ty/typos-lsp/package.nix

    version = "0.1.45";

    version = "0.1.51";

    inherit (extInfo) hash arch;

  };

pkgs/applications/networking/cluster/terraform-providers/providers.json

+5 −5
Original line number Diff line number Diff line
@@ -526,11 +526,11 @@ 
    "vendorHash": null

  },

  "hashicorp_azurerm": {

    "hash": "sha256-3rj9YJqgys+IZjx8/pMckAYyv5yKhHdySWlCmgZy5TU=",

    "hash": "sha256-22ZxBz5ZKJzgG/HMv6kce5NosPtmYPk46R7pu3Ss4OA=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",

    "owner": "hashicorp",

    "repo": "terraform-provider-azurerm",

    "rev": "v4.67.0",

    "rev": "v4.68.0",

    "spdx": "MPL-2.0",

    "vendorHash": null

  },
@@ -1274,13 +1274,13 @@ 
    "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="

  },

  "sysdiglabs_sysdig": {

    "hash": "sha256-TKdZaE3FJ3vE+wxCrqaIuON1sKW/EJAZ1YE73v23K9I=",

    "hash": "sha256-+rP7HnEF+J5NjwgnYEnFbSBdV/fyq7s2A0Xt4maLy7k=",

    "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",

    "owner": "sysdiglabs",

    "repo": "terraform-provider-sysdig",

    "rev": "v3.5.0",

    "rev": "v3.7.1",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="

    "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="

  },

  "tailscale_tailscale": {

    "hash": "sha256-yR65w/o/VpwKINcvz4SBybAwsphGC7A/B+baKRcIT3I=",

pkgs/by-name/ac/actool/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 
}:

python3Packages.buildPythonApplication (finalAttrs: {

  pname = "actool";

  version = "1.4.0";

  version = "1.5.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "viraptor";

    repo = "actool";

    tag = finalAttrs.version;

    hash = "sha256-WtiunUS0E6t7X+5lZqm4vZJ7C4dvFGiUKfjvHwNNtR0=";

    hash = "sha256-HWi+MM0jMfg+nPiNFa3dG3sRuSEnS84+h3s6YRcxcAs=";

  };



  build-system = with python3Packages; [

pkgs/by-name/be/beekeeper-studio/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "beekeeper-studio";

  version = "5.6.4";

  version = "5.6.5";



  src =

    let
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: { 
    fetchurl {

      url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";

      hash = selectSystem {

        x86_64-linux = "sha256-HAWT2JSM+H4iDvfFAAYTRXWszmyHnxd/iik2f0kfVoY=";

        aarch64-linux = "sha256-GZqoIVg/RGheSrbViGJF+U9becDml1TNQisZB+cqO4g=";

        x86_64-darwin = "sha256-KqW4tYrxl0fwfiLmGLyjkZHxpHm5CGE5z60Ml+X9W/A=";

        aarch64-darwin = "sha256-/Gn+64aXBfpdii/TL4rbUKL2TvibYDDIX08B3/wfOlQ=";

        x86_64-linux = "sha256-JQs/B2CkwUuVBWgn+eJCokE3wWNrQzl8nj8Rd1UcCgk=";

        aarch64-linux = "sha256-/yyXvp2x2elVUqDAzB7/jWQi2Z/7b1td8sGBD7WRPDw=";

        x86_64-darwin = "sha256-0cSsRiFCFVKMkPjUj3bC096ijZu8rAj0GObeLlpvaX8=";

        aarch64-darwin = "sha256-Mtf0xlEvFcsE7O2IgXFmOzVU7P9WKr5DhJRmf5WCU4E=";

      };

    };

pkgs/by-name/do/dosbox/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 
    SDL

  ];



  depsBuildBuild = [

  depsBuildBuild = lib.optionals (!stdenv.buildPlatform.isDarwin) [

    binutils # build calls `ar`

  ];