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

Merge master into staging-next

parents 0523b2e6 cd014bdb

doc/hooks/index.md

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ perl.section.md 
pkg-config.section.md

postgresql-test-hook.section.md

python.section.md

qt-4.section.md

scons.section.md

tetex-tex-live.section.md

unzip.section.md

doc/hooks/qt-4.section.md

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# Qt 4 {#qt-4}



Sets the `QTDIR` environment variable to Qt’s path.

nixos/modules/security/sudo.nix

+6 −4
Original line number Diff line number Diff line
@@ -192,10 +192,12 @@ in 
  ###### implementation



  config = mkIf cfg.enable {

    assertions = [

      { assertion = cfg.package.pname != "sudo-rs";

        message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; }

    ];

    assertions = [ {

      assertion = cfg.package.pname != "sudo-rs";

      message = ''

        NixOS' `sudo` module does not support `sudo-rs`; see `security.sudo-rs` instead.

      '';

    } ];



    security.sudo.extraRules =

      let

nixos/tests/pleroma.nix

+18 −3
Original line number Diff line number Diff line
@@ -25,6 +25,18 @@ 


import ./make-test-python.nix ({ pkgs, ... }:

  let

  # Fix for https://github.com/ihabunek/toot/pull/405. Includes

  # https://github.com/ihabunek/toot/pull/405. TOREMOVE when

  # toot > 0.38.1

  patched-toot = pkgs.toot.overrideAttrs (old: {

    version = "unstable-24-09-2023";

    src = pkgs.fetchFromGitHub {

      owner = "ihabunek";

      repo = "toot";

      rev = "30857f570d64a26da80d0024227a8259f7cb65b5";

      sha256 = "sha256-BxrI7UY9bfqPzS+VLqCFSmu4PkIkvhntcEeNJb1AzOs=";

    };

  });

  send-toot = pkgs.writeScriptBin "send-toot" ''

    set -eux

    # toot is using the requests library internally. This library
@@ -164,9 +176,12 @@ import ./make-test-python.nix ({ pkgs, ... }: 
  '';



  tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''

    openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500

    mkdir -p $out

    cp key.pem cert.pem $out

    openssl req -x509 \

      -subj '/CN=pleroma.nixos.test/' -days 49710 \

      -addext 'subjectAltName = DNS:pleroma.nixos.test' \

      -keyout "$out/key.pem" -newkey ed25519 \

      -out "$out/cert.pem" -noenc

  '';



  hosts = nodes: ''
@@ -180,7 +195,7 @@ import ./make-test-python.nix ({ pkgs, ... }: 
      security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];

      networking.extraHosts = hosts nodes;

      environment.systemPackages = with pkgs; [

        toot

        patched-toot

        send-toot

      ];

    };

pkgs/applications/editors/texworks/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
, poppler

, qt5compat

, qttools

, qtwayland

, withLua ? true, lua

, withPython ? true, python3 }:
@@ -36,7 +37,8 @@ stdenv.mkDerivation rec { 
    qt5compat

    qttools

  ] ++ lib.optional withLua lua

    ++ lib.optional withPython python3;

    ++ lib.optional withPython python3

    ++ lib.optional stdenv.isLinux qtwayland;



  cmakeFlags = [

    "-DQT_DEFAULT_MAJOR_VERSION=6"