summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-02-09 21:08:11 -0500
committerGitHub <noreply@github.com>2020-02-09 21:08:11 -0500
commitaa4ba502d6b545da809cc1828412f6866e8e2b02 (patch)
tree8ef5294a541c9cec19f54a95e4bfbff97036f89e /pkgs
parent55ace3be68924df2a1639094c37a6f5b73afd2e1 (diff)
parent0945178b3c6fd9e33002dd6e3c6f77dfca49565a (diff)
downloadnixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.tar
nixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.tar.gz
nixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.tar.bz2
nixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.tar.lz
nixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.tar.xz
nixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.tar.zst
nixpkgs-aa4ba502d6b545da809cc1828412f6866e8e2b02.zip
Merge pull request #79335 from flokli/deprecate-perl-vm-tests
nixos/testing: add deprecation notice for Perl VM tests
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/test/nixos-functions/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix
index 6dee0a27a79..6a4f3164f92 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/pkgs/test/nixos-functions/default.nix
@@ -33,7 +33,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux (
         environment.systemPackages = [ pkgs.hello ];
       };
       testScript = ''
-        $machine->succeed("hello");
+        machine.succeed("hello")
       '';
     });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c0238735d7..a38f9cb297e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25026,7 +25026,7 @@ in
   /*
    * Run a NixOS VM network test using this evaluation of Nixpkgs.
    *
-   * It is mostly equivalent to `import ./make-test.nix` from the
+   * It is mostly equivalent to `import ./make-test-python.nix` from the
    * NixOS manual[1], except that your `pkgs` will be used instead of
    * letting NixOS invoke Nixpkgs again. If a test machine needs to
    * set NixOS options under `nixpkgs`, it must set only the
@@ -25052,11 +25052,11 @@ in
    */
   nixosTest =
     let
-      /* The nixos/lib/testing.nix module, preapplied with arguments that
+      /* The nixos/lib/testing-python.nix module, preapplied with arguments that
        * make sense for this evaluation of Nixpkgs.
        */
       nixosTesting =
-        (import ../../nixos/lib/testing.nix {
+        (import ../../nixos/lib/testing-python.nix {
           inherit (pkgs.stdenv.hostPlatform) system;
           inherit pkgs;
           extraConfigurations = [(