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

Merge staging-next into staging

parents 48449559 3f441b1a

pkgs/applications/editors/vscode/extensions/visualjj.visualjj/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-cuCxSODDNf2nhiUwgQT5SRugRLYOhq3igsvgP/hzcZE=";

          hash = "sha256-HbaB0WnWNOxooZDuAFbpCZi3EDrqUzDAEPovfN670hk=";

        };

        "x86_64-darwin" = {

          arch = "darwin-x64";

          hash = "sha256-OQqw/f2gSmFLN9CDn/auxXY6ao/XieAY7XVcI/kf1TA=";

          hash = "sha256-K+I36W1y31WG9JNd25L4AbxsIqS6zWrrgQVUAd+BEqY=";

        };

        "aarch64-linux" = {

          arch = "linux-arm64";

          hash = "sha256-qMWJS/4afJkSENk+BdaPPAynjEMErT2jjeFAkOSMfZ4=";

          hash = "sha256-AMTgCdUwe0ba6tuWj+GEtkcV/x0TCjXNVlrujoQ+Pe4=";

        };

        "aarch64-darwin" = {

          arch = "darwin-arm64";

          hash = "sha256-cj6cu/uSHflJHKub4LKaqPOMc7EC3Hlzxp7DfDpi9hU=";

          hash = "sha256-x0zki117HMP9M3pNeN4FVIzyIcTJIe3MO0GFsK0J8BY=";

        };

      };

    in

    {

      name = "visualjj";

      publisher = "visualjj";

      version = "0.16.4";

      version = "0.16.6";

    }

    // sources.${stdenvNoCC.hostPlatform.system}

      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

pkgs/applications/misc/organicmaps/default.nix

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

stdenv.mkDerivation (finalAttrs: {

  pname = "organicmaps";

  version = "2025.09.01-6";

  version = "2025.09.25-5";



  src = fetchFromGitHub {

    owner = "organicmaps";

    repo = "organicmaps";

    tag = "${finalAttrs.version}-android";

    hash = "sha256-wxJgfvZvksW/U3ZC7/apRHQTcGvfdi8mYTPCzT8FM3U=";

    hash = "sha256-WRr4zLlzGiFnTDuqr+gpnE92f/BZY/c0Ij6x40Rr1LM=";

    fetchSubmodules = true;

  };

pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix

+397 −397

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ rec { 
  thunderbird = thunderbird-latest;



  thunderbird-latest = common {

    version = "143.0";

    sha512 = "128fb1ed35561cceb847b09c881968b474c9fc2cf7bf027f20c2d5b03366116e058b471f98cad4606a720f65d99c60ed3b4301b9e57b5971001adb3e00a51cc5";

    version = "143.0.1";

    sha512 = "5f4fd5e4f5bc9fee9852d51b8e675f7c9c605660332c24aa0c90e5437301b468153c1788720bc80a53cfc1c3bf95a4bdb622a0533b8f11fb9853b290485c47c6";



    updateScript = callPackage ./update.nix {

      attrPath = "thunderbirdPackages.thunderbird-latest";

pkgs/applications/virtualization/docker/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ let 
      });



      docker-tini = tini.overrideAttrs {

        pname = "docker-init";

        pname = "docker-tini";

        inherit version;



        src = fetchFromGitHub {

          owner = "krallin";

          repo = "tini";

          tag = tiniRev;

          rev = tiniRev;

          hash = tiniHash;

        };
@@ -401,8 +401,8 @@ in 
      runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";

      containerdRev = "v1.7.27";

      containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps=";

      tiniRev = "v0.19.0";

      tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";

      tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";

      tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";

    };



  docker_28 =
@@ -419,8 +419,8 @@ in 
      runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY=";

      containerdRev = "v1.7.28";

      containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s=";

      tiniRev = "v0.19.0";

      tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";

      tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";

      tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";

    };



}