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

Merge staging-next into staging

parents c3de7a6a a7607a0d

pkgs/applications/editors/vim/plugins/aliases.nix

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ mapAliases ( 
    easymotion = vim-easymotion;

    echodoc = echodoc-vim;

    eighties = vim-eighties;

    ethersync = teamtype;

    ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31

    extradite = vim-extradite;

    feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09

    fugitive = vim-fugitive;

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

+3 −3
Original line number Diff line number Diff line
@@ -498,13 +498,13 @@ 
    "vendorHash": "sha256-Nxw5C4li2kH6MAlyaqHAUL+XYyuVPZYSkQ6PnmL3sV8="

  },

  "hashicorp_awscc": {

    "hash": "sha256-SrJQG1F9V/HThL6TDduT/qEA2x3tzII56+JMVDFpqEk=",

    "hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",

    "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",

    "owner": "hashicorp",

    "repo": "terraform-provider-awscc",

    "rev": "v1.61.0",

    "rev": "v1.62.0",

    "spdx": "MPL-2.0",

    "vendorHash": "sha256-WKshejs/cOtCGpMLxrnzRV+eKDPkPWIjK2nvwDodoDk="

    "vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk="

  },

  "hashicorp_azuread": {

    "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",

pkgs/by-name/br/brltty/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY=";

  };



  depsBuildBuild = [ pkg-config ];

  nativeBuildInputs = [

    pkg-config

    python3.pkgs.cython

    python3.pkgs.setuptools

    tcl # One of build scripts require tclsh

pkgs/applications/emulators/dosbox/default.nix→pkgs/by-name/do/dosbox/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 
    autoreconfHook

    copyDesktopItems

    graphicsmagick

    SDL # for sdl-config during build time

    SDL

  ];



  depsBuildBuild = [

pkgs/by-name/ha/hal-hardware-analyzer/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  cmake,

  fetchFromGitHub,

  graphviz,

  igraph,

  igraph_0, # https://github.com/emsec/hal/issues/623

  llvmPackages,

  ninja,

  nlohmann_json,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 
    libsForQt5.qtsvg

    boost

    rapidjson

    igraph

    igraph_0

    nlohmann_json

    spdlog

    graphviz