···866 package.
867 </para>
868 </listitem>
869+ <listitem>
870+ <para>
871+ The vim/kakoune plugin updater now reads from a CSV file:
872+ check
873+ <literal>pkgs/applications/editors/vim/plugins/vim-plugin-names</literal>
874+ out to see the new format
875+ </para>
876+ </listitem>
877 </itemizedlist>
878 </section>
879</section>
+2
nixos/doc/manual/release-notes/rl-1803.section.md
···282- 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.
283284- 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.
00
···282- 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.
283284- 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.
285+286+- 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
···170 config.system.build.nixos-install
171 config.system.build.nixos-enter
172 nix
0173 ] ++ stdenv.initialPath);
174175 # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
···170 config.system.build.nixos-install
171 config.system.build.nixos-enter
172 nix
173+ systemdMinimal
174 ] ++ stdenv.initialPath);
175176 # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
···7let
89 remoteSystem =
10- if pkgs.system == "aarch64-linux"
11 then "x86_64-linux"
12 else "aarch64-linux";
13···1819 # NOTE: Since this file can't control where the test will be _run_ we don't
20 # cross-compile _to_ a different system but _from_ a different system
21- crossSystem = pkgs.system;
22 };
2324 hello1 = remoteCrossPkgs.dockerTools.buildImage {
···7let
89 remoteSystem =
10+ if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
11 then "x86_64-linux"
12 else "aarch64-linux";
13···1819 # NOTE: Since this file can't control where the test will be _run_ we don't
20 # cross-compile _to_ a different system but _from_ a different system
21+ crossSystem = pkgs.stdenv.hostPlatform.system;
22 };
2324 hello1 = remoteCrossPkgs.dockerTools.buildImage {
···16, makeWrapper
17, moreutils
18, nix
019, pigz
20-, pkgs
21, rsync
22, runCommand
23, runtimeShell
···26, storeDir ? builtins.storeDir
27, substituteAll
28, symlinkJoin
029, util-linux
30, vmTools
31, writeReferencesToFile
···81 inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb;
82 };
8300000000084 pullImage =
85 let
86 fixName = name: builtins.replaceStrings [ "/" ":" ] [ "-" "-" ] name;
···113 outputHashAlgo = "sha256";
114 outputHash = sha256;
115116- nativeBuildInputs = lib.singleton skopeo;
117 SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt";
118119 sourceURL = "docker://${imageName}@${imageDigest}";
···132133 # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
134 # And we cannot untar it, because then we cannot preserve permissions etc.
135- tarsum = pkgs.tarsum;
136137 # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
138 mergeDrvs =
···754 # "#!/usr/bin/env executable" shebang.
755 usrBinEnv = runCommand "usr-bin-env" { } ''
756 mkdir -p $out/usr/bin
757- ln -s ${pkgs.coreutils}/bin/env $out/usr/bin
758 '';
759760 # This provides /bin/sh, pointing to bashInteractive.
···16, makeWrapper
17, moreutils
18, nix
19+, nixosTests
20, pigz
021, rsync
22, runCommand
23, runtimeShell
···26, storeDir ? builtins.storeDir
27, substituteAll
28, symlinkJoin
29+, tarsum
30, util-linux
31, vmTools
32, writeReferencesToFile
···82 inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb;
83 };
8485+ tests = {
86+ inherit (nixosTests)
87+ docker-tools
88+ docker-tools-overlay
89+ # requires remote builder
90+ # docker-tools-cross
91+ ;
92+ };
93+94 pullImage =
95 let
96 fixName = name: builtins.replaceStrings [ "/" ":" ] [ "-" "-" ] name;
···123 outputHashAlgo = "sha256";
124 outputHash = sha256;
125126+ nativeBuildInputs = [ skopeo ];
127 SSL_CERT_FILE = "${cacert.out}/etc/ssl/certs/ca-bundle.crt";
128129 sourceURL = "docker://${imageName}@${imageDigest}";
···142143 # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
144 # And we cannot untar it, because then we cannot preserve permissions etc.
145+ inherit tarsum; # pkgs.dockerTools.tarsum
146147 # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
148 mergeDrvs =
···764 # "#!/usr/bin/env executable" shebang.
765 usrBinEnv = runCommand "usr-bin-env" { } ''
766 mkdir -p $out/usr/bin
767+ ln -s ${coreutils}/bin/env $out/usr/bin
768 '';
769770 # This provides /bin/sh, pointing to bashInteractive.
+1-1
pkgs/build-support/docker/examples.nix
···486 cross = let
487 # Cross compile for x86_64 if on aarch64
488 crossPkgs =
489- if pkgs.system == "aarch64-linux" then pkgsCross.gnu64
490 else pkgsCross.aarch64-multiplatform;
491 in crossPkgs.dockerTools.buildImage {
492 name = "hello-cross";
···486 cross = let
487 # Cross compile for x86_64 if on aarch64
488 crossPkgs =
489+ if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then pkgsCross.gnu64
490 else pkgsCross.aarch64-multiplatform;
491 in crossPkgs.dockerTools.buildImage {
492 name = "hello-cross";