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

Merge master into staging-nixos

parents 105c0e48 54616974
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ let
    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.5/android-studio-panda4-rc1-linux.tar.gz";
  };
  latestVersion = {
    version = "2026.1.1.1"; # "Android Studio Quail 1 | 2026.1.1 Canary 1"
    sha256Hash = "sha256-Nr7V6B4sEZrcwkMdKoevLEkyIHawxUx/ejN0nBL4KW0=";
    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.1/android-studio-quail1-canary1-linux.tar.gz";
    version = "2026.1.1.2"; # "Android Studio Quail 1 | 2026.1.1 Canary 2"
    sha256Hash = "sha256-jdbxyK7V4EJI5sCk31oo77lH6uXTM0QjljUgWn5Bl3M=";
    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.2/android-studio-quail1-canary2-linux.tar.gz";
  };
in
{
+3 −3
Original line number Diff line number Diff line
@@ -1481,13 +1481,13 @@
    "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
  },
  "vultr_vultr": {
    "hash": "sha256-/lKhEoRNBsiQ2fTNaDFApSXgQp+jjtp8gLYRsKqzPv8=",
    "hash": "sha256-gw4Eo4wrBDAycQyN7xGHe/w1VazTSgtIcAlBBrePrgs=",
    "homepage": "https://registry.terraform.io/providers/vultr/vultr",
    "owner": "vultr",
    "repo": "terraform-provider-vultr",
    "rev": "v2.30.1",
    "rev": "v2.31.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-JIv3xfK3Pda/Y1IvTHR/Ypi9b51SOA9n3xVtxOkDMMo="
    "vendorHash": "sha256-bKf0QittBRoEbuz0JvmcyCyus1wPP3pacuYmq2RLV08="
  },
  "wgebis_mailgun": {
    "hash": "sha256-Li4eyqZ6huO5Q+XTcQ+HQCg8IOjhxGU9Z4Uw3TbMdAc=",
+265 −265

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@

ocamlPackages.buildDunePackage rec {
  pname = "anders";
  version = "1.1.1";
  version = "5.0.0";

  duneVersion = "3";

@@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
    owner = "groupoid";
    repo = "anders";
    tag = version;
    sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4=";
    sha256 = "sha256-8T/+faVsmgghjxC4SkXQ5B6KDuhVO9NdwMvu7UDlk/0=";
  };

  strictDeps = true;
+3 −3
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
  pname = "astro-language-server";
  version = "2.16.6";
  version = "2.16.7";

  src = fetchFromGitHub {
    owner = "withastro";
    repo = "astro";
    tag = "@astrojs/language-server@${finalAttrs.version}";
    hash = "sha256-xuAkfTVF+do7Tmk6LUOFkS7yunhVRkl+ZGpsOC7Ob4M=";
    hash = "sha256-0UkbHGOvMJxY4RXVLx9T8oh2cnuwziEuwUfFrls4Wc0=";
  };

  # https://pnpm.io/filtering#--filter-package_name-1
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
      ;
    pnpm = pnpm_10;
    fetcherVersion = 2;
    hash = "sha256-+5S/VuZjP6LoWUPKF1NMhw317AFAJUgaY7/Tq0ZKouw=";
    hash = "sha256-DFoIq5+cKqnmWLJ6CHhfdQEAGjvpu72qb1CSWaExODI=";
  };

  nativeBuildInputs = [
Loading