Updated website builder and formatting workflow

This commit is contained in:
rasmus-kirk
2025-03-10 09:44:22 +01:00
parent 5e8d870246
commit 17d60afbbc
3 changed files with 35 additions and 11 deletions
-2
View File
@@ -6,8 +6,6 @@ on:
branches: [main, release**] branches: [main, release**]
pull_request: pull_request:
branches: [main, release**] branches: [main, release**]
# Don't run on draft PR's, see: https://github.com/orgs/community/discussions/25722#discussioncomment-3248917
types: [opened, synchronize, reopened, ready_for_review]
# Allows us to run the workflow manually from the Actions tab # Allows us to run the workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:
Generated
+9 -9
View File
@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736657626, "lastModified": 1741402956,
"narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=", "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -42,11 +42,11 @@
}, },
"vpnconfinement": { "vpnconfinement": {
"locked": { "locked": {
"lastModified": 1731209328, "lastModified": 1740921534,
"narHash": "sha256-b3jggBHZh20jUfBxoaIvew23czsw82zBc0aKxtkF3g8=", "narHash": "sha256-orXe3m04DLTW3I19VVanClzpqeq7adnDTqKAD7aPbA8=",
"owner": "Maroka-chan", "owner": "Maroka-chan",
"repo": "VPN-Confinement", "repo": "VPN-Confinement",
"rev": "74e6fd47804b5ca69187200efbb14cf1ecb9ea07", "rev": "5eb7dc3e901f4dbb085eb37f5785473a9ae78bc4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -62,11 +62,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737502356, "lastModified": 1741594814,
"narHash": "sha256-IF8rpMs63pPu+EvLRQ1mfyc1EZHP7BNeK3dN048tf1U=", "narHash": "sha256-YPAIywsWZVhQuy/cPJLi3PiWgoWDrqvQCBytXeSQYCk=",
"owner": "rasmus-kirk", "owner": "rasmus-kirk",
"repo": "website-builder", "repo": "website-builder",
"rev": "d9fc8c15f297fa7a588b3ca251ef77e1f0c6ebb5", "rev": "e0239195b33103a4923011d8e96ef39a3397631b",
"type": "github" "type": "github"
}, },
"original": { "original": {
+26
View File
@@ -54,6 +54,7 @@
website = website-builder.lib { website = website-builder.lib {
pkgs = pkgs; pkgs = pkgs;
src = "${self}"; src = "${self}";
timestamp = self.lastModified;
headerTitle = "Nixarr"; headerTitle = "Nixarr";
standalonePages = [ standalonePages = [
{ {
@@ -99,6 +100,31 @@
in { in {
default = website.package; default = website.package;
debug = website.loop; debug = website.loop;
testPkg = pkgs.stdenv.mkDerivation {
name = "test-pkg";
src = ./.;
buildInputs = [(
pkgs.writeShellApplication {
name = "test-pkg-builder";
runtimeInputs = with pkgs; [
pandoc
coreutils
findutils
gnused
rsync
git
];
text = ''
echo "${self.lastModified}"
'';
}
)];
phases = ["unpackPhase" "buildPhase"];
buildPhase = "test-pkg-builder";
};
}); });
formatter = forAllSystems ({pkgs}: pkgs.alejandra); formatter = forAllSystems ({pkgs}: pkgs.alejandra);