diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-1803.section.xml | 8 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/misc/ethminer.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 24 | ||||
| -rw-r--r-- | nixos/tests/docker-tools-cross.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/docker-tools.nix | 2 |
6 files changed, 34 insertions, 8 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml index f54f6129e0db9..910cad467e9d8 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-1803.section.xml @@ -866,6 +866,14 @@ package. </para> </listitem> + <listitem> + <para> + The vim/kakoune plugin updater now reads from a CSV file: + check + <literal>pkgs/applications/editors/vim/plugins/vim-plugin-names</literal> + out to see the new format + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-1803.section.md b/nixos/doc/manual/release-notes/rl-1803.section.md index e4e467981047b..c5146015d4499 100644 --- a/nixos/doc/manual/release-notes/rl-1803.section.md +++ b/nixos/doc/manual/release-notes/rl-1803.section.md @@ -282,3 +282,5 @@ When upgrading from a previous release, please be aware of the following incompa - The NixOS test driver supports user services declared by `systemd.user.services`. The methods `waitForUnit`, `getUnitInfo`, `startJob` and `stopJob` provide an optional `$user` argument for that purpose. - Enabling bash completion on NixOS, `programs.bash.enableCompletion`, will now also enable completion for the Nix command line tools by installing the [nix-bash-completions](https://github.com/hedning/nix-bash-completions) package. + +- The vim/kakoune plugin updater now reads from a CSV file: check `pkgs/applications/editors/vim/plugins/vim-plugin-names` out to see the new format diff --git a/nixos/modules/services/misc/ethminer.nix b/nixos/modules/services/misc/ethminer.nix index a6c52e394996c..253476d1a23e5 100644 --- a/nixos/modules/services/misc/ethminer.nix +++ b/nixos/modules/services/misc/ethminer.nix @@ -97,7 +97,7 @@ in Restart = "always"; }; - environment = { + environment = mkIf (cfg.toolkit == "cuda") { LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib"; }; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index a3ea787303764..c383486bb0bcc 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -146,7 +146,7 @@ in { ''; package = (mkPackageOption pkgs "systemd" { - default = "systemdMinimal"; + default = "systemdStage1"; }) // { visible = false; }; @@ -383,12 +383,28 @@ in { "/sbin".source = "${initrdBinEnv}/sbin"; "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; + "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; }; storePaths = [ - # TODO: Limit this to the bare necessities - "${cfg.package}/lib" - + # systemd tooling + "${cfg.package}/lib/systemd/systemd-fsck" + "${cfg.package}/lib/systemd/systemd-growfs" + "${cfg.package}/lib/systemd/systemd-hibernate-resume" + "${cfg.package}/lib/systemd/systemd-journald" + "${cfg.package}/lib/systemd/systemd-makefs" + "${cfg.package}/lib/systemd/systemd-modules-load" + "${cfg.package}/lib/systemd/systemd-remount-fs" + "${cfg.package}/lib/systemd/systemd-sulogin-shell" + "${cfg.package}/lib/systemd/systemd-sysctl" + "${cfg.package}/lib/systemd/systemd-udevd" + "${cfg.package}/lib/systemd/systemd-vconsole-setup" + + # additional systemd directories + "${cfg.package}/lib/systemd/system-generators" + "${cfg.package}/lib/udev" + + # utilities needed by systemd "${cfg.package.util-linux}/bin/mount" "${cfg.package.util-linux}/bin/umount" "${cfg.package.util-linux}/bin/sulogin" diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix index a7a6a31475d67..8791ec2581279 100644 --- a/nixos/tests/docker-tools-cross.nix +++ b/nixos/tests/docker-tools-cross.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let remoteSystem = - if pkgs.system == "aarch64-linux" + if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "x86_64-linux" else "aarch64-linux"; @@ -18,7 +18,7 @@ let # NOTE: Since this file can't control where the test will be _run_ we don't # cross-compile _to_ a different system but _from_ a different system - crossSystem = pkgs.system; + crossSystem = pkgs.stdenv.hostPlatform.system; }; hello1 = remoteCrossPkgs.dockerTools.buildImage { diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 8a240ddb17f24..80859ac7a96ec 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -315,7 +315,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker inspect ${pkgs.dockerTools.examples.cross.imageName} " + "| ${pkgs.jq}/bin/jq -r .[].Architecture" ).strip() - == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}" + == "${if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "amd64" else "arm64"}" ) with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"): |