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

Merge master into staging-nixos

parents 93a4f988 72b0c95f

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -24531,6 +24531,12 @@ 
    githubId = 77039267;

    name = "Vito Secona";

  };

  sectore = {

    email = "sectore@gmail.com";

    github = "sectore";

    githubId = 47693;

    name = "Jens Krause";

  };

  sedlund = {

    email = "scott+nixpkgs@teraton.com";

    github = "sedlund";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ with lib.maintainers; 
    ];

    scope = "Maintain GCC (GNU Compiler Collection) compilers";

    shortName = "GCC";

    enableFeatureFreezePing = true;

  };



  geospatial = {

pkgs/applications/editors/vim/macvim.nix

+5 −1
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  callPackage,

  fetchFromGitHub,

  apple-sdk_14,

  ncurses,
@@ -24,6 +25,9 @@ let 
  ruby = ruby_3_4;

in



let

  common = callPackage ./common.nix { inherit stdenv; };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "macvim";
@@ -182,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  # macvim obj-c log macro triggers -Wformat-security (seems like a bug? it's a string literal!)

  hardeningDisable = [ "format" ];

  hardeningDisable = common.hardeningDisable ++ [ "format" ];

  # os_log also enables -Werror,-Wformat by default

  env.NIX_CFLAGS_COMPILE = "-DOS_LOG_FORMAT_WARNINGS";

pkgs/applications/emulators/libretro/cores/nxengine.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
}:

mkLibretroCore {

  core = "nxengine";

  version = "0-unstable-2026-03-31";

  version = "0-unstable-2026-04-09";



  src = fetchFromGitHub {

    owner = "libretro";

    repo = "nxengine-libretro";

    rev = "990bdaacd6ed9db735ea625c948252d0b8a2100a";

    hash = "sha256-41f2iHQi3gwla1gM2/rFvzTKhSIrJqYLZN+5f9Ylu7A=";

    rev = "a1c45fd4d045333f4ea523e556469b545be82b0a";

    hash = "sha256-v7mUr4GeNc/bOe4gQvtPns4/uLA+r7UFGavDdtBNj6E=";

  };



  makefile = "Makefile";

pkgs/applications/networking/cluster/terraform-providers/providers.json

+2 −2
Original line number Diff line number Diff line
@@ -932,11 +932,11 @@ 
    "vendorHash": "sha256-cvnxSUCiu6S5lkT9VAyn9K6lmridRb0WZyrrvMv+B48="

  },

  "namecheap_namecheap": {

    "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

    "hash": "sha256-eV2K3KHTEXEEt1WXwfYfNMK+gLUY0EoHFQg9kLdAI3s=",

    "homepage": "https://registry.terraform.io/providers/namecheap/namecheap",

    "owner": "namecheap",

    "repo": "terraform-provider-namecheap",

    "rev": "v2.2.0",

    "rev": "v2.3.2",

    "spdx": "Apache-2.0",

    "vendorHash": null

  },