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

Merge master into staging-next

parents cb64b504 b30e97ac

.github/CODEOWNERS

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
/maintainers/scripts/update-python-libraries	              @FRidh

/pkgs/development/interpreters/python                       @FRidh

/doc/languages-frameworks/python.section.md                 @FRidh @mweinelt

/pkgs/development/tools/poetry2nix                          @adisbladis

/pkgs/development/interpreters/python/hooks                 @FRidh @jonringer



# Haskell

doc/builders/fetchers.chapter.md

+5 −5
Original line number Diff line number Diff line
@@ -243,21 +243,21 @@ or 


***

```

## `fetchFromBittorrent` {#fetchfrombittorrent}

## `fetchtorrent` {#fetchtorrent}



`fetchFromBittorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)

`fetchtorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)



```

{ fetchFromBittorrent }:

{ fetchtorrent }:



fetchFromBittorrent {

fetchtorrent {

  config = { peer-limit-global = 100; };

  url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c";

  sha256 = "";

}

```



### Parameters {#fetchfrombittorrent-parameters}

### Parameters {#fetchtorrent-parameters}



- `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file.

nixos/modules/config/mysql.nix

+2 −2
Original line number Diff line number Diff line
@@ -429,11 +429,11 @@ in 
      '';

    };



    # Activation script to append the password from the password file

    # preStart script to append the password from the password file

    # to the configuration files. It also fixes the owner of the

    # libnss-mysql-root.cfg because it is changed to root after the

    # password is appended.

    system.activationScripts.mysql-auth-passwords = ''

    systemd.services.mysql.preStart = ''

      if [[ -r ${cfg.passwordFile} ]]; then

        org_umask=$(umask)

        umask 0077

nixos/modules/config/nix-channel.nix

+4 −7
Original line number Diff line number Diff line
@@ -97,12 +97,9 @@ in 


    nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault "");



    system.activationScripts.nix-channel = mkIf cfg.channel.enable

      (stringAfter [ "etc" "users" ] ''

        # Subscribe the root user to the NixOS channel by default.

        if [ ! -e "/root/.nix-channels" ]; then

            echo "${config.system.defaultChannel} nixos" > "/root/.nix-channels"

        fi

      '');

    systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [

      "f /root/.nix-channels -"

      ''w "/root/.nix-channels" - - - - "${config.system.defaultChannel} nixos\n"''

    ];

  };

}

nixos/modules/security/duosec.nix

+12 −3
Original line number Diff line number Diff line
@@ -193,8 +193,11 @@ in 
        source = "${pkgs.duo-unix.out}/bin/login_duo";

      };



    system.activationScripts = {

      login_duo = mkIf cfg.ssh.enable ''

    systemd.services.login-duo = lib.mkIf cfg.ssh.enable {

      wantedBy = [ "sysinit.target" ];

      before = [ "sysinit.target" ];

      unitConfig.DefaultDependencies = false;

      script = ''

        if test -f "${cfg.secretKeyFile}"; then

          mkdir -m 0755 -p /etc/duo
@@ -209,7 +212,13 @@ in 
          mv -fT "$conf" /etc/duo/login_duo.conf

        fi

      '';

      pam_duo = mkIf cfg.pam.enable ''

    };



    systemd.services.pam-duo = lib.mkIf cfg.ssh.enable {

      wantedBy = [ "sysinit.target" ];

      before = [ "sysinit.target" ];

      unitConfig.DefaultDependencies = false;

      script = ''

        if test -f "${cfg.secretKeyFile}"; then

          mkdir -m 0755 -p /etc/duo