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

Merge master into haskell-updates

parents f7e7809a 339a0fd6

nixos/modules/services/logging/vector.nix

+3 −8
Original line number Diff line number Diff line
@@ -26,13 +26,9 @@ in 
  };



  config = mkIf cfg.enable {

    # for cli usage

    environment.systemPackages = [ pkgs.vector ];



    users.groups.vector = { };

    users.users.vector = {

      description = "Vector service user";

      group = "vector";

      isSystemUser = true;

    };

    systemd.services.vector = {

      description = "Vector event and log aggregator";

      wantedBy = [ "multi-user.target" ];
@@ -52,8 +48,7 @@ in 
        in

        {

          ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}";

          User = "vector";

          Group = "vector";

          DynamicUser = true;

          Restart = "no";

          StateDirectory = "vector";

          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

nixos/modules/services/web-apps/discourse.nix

+3 −0
Original line number Diff line number Diff line
@@ -651,6 +651,9 @@ in 
      preload_link_header = false;

      redirect_avatar_requests = false;

      pg_force_readonly_mode = false;

      dns_query_timeout_secs = null;

      regex_timeout_seconds = 2;

      allow_impersonation = true;

    };



    services.redis.servers.discourse =

nixos/tests/home-assistant.nix

+8 −1
Original line number Diff line number Diff line
@@ -61,6 +61,13 @@ in { 
        # https://www.home-assistant.io/integrations/frontend/

        frontend = {};



        # include some popular integrations, that absolutely shouldn't break

        esphome = {};

        knx = {};

        matter = {};

        shelly = {};

        zha = {};



        # set up a wake-on-lan switch to test capset capability required

        # for the ping suid wrapper

        # https://www.home-assistant.io/integrations/wake_on_lan/
@@ -107,7 +114,7 @@ in { 
    # Cause a configuration change that requires a service restart as we added a new runtime dependency

    specialisation.newFeature = {

      inheritParentConfig = true;

      configuration.services.home-assistant.config.esphome = {};

      configuration.services.home-assistant.config.backup = {};

    };

  };

pkgs/applications/audio/audacity/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -61,13 +61,13 @@ 


stdenv.mkDerivation rec {

  pname = "audacity";

  version = "3.3.0";

  version = "3.3.1";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "Audacity-${version}";

    hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM=";

    hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";

  };



  postPatch = ''
@@ -150,6 +150,7 @@ stdenv.mkDerivation rec { 
    "-Daudacity_conan_enabled=Off"

    "-Daudacity_use_ffmpeg=loaded"

    "-Daudacity_has_vst3=Off"

    "-Daudacity_has_crashreports=Off"



    # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/

    "-DCMAKE_SKIP_BUILD_RPATH=ON"

pkgs/applications/audio/ledfx/default.nix

0 → 100644
+73 −0
Original line number Diff line number Diff line 
{ lib

, fetchpatch

, python3

}:



python3.pkgs.buildPythonPackage rec {

  pname = "ledfx";

  version = "2.0.64";

  format = "setuptools";



  src = python3.pkgs.fetchPypi {

    inherit pname version;

    hash = "sha256-TKRa4PcMd0Jl94XD2WubOhmsxZaUplZeWKsuKz83Rl4=";

  };



  patches = [

    # replace tcp-latency which is not packaged with icmplib

    (fetchpatch {

      url = "https://github.com/LedFx/LedFx/commit/98cd4256846ae3bdae7094eeacb3b02a4807dc6f.patch";

      excludes = [

        # only used in win.spec file which is windows specific

        "hiddenimports.py"

      ];

      hash = "sha256-p9fiLdjZI5fe5Qy2xbJIAtblp/7BwUxAvwjHQy5l9nQ=";

    })

  ];



  postPatch = ''

    substituteInPlace setup.py \

      --replace '"openrgb-python~=0.2.10",' "" \

      --replace '"pyupdater>=3.1.0",' "" \

      --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \

      --replace "~=" ">="

  '';



  propagatedBuildInputs = with python3.pkgs; [

    aiohttp

    aiohttp-cors

    aubio

    certifi

    cython

    flux-led

    icmplib

    multidict

    numpy

    # openrgb-python # not packaged

    paho-mqtt

    pillow

    psutil

    pyserial

    pystray

    # rpi-ws281x # not packaged

    requests

    sacn

    samplerate

    sentry-sdk

    sounddevice

    uvloop

    voluptuous

    zeroconf

  ];



  # has no tests

  doCheck = false;



  meta = with lib; {

    description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects";

    homepage = "https://github.com/LedFx/LedFx";

    changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";

    license = licenses.gpl3Only;

    maintainers = teams.c3d2.members;

  };

}