Unverified Commit 0a95fd24 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

Merge remote-tracking branch 'origin/master' into staging-next 

Conflicts:
	pkgs/development/libraries/libunwind/default.nix
parents d45e853c d94ae680

nixos/modules/services/networking/knot.nix

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ let 
        ++ [ (sec_list_fa "id" nix_def "template") ]

        ++ [ (sec_list_fa "domain" nix_def "zone") ]

        ++ [ (sec_plain nix_def "include") ]

        ++ [ (sec_plain nix_def "clear") ]

      );



    # A plain section contains directly attributes (we don't really check that ATM).

nixos/tests/ceph-multi-node.nix

+8 −0
Original line number Diff line number Diff line
@@ -185,6 +185,14 @@ let 
    monA.succeed(

        "ceph osd pool create multi-node-test 32 32",

        "ceph osd pool ls | grep 'multi-node-test'",



        # We need to enable an application on the pool, otherwise it will

        # stay unhealthy in state POOL_APP_NOT_ENABLED.

        # Creating a CephFS would do this automatically, but we haven't done that here.

        # See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application

        # We use the custom application name "nixos-test" for this.

        "ceph osd pool application enable multi-node-test nixos-test",



        "ceph osd pool rename multi-node-test multi-node-other-test",

        "ceph osd pool ls | grep 'multi-node-other-test'",

    )

nixos/tests/ceph-single-node-bluestore.nix

+8 −0
Original line number Diff line number Diff line
@@ -145,6 +145,14 @@ let 
    monA.succeed(

        "ceph osd pool create single-node-test 32 32",

        "ceph osd pool ls | grep 'single-node-test'",



        # We need to enable an application on the pool, otherwise it will

        # stay unhealthy in state POOL_APP_NOT_ENABLED.

        # Creating a CephFS would do this automatically, but we haven't done that here.

        # See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application

        # We use the custom application name "nixos-test" for this.

        "ceph osd pool application enable single-node-test nixos-test",



        "ceph osd pool rename single-node-test single-node-other-test",

        "ceph osd pool ls | grep 'single-node-other-test'",

    )

nixos/tests/ceph-single-node.nix

+17 −12
Original line number Diff line number Diff line
@@ -145,6 +145,14 @@ let 
    monA.succeed(

        "ceph osd pool create single-node-test 32 32",

        "ceph osd pool ls | grep 'single-node-test'",



        # We need to enable an application on the pool, otherwise it will

        # stay unhealthy in state POOL_APP_NOT_ENABLED.

        # Creating a CephFS would do this automatically, but we haven't done that here.

        # See: https://docs.ceph.com/en/reef/rados/operations/pools/#associating-a-pool-with-an-application

        # We use the custom application name "nixos-test" for this.

        "ceph osd pool application enable single-node-test nixos-test",



        "ceph osd pool rename single-node-test single-node-other-test",

        "ceph osd pool ls | grep 'single-node-other-test'",

    )
@@ -182,19 +190,16 @@ let 
    monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")

    monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")



    # This test has been commented out due to the upstream issue with pyo3

    # that has broken this dashboard

    # Reference: https://www.spinics.net/lists/ceph-users/msg77812.html

    # Enable the dashboard and recheck health

    # monA.succeed(

    #     "ceph mgr module enable dashboard",

    #     "ceph config set mgr mgr/dashboard/ssl false",

    #     # default is 8080 but it's better to be explicit

    #     "ceph config set mgr mgr/dashboard/server_port 8080",

    # )

    # monA.wait_for_open_port(8080)

    # monA.wait_until_succeeds("curl -q --fail http://localhost:8080")

    # monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")

    monA.succeed(

        "ceph mgr module enable dashboard",

        "ceph config set mgr mgr/dashboard/ssl false",

        # default is 8080 but it's better to be explicit

        "ceph config set mgr mgr/dashboard/server_port 8080",

    )

    monA.wait_for_open_port(8080)

    monA.wait_until_succeeds("curl -q --fail http://localhost:8080")

    monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")

  '';

in {

  name = "basic-single-node-ceph-cluster";

pkgs/applications/audio/ledfx/default.nix

+13 −10
Original line number Diff line number Diff line
@@ -5,23 +5,25 @@ 


python3.pkgs.buildPythonPackage rec {

  pname = "ledfx";

  version = "2.0.86";

  version = "2.0.89";

  pyproject= true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-miOGMsrvK3A3SYnd+i/lqB+9GOHtO4F3RW8NkxDgFqU=";

    hash = "sha256-PBOj6u0TukT6wRKMQML4+XNQQZvsGyRzXBk9YsISst4=";

  };



  postPatch = ''

    substituteInPlace setup.py \

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

      --replace "sentry-sdk==1.38.0" "sentry-sdk" \

      --replace "~=" ">="

  '';

  pythonRelaxDeps = true;



  pythonRemoveDeps = [

    # not packaged

    "rpi-ws281x"

  ];



  nativeBuildInputs = with python3.pkgs; [

    setuptools

    cython

    poetry-core

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = with python3.pkgs; [
@@ -29,8 +31,8 @@ python3.pkgs.buildPythonPackage rec { 
    aiohttp-cors

    aubio

    certifi

    cython

    flux-led

    python-dotenv

    icmplib

    mss

    multidict
@@ -52,6 +54,7 @@ python3.pkgs.buildPythonPackage rec { 
    sentry-sdk

    setuptools

    sounddevice

    stupidartnet

    uvloop

    voluptuous

    zeroconf