Commit 16c0f125 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

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

Conflicts:
- pkgs/build-support/build-mozilla-mach/default.nix
parents 892647f3 de2d647f

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

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

    name = "claude-code";

    publisher = "anthropic";

    version = "2.0.34";

    hash = "sha256-e+pjuGY0xrg43+pDDkQ4Svb1yBx2Fv+Z8WZoJv/k6D4=";

    version = "2.0.35";

    hash = "sha256-1wN82mZk3zCGGFQ8FNwLFm1793U8GEC8p46BJiPNaUo=";

  };



  meta = {

pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

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

    name = "claude-dev";

    publisher = "saoudrizwan";

    version = "3.35.0";

    hash = "sha256-fPoSrpWHfDEGLbawTVV65MAQAXWUy6WTb7ijhKaoLvc=";

    version = "3.36.1";

    hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g=";

  };



  meta = {

pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
buildMozillaMach rec {

  pname = "firefox-beta";

  binaryName = "firefox-beta";

  version = "144.0b9";

  version = "145.0b9";

  applicationName = "Firefox Beta";

  src = fetchurl {

    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7";

    sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769";

  };



  meta = {

pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
buildMozillaMach rec {

  pname = "firefox-devedition";

  binaryName = "firefox-devedition";

  version = "144.0b9";

  version = "145.0b9";

  applicationName = "Firefox Developer Edition";

  requireSigning = false;

  branding = "browser/branding/aurora";

  src = fetchurl {

    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";

    sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247";

    sha512 = "36000021b8f30eb5e80ce3b2e4ae05499e8b8cbdec93ba97dfb9c8f107cbe80202a13c4923491c01c8c245fc1810bb6fc82a46a06817ab7e70a47c04385b306e";

  };



  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

pkgs/build-support/build-mozilla-mach/default.nix

+10 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ in 
  # Darwin

  apple-sdk_14,

  apple-sdk_15,

  apple-sdk_26,

  cups,

  rsync, # used when preparing .app directory
@@ -457,6 +458,7 @@ buildStdenv.mkDerivation { 
      (

        stdenv.hostPlatform.isDarwin

        && lib.versionAtLeast version "143"

        && lib.versionOlder version "145"

        && lib.versionOlder apple-sdk_15.version "15.4"

      )

      ''
@@ -547,7 +549,14 @@ buildStdenv.mkDerivation { 
    zip

  ]

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)

    (

      if lib.versionAtLeast version "145" then

        apple-sdk_26

      else if lib.versionAtLeast version "138" then

        apple-sdk_15

      else

        apple-sdk_14

    )

    cups

  ]

  ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (