Unverified Commit f2e88eaa authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 3ad0b42a 3f14b854

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -13364,6 +13364,12 @@ 
    githubId = 37505890;

    name = "Luis Wirth";

  };

  lu1a = {

    email = "lu5a@proton.me";

    github = "lu1a";

    githubId = 83420438;

    name = "Lewis";

  };

  LucaGuerra = {

    email = "luca@guerra.sh";

    github = "LucaGuerra";

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ 
  +services.asusd.asusdConfig.text = '''file contents'''

  ```



- `linuxPackages.nvidiaPackages.stable` now defaults to the `production` variant instead of `latest`.



- `timescaledb` requires manual upgrade steps.

    After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797).

    PostgreSQL 13 is no longer supported in TimescaleDB v2.16.

nixos/modules/programs/wayland/sway.nix

+13 −0
Original line number Diff line number Diff line
@@ -113,6 +113,19 @@ in 
        }

      ];



      warnings =

          lib.mkIf

            (

              (lib.elem "nvidia" config.services.xserver.videoDrivers)

              && !config.hardware.nvidia.open

              && (lib.versionOlder "551" (

                lib.versions.major (lib.getVersion config.hardware.nvidia.package)

              ))

            )

            [

              "Using Sway with Nvidia driver version <= 550 may result in a broken system. Configure hardware.nvidia.package to use a newer version."

            ];



      environment = {

        systemPackages = lib.optional (cfg.package != null) cfg.package ++ cfg.extraPackages;

pkgs/applications/backup/vorta/default.nix

+19 −13
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  python3Packages,

  fetchFromGitHub,

  wrapQtAppsHook,

  borgbackup,

  qtbase,

  qtwayland,

  stdenv,

  borgbackup,

  versionCheckHook,

  makeFontsConf,

  qtbase,

}:



python3Packages.buildPythonApplication rec {
@@ -23,7 +24,6 @@ python3Packages.buildPythonApplication rec { 
  };



  nativeBuildInputs = [

    python3Packages.setuptools

    wrapQtAppsHook

  ];
@@ -31,18 +31,22 @@ python3Packages.buildPythonApplication rec { 
    qtwayland

  ];



  propagatedBuildInputs = with python3Packages; [

  build-system = with python3Packages; [

    setuptools

  ];



  dependencies = with python3Packages; [

    packaging

    peewee

    pyqt6

    platformdirs

    psutil

    pyqt6

    secretstorage

    setuptools

    platformdirs

  ];



  postPatch = ''

    substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \

    --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic"

    --replace-fail com.borgbase.Vorta "com.borgbase.Vorta-symbolic"

  '';



  postInstall = ''
@@ -61,7 +65,9 @@ python3Packages.buildPythonApplication rec { 
    pytest-qt

    pytest-mock

    pytestCheckHook

    versionCheckHook

  ];

  versionCheckProgramArg = [ "--version" ];



  preCheck =

    let
@@ -89,13 +95,13 @@ python3Packages.buildPythonApplication rec { 
      "tests/network_manager/test_darwin.py"

    ];



  meta = with lib; {

  meta = {

    changelog = "https://github.com/borgbase/vorta/releases/tag/v${version}";

    description = "Desktop Backup Client for Borg";

    homepage = "https://vorta.borgbase.com/";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ ma27 ];

    platforms = platforms.linux;

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ ma27 ];

    platforms = lib.platforms.linux;

    mainProgram = "vorta";

  };

}

pkgs/applications/editors/neovim/tests/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Here are some common neovim flags used in the tests: 
, neovim-unwrapped

, fetchFromGitLab

, runCommandLocal

, testers

, pkgs

}:

let
@@ -107,8 +108,7 @@ in 


  inherit nmt;



  # Disabled because of https://github.com/NixOS/nixpkgs/pull/352727

  # failed_check = pkgs.testers.testBuildFailure nvim-run-failing-check;

  failed_check = testers.testBuildFailure nvim-run-failing-check;



  vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; };