Merge master into staging-next

NixOS · Jun 10, 2024 · 4b24ae6 · 4b24ae6
2 parents da065a0 + 66382c8
commit 4b24ae6
Show file tree

Hide file tree

Showing 64 changed files with 3,309 additions and 352 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -6700,6 +6700,16 @@
  githubId = 9959940;
  name = "Andreas Fehn";
  };
+ felbinger = {
+ name = "Nico Felbinger";
+ email = "[email protected]";
+ matrix = "@nico:felbinger.eu";
+ github = "felbinger";
+ githubId = 26925347;
+ keys = [{
+ fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4";
+ }];
+ };
  felipeqq2 = {
  name = "Felipe Silva";
  email = "[email protected]";
@@ -12926,6 +12936,16 @@
  githubId = 11810057;
  name = "Matt Snider";
  };
+ MattSturgeon = {
+ email = "[email protected]";
+ github = "MattSturgeon";
+ githubId = 5046562;
+ matrix = "@mattsturg:matrix.org";
+ name = "Matt Sturgeon";
+ keys = [{
+ fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299";
+ }];
+ };
  matusf = {
  email = "[email protected]";
  github = "matusf";
@@ -16976,6 +16996,12 @@
  githubId = 2141853;
  name = "Bang Lee";
  };
+ qwqawawow = {
+ email = "[email protected]";
+ github = "qwqawawow";
+ githubId = 40905037;
+ name = "qwqawawow";
+ };
  qyliss = {
  email = "[email protected]";
  github = "alyssais";

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
@@ -76,6 +76,7 @@ lualdap,,,,,,aanderse
 lualogging,,,,,,
 luaossl,,,,,5.1,
 luaposix,,,,34.1.1-1,,vyp lblasc
+luaprompt,,,,,,Freed-Wu
 luarepl,,,,,,
 luarocks,,,,,,mrcjkb teto
 luarocks-build-rust-mlua,,,,,,mrcjkb

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
@@ -275,7 +275,7 @@ in
  softdep nvidia post: nvidia-uvm
  '';
  };
- systemd.tmpfiles.rules = lib.optional config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin";
+ systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin";
  services.udev.extraRules = ''
  # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
  KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
@@ -290,6 +290,7 @@ in
  };
  environment.systemPackages = [ nvidia_x11.bin ];
  })
+
  # X11
  (lib.mkIf nvidiaEnabled {
  assertions = [
@@ -455,6 +456,7 @@ in
  extraPackages = [ pkgs.nvidia-vaapi-driver ];
  extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ];
  };
+
  environment.systemPackages =
  lib.optional cfg.nvidiaSettings nvidia_x11.settings
  ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced
@@ -527,16 +529,12 @@ in
  };
  })
  ];
+
  services.acpid.enable = true;
 
  services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin;
 
- hardware.firmware =
- let
- isOpen = cfg.open;
- isNewUnfree = lib.versionAtLeast nvidia_x11.version "555";
- in
- lib.optional (isOpen || isNewUnfree) nvidia_x11.firmware;
+ hardware.firmware = lib.optional (cfg.open || lib.versionAtLeast nvidia_x11.version "555") nvidia_x11.firmware;
 
  systemd.tmpfiles.rules =
  [

diff --git a/nixos/modules/services/misc/mqtt2influxdb.nix b/nixos/modules/services/misc/mqtt2influxdb.nix
@@ -125,6 +125,7 @@ in {
  options = {
  services.mqtt2influxdb = {
  enable = mkEnableOption "BigClown MQTT to InfluxDB bridge.";
+ package = mkPackageOption pkgs ["python3Packages" "mqtt2influxdb"] {};
  environmentFiles = mkOption {
  type = types.listOf types.path;
  default = [];
@@ -245,7 +246,7 @@ in {
  '';
  serviceConfig = {
  EnvironmentFile = cfg.environmentFiles;
- ExecStart = "${cfg.package}/bin/mqtt2influxdb -dc ${finalConfig}";
+ ExecStart = "${lib.getExe cfg.package} -dc ${finalConfig}";
  RuntimeDirectory = "mqtt2influxdb";
  };
  };

diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix
@@ -94,6 +94,7 @@ in {
  systemd.services.loki = {
  description = "Loki Service Daemon";
  wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
 
  serviceConfig = let
  conf = if cfg.configFile == null

diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix
@@ -167,8 +167,13 @@ in {
  preStart = optionalString (settings != null) ''
  if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
  && [ "${toString cfg.mutableSettings}" = "1" ]; then
+ # First run a schema_version update on the existing configuration
+ # This ensures that both the new config and the existing one have the same schema_version
+ # Note: --check-config has the side effect of modifying the file at rest!
+ ${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config
+
  # Writing directly to AdGuardHome.yaml results in empty file
- ${pkgs.yaml-merge}/bin/yaml-merge "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
+ ${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
  mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
  else
  cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
@@ -178,7 +183,7 @@ in {
 
  serviceConfig = {
  DynamicUser = true;
- ExecStart = "${cfg.package}/bin/adguardhome ${args}";
+ ExecStart = "${lib.getExe cfg.package} ${args}";
  AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]
  ++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ];
  Restart = "always";

diff --git a/nixos/modules/services/networking/mihomo.nix b/nixos/modules/services/networking/mihomo.nix
@@ -25,6 +25,7 @@ in
  webui = lib.mkOption {
  default = null;
  type = lib.types.nullOr lib.types.path;
+ example = lib.literalExpression "pkgs.metacubexd";
  description = ''
  Local web interface to use.
 

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
  pname = "youtube-music";
- version = "3.3.6";
+ version = "3.3.12";
 
  src = fetchFromGitHub {
  owner = "th-ch";
  repo = "youtube-music";
  rev = "v${finalAttrs.version}";
- hash = "sha256-nxpctEG4XoxW6jOAxGdgTEYr6YnhFRR8+5HUQLxRJB0=";
+ hash = "sha256-kBGMp58086NQ77x1YGS5NewWfiDaXHOEbyflHPtdfIs=";
  };
 
  pnpmDeps = pnpm.fetchDeps {
  inherit (finalAttrs) pname version src;
- hash = "sha256-8oeloQYiwUy+GDG4R+XtiynT+8Fad4WYFWTO1KANZKQ=";
+ hash = "sha256-t5omzz6y8lVFGAuhtc+HF5gwu4Ntt/dxml+nWysEpVs=";
  };
 
  nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ]
@@ -87,8 +87,9 @@ stdenv.mkDerivation (finalAttrs: {
  meta = with lib; {
  description = "Electron wrapper around YouTube Music";
  homepage = "https://th-ch.github.io/youtube-music/";
+ changelog = "https://github.com/th-ch/youtube-music/blob/master/changelog.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}";
  license = licenses.mit;
- maintainers = [ maintainers.aacebedo ];
+ maintainers = with maintainers; [ aacebedo SuperSandro2000 ];
  mainProgram = "youtube-music";
  platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
  };

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -505,8 +505,8 @@ let
  mktplcRef = {
  name = "vscode-bazel";
  publisher = "bazelbuild";
- version = "0.7.0";
- sha256 = "05wvih09184bsp4rv2m55z0sasra2qrvch5m3bkbrjq7rcqgibgx";
+ version = "0.10.0";
+ sha256 = "sha256-8SUOzsUmfgt9fAy037qLVNrGJPvTnIeMNz2tbN5psbs=";
  };
  meta = {
  description = "Bazel support for Visual Studio Code";

diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
  pname = "talosctl";
- version = "1.7.2";
+ version = "1.7.4";
 
  src = fetchFromGitHub {
  owner = "siderolabs";
  repo = "talos";
  rev = "v${version}";
- hash = "sha256-hYfh/faOQtN1MTnaCHsdogzBU3Xf6BY4apK+VuVCh6E=";
+ hash = "sha256-TVRWcgBt6MmHOh3LYSjJtp5qf/+ar+LWDGfHKQhDFZ8=";
  };
 
- vendorHash = "sha256-5Dxtwu+PM0TbznIPTl8QxgOvNsQZUDMGY2kf+PSfCqo=";
+ vendorHash = "sha256-30fMLczb4+BVSxZSbhQ2S1MrQ2+Ykyqf+Dio8n0LGE0=";
 
  ldflags = [ "-s" "-w" ];
 

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
@@ -16,17 +16,17 @@
 }:
 
 let
- rev = 3464;
+ rev = 3546;
  jre' = if preferZulu then zulu else jre;
  gtk' = if preferGtk3 then gtk3 else gtk2;
 in
 stdenv.mkDerivation rec {
  pname = "davmail";
- version = "6.2.0";
+ version = "6.2.2";
 
  src = fetchurl {
  url = "mirror:https://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
- sha256 = "sha256-FatB0t/BhZRMofYE0KD5LDYGjDQ8hriIszKJP8qNvhw=";
+ hash = "sha256-45paGy6SfUFXK6vY8L4tHFYiio1/5ah9vTyGImdgwHI=";
  };
 
  postPatch = ''

diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/applications/networking/remote/dayon/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
  pname = "dayon";
- version = "14.0.1";
+ version = "14.0.2";
 
  src = fetchFromGitHub {
  owner = "RetGal";
  repo = "dayon";
  rev = "v${finalAttrs.version}";
- hash = "sha256-7XrgPrYKhaUvmXxiZLsduzrbyZRHjPSo+fg4BvlatHQ=";
+ hash = "sha256-nRNqubR44ydZwwuQG3q6TRm+MHTRgRbeLI9dsk83wq4=";
  };
 
  nativeBuildInputs = [

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
  };
 in
 stdenv.mkDerivation rec {
- version = "16.2.15";
+ version = "16.2.17";
  pname = "jmol";
 
  src = let
  baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
  in fetchurl {
  url = "mirror:https://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- hash = "sha256-zPHh5IFdttliPc0SCgkM/3UQmS4eT2rfi5HqpFjY5hA=";
+ hash = "sha256-1iBLLfaoztbphhrG3NVWH+PVSbCZd+HQqvCYF3H9S/E=";
  };
 
  patchPhase = ''

diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
  pname = "hypnotix";
- version = "4.3";
+ version = "4.4";
 
  src = fetchFromGitHub {
  owner = "linuxmint";
  repo = "hypnotix";
  rev = version;
- hash = "sha256-nmldOziye+bSi8CA9TL0f3EKEKTeXRk3HFzf4ksE9oE=";
+ hash = "sha256-SGKa3yo3iEDAjsvfa6dBfM7sAnBVr0pB6zLKQb6e4Ys=";
  };
 
  patches = [

diff --git a/pkgs/data/fonts/apl386/default.nix → pkgs/by-name/ap/apl386/package.nix b/pkgs/data/fonts/apl386/default.nix → pkgs/by-name/ap/apl386/package.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation {
  pname = "apl386";
- version = "unstable-2022-03-07";
+ version = "0-unstable-2024-01-10";
 
  src = fetchFromGitHub {
  owner = "abrudz";
  repo = "APL386";
- rev = "6332c9dbb588946a0e8c9d7984dd0c003eeea266";
- hash = "sha256-oHk4e7NRgAjGtZzQmZToYz7wCZETaj7/yRwZMeeYF2M=";
+ rev = "43ebc6349506b0e7ab5c49f6b08f8afe66c4d9c5";
+ hash = "sha256-MLHSYHFyI9eKdrE/yM7u4vu4Dz6riEk7XQTUuAXPfzM=";
  };
 
  installPhase = ''

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
  pname = "bngblaster";
- version = "0.8.51";
+ version = "0.9.2";
 
  src = fetchFromGitHub {
  owner = "rtbrick";
  repo = "bngblaster";
  rev = finalAttrs.version;
- hash = "sha256-7AwLedYPOZAKQpWWuEasI9ytN66MZYKFO9SgXi7NjIo=";
+ hash = "sha256-ugfimJmyAHxgLypgEwzOK0VLmIYod5YzW7oO/omcl1I=";
  };
 
  nativeBuildInputs = [ cmake ];

diff --git a/pkgs/by-name/do/docopts/package.nix b/pkgs/by-name/do/docopts/package.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, fetchpatch
+}:
+buildGoModule rec {
+ pname = "docopts";
+ version = "0.6.4-with-no-mangle-double-dash";
+
+ src = fetchFromGitHub {
+ owner = "docopt";
+ repo = "docopts";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-GIBrJ5qexeJ6ul5ek9LJZC4J3cNExsTrnxdzRCfoqn8=";
+ };
+
+ patches = [
+ # Migrate project to Go modules.
+ (fetchpatch {
+ url = "https://github.com/docopt/docopts/pull/74/commits/2c516165e72b35516a64c4529dbc938c0aaa9442.patch";
+ sha256 = "sha256-Tp05B3tmctnSYIQzCxCc/fhcAWWuEz2ifu/CQZt0XPU=";
+ })
+ ];
+
+ vendorHash = "sha256-+pMgaHB69itbQ+BDM7/oaJg3HrT1UN+joJL7BO/2vxE=";
+
+ meta = {
+ homepage = "https://github.com/docopt/docopts";
+ description = "Shell interpreter for docopt, the command-line interface description language";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.confus ];
+ platforms = lib.platforms.unix;
+ };
+}