From 3e5ae96919582226dfc7f7e42231b0c7a63dfb45 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Thu, 10 Jun 2021 08:50:04 +0200
Subject: flake: less hacky usage of nixos tests

---
 flake.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index f093e14..689dbb4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -155,7 +155,7 @@
           self.nixosModules.default
           ({ modulesPath, ... }: {
             imports = [
-                (modulesPath + "/installer/cd-dvd/installation-cd-base.nix")
+              (modulesPath + "/installer/cd-dvd/installation-cd-base.nix")
             ];
 
             isoImage.makeEfiBootable = true;
@@ -173,11 +173,11 @@
 
     hydraJobs =
       let
-        testing = import (nixpkgs + "/nixos/lib/testing-python.nix") { system = "x86_64-linux"; };
+        inherit (nixpkgs.legacyPackages.x86_64-linux) nixosTest;
       in
       {
 
-        tests.testDefault = testing.simpleTest {
+        tests.testDefault = nixosTest {
           machine = self.nixosModules.test;
           testScript = ''
             # TODO
@@ -185,7 +185,7 @@
           '';
         };
 
-        tests.testPlainDesktop = testing.simpleTest {
+        tests.testPlainDesktop = nixosTest {
           machine = { ... }: {
             imports = [
               self.nixosModules.test
@@ -199,7 +199,7 @@
           '';
         };
 
-        tests.testDevDesktop = testing.simpleTest {
+        tests.testDevDesktop = nixosTest {
           machine = { ... }: {
             imports = [
               self.nixosModules.test
@@ -214,7 +214,7 @@
           '';
         };
 
-        tests.testServer = testing.simpleTest {
+        tests.testServer = nixosTest {
           machine = { ... }: {
             imports = [
               self.nixosModules.test
-- 
cgit v1.2.3