Commit 85faae5e authored by Emily's avatar Emily
Browse files

Merge staging-next into staging

parents 5a96e991 df769e85

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -12697,6 +12697,12 @@ 
    githubId = 3044438;

    name = "Lucas Savva";

  };

  m1dugh = {

    email = "romain103paris@gmail.com";

    name = "Romain LE MIERE";

    github = "m1dugh";

    githubId = 42266017;

  };

  ma27 = {

    email = "maximilian@mbosch.me";

    matrix = "@ma27:nicht-so.sexy";

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

+2 −0
Original line number Diff line number Diff line
@@ -502,6 +502,8 @@ 


- The `xdg.portal.gtkUsePortal` option has been removed, as it had been deprecated for over 2 years. Using the `GTK_USE_PORTAL` environment variable in this manner is not intended nor encouraged by the GTK developers, but can still be done manually via `environment.sessionVariables`.



- Support for the legacy CUPS browsing and LDAP have been removed from `services.printing`. If `cups` or `ldap` are in the `BrowseRemoteProtocols` setting in `services.printing.browsedConf`, it needs to be removed.



- The `services.trust-dns` module has been renamed to `services.hickory-dns`.



- The option `services.prometheus.exporters.pgbouncer.connectionStringFile` has been removed since

nixos/modules/services/printing/cupsd.nix

+2 −3
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ in 
        type = types.bool;

        default = false;

        description = ''

          Whether to open the firewall for TCP/UDP ports specified in

          listenAdrresses option.

          Whether to open the firewall for TCP ports specified in

          listenAddresses option.

        '';

      };
@@ -493,7 +493,6 @@ in 
      listenPorts = parsePorts cfg.listenAddresses;

    in mkIf cfg.openFirewall {

      allowedTCPPorts = listenPorts;

      allowedUDPPorts = listenPorts;

    };



  };

pkgs/applications/blockchains/bisq-desktop/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -122,5 +122,7 @@ stdenv.mkDerivation rec { 
    license = licenses.mit;

    maintainers = with maintainers; [ juaningan emmanuelrosa ];

    platforms = [ "x86_64-linux" ];

    # Requires OpenJFX 11 or 16, which are both EOL.

    broken = true;

  };

}

pkgs/applications/editors/vscode/extensions/chrischinchilla.vscode-pandoc/default.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{

  lib,

  vscode-utils,

  jq,

  moreutils,

  pandoc,

}:



vscode-utils.buildVscodeMarketplaceExtension {

  mktplcRef = {

    name = "vscode-pandoc";

    publisher = "chrischinchilla";

    version = "0.4.8";

    hash = "sha256-+U6AtT2wf1mE92IR+mv4aKD9/78ULus2GuwwgxdCvBA=";

  };

  nativeBuildInputs = [

    jq

    moreutils

  ];

  postInstall = ''

    jq '.contributes.configuration.properties."pandoc.executable".default = "${lib.getExe pandoc}"' $out/$installPrefix/package.json | sponge $out/$installPrefix/package.json

  '';

  meta = {

    description = "Converts Markdown files to pdf, docx, or html files using pandoc";

    homepage = "https://github.com/ChrisChinchilla/vscode-pandoc#readme";

    downloadPage = "https://marketplace.visualstudio.com/items?itemName=yzane.markdown-pdf";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ pandapip1 ];

  };

}