Unverified Commit 026b3390 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents a592a573 52f25dd8

nixos/modules/services/video/frigate.nix

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ in 
              add_header Cache-Control "public";

            '';

          };

          "~ ^/.*-([A-Za-z0-9]+)\.webmanifest$" = {

          "~ ^/.*-([A-Za-z0-9]+)\\.webmanifest$" = {

            root = cfg.package.web;

            extraConfig = ''

              access_log off;

nixos/modules/services/x11/window-managers/qtile.nix

+4 −0
Original line number Diff line number Diff line
@@ -68,7 +68,11 @@ in 
      xserver.windowManager.qtile.finalPackage = cfg.package.override {

        extraPackages = cfg.extraPackages cfg.package.pythonModule.pkgs;

      };



      displayManager.sessionPackages = [ cfg.finalPackage ];



      # Recommended by upstream for libqtile/widget/imapwidget.py

      gnome.gnome-keyring.enable = lib.mkDefault true;

    };



    environment = {

nixos/tests/all-tests.nix

+8 −2
Original line number Diff line number Diff line
@@ -818,7 +818,10 @@ in 
  ksm = runTest ./ksm.nix;

  kthxbye = runTest ./kthxbye.nix;

  kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };

  kubo = import ./kubo { inherit runTest; };

  kubo = import ./kubo {

    inherit runTest;

    inherit (pkgs) lib;

  };

  lact = runTest ./lact.nix;

  ladybird = runTest ./ladybird.nix;

  languagetool = runTest ./languagetool.nix;
@@ -963,7 +966,10 @@ in 
  mopidy = runTest ./mopidy.nix;

  morph-browser = runTest ./morph-browser.nix;

  mosquitto = runTest ./mosquitto.nix;

  movim = import ./web-apps/movim { inherit runTest; };

  movim = import ./web-apps/movim {

    inherit runTest;

    inherit (pkgs) lib;

  };

  mpd = runTest ./mpd.nix;

  mpv = runTest ./mpv.nix;

  mtp = runTest ./mtp.nix;

nixos/tests/zfs.nix

+0 −5
Original line number Diff line number Diff line
@@ -204,11 +204,6 @@ let 
in

{



  series_2_2 = makeZfsTest {

    zfsPackage = pkgs.zfs_2_2;

    kernelPackages = pkgs.linuxPackages;

  };



  series_2_3 = makeZfsTest {

    zfsPackage = pkgs.zfs_2_3;

    kernelPackages = pkgs.linuxPackages;

pkgs/applications/audio/lmms/default.nix

+16 −5
Original line number Diff line number Diff line
@@ -70,17 +70,28 @@ mkDerivation rec { 
    })

  ];



  cmakeFlags = [ "-DWANT_QT5=ON" ];

  prePatch = ''

    # Update CMake minimum required version and policies

    substituteInPlace CMakeLists.txt --replace 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)' 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)'

    substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0026 OLD)' 'CMAKE_POLICY(SET CMP0026 NEW)'

    substituteInPlace CMakeLists.txt --replace 'CMAKE_POLICY(SET CMP0050 OLD)' 'CMAKE_POLICY(SET CMP0050 NEW)'

    substituteInPlace CMakeLists.txt --replace 'GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)' 'SET(BIN2RES $<TARGET_FILE:bin2res>)'

  '';



  cmakeFlags = [

    "-DWANT_QT5=ON"

  ]

  ++ lib.optionals (lib.versionOlder version "11.4") [

    # Fix the build with CMake 4.

    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"

  ];



  meta = with lib; {

    description = "DAW similar to FL Studio (music production software)";

    mainProgram = "lmms";

    homepage = "https://lmms.io";

    license = licenses.gpl2Plus;

    platforms = [

      "x86_64-linux"

      "i686-linux"

    ];

    platforms = platforms.linux;

    maintainers = [ ];

  };

}