Commit 36720537 authored by Dennis Gosnell's avatar Dennis Gosnell
Browse files

Merge remote-tracking branch 'origin/master' into haskell-updates

parents b45794eb 8e32f5b9

doc/languages-frameworks/beam.section.md

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ Here is how your `default.nix` file would look for a phoenix project. 
with import <nixpkgs> { };



let

  # beam.interpreters.erlang_23 is available if you need a particular version

  # beam.interpreters.erlang_26 is available if you need a particular version

  packages = beam.packagesWith beam.interpreters.erlang;



  pname = "your_project";

maintainers/maintainer-list.nix

+7 −1
Original line number Diff line number Diff line
@@ -18135,6 +18135,12 @@ 
    githubId = 90482;

    name = "Viktor Nordling";

  };

  vilsol = {

    email = "me@vil.so";

    github = "vilsol";

    githubId = 1759390;

    name = "Vilsol";

  };

  viluon = {

    email = "nix@viluon.me";

    github = "viluon";
@@ -18390,7 +18396,7 @@ 
  };

  weathercold = {

    name = "Weathercold";

    email = "weathercold.scr@gmail.com";

    email = "weathercold.scr@proton.me";

    matrix = "@weathercold:matrix.org";

    github = "Weathercold";

    githubId = 49368953;

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

+1 −2
Original line number Diff line number Diff line
@@ -935,8 +935,7 @@ In addition to numerous new and upgraded packages, this release has the followin 
  using the `pomerium-cli` command, you should now install the `pomerium-cli`

  package.



- The option

  [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock)

- The option `services.networking.networkmanager.enableFccUnlock`

  was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager

  daemon no longer automatically performs the FCC unlock procedure by default. See

  [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details.

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

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


- Emacs macport version 29 was introduced.



- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option simply did enable all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all.



- The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md).



- `kratos` has been updated from 0.10.1 to the first stable version 1.0.0, please read the [0.10.1 to 0.11.0](https://github.com/ory/kratos/releases/tag/v0.11.0), [0.11.0 to 0.11.1](https://github.com/ory/kratos/releases/tag/v0.11.1), [0.11.1 to 0.13.0](https://github.com/ory/kratos/releases/tag/v0.13.0) and [0.13.0 to 1.0.0](https://github.com/ory/kratos/releases/tag/v1.0.0) upgrade guides. The most notable breaking change is the introduction of one-time passwords (`code`) and update of the default recovery strategy from `link` to `code`.

nixos/modules/config/update-users-groups.pl

+4 −4
Original line number Diff line number Diff line
@@ -239,12 +239,12 @@ foreach my $u (@{$spec->{users}}) { 
        chmod oct($u->{homeMode}), $u->{home};

    }



    if (defined $u->{passwordFile}) {

        if (-e $u->{passwordFile}) {

            $u->{hashedPassword} = read_file($u->{passwordFile});

    if (defined $u->{hashedPasswordFile}) {

        if (-e $u->{hashedPasswordFile}) {

            $u->{hashedPassword} = read_file($u->{hashedPasswordFile});

            chomp $u->{hashedPassword};

        } else {

            warn "warning: password file ‘$u->{passwordFile}’ does not exist\n";

            warn "warning: password file ‘$u->{hashedPasswordFile}’ does not exist\n";

        }

    } elsif (defined $u->{password}) {

        $u->{hashedPassword} = hashPassword($u->{password});