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

Merge master into staging-next

parents 63482836 5d361f1d
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -5072,6 +5072,18 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };
  evergarden-nvim = buildVimPlugin {
    pname = "nvim";
    version = "0-unstable-2026-01-11";
    src = fetchgit {
      url = "https://codeberg.org/evergarden/nvim";
      rev = "124f7d142ed328fe413888b10ae39d94ee695560";
      hash = "sha256-TeWsXdiCbNCFWMgCixDIu2yQ7R8uTWVScben6rOPsx8=";
    };
    meta.homepage = "https://codeberg.org/everviolet/nvim";
    meta.hydraPlatforms = [ ];
  };
  executor-nvim = buildVimPlugin {
    pname = "executor.nvim";
    version = "0-unstable-2025-08-15";
+8 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,14 @@ assertNoAdditions {
    '';
  };

  evergarden-nvim = super.evergarden-nvim.overrideAttrs {
    # optional modules
    nvimSkipModules = [
      "evergarden.extras"
      "minidoc"
    ];
  };

  executor-nvim = super.executor-nvim.overrideAttrs {
    dependencies = [ self.nui-nvim ];
  };
+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "palemoon-bin";
  version = "33.9.1";
  version = "34.0.0";

  src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";

@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
      {
        gtk3 = fetchzip {
          urls = urlRegionVariants "gtk3";
          hash = "sha256-muFqS3NpYX0Walhd+RFIZh7pUKQ5ZbPMZJasm9+rqTE=";
          hash = "sha256-TC/Lmn/be2RR0De3DgIo9zWm0IumlOju+CuMCJ8Rggs=";
        };
        gtk2 = fetchzip {
          urls = urlRegionVariants "gtk2";
          hash = "sha256-lRFXpv+dp3ALVSiEDwE4kiaVjBX5XuVZeugEr+St53I=";
          hash = "sha256-LGZP1sVS0LYZmHE9l68RPa/BOew5bgCDqyxXs0BYLjw=";
        };
      };

+2 −2
Original line number Diff line number Diff line
@@ -1247,11 +1247,11 @@
    "vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8="
  },
  "spotinst_spotinst": {
    "hash": "sha256-1Ws1qEeoU4hWSOs59cymDIT1zQHUlr1QpjBToK3OEdw=",
    "hash": "sha256-0KjAzRrPsjBh1SadyKT4KTLvF7+cl5Hq5mWbv6uHNaA=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
    "rev": "v1.232.0",
    "rev": "v1.232.1",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE="
  },
+3 −3
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@
}:

stdenv.mkDerivation rec {
  pname = "airstrike-pre";
  version = "6a";
  pname = "airstrike";
  version = "pre6a";

  src = fetchurl {
    url = "https://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz";
    url = "https://icculus.org/airstrike/airstrike-${version}-src.tar.gz";
    sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi";
  };

Loading