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

Merge master into staging-next

parents d599106f 67a706a7

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -7223,6 +7223,12 @@ 
    githubId = 1267527;

    name = "Daniel Firth";

  };

  lodi = {

    email = "anthony.lodi@gmail.com";

    github = "lodi";

    githubId = 918448;

    name = "Anthony Lodi";

  };

  lopsided98 = {

    email = "benwolsieffer@gmail.com";

    github = "lopsided98";

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

+11 −1
Original line number Diff line number Diff line
@@ -35,7 +35,17 @@ 
          This means, <literal>ip[6]tables</literal>,

          <literal>arptables</literal> and <literal>ebtables</literal>

          commands will actually show rules from some specific tables in

          the <literal>nf_tables</literal> kernel subsystem.

          the <literal>nf_tables</literal> kernel subsystem. In case

          you’re migrating from an older release without rebooting,

          there might be cases where you end up with iptable rules

          configured both in the legacy <literal>iptables</literal>

          kernel backend, as well as in the <literal>nf_tables</literal>

          backend. This can lead to confusing firewall behaviour. An

          <literal>iptables-save</literal> after switching will complain

          about <quote>iptables-legacy tables present</quote>. It’s

          probably best to reboot after the upgrade, or manually

          removing all legacy iptables rules (via the

          <literal>iptables-legacy</literal> package).

        </para>

      </listitem>

      <listitem>

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

+7 −0
Original line number Diff line number Diff line
@@ -13,6 +13,13 @@ In addition to numerous new and upgraded packages, this release has the followin 
  [Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default).

  This means, `ip[6]tables`, `arptables` and `ebtables` commands  will actually

  show rules from some specific tables in the `nf_tables` kernel subsystem.

  In case you're migrating from an older release without rebooting, there might

  be cases where you end up with iptable rules configured both in the legacy

  `iptables` kernel backend, as well as in the `nf_tables` backend.

  This can lead to confusing firewall behaviour. An `iptables-save` after

  switching will complain about "iptables-legacy tables present".

  It's probably best to reboot after the upgrade, or manually removing all

  legacy iptables rules (via the `iptables-legacy` package).



- systemd got an `nftables` backend, and configures (networkd) rules in their

  own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not

nixos/modules/virtualisation/oci-containers.nix

+6 −4
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ let 
          type = with types; nullOr package;

          default = null;

          description = ''

            Path to an image file to load instead of pulling from a registry.

            If defined, do not pull from registry.

            Path to an image file to load before running the image. This can

            be used to bypass pulling the image from the registry.



            You still need to set the <literal>image</literal> attribute, as it

            will be used as the image name for docker to start a container.

            The <literal>image</literal> attribute must match the name and

            tag of the image contained in this file, as they will be used to

            run the container with that image. If they do not match, the

            image will be pulled from the registry as usual.

          '';

          example = literalExpression "pkgs.dockerTools.buildImage {...};";

        };

pkgs/applications/audio/jellycli/default.nix

0 → 100644
+33 −0
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildGoModule, alsa-lib }:



buildGoModule rec {

  pname = "jellycli";

  version = "0.9.1";



  src = fetchFromGitHub {

    owner = "tryffel";

    repo = "jellycli";

    rev = "v${version}";

    sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys";

  };



  vendorSha256 = "02fwsnrhj09m0aa199plpqlsjrwpmrk4c80fszzm07s5vmjqvnfy";



  patches = [

    # Fixes log file path for tests.

    ./fix-test-dir.patch

  ];



  buildInputs = [ alsa-lib ];



  meta = with lib; {

    description = "Jellyfin terminal client";

    longDescription = ''

      Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and

      Subsonic comptabile servers (API >= 1.16), e.g., Navidrome.

    '';

    homepage = "https://github.com/tryffel/jellycli";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ oxzi ];

  };

}