From 44d42ea5d1960ea4ea760da6464c2dd7e42e1f45 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 29 Jan 2024 02:28:29 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
flake.lock | 86 +++++++++++++++++++++++++++++++++++++++++++----
flake.nix | 1 +
hosts/default.nix | 2 ++
3 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
index e2e4891..9723047 100644
--- a/flake.lock
+++ b/flake.lock
@@ -317,6 +317,27 @@
}
},
"flake-parts_3": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "hercules-ci-agent",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1704982712,
+ "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "07f6395285469419cf9d078f59b5b49993198c00",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"hercules-ci-effects",
@@ -336,7 +357,7 @@
"type": "indirect"
}
},
- "flake-parts_4": {
+ "flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
@@ -429,6 +450,42 @@
"type": "github"
}
},
+ "haskell-flake": {
+ "locked": {
+ "lastModified": 1684780604,
+ "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
+ "owner": "srid",
+ "repo": "haskell-flake",
+ "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "srid",
+ "ref": "0.3.0",
+ "repo": "haskell-flake",
+ "type": "github"
+ }
+ },
+ "hercules-ci-agent": {
+ "inputs": {
+ "flake-parts": "flake-parts_3",
+ "haskell-flake": "haskell-flake",
+ "nixpkgs": "nixpkgs_6"
+ },
+ "locked": {
+ "lastModified": 1706307588,
+ "narHash": "sha256-t46dB7XCBwj2FOwhFWyMOfriGny1bEOgak24fylo5j4=",
+ "owner": "hercules-ci",
+ "repo": "hercules-ci-agent",
+ "rev": "f01ae96b022bb12d35d7223548a0b05623a55ddf",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "hercules-ci-agent",
+ "type": "github"
+ }
+ },
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_2",
@@ -450,8 +507,8 @@
},
"hercules-ci-effects_2": {
"inputs": {
- "flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs_6"
+ "flake-parts": "flake-parts_4",
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1704029560,
@@ -781,6 +838,22 @@
}
},
"nixpkgs_6": {
+ "locked": {
+ "lastModified": 1705856552,
+ "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_7": {
"locked": {
"lastModified": 1703637592,
"narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
@@ -796,7 +869,7 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1678470307,
"narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
@@ -911,9 +984,9 @@
"rock5b": {
"inputs": {
"fan-control": "fan-control",
- "flake-parts": "flake-parts_4",
+ "flake-parts": "flake-parts_5",
"kernel-src": "kernel-src",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_8",
"nixpkgs-kernel": "nixpkgs-kernel",
"panfork": "panfork",
"tow-boot": "tow-boot",
@@ -940,6 +1013,7 @@
"disko": "disko",
"dream2nix": "dream2nix",
"flakeParts": "flakeParts",
+ "hercules-ci-agent": "hercules-ci-agent",
"hercules-ci-effects": "hercules-ci-effects_2",
"homeManager": "homeManager",
"homeManagerGitWorkspace": "homeManagerGitWorkspace",
diff --git a/flake.nix b/flake.nix
index 1f8a1e8..84b47c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,7 @@
};
hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects";
dream2nix.url = "github:nix-community/dream2nix";
+ hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent";
};
outputs = inputs @ {flakeParts, ...}:
diff --git a/hosts/default.nix b/hosts/default.nix
index 47676d5..de8e4d2 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -99,6 +99,7 @@
};
extraModules = [
inputs.disko.nixosModules.disko
+ # inputs.hercules-ci-agent.nixosModules.agent-service
];
extraHmModules = [
inputs.ccrEmacs.hmModules.default
@@ -127,6 +128,7 @@
};
extraModules = with inputs; [
disko.nixosModules.disko
+ # inputs.hercules-ci-agent.nixosModules.agent-service;
# rock5b.nixosModules.default
];
secrets = {