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

Merge staging-next into staging

parents 0eb78d16 21731ce9

pkgs/applications/editors/vscode/extensions/continue.continue/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { 
      sources = {

        "x86_64-linux" = {

          arch = "linux-x64";

          hash = "sha256-4C8ug5B7xdd4rsmH9vsPkIerfF+tYniKn0tUk+zcNfg=";

          hash = "sha256-zcP+oV7+xpXN5ZSvxw03XborEp2i9+3r1Hbv6sFq2rM=";

        };

        "x86_64-darwin" = {

          arch = "darwin-x64";

          hash = "sha256-OCp1wNWSl/Gg2IJhVGWmM677yqRa4y4UVAC+oypziIE=";

          hash = "sha256-/nP0e3IHZtmsgTzNlJk9WOtg3jm6kpVGBaC5RMIvaII=";

        };

        "aarch64-linux" = {

          arch = "linux-arm64";

          hash = "sha256-L2WwrZy0Aw7QO8060jW9rO8Dw6Fia450vvIWeW70uyU=";

          hash = "sha256-WhIMbgMJE4FK83qmjCPobwNIzcGVU56jOw5v2Q4oIhU=";

        };

        "aarch64-darwin" = {

          arch = "darwin-arm64";

          hash = "sha256-t5h3/PoILd2/vcXIa0IK5Qx1uxNzHUdoUlRSSXK6bdw=";

          hash = "sha256-gThzjcah7MWBKVkViDWJ5Z0epxy+9aWFpcFt4KI9zzQ=";

        };

      };

    in

    {

      name = "continue";

      publisher = "Continue";

      version = "1.2.8";

      version = "1.2.9";

    }

    // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

pkgs/applications/editors/vscode/extensions/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -3766,8 +3766,8 @@ let 
        mktplcRef = {

          name = "prisma";

          publisher = "Prisma";

          version = "6.17.0";

          hash = "sha256-GaIxrtO+vXjQdDgY5BhVrZjIt8L4X03CNYGh34nbB9E=";

          version = "6.17.1";

          hash = "sha256-P+D6fQg30C2nJFv8z/+51cSk5etCvugAbRj7h7nyGd0=";

        };

        meta = {

          changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@@ -4307,8 +4307,8 @@ let 
        mktplcRef = {

          publisher = "sonarsource";

          name = "sonarlint-vscode";

          version = "4.31.0";

          hash = "sha256-Zw5Dy6VaMkt2zyEy8wZs2e92hA2j7u+moRSONHCDkgw=";

          version = "4.32.0";

          hash = "sha256-faFX58fYzJ94tkKxHkTHpyt9zBc2nxmPd6xOgO59qPc=";

        };

        meta.license = lib.licenses.lgpl3Only;

      };

pkgs/applications/graphics/ImageMagick/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -85,13 +85,13 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "imagemagick";

  version = "7.1.2-6";

  version = "7.1.2-7";



  src = fetchFromGitHub {

    owner = "ImageMagick";

    repo = "ImageMagick";

    tag = finalAttrs.version;

    hash = "sha256-eJCUryZhGn3LPkmP9JG1iVqZiy8RXARLYDZR++SeYgM=";

    hash = "sha256-9ARCYftoXiilpJoj+Y+aLCEqLmhHFYSrHfgA5DQHbGo=";

  };



  outputs = [

pkgs/by-name/am/amp-cli/package-lock.json

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  "packages": {

    "": {

      "dependencies": {

        "@sourcegraph/amp": "^0.0.1760013766-g2b1690"

        "@sourcegraph/amp": "^0.0.1760546826-g6984fa"

      }

    },

    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@ 
      }

    },

    "node_modules/@sourcegraph/amp": {

      "version": "0.0.1760013766-g2b1690",

      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1760013766-g2b1690.tgz",

      "integrity": "sha512-ih52g519nqbfUaofmyNEGh2MXLzakpofTK5jjBb9ErH1gXrh9tfxEIUANpmqtPk11swDBH0ZSdtn1Alz3rWm6w==",

      "version": "0.0.1760546826-g6984fa",

      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1760546826-g6984fa.tgz",

      "integrity": "sha512-QKtu4XFbdi+B9mmkbu64RGPO2gcCtvHFCr3pSojnBQWVMLUjVJpj51dTSNYhBs8pABmJoRA6n8TGNRyaosl7aQ==",

      "dependencies": {

        "@napi-rs/keyring": "1.1.9"

      },

pkgs/by-name/am/amp-cli/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 


buildNpmPackage (finalAttrs: {

  pname = "amp-cli";

  version = "0.0.1760013766-g2b1690";

  version = "0.0.1760546826-g6984fa";



  src = fetchzip {

    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";

    hash = "sha256-b3mq95ZFrXpqDSUbBRRbvwem16qSuhfEFhi7zNc13ZY=";

    hash = "sha256-aEUBTpQMQ2fgSfioRNXvdkKy4eLTw5XqkeSrt5T5498=";

  };



  postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { 
    chmod +x bin/amp-wrapper.js

  '';



  npmDepsHash = "sha256-uGjKSa11JGd8/EtJ+3jtCIwVJY6kfYy9cL0CFiwzVkY=";

  npmDepsHash = "sha256-/s1wZhdwvVGOJoasgBs5eCWcvSuIriWi+bfz/Np8h+Y=";



  propagatedBuildInputs = [

    ripgrep