From 74b30cca9ff2f11d8cff81a7d30c9e21c3993e44 Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Thu, 27 Feb 2025 15:18:52 +0700
Subject: [PATCH] switch to nixpkgs hosteded by cache.nixos.org

take 2 on https://git.clan.lol/clan/clan-core/pulls/2921
---
 checks/container/default.nix         |  2 +-
 checks/installation/flake-module.nix |  1 +
 checks/lib/container-test.nix        |  3 +++
 flake.lock                           | 16 ++++++----------
 flake.nix                            |  2 +-
 lib/build-clan/tests.nix             |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/checks/container/default.nix b/checks/container/default.nix
index 61c75a0e9..6c86a4135 100644
--- a/checks/container/default.nix
+++ b/checks/container/default.nix
@@ -1,7 +1,7 @@
 (import ../lib/container-test.nix) (
   { ... }:
   {
-    name = "secrets";
+    name = "container";
 
     nodes.machine =
       { ... }:
diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix
index 90cef4cfb..660506b00 100644
--- a/checks/installation/flake-module.nix
+++ b/checks/installation/flake-module.nix
@@ -92,6 +92,7 @@
         self.nixosConfigurations.test-install-machine.config.system.build.toplevel
         self.nixosConfigurations.test-install-machine.config.system.build.diskoScript
         self.nixosConfigurations.test-install-machine.config.system.clan.deployment.file
+        pkgs.bash.drvPath
         pkgs.stdenv.drvPath
         pkgs.nixos-anywhere
         pkgs.bubblewrap
diff --git a/checks/lib/container-test.nix b/checks/lib/container-test.nix
index f4da6ed67..fc4574dde 100644
--- a/checks/lib/container-test.nix
+++ b/checks/lib/container-test.nix
@@ -16,6 +16,9 @@ in
       documentation.enable = lib.mkDefault false;
       boot.isContainer = true;
 
+      # needed since nixpkgs 7fb2f407c01b017737eafc26b065d7f56434a992 removed the getty unit by default
+      console.enable = true;
+
       # undo qemu stuff
       system.build.initialRamdisk = "";
       virtualisation.sharedDirectories = lib.mkForce { };
diff --git a/flake.lock b/flake.lock
index 9f734df7c..22d3d569b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,18 +57,14 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739512841,
-        "narHash": "sha256-Zc+K4AxAwFaWKK18nSl/3TKidGf46En7bfK8SL+Revg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fada727ee7c0bd487e311dede0a2b0725a0f7765",
-        "type": "github"
+        "lastModified": 315532800,
+        "narHash": "sha256-hAlw8vSTDD0GuUWGdmA/Pj7N85b6tBGehLsu+qcZpFQ=",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre759303.3a05eebede89/nixexprs.tar.xz"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index fd1fb6f1d..6d1f945cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "clan.lol base operating system";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
diff --git a/lib/build-clan/tests.nix b/lib/build-clan/tests.nix
index d9cd755c6..305dbca35 100644
--- a/lib/build-clan/tests.nix
+++ b/lib/build-clan/tests.nix
@@ -30,7 +30,7 @@ in
       expr = shallowForceAllAttributes config;
       expectedError = {
         type = "ThrownError";
-        msg = "A definition for option `directory' is not of type `path*";
+        msg = "A definition for option `directory' is not of type `absolute path*";
       };
     };