Skip to content

Commit

Permalink
Merge branch 'release-24.11' into backport-374618-to-release-24.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@felbinger
felbinger authored Jan 17, 2025
2 parents ce28a07 + e406743 commit e6d2b90
Show file tree
Hide file tree
Showing 4,830 changed files with 7,615 additions and 6,782 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 17 additions & 0 deletions nixos/modules/services/monitoring/prometheus/exporters/frr.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@ in
{
port = 9342;
extraOpts = {
user = mkOption {
type = types.str;
default = "frr";
description = ''
User name under which the frr exporter shall be run.
The exporter talks to frr using a unix socket, which is owned by frr.
'';
};
group = mkOption {
type = types.str;
default = "frrtty";
description = ''
Group under which the frr exporter shall be run.
The exporter talks to frr using a unix socket, which is owned by frrtty group.
'';
};
enabledCollectors = mkOption {
type = types.listOf types.str;
default = [ ];
Expand All @@ -38,6 +54,7 @@ in
serviceConfig = {
DynamicUser = false;
RuntimeDirectory = "prometheus-frr-exporter";
RestrictAddressFamilies = [ "AF_UNIX" ];
ExecStart = ''
${lib.getExe pkgs.prometheus-frr-exporter} \
${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
Expand Down
5 changes: 4 additions & 1 deletion nixos/modules/services/web-apps/matomo.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,10 @@ in {
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
# check whether user setup has already been done
if test -f "${dataDir}/config/config.ini.php"; then
if test -f "${dataDir}/config/config.ini.php" &&
# since matomo-5.2.0, the config.ini.php is already created at first
# installer page access https://github.com/matomo-org/matomo/issues/22932
grep -q -F "[database]" "${dataDir}/config/config.ini.php"; then
# then execute possibly pending database upgrade
matomo-console core:update --yes
fi
Expand Down
4 changes: 3 additions & 1 deletion nixos/modules/services/web-apps/trilium.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ in
options.services.trilium-server = with lib; {
enable = mkEnableOption "trilium-server";

package = mkPackageOption pkgs "trilium-server" {};

dataDir = mkOption {
type = types.str;
default = "/var/lib/trilium";
Expand Down Expand Up @@ -117,7 +119,7 @@ in
wantedBy = [ "multi-user.target" ];
environment.TRILIUM_DATA_DIR = cfg.dataDir;
serviceConfig = {
ExecStart = "${pkgs.trilium-server}/bin/trilium-server";
ExecStart = lib.getExe cfg.package;
User = "trilium";
Group = "trilium";
PrivateTmp = "true";
Expand Down
21 changes: 7 additions & 14 deletions nixos/modules/virtualisation/hyperv-guest.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,15 @@ let
cfg = config.virtualisation.hypervGuest;

in {
imports = [
(mkRemovedOptionModule [ "virtualisation" "hypervGuest" "videoMode" ]
"The video mode can now be configured via standard tools, or in Hyper-V VM settings."
)
];

options = {
virtualisation.hypervGuest = {
enable = mkEnableOption "Hyper-V Guest Support";

videoMode = mkOption {
type = types.str;
default = "1152x864";
example = "1024x768";
description = ''
Resolution at which to initialize the video adapter.
Supports screen resolution up to Full HD 1920x1080 with 32 bit color
on Windows Server 2012, and 1600x1200 with 16 bit color on Windows
Server 2008 R2 or earlier.
'';
};
};
};

Expand All @@ -34,7 +27,7 @@ in {
initrd.availableKernelModules = [ "hyperv_keyboard" ];

kernelParams = [
"video=hyperv_fb:${cfg.videoMode}" "elevator=noop"
"elevator=noop"
];
};

Expand Down
5 changes: 4 additions & 1 deletion nixos/modules/virtualisation/libvirtd.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,10 @@ in
paths = cfg.qemu.vhostUserPackages;
pathsToLink = [ "/share/qemu/vhost-user" ];
};
in [ "L+ /var/lib/qemu/vhost-user - - - - ${vhostUserCollection}/share/qemu/vhost-user" ];
in [
"L+ /var/lib/qemu/vhost-user - - - - ${vhostUserCollection}/share/qemu/vhost-user"
"L+ /var/lib/qemu/firmware - - - - ${cfg.qemu.package}/share/qemu/firmware"
];

security.polkit = {
enable = true;
Expand Down
8 changes: 7 additions & 1 deletion nixos/tests/homepage-dashboard.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import ./make-test-python.nix (
{
services.homepage-dashboard = {
enable = true;
settings.title = "custom";
settings.title = "test title rodUsEagid"; # something random/unique
};
};

Expand All @@ -38,6 +38,12 @@ import ./make-test-python.nix (
# Ensure /etc/homepage-dashboard is created and unmanaged conf location isn't.
managed_conf.succeed("test -d /etc/homepage-dashboard")
managed_conf.fail("test -f /var/lib/private/homepage-dashboard/settings.yaml")
# Ensure that we see the custom title *only in the managed config*
page = managed_conf.succeed("curl --fail http://localhost:8082/")
assert "test title rodUsEagid" in page, "Custom title not found"
page = unmanaged_conf.succeed("curl --fail http://localhost:8082/")
assert "test title rodUsEagid" not in page, "Custom title found where it shouldn't be"
'';
}
)
14 changes: 14 additions & 0 deletions nixos/tests/matomo.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,25 @@ let
machine.wait_for_unit("phpfpm-matomo.service")
machine.wait_for_unit("nginx.service")
with subtest("matomo.js reachable via HTTP"):
machine.succeed("curl -sSfk http://machine/matomo.js")
with subtest("js/piwik.js reachable via HTTP"):
machine.succeed("curl -sSfk http://machine/js/piwik.js")
with subtest("matomo.php (API) reachable via HTTP"):
machine.succeed("curl -sSfk http://machine/matomo.php")
# without the grep the command does not produce valid utf-8 for some reason
with subtest("welcome screen loads"):
machine.succeed(
"curl -sSfL http://localhost/ | grep '<title>Matomo[^<]*Installation'"
)
with subtest("killing the phpfpm process should trigger an automatic restart"):
machine.succeed("systemctl kill -s KILL phpfpm-matomo")
machine.sleep(1)
machine.wait_for_unit("phpfpm-matomo.service")
'';
};
in
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/greg/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "manolomartinez";
repo = pname;
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/pithos/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/puddletag/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "puddletag";
repo = "puddletag";
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/zynaddsubfx/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
tag = version;
fetchSubmodules = true;
hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg=";
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/lapce/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "lapce";
repo = "lapce";
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/manuskript/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
repo = pname;
owner = "olivierkes";
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-/Ryvv5mHdZ3iwMpZjOa62h8D2B00pzknJ70DfjDTPPA=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/rednotebook/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "jendrikseipp";
repo = "rednotebook";
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-sGwdZZ3YGm3sXJoxnYwj6HQcYMnC1pEzba3N9KLfRHM=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/retext/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "retext-project";
repo = pname;
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-LWA3rPvqq+zeK+8zS1kM1BaQ+uaBmlHJy4o7IaT1zsg=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/emulators/dolphin-emu/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
rev = "refs/tags/${finalAttrs.version}";
tag = finalAttrs.version;
hash = "sha256-x4ZtV/5bwUjcmdYneG7n7uFVyPmYj0sD8TXEqsqbUFU=";
fetchSubmodules = true;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/f3d/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "f3d-app";
repo = "f3d";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-Mw40JyXZj+Q4a9dD5UnkUSdUfQGaV92gor8ynn86VJ8=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/hydrus/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec {
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-bIUtFpAMCIeLAyGXi4Rgn8FmijN5NwbkC31JoVyjNdg=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "fablabnbg";
repo = pname;
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/inkscape/extensions/textext/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "textext";
repo = "textext";
rev = "refs/tags/${version}";
tag = version;
sha256 = "sha256-JbI/ScCFCvHbK9JZzHuT67uSAL3546et+gtTkwRnCSE=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/ipe/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "otfried";
repo = "ipe";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/logging/sosreport/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "sosreport";
repo = "sos";
rev = "refs/tags/${version}";
tag = version;
sha256 = "sha256-8laOHFBvlSo70filTd84vMiivcZ9hE8rgFThVVrMwtE=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/cask-server/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "Nitrux";
repo = pname;
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-XUgLtZMcvzGewtUcgu7FbBCn/1zqOjWvw2AI9gUwWkc=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/databricks-sql-cli/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "databricks";
repo = "databricks-sql-cli";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-wmwXw1o+pRsRjA7ai9x5o1el7mNBqM6xlGrvw0IqfMo=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/electron-cash/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "Electron-Cash";
repo = "Electron-Cash";
rev = "refs/tags/${version}";
tag = version;
sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo=";
};

Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/misc/electrum/ltc.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ python3.pkgs.buildPythonApplication {
# copy the patched `/run_electrum` over `/electrum/electrum`
# so the aiorpcx compatibility patch is used
cp run_electrum electrum_ltc/electrum-ltc
# refresh stale generated code, per electrum_ltc/paymentrequest.py line 40
protoc --proto_path=electrum_ltc/ --python_out=electrum_ltc/ electrum_ltc/paymentrequest.proto
'';

preBuild =
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/golden-cheetah/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "GoldenCheetah";
repo = "GoldenCheetah";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/gramps/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "gramps-project";
repo = "gramps";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/html5validator/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "svenkreiss";
repo = "html5validator";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-yvclqE4+2R9q/UJU9W95U1/xVJeNj+5eKvT6VQel9k8=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/inkcut/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/maliit-framework/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "maliit";
repo = "framework";
rev = "refs/tags/${version}";
tag = version;
sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY=";
};

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/mbutil/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "mapbox";
repo = "mbutil";
rev = "refs/tags/v${version}";
tag = "v${version}";
hash = "sha256-vxAF49NluEI/cZMUv1dlQBpUh1jfZ6KUVkYAmFAWphk=";
};

Expand Down
Loading

0 comments on commit e6d2b90

Please sign in to comment.