yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

switch to nixpkgs hosteded by cache.nixos.org

Browse Source 
take 2 on https://git.clan.lol/clan/clan-core/pulls/2921
This commit is contained in:
DavHau
2025-02-27 15:18:52 +07:00
parent 35455afeb8
commit 74b30cca9f
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/container/default.nix
View File

@@ -1,7 +1,7 @@
(import ../lib/container-test.nix) ( (import ../lib/container-test.nix) (
{ ... }: { ... }:
{ {
name = "secrets"; name = "container";
nodes.machine = nodes.machine =
{ ... }: { ... }:

1
checks/installation/flake-module.nix
View File

@@ -92,6 +92,7 @@
self.nixosConfigurations.test-install-machine.config.system.build.toplevel 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.build.diskoScript
self.nixosConfigurations.test-install-machine.config.system.clan.deployment.file self.nixosConfigurations.test-install-machine.config.system.clan.deployment.file
pkgs.bash.drvPath
pkgs.stdenv.drvPath pkgs.stdenv.drvPath
pkgs.nixos-anywhere pkgs.nixos-anywhere
pkgs.bubblewrap pkgs.bubblewrap

3
checks/lib/container-test.nix
View File

@@ -16,6 +16,9 @@ in
documentation.enable = lib.mkDefault false; documentation.enable = lib.mkDefault false;
boot.isContainer = true; boot.isContainer = true;
# needed since nixpkgs 7fb2f407c01b017737eafc26b065d7f56434a992 removed the getty unit by default
console.enable = true;
# undo qemu stuff # undo qemu stuff
system.build.initialRamdisk = ""; system.build.initialRamdisk = "";
virtualisation.sharedDirectories = lib.mkForce { }; virtualisation.sharedDirectories = lib.mkForce { };

16
flake.lock generated
View File

@@ -57,18 +57,14 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739512841, "lastModified": 315532800,
"narHash": "sha256-Zc+K4AxAwFaWKK18nSl/3TKidGf46En7bfK8SL+Revg=", "narHash": "sha256-hAlw8vSTDD0GuUWGdmA/Pj7N85b6tBGehLsu+qcZpFQ=",
"owner": "NixOS", "type": "tarball",
"repo": "nixpkgs", "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre759303.3a05eebede89/nixexprs.tar.xz"
"rev": "fada727ee7c0bd487e311dede0a2b0725a0f7765",
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixpkgs-unstable", "url": "https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

2
flake.nix
View File

@@ -2,7 +2,7 @@
description = "clan.lol base operating system"; description = "clan.lol base operating system";
inputs = { 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.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";

2
lib/build-clan/tests.nix
View File

@@ -30,7 +30,7 @@ in
expr = shallowForceAllAttributes config; expr = shallowForceAllAttributes config;
expectedError = { expectedError = {
type = "ThrownError"; 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*";
}; };
}; };