diff options
author | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-01-25 11:54:52 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-25 11:54:52 -0800 |
commit | e74ccf2d727783967b30887a71aa7f18cef14a35 (patch) | |
tree | 7eb08bd615c3389da108d402d620769b607d90d5 /nixos | |
parent | cd85b9fc42cf385eebf113f05a403622a021fab9 (diff) | |
parent | bf793f213d8aa5607112cca7bff1639c76306e7a (diff) |
Merge pull request #154708 from NixOS/staging-next
Staging next 2022-01-12
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 13 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 6 | ||||
-rw-r--r-- | nixos/modules/security/pam.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/activation/top-level.nix | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/systemd.nix | 16 |
5 files changed, 27 insertions, 14 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index d1692c66a4ba2..436157515ebe8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -358,6 +358,19 @@ </listitem> <listitem> <para> + The iputils package, which is installed by default, no longer + provides the legacy tools <literal>tftpd</literal> and + <literal>traceroute6</literal>. More tools + (<literal>ninfod</literal>, <literal>rarpd</literal>, and + <literal>rdisc</literal>) are going to be removed in the next + release. See + <link xlink:href="https://github.com/iputils/iputils/releases/tag/20211215">upstream’s + release notes</link> for more details and available + replacements. + </para> + </listitem> + <listitem> + <para> <literal>services.thelounge.private</literal> was removed in favor of <literal>services.thelounge.public</literal>, to follow with upstream changes. diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index f2484c911e72f..9d919711cb7f4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -116,6 +116,12 @@ In addition to numerous new and upgraded packages, this release has the followin - `idris2` now requires `--package` when using packages `contrib` and `network`, while previously these idris2 packages were automatically loaded. +- The iputils package, which is installed by default, no longer provides the + legacy tools `tftpd` and `traceroute6`. More tools (`ninfod`, `rarpd`, and + `rdisc`) are going to be removed in the next release. See + [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20211215) + for more details and available replacements. + - `services.thelounge.private` was removed in favor of `services.thelounge.public`, to follow with upstream changes. - `pkgs.docbookrx` was removed since it's unmaintained diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 21202c55fe285..964cfe7040c1b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1035,7 +1035,7 @@ in setuid = true; owner = "root"; group = "root"; - source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; + source = "${pkgs.pam}/bin/unix_chkpwd"; }; }; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index c9fef33c94038..18ac717f5dd6c 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -55,8 +55,8 @@ let substituteInPlace $out/dry-activate --subst-var out chmod u+x $out/activate $out/dry-activate unset activationScript dryActivationScript - ${pkgs.stdenv.shell} -n $out/activate - ${pkgs.stdenv.shell} -n $out/dry-activate + ${pkgs.stdenv.shellDryRun} $out/activate + ${pkgs.stdenv.shellDryRun} $out/dry-activate cp ${config.system.build.bootStage2} $out/init substituteInPlace $out/init --subst-var-by systemConfig $out diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index ec5dea075bbce..76c59c047e0fe 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -210,20 +210,14 @@ let makeJobScript = name: text: let scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); - out = pkgs.writeTextFile { + out = (pkgs.writeShellScriptBin scriptName '' + set -e + ${text} + '').overrideAttrs (_: { # The derivation name is different from the script file name # to keep the script file name short to avoid cluttering logs. name = "unit-script-${scriptName}"; - executable = true; - destination = "/bin/${scriptName}"; - text = '' - #!${pkgs.runtimeShell} -e - ${text} - ''; - checkPhase = '' - ${pkgs.stdenv.shell} -n "$out/bin/${scriptName}" - ''; - }; + }); in "${out}/bin/${scriptName}"; unitConfig = { config, options, ... }: { |