···866866 package.
867867 </para>
868868 </listitem>
869869+ <listitem>
870870+ <para>
871871+ The vim/kakoune plugin updater now reads from a CSV file:
872872+ check
873873+ <literal>pkgs/applications/editors/vim/plugins/vim-plugin-names</literal>
874874+ out to see the new format
875875+ </para>
876876+ </listitem>
869877 </itemizedlist>
870878 </section>
871879</section>
+2
nixos/doc/manual/release-notes/rl-1803.section.md
···282282- 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.
283283284284- 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.
285285+286286+- 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
+1
nixos/lib/make-disk-image.nix
···170170 config.system.build.nixos-install
171171 config.system.build.nixos-enter
172172 nix
173173+ systemdMinimal
173174 ] ++ stdenv.initialPath);
174175175176 # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
···77let
8899 remoteSystem =
1010- if pkgs.system == "aarch64-linux"
1010+ if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
1111 then "x86_64-linux"
1212 else "aarch64-linux";
1313···18181919 # NOTE: Since this file can't control where the test will be _run_ we don't
2020 # cross-compile _to_ a different system but _from_ a different system
2121- crossSystem = pkgs.system;
2121+ crossSystem = pkgs.stdenv.hostPlatform.system;
2222 };
23232424 hello1 = remoteCrossPkgs.dockerTools.buildImage {
···1616, makeWrapper
1717, moreutils
1818, nix
1919+, nixosTests
1920, pigz
2020-, pkgs
2121, rsync
2222, runCommand
2323, runtimeShell
···2626, storeDir ? builtins.storeDir
2727, substituteAll
2828, symlinkJoin
2929+, tarsum
2930, util-linux
3031, vmTools
3132, writeReferencesToFile
···8182 inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb;
8283 };
83848585+ tests = {
8686+ inherit (nixosTests)
8787+ docker-tools
8888+ docker-tools-overlay
8989+ # requires remote builder
9090+ # docker-tools-cross
9191+ ;
9292+ };
9393+8494 pullImage =
8595 let
8696 fixName = name: builtins.replaceStrings [ "/" ":" ] [ "-" "-" ] name;
···113123 outputHashAlgo = "sha256";
114124 outputHash = sha256;
115125116116- nativeBuildInputs = lib.singleton skopeo;
126126+ nativeBuildInputs = [ skopeo ];
117127 SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt";
118128119129 sourceURL = "docker://${imageName}@${imageDigest}";
···132142133143 # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
134144 # And we cannot untar it, because then we cannot preserve permissions etc.
135135- tarsum = pkgs.tarsum;
145145+ inherit tarsum; # pkgs.dockerTools.tarsum
136146137147 # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
138148 mergeDrvs =
···754764 # "#!/usr/bin/env executable" shebang.
755765 usrBinEnv = runCommand "usr-bin-env" { } ''
756766 mkdir -p $out/usr/bin
757757- ln -s ${pkgs.coreutils}/bin/env $out/usr/bin
767767+ ln -s ${coreutils}/bin/env $out/usr/bin
758768 '';
759769760770 # This provides /bin/sh, pointing to bashInteractive.
+1-1
pkgs/build-support/docker/examples.nix
···486486 cross = let
487487 # Cross compile for x86_64 if on aarch64
488488 crossPkgs =
489489- if pkgs.system == "aarch64-linux" then pkgsCross.gnu64
489489+ if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then pkgsCross.gnu64
490490 else pkgsCross.aarch64-multiplatform;
491491 in crossPkgs.dockerTools.buildImage {
492492 name = "hello-cross";