gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-09-23 06:05:53 +00:00
committed by GitHub
parent 562c842d00 deb2af3116
commit 825dad8ff6
12 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/vscode/extensions/default.nix
+1 -4
View File
@@ -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
pkgs/applications/editors/vscode/extensions/dendron.dendron-markdown-preview-enhanced/default.nix
-17
View File
@@ -1,17 +0,0 @@
{ 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 ];
};
}
pkgs/by-name/ea/easytier/package.nix
+5 -1
View File
@@ -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
pkgs/by-name/fa/fastfetch/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/gi/git-relevant-history/package.nix
+4 -1
View File
@@ -1,6 +1,7 @@
{
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";
pkgs/by-name/li/limine/package.nix
+2 -2
View File
@@ -42,14 +42,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
version = "10.0.0";
version = "10.0.1";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
hash = "sha256-y709MUhV/SwohrKCHUW2iLAlQ/RzLxn1AeTVVo4Mf4c=";
hash = "sha256-7P8N/HomleQBnoaX6S5V7KwX1GYVIY7XkUYU9Xo9jlk=";
};
enableParallelBuilding = true;
pkgs/by-name/ll/lldap/package.nix
+36 -1
View File
@@ -10,6 +10,10 @@
wasm-bindgen-cli_0_2_100,
wasm-pack,
which,
runCommand,
cacert,
curl,
staticAssetsHash ? "sha256-xVbHD9s3ofbtHCDvjYwmsWXDEJ9z9vRxQDRR6pW6rt8=",
}:
let
@@ -29,7 +33,35 @@ let
cargoHash = "sha256-SO7+HiiXNB/KF3fjzSMeiTPjRQq/unEfsnplx4kZv9c=";
};
staticAssets =
src:
runCommand "${commonDerivationAttrs.pname}-static-assets"
{
outputHash = staticAssetsHash;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
inherit src;
nativeBuildInputs = [
curl
];
env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
}
''
mkdir $out
mkdir $out/fonts
for file in $(cat ${src}/app/static/libraries.txt); do
curl $file --location --remote-name --output-dir $out
done
for file in $(cat ${src}/app/static/fonts/fonts.txt); do
curl $file --location --remote-name --output-dir $out/fonts
done
'';
frontend = rustPlatform.buildRustPackage (
finalAttrs:
commonDerivationAttrs
// {
pname = commonDerivationAttrs.pname + "-frontend";
@@ -49,7 +81,10 @@ let
installPhase = ''
mkdir -p $out
cp -R app/{index.html,pkg,static} $out/
cp -R app/{pkg,static} $out/
cp app/index_local.html $out/index.html
cp -R ${staticAssets finalAttrs.src}/* $out/static
rm $out/static/libraries.txt $out/static/fonts/fonts.txt
'';
doCheck = false;
pkgs/by-name/mo/mozhi/package.nix
+3 -3
View File
@@ -6,14 +6,14 @@
}:
buildGoModule {
pname = "mozhi";
version = "0-unstable-2025-06-25";
version = "0-unstable-2025-09-19";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "aryak";
repo = "mozhi";
rev = "88730a992f9bfccf52b6f2a9554ed9a3db697a70";
hash = "sha256-f2cKgcZ/5A3mSRwfI7h8DsaN15oVnXrg7PejsK8eXGc=";
rev = "67f216b3fa9edb3b3ec995a4a6fb6777ea934177";
hash = "sha256-fQkOyfuBbRLvCzwv7kT1AEJUAWQshWOZDTYfp7plkag=";
};
vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A=";
pkgs/by-name/sw/switch-to-configuration-ng/src/Cargo.toml
+6
View File
@@ -5,6 +5,12 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[profile.release]
codegen-units = 1
opt-level = 3
lto = true
[dependencies]
anyhow = "1.0.82"
dbus = "0.9.7"
pkgs/by-name/tq/tqsl/package.nix
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "tqsl";
version = "2.8.1";
version = "2.8.2";
src = fetchurl {
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
sha256 = "sha256-/tHMt7TN8i7OMqpum1jCJFrxrQt3SD40ZraTryxX56Y=";
sha256 = "sha256-HH78pTeT/wW9dZggxcqRiZ3OqShU7B2uPWa4ya59LfA=";
};
nativeBuildInputs = [
pkgs/by-name/ty/typescript-go/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@ let
in
buildGoModule {
pname = "typescript-go";
version = "0-unstable-2025-09-11";
version = "0-unstable-2025-09-17";
src = fetchFromGitHub {
owner = "microsoft";
repo = "typescript-go";
rev = "4c9b8f6b7856de7e5598350424f243e6d17d73a6";
hash = "sha256-8qxq9JR+w7Dy1Mm2Y1wKDuYzRwvo5ORNZ7vdJla51EI=";
rev = "1ca5a2d97b0c2b93cfc32137c8922185b4f41df0";
hash = "sha256-g1Wc2jAlpO7voqIFvNkEF900ZZIb/nwNFL1+4ZUGU9U=";
fetchSubmodules = false;
};
pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix
+2 -2
View File
@@ -8,13 +8,13 @@
buildHomeAssistantComponent rec {
owner = "jmcollin78";
domain = "versatile_thermostat";
version = "7.3.2";
version = "7.3.4";
src = fetchFromGitHub {
inherit owner;
repo = domain;
rev = "refs/tags/${version}";
hash = "sha256-kUA9ApJsrKIqo7M9HPI3DLh+vzOwdSuDrdycUvrzhxU=";
hash = "sha256-3Aj1ZrF+36qmsq8ffS8FyveUz2cB5fhiCBsPabC5BzE=";
};
passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; };