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

Merge master into staging-next

parents 562c842d deb2af31
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -1256,10 +1256,6 @@ let

      dendron.dendron = callPackage ./dendron.dendron { };

      dendron.dendron-markdown-preview-enhanced =
        callPackage ./dendron.dendron-markdown-preview-enhanced
          { };

      dendron.dendron-paste-image = callPackage ./dendron.dendron-paste-image { };

      dendron.dendron-snippet-maker = callPackage ./dendron.dendron-snippet-maker { };
@@ -5526,6 +5522,7 @@ let
    _2gua = throw "_2gua is deprecated in favor of 2gua"; # Added 2024-05-29
    _4ops = throw "_4ops is deprecated in favor of 4ops"; # Added 2024-05-29
    Arjun.swagger-viewer = throw "Arjun.swagger-viewer is deprecated in favor of arjun.swagger-viewer"; # Added 2024-05-29
    dendron.dendron-markdown-preview-enhanced = throw "dendron.dendron-markdown-preview-enhanced has been removed from the VSCode marketplace."; # Added 2025-08-21
    equinusocio.vsc-material-theme = throw "'equinusocio.vsc-material-theme' has been removed due to security concerns. The extension contained potentially malicious code and was taken down."; # Added 2025-02-28
    equinusocio.vsc-material-theme-icons = throw "'equinusocio.vsc-material-theme-icons' has been removed due to security concerns. The extension contained potentially malicious code and was taken down."; # Added 2025-02-28
    jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29
+0 −17
Original line number Diff line number Diff line
{ lib, vscode-utils }:

vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "dendron-markdown-preview-enhanced";
    publisher = "dendron";
    version = "0.10.57";
    hash = "sha256-uJmdsC+nKCkAJVH+szNepPcyfHD4ZQ83on195jjqZig=";
  };
  meta = {
    description = "SUPER POWERFUL markdown extension for Visual Studio Code to bring you a wonderful markdown writing experience";
    downloadPage = "https://marketplace.visualstudio.com/items?itemName=dendron.dendron-markdown-preview-enhanced";
    homepage = "https://github.com/dendronhq/markdown-preview-enhanced";
    license = lib.licenses.ncsa;
    maintainers = [ lib.maintainers.ivyfanchiang ];
  };
}
+5 −1
Original line number Diff line number Diff line
@@ -41,10 +41,14 @@ rustPlatform.buildRustPackage rec {
  buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic";

  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd easytier \
    installShellCompletion --cmd easytier-cli \
      --bash <($out/bin/easytier-cli gen-autocomplete bash) \
      --fish <($out/bin/easytier-cli gen-autocomplete fish) \
      --zsh <($out/bin/easytier-cli gen-autocomplete zsh)
    installShellCompletion --cmd easytier-core \
      --bash <($out/bin/easytier-core --gen-autocomplete bash) \
      --fish <($out/bin/easytier-core --gen-autocomplete fish) \
      --zsh <($out/bin/easytier-core --gen-autocomplete zsh)
  '';

  doCheck = false; # tests failed due to heavy rely on network
+2 −2
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch";
  version = "2.52.0";
  version = "2.53.0";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    tag = finalAttrs.version;
    hash = "sha256-Zylq4Ae1Ut2iB4qOnOtGkjDjuPxRyr221FVzOx3kdIE=";
    hash = "sha256-Cq6Nq7UpeW7MFi6VjsWmU2M3FjzDiAyhwnl4yTQFRnA=";
  };

  outputs = [
+4 −1
Original line number Diff line number Diff line
{
  lib,
  fetchFromGitHub,
  unstableGitUpdater,
  python3,
  git,
  git-filter-repo,
@@ -8,7 +9,7 @@

python3.pkgs.buildPythonApplication {
  pname = "git-relevant-history";
  version = "2022-09-15";
  version = "1.0.0-unstable-2022-09-15";
  format = "setuptools";
  src = fetchFromGitHub {
    owner = "rainlabs-eu";
@@ -22,6 +23,8 @@ python3.pkgs.buildPythonApplication {
    python3.pkgs.docopt
  ];

  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };

  meta = with lib; {
    description = "Extract only relevant history from git repo";
    homepage = "https://github.com/rainlabs-eu/git-relevant-history";
Loading