Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -10,6 +10,10 @@ let
|
||||
mkKeyValue = lib.generators.mkKeyValueDefault { } " ";
|
||||
listsAsDuplicateKeys = true;
|
||||
};
|
||||
assertKey = key: {
|
||||
assertion = cfg.settings ? ${key};
|
||||
message = "Please set services.gonic.settings.${key}. See https://github.com/sentriz/gonic#configuration-options for supported values.";
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -29,6 +33,7 @@ in
|
||||
example = {
|
||||
music-path = [ "/mnt/music" ];
|
||||
podcast-path = "/mnt/podcasts";
|
||||
playlists-path = "/mnt/playlists";
|
||||
};
|
||||
description = ''
|
||||
Configuration for Gonic, see <https://github.com/sentriz/gonic#configuration-options> for supported values.
|
||||
@@ -39,6 +44,12 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
(assertKey "music-path")
|
||||
(assertKey "podcast-path")
|
||||
(assertKey "playlists-path")
|
||||
];
|
||||
|
||||
systemd.services.gonic = {
|
||||
description = "Gonic Media Server";
|
||||
after = [ "network.target" ];
|
||||
@@ -62,6 +73,7 @@ in
|
||||
BindPaths = [
|
||||
cfg.settings.playlists-path
|
||||
cfg.settings.podcast-path
|
||||
cfg.settings.cache-path
|
||||
];
|
||||
BindReadOnlyPaths = [
|
||||
# gonic can access scrobbling services
|
||||
@@ -94,7 +106,6 @@ in
|
||||
];
|
||||
RestrictRealtime = true;
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
UMask = "0066";
|
||||
ProtectHostname = true;
|
||||
};
|
||||
|
||||
@@ -5633,6 +5633,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gdscript-extended-lsp-nvim = buildVimPlugin {
|
||||
pname = "gdscript-extended-lsp.nvim";
|
||||
version = "2025-10-28";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Teatek";
|
||||
repo = "gdscript-extended-lsp.nvim";
|
||||
rev = "27eab5f4979b759368a7760d6955fb93f147e97e";
|
||||
sha256 = "1jilxsz49w720ai41zksvap6bsib347bz9xh0x8b0izcpmsdjc80";
|
||||
};
|
||||
meta.homepage = "https://github.com/Teatek/gdscript-extended-lsp.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
gen-nvim = buildVimPlugin {
|
||||
pname = "gen.nvim";
|
||||
version = "2025-05-03";
|
||||
|
||||
@@ -431,6 +431,7 @@ https://github.com/gfanto/fzf-lsp.nvim/,,
|
||||
https://github.com/junegunn/fzf.vim/,,
|
||||
https://github.com/NTBBloodbath/galaxyline.nvim/,,
|
||||
https://github.com/gbprod/nord.nvim/,,gbprod-nord
|
||||
https://github.com/Teatek/gdscript-extended-lsp.nvim/,HEAD,
|
||||
https://github.com/David-Kunz/gen.nvim/,HEAD,
|
||||
https://github.com/jsfaint/gen_tags.vim/,,
|
||||
https://github.com/gentoo/gentoo-syntax/,,
|
||||
|
||||
@@ -4514,8 +4514,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "tabnine-vscode";
|
||||
publisher = "tabnine";
|
||||
version = "3.321.0";
|
||||
hash = "sha256-GIszVwrS0brC+3jT+48zUa0E2Q+DUau/WuoOfRDobb8=";
|
||||
version = "3.324.0";
|
||||
hash = "sha256-W1+TCXUmuTCb+IZZk3n6dyIDfVbMuU3jJUOsfrdjoXo=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "genesis-plus-gx";
|
||||
version = "0-unstable-2025-10-23";
|
||||
version = "0-unstable-2025-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "Genesis-Plus-GX";
|
||||
rev = "cecccacf767b1c8e86af3e315223b052a7f81b95";
|
||||
hash = "sha256-x2ClmCtWIF9HS8Yb+8cNm9MSxwcwSm05G+hZGWBz2OY=";
|
||||
rev = "180bed8e35fc48827f087926c4770f9ccdeaad0c";
|
||||
hash = "sha256-7RfO2GdsMZ/9VZ0cK2pl/s+kOUyUBbqTSDVzn1icN6k=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildLua {
|
||||
pname = "visualizer";
|
||||
version = "0-unstable-2025-04-12";
|
||||
version = "0-unstable-2025-11-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfcc64";
|
||||
repo = "mpv-scripts";
|
||||
rev = "bf6776f5c3dae8d83ba29b820496af89dc436613";
|
||||
sha256 = "9ApUBXjH4TKPP4P/fUXSNYbJu2AH6HBYt+1K+sHB7yE=";
|
||||
rev = "fd73f95c6b642366adf1df8dd4ff998d89d2e13e";
|
||||
sha256 = "+4QV1f+8YffevXNYETHDl4Rwb5cDx+YBbaDk7MscHEU=";
|
||||
};
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bash-pinyin-completion-rs";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "bash-pinyin-completion-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XmxJYzDnA/7v/U3fFzNd2BQu43q6zYGSk/tJ0I6aKBo=";
|
||||
hash = "sha256-fqrKaz46TYUYA2rcpChvFYZLISsxsMuxwWvbp2E4abU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -37,14 +37,14 @@ with py.pkgs;
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.490";
|
||||
version = "3.2.492";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = version;
|
||||
hash = "sha256-QK4dPF+3F53chmN2WSDkVkrnB+XFSAKWuxqQe1M8nu8=";
|
||||
hash = "sha256-AEgNTv49IjSqTFDn8YQqu9si3uqfhO1whS5xTp9qxc4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pythonPath =
|
||||
with python3.pkgs;
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
systemd
|
||||
systemd-python
|
||||
pyinotify
|
||||
|
||||
# https://github.com/fail2ban/fail2ban/issues/3787, remove it in the next release
|
||||
|
||||
@@ -1,21 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
cacert,
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
git-lfs,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "github-backup";
|
||||
version = "0.50.3";
|
||||
version = "0.51.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josegonzalez";
|
||||
repo = "python-github-backup";
|
||||
tag = version;
|
||||
hash = "sha256-MBKBY86qIM/rgvGMvE7K9x9n+zDVtoimkVGLBxCWRmI=";
|
||||
hash = "sha256-XqQw2Qu5b5Gdna8krwvkYsTPbM5p1gUBV2P7JLypqVU=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -32,8 +34,13 @@ python3Packages.buildPythonApplication rec {
|
||||
])
|
||||
];
|
||||
|
||||
# has no unit tests
|
||||
doCheck = false;
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
versionCheckKeepEnvironment = [ "SSL_CERT_FILE" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Backup a github user or organization";
|
||||
|
||||
@@ -20,20 +20,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gonic";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sentriz";
|
||||
repo = "gonic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qWUADZntJg8722Kxt3z1cwIOTcjxS0PYC0RHzselkdI=";
|
||||
sha256 = "sha256-la3xBECo4zZfkp5BlXuUzFEUGtxMl8ZAQdwgjFXIuSM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
taglib
|
||||
zlib
|
||||
];
|
||||
vendorHash = "sha256-HY+57SJsz/kPxSadjFl4LQ1Jlu3A5I+rpih67cMMGHA=";
|
||||
vendorHash = "sha256-HrYS7c0MtiOYRyiSg7eLbiSIUkHeRikJ0Rwf4EoZIsQ=";
|
||||
|
||||
# TODO(Profpatsch): write a test for transcoding support,
|
||||
# since it is prone to break
|
||||
|
||||
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [ systemd ];
|
||||
dependencies = with python3Packages; [ systemd-python ];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ python3Packages.buildPythonApplication rec {
|
||||
authlib
|
||||
];
|
||||
systemd = [
|
||||
systemd
|
||||
systemd-python
|
||||
];
|
||||
url-preview = [
|
||||
lxml
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"postgres"
|
||||
"url-preview"
|
||||
]
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd) "systemd",
|
||||
++ lib.optional (lib.meta.availableOn stdenv.hostPlatform matrix-synapse-unwrapped.python.pkgs.systemd-python) "systemd",
|
||||
plugins ? [ ],
|
||||
}:
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pyatspi
|
||||
pycairo
|
||||
pygobject3
|
||||
systemd
|
||||
systemd-python
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ dconf ];
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
pythonPath = python3.withPackages (ps: [
|
||||
ps.dbus-python
|
||||
ps.pygobject3
|
||||
ps.systemd
|
||||
ps.systemd-python
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -48,7 +48,7 @@ pypkgs.buildPythonApplication rec {
|
||||
sourceRoot = "${src.name}/py-kms";
|
||||
|
||||
propagatedBuildInputs = with pypkgs; [
|
||||
systemd
|
||||
systemd-python
|
||||
pytz
|
||||
tzlocal
|
||||
dnspython
|
||||
|
||||
@@ -43,12 +43,12 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rabbitmq-server";
|
||||
version = "4.1.4";
|
||||
version = "4.2.0";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-dqNdrbXSysYUMN+6gMMb9GXKER/mOGXgW6j3iOLHNks=";
|
||||
hash = "sha256-zmPo6+z+elyjROLphqw7HxrYzCP83n3//qMzMML1fDw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.16.29";
|
||||
version = "3.16.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-y4JK99EDlDdRgOJj6NkiafVDab6umWJCjupKm9Leekk=";
|
||||
hash = "sha256-9L4jyN+ByqdjpsymZW+W56IV3D1mi63D9hm4bcltlfI=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "terragrunt";
|
||||
version = "0.93.0";
|
||||
version = "0.93.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wi5Ff2wYPMgMMHZAJlq1v/UHjnRyNFbAy3IUYA+T5yI=";
|
||||
hash = "sha256-E+NV3snA02fHDVadjQACdt6RNndjWDAcxChGxf/+/M4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: {
|
||||
make generate-mocks
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-GLdUM5vlLO6B8ZCGiBAz5L32Wzr9eeYZxPtUc9MkjhE=";
|
||||
vendorHash = "sha256-nUiXlkJKFiKlZkXoMfwysedyX0//GtNVB/fyR3sBWEU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
python,
|
||||
rpm,
|
||||
sphinx,
|
||||
systemd,
|
||||
systemd-python,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -68,7 +68,7 @@ buildPythonPackage rec {
|
||||
libcomps
|
||||
libdnf
|
||||
rpm
|
||||
systemd
|
||||
systemd-python
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metakernel";
|
||||
version = "0.30.3";
|
||||
version = "0.30.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nryNTYciAq16xkpW4HIm2NPFzkW1tCDQQB9UfHUKR10=";
|
||||
hash = "sha256-SIWPiGMNsEcPIkcT0HY4/9QRt1wxPwYxZGLUOjywgug=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchPypi,
|
||||
isPy3k,
|
||||
pkg-config,
|
||||
systemd,
|
||||
libyaml,
|
||||
openzwave,
|
||||
cython,
|
||||
@@ -30,7 +29,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
systemd
|
||||
libyaml
|
||||
openzwave
|
||||
cython
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rectangle-packer";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Penlect";
|
||||
repo = "rectangle-packer";
|
||||
rev = version;
|
||||
hash = "sha256-Tm1ZkWTecmQDGsTOa1AP2GtjdxVgxklLIYSBlTSfSiY=";
|
||||
hash = "sha256-BHFy88yrcfDRalvrzwUHseSKmQXIM70ginnd+W6LVLY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
pytest-postgresql,
|
||||
pytz,
|
||||
requests-mock,
|
||||
systemd,
|
||||
systemd-python,
|
||||
types-deprecated,
|
||||
types-psycopg2,
|
||||
types-pytz,
|
||||
@@ -90,7 +90,7 @@ buildPythonPackage rec {
|
||||
pytest-postgresql
|
||||
pytz
|
||||
requests-mock
|
||||
systemd
|
||||
systemd-python
|
||||
types-deprecated
|
||||
types-psycopg2
|
||||
types-pytz
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
pytest-postgresql,
|
||||
requests-mock,
|
||||
requests-toolbelt,
|
||||
systemd,
|
||||
systemd-python,
|
||||
types-python-dateutil,
|
||||
types-pyyaml,
|
||||
types-requests,
|
||||
@@ -96,7 +96,7 @@ buildPythonPackage rec {
|
||||
pytest-postgresql
|
||||
requests-mock
|
||||
requests-toolbelt
|
||||
systemd
|
||||
systemd-python
|
||||
types-python-dateutil
|
||||
types-pyyaml
|
||||
types-requests
|
||||
|
||||
+6
-3
@@ -7,20 +7,23 @@
|
||||
pkg-config,
|
||||
pytest,
|
||||
python,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "systemd";
|
||||
pname = "systemd-python";
|
||||
version = "235";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "python-systemd";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8p4m4iM/z4o6PHRQIpuSXb64tPTWGlujEYCDVLiIt2o=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ systemd ];
|
||||
@@ -445,6 +445,7 @@ mapAliases {
|
||||
subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
|
||||
supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29
|
||||
synologydsm-api = throw "'synologydsm-api' has been renamed to/replaced by 'py-synologydsm-api'"; # Converted to throw 2025-10-29
|
||||
systemd = throw "systemd was removed because it was misnamed; use systemd-python instead"; # added 2025-11-09
|
||||
sysv_ipc = throw "'sysv_ipc' has been renamed to/replaced by 'sysv-ipc'"; # Converted to throw 2025-10-29
|
||||
tensorflow-bin_2 = throw "'tensorflow-bin_2' has been renamed to/replaced by 'tensorflow-bin'"; # Converted to throw 2025-10-29
|
||||
tensorflow-build_2 = throw "'tensorflow-build_2' has been renamed to/replaced by 'tensorflow-build'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -18136,7 +18136,9 @@ self: super: with self; {
|
||||
|
||||
systembridgemodels = callPackage ../development/python-modules/systembridgemodels { };
|
||||
|
||||
systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; };
|
||||
systemd-python = callPackage ../development/python-modules/systemd-python {
|
||||
inherit (pkgs) systemd;
|
||||
};
|
||||
|
||||
systemdunitparser = callPackage ../development/python-modules/systemdunitparser { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user