Merge master into staging-next

This commit is contained in:
github-actions[bot]
2025-01-10 06:05:08 +00:00
committed by GitHub
24 changed files with 177 additions and 151 deletions

View File

@@ -58,7 +58,7 @@ in
logFormat = mkOption {
type = types.lines;
default = ''
output file ${cfg.logDir}/access-${config.hostName}.log
output file ${cfg.logDir}/access-${lib.replaceStrings [ "/" " " ] [ "_" "_" ] config.hostName}.log
'';
defaultText = ''
output file ''${config.services.caddy.logDir}/access-''${hostName}.log

View File

@@ -41,6 +41,11 @@ import ./make-test-python.nix (
"http://localhost:8081" = { };
};
};
specialisation.multiple-hostnames.configuration = {
services.caddy.virtualHosts = {
"http://localhost:8080 http://localhost:8081" = { };
};
};
specialisation.rfc42.configuration = {
services.caddy.settings = {
apps.http.servers.default = {
@@ -70,7 +75,7 @@ import ./make-test-python.nix (
services.caddy = {
package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ];
hash = "sha256-zgMdtOJbmtRSfTlrrg8njr11in2C7OAXLB+34V23jek=";
hash = "sha256-BorJJWICgAWU7DrpDZJWifMnIYtGWldt/4S1VELwGJI=";
};
configFile = pkgs.writeText "Caddyfile" ''
{
@@ -93,6 +98,7 @@ import ./make-test-python.nix (
explicitConfigFile = "${nodes.webserver.system.build.toplevel}/specialisation/explicit-config-file";
justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload";
multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs";
multipleHostnames = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-hostnames";
rfc42Config = "${nodes.webserver.system.build.toplevel}/specialisation/rfc42";
withPluginsConfig = "${nodes.webserver.system.build.toplevel}/specialisation/with-plugins";
in
@@ -117,6 +123,13 @@ import ./make-test-python.nix (
webserver.wait_for_open_port(8080)
webserver.wait_for_open_port(8081)
with subtest("a virtual host with multiple hostnames works"):
webserver.succeed(
"${multipleHostnames}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port(8080)
webserver.wait_for_open_port(8081)
with subtest("rfc42 settings config"):
webserver.succeed(
"${rfc42Config}/bin/switch-to-configuration test >&2"

View File

@@ -2933,6 +2933,18 @@ final: prev:
meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
};
cspell-nvim = buildVimPlugin {
pname = "cspell.nvim";
version = "2024-11-21";
src = fetchFromGitHub {
owner = "davidmh";
repo = "cspell.nvim";
rev = "be04e47348c04f89614d99cf73a7ce1165a2e3ec";
sha256 = "0cwfc7zqlfpz9x4s6xxv6dadh6xxyp19f595pjp9sp9sxb21r7hj";
};
meta.homepage = "https://github.com/davidmh/cspell.nvim/";
};
csv-vim = buildVimPlugin {
pname = "csv.vim";
version = "2024-12-15";

View File

@@ -829,6 +829,13 @@ in
nvimRequireCheck = "crates";
};
cspell-nvim = super.cspell-nvim.overrideAttrs {
dependencies = with self; [
none-ls-nvim
plenary-nvim
];
};
ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs {
# drop Python 2 patches
# https://github.com/JazzCore/ctrlp-cmatcher/pull/44

View File

@@ -242,6 +242,7 @@ https://github.com/nixprime/cpsm/,,
https://github.com/saecki/crates.nvim/,,
https://github.com/godlygeek/csapprox/,,
https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
https://github.com/davidmh/cspell.nvim/,HEAD,
https://github.com/chrisbra/csv.vim/,,
https://github.com/hat0uma/csvview.nvim/,HEAD,
https://github.com/JazzCore/ctrlp-cmatcher/,,

View File

@@ -1,6 +1,5 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
@@ -12,15 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
hash = "sha256-1RjlJEmY/jMf0IYQbrWrT1CHFyiqgarOl72u9xjjQiQ=";
hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
};
cargoHash = "sha256-b7wNWdKQ4QLeCf7bNZRfzT9hD/D/oDglU7Xyb65IrGY=";
cargoHash = "sha256-07D3N1xJnrTueI+7SpQPUnCzKOLJTldyyIG2mNfJzME=";
nativeBuildInputs = [
pkg-config

View File

@@ -0,0 +1,54 @@
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "criticality-score";
version = "2.0.4";
src = fetchFromGitHub {
owner = "ossf";
repo = "criticality_score";
tag = "v${version}";
hash = "sha256-p2ZXNpPFwIKPWDKCdEUZQvt/hvLQS9xjZaaquNTaUB0=";
};
proxyVendor = true;
vendorHash = "sha256-mKCwyAE/fI9ateKcrTLDAdULbT6pUpV0cMZ0X5bqT1M=";
ldflags = [
"-s"
"-w"
"-X=main.version=${version}"
"-X=main.commit=${src.tag}"
"-X=main.date=1970-01-01T00:00:00Z"
];
subPackages = [
"cmd/collect_signals"
"cmd/criticality_score"
"cmd/csv_transfer"
"cmd/enumerate_github"
"cmd/scorer"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = [ "--version" ];
meta = {
description = "Gives criticality score for an open source project";
homepage = "https://github.com/ossf/criticality_score";
changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ wamserma ];
mainProgram = "criticality_score";
};
}

View File

@@ -45,13 +45,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.33.0";
version = "2.34.0";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
rev = finalAttrs.version;
hash = "sha256-GCUG9b98UmuC/6psDs4PNAoquEWOMz0kl/IBQXRGX5o=";
tag = finalAttrs.version;
hash = "sha256-ZTtDYUnLp8IzGluJXLCHBxHCZAXxO+akUkPOCPMdA5w=";
};
outputs = [

View File

@@ -2,30 +2,35 @@
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
pname = "mactop";
version = "0.1.9";
version = "0.2.3";
src = fetchFromGitHub {
owner = "context-labs";
repo = "mactop";
rev = "refs/tags/v${version}";
hash = "sha256-r9je+oeedQJsFBWWbOUcUls/EX0JZveUkmsXXtC8O0Q=";
tag = "v${version}";
hash = "sha256-xWUCOmNwhxmutY7G+FmxT7mabexuBIcgFzX++zsdnN4=";
};
vendorHash = "sha256-/KecVx4Gp776t8gFSO29E1q9v29nwrKIWZYCpj7IlSo=";
vendorHash = "sha256-BFvd1jJzGYsI2E6BdFy+BwHOAy7VgblcByV/oRCKORs=";
ldflags = [
"-s"
"-w"
];
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = [ "--version" ];
meta = {
description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips";
homepage = "https://github.com/context-labs/mactop";
changelog = "https://github.com/context-labs/mactop/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
changelog = "https://github.com/context-labs/mactop/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "mactop";

View File

@@ -11,7 +11,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "markdownlint-cli2";
version = "0.16.0";
version = "0.17.1";
# upstream is not interested in including package-lock.json in the source
# https://github.com/DavidAnson/markdownlint-cli2/issues/198#issuecomment-1690529976
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
# so use the tarball from the archlinux mirror
src = fetchurl {
url = "https://us.mirrors.cicku.me/archlinux/extra/os/x86_64/markdownlint-cli2-${finalAttrs.version}-1-any.pkg.tar.zst";
hash = "sha256-VkT94QS2XeUp2cJLGvK+MZnDdlqmG9szTmzv6lKyxUs=";
hash = "sha256-NdZDh0Di+relrzJzYmMb9kE9xUHe1do+9m3G4WttGlU=";
};
nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
mkdir -p $out/bin
cp -r lib share $out
makeWrapper "${lib.getExe nodejs}" "$out/bin/markdownlint-cli2" \
--add-flags "$out/lib/node_modules/markdownlint-cli2/markdownlint-cli2.js"
--add-flags "$out/lib/node_modules/markdownlint-cli2/markdownlint-cli2-bin.mjs"
runHook postInstall
'';

View File

@@ -15,16 +15,16 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.8.8";
version = "1.9.0";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
rev = "v${version}";
hash = "sha256-qH08gSQijn/o+YlMUXKdNaSY8lBk0u/pN28TBcevDvE=";
tag = "v${version}";
hash = "sha256-e0ZzbQdex0DD7Bj9WpcVI5roh0cMbJuNr5nsSVaOSu4=";
};
vendorHash = "sha256-Ijgr5XhsFM3M8f4bnMAQ691kNnQPAGQ8pHv1BCqZU3I=";
vendorHash = "sha256-fMTbLSeW+pw6GK8/JLZzG2ER90ss2g1FSDX5+f292do=";
ldflags = [
"-s"
"-w"
@@ -99,10 +99,17 @@ let
in
test;
plugins =
lib.mapAttrs
(
_: provider:
plugins = removeAttrs terraform-providers [
"override"
"overrideDerivation"
"recurseForDerivations"
];
withPlugins =
plugins:
let
actualPlugins = lib.lists.map (
provider:
if provider ? override then
# use opentofu plugin registry over terraform's
provider.override (oldArgs: {
@@ -116,19 +123,7 @@ let
})
else
provider
)
(
removeAttrs terraform-providers [
"override"
"overrideDerivation"
"recurseForDerivations"
]
);
withPlugins =
plugins:
let
actualPlugins = plugins package.plugins;
) (plugins package.plugins);
# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
wrapperInputs = lib.unique (

View File

@@ -1,35 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
pygithub,
python-gitlab,
}:
buildPythonPackage rec {
pname = "criticality_score";
version = "1.0.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-5XkVT0blnLG158a01jDfQl1Rx9U1LMsqaMjTdN7Q4QQ=";
};
propagatedBuildInputs = [
pygithub
python-gitlab
];
doCheck = false;
pythonImportsCheck = [ "criticality_score" ];
meta = with lib; {
description = "Python tool for computing the Open Source Project Criticality Score";
mainProgram = "criticality_score";
homepage = "https://github.com/ossf/criticality_score";
changelog = "https://github.com/ossf/criticality_score/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ wamserma ];
};
}

View File

@@ -1,25 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
}:
buildPythonPackage rec {
pname = "dash_renderer";
version = "1.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "73a69e3d145880e68e42723ad10182251d92b44f3efe92b8763145cfd2158e7e";
};
# No tests in archive
doCheck = false;
meta = with lib; {
description = "Renderer for the Dash framework";
homepage = "https://dash.plot.ly/";
license = licenses.mit;
maintainers = [ maintainers.antoinerg ];
};
}

View File

@@ -2,29 +2,35 @@
buildPythonPackage,
lib,
fetchFromGitHub,
setuptools,
pexpect,
}:
buildPythonPackage rec {
version = "0.1.1";
pname = "delegator.py";
pname = "delegator-py";
pyproject = true;
src = fetchFromGitHub {
owner = "amitt001";
repo = "delegator.py";
rev = "v${version}";
sha256 = "17n9h3xzjsfxmwclh33vc4yg3c9yzh9hfhaj12kv5ah3fy8rklwb";
tag = "v${version}";
hash = "sha256-i9OZkXcDqrKnCFJBBxP8PrHxPGF7DEgZr91p+fuAyZ4=";
};
propagatedBuildInputs = [ pexpect ];
build-system = [ setuptools ];
dependencies = [ pexpect ];
pythonImportsCheck = [ "delegator" ];
# no tests in github or pypi
doCheck = false;
meta = with lib; {
meta = {
description = "Subprocesses for Humans 2.0";
homepage = "https://github.com/amitt001/delegator.py";
license = licenses.mit;
license = lib.licenses.mit;
maintainers = [ ];
};
}

View File

@@ -1,12 +1,12 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,
requests,
uritemplate,
python-dateutil,
pyjwt,
pytest-xdist,
pytestCheckHook,
betamax,
betamax-matchers,
@@ -15,32 +15,16 @@
}:
buildPythonPackage rec {
pname = "github3.py";
pname = "github3-py";
version = "4.0.1";
format = "pyproject";
disabled = pythonOlder "3.6";
pyproject = true;
src = fetchPypi {
inherit pname version;
pname = "github3.py";
inherit version;
hash = "sha256-MNVxB2dT78OJ7cf5qu8zik/LJLVNiWjV85sTQvRd3TY=";
};
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
pyjwt
python-dateutil
requests
uritemplate
] ++ pyjwt.optional-dependencies.crypto;
nativeCheckInputs = [
pytestCheckHook
betamax
betamax-matchers
];
patches = [
(fetchpatch {
# disable tests with "AttributeError: 'MockHTTPResponse' object has no attribute 'close'", due to betamax
@@ -49,20 +33,29 @@ buildPythonPackage rec {
})
];
# Solves "__main__.py: error: unrecognized arguments: -nauto"
preCheck = ''
rm tox.ini
'';
build-system = [ hatchling ];
disabledTests = [
# FileNotFoundError: [Errno 2] No such file or directory: 'tests/id_rsa.pub'
"test_delete_key"
dependencies = [
pyjwt
python-dateutil
requests
uritemplate
] ++ pyjwt.optional-dependencies.crypto;
pythonImportsCheck = [ "github3" ];
nativeCheckInputs = [
pytest-xdist
pytestCheckHook
betamax
betamax-matchers
];
meta = with lib; {
meta = {
homepage = "https://github3py.readthedocs.org/en/master/";
description = "Wrapper for the GitHub API written in python";
license = licenses.bsd3;
maintainers = with maintainers; [ pSub ];
changelog = "https://github.com/sigmavirus24/github3.py/blob/${version}/docs/source/release-notes/${version}.rst";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ pSub ];
};
}

View File

@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pyflick";
version = "1.1.2";
version = "1.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ZephireNZ";
repo = "PyFlick";
tag = "v${version}";
hash = "sha256-Csm5gXMIGEhHgzN/7sO/1iM/wZklI2Jc0C69tgYWxnQ=";
hash = "sha256-JROtklRimr6I1/6+yYaDL6rNGSj7O15nI/C9ZSj6eFo=";
};
pythonRelaxDeps = [ "aiohttp" ];

View File

@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2025.1.1";
version = "2025.1.2";
components = {
"3_day_blinds" =
ps: with ps; [

View File

@@ -289,7 +289,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2025.1.1";
hassVersion = "2025.1.2";
in
python.pkgs.buildPythonApplication rec {
@@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-fiGdRXQmH+CcgnGQloktl66Yh8iiFEDCQyOL3jfXjdU=";
hash = "sha256-dEjTSByjv8+YwAcztFwCvQp+GWcS0QZxP1norxd8MmY=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-CYvi2Z1d3hbcfet08TR/jScuOKGgipTEWmno7/r5qLU=";
hash = "sha256-AO2n3t2QobFuN2IrlYcwBA4LRxsMr7B/T0dc2IWZrfg=";
};
build-system = with python.pkgs; [

View File

@@ -8,7 +8,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20250106.0";
version = "20250109.0";
format = "wheel";
src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-Jhbw/HNOInLAihHeP+Vpsvsukjf3OY32EbBayDEuU+k=";
hash = "sha256-kZmBZyiCUxODRcg8GnRUMWk+T+Lry1gdgY2yzQznFPI=";
};
# there is nothing to strip in this package

View File

@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
version = "0.13.201";
version = "0.13.202";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
rev = "refs/tags/${version}";
hash = "sha256-WWfVxLYW5V5q0huBoST3n64Fm9f69rjv8B6g96ZaFDc=";
hash = "sha256-MoOIEoJna3nROYYvMzVSV6qpQN/qoDumr3sDOrECZh4=";
};
build-system = [ setuptools ];

View File

@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2025.1.1";
version = "2025.1.2";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-9z8HX9zNzRfMTWJiHwbCpOAmYF9yfHsM/FR9siB7D/E=";
hash = "sha256-35JzLlzx7+zQ6/RLqNwlqfAKAZ/axPa7lwFc6xtQbzQ=";
};
build-system = [

View File

@@ -103,6 +103,8 @@ let
license = with licenses; [ mit ];
maintainers = with maintainers; [ bbigras ];
platforms = platforms.all;
# not compatible with bat 0.25.0
broken = true;
};
};
script =

View File

@@ -132,12 +132,14 @@ mapAliases ({
covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20
cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21
cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
criticality-score = throw "use pkgs.criticality-score instead"; # added 2024-12-31
cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
cx_Freeze = cx-freeze; # added 2023-08-02
cx_oracle = cx-oracle; # added 2024-01-03
d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01
dateutil = python-dateutil; # added 2021-07-03
debian = python-debian; # added 2024-12-10
deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09

View File

@@ -2728,8 +2728,6 @@ self: super: with self; {
credstash = callPackage ../development/python-modules/credstash { };
criticality-score = callPackage ../development/python-modules/criticality-score { };
crocoddyl = toPythonModule (pkgs.crocoddyl.override {
pythonSupport = true;
python3Packages = self;
@@ -2930,8 +2928,6 @@ self: super: with self; {
dash-html-components = callPackage ../development/python-modules/dash-html-components { };
dash-renderer = callPackage ../development/python-modules/dash-renderer { };
dash-table = callPackage ../development/python-modules/dash-table { };
dashing = callPackage ../development/python-modules/dashing { };