fix: fixed publish dates for builds
This commit is contained in:
parent
51b237dd8e
commit
e8fd233a30
4 changed files with 46 additions and 9 deletions
12
flake.nix
12
flake.nix
|
|
@ -18,16 +18,21 @@
|
|||
f {
|
||||
pkgs = import nixpkgs {inherit overlays system;};
|
||||
});
|
||||
|
||||
realSrc = /. + (builtins.getEnv "PWD");
|
||||
in {
|
||||
packages = forEachSupportedSystem ({pkgs}: {
|
||||
default = pkgs.callPackage ./nix/package.nix {
|
||||
siteUrl = "https://blog.jan-leila.com";
|
||||
sourcePath = realSrc;
|
||||
};
|
||||
blog = pkgs.callPackage ./nix/package.nix {
|
||||
siteUrl = "https://blog.jan-leila.com";
|
||||
sourcePath = realSrc;
|
||||
};
|
||||
volpe = pkgs.callPackage ./nix/package.nix {
|
||||
siteUrl = "https://volpe.jan-leila.com";
|
||||
sourcePath = realSrc;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -46,7 +51,7 @@
|
|||
{nixpkgs.overlays = overlays;}
|
||||
./nix/configuration.nix
|
||||
];
|
||||
specialArgs = {inherit inputs;};
|
||||
specialArgs = {inherit inputs realSrc;};
|
||||
};
|
||||
|
||||
# Deployment helper - use with: nix run .#deploy
|
||||
|
|
@ -58,9 +63,10 @@
|
|||
echo "Building and deploying to cyberian@69.61.19.180..."
|
||||
nixos-rebuild switch --flake .#volpe \
|
||||
--target-host cyberian@69.61.19.180 \
|
||||
--sudo
|
||||
--sudo \
|
||||
--impure
|
||||
'');
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{inputs, ...}: {
|
||||
{inputs, realSrc, ...}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./module.nix
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
];
|
||||
enableACME = true;
|
||||
acmeEmail = "leyla@jan-leila.com";
|
||||
sourcePath = realSrc;
|
||||
};
|
||||
|
||||
services.tor = {
|
||||
|
|
@ -80,4 +81,4 @@
|
|||
enable = true;
|
||||
capacity = 100;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
in
|
||||
pkgs.callPackage ./package.nix {
|
||||
siteUrl = "${protocol}://${domain}";
|
||||
sourcePath = cfg.sourcePath;
|
||||
};
|
||||
|
||||
allDomains = [cfg.domain] ++ cfg.extraDomains;
|
||||
|
|
@ -118,6 +119,12 @@ in {
|
|||
default = "";
|
||||
description = "Email address for ACME certificate registration.";
|
||||
};
|
||||
|
||||
sourcePath = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = ./..;
|
||||
description = "Path to the source directory. Pass a path with .git for correct dates.";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
@ -214,4 +221,4 @@ in {
|
|||
|
||||
networking.firewall.allowedTCPPorts = [80 443];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -5,26 +5,49 @@
|
|||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
git,
|
||||
siteUrl,
|
||||
sourcePath ? ./..
|
||||
}: let
|
||||
nodejs = nodejs_latest;
|
||||
pnpm = pnpm_10;
|
||||
|
||||
# Filter source: use cleanSourceFilter as base, but include .git and exclude _site
|
||||
filteredSrc = lib.cleanSourceWith {
|
||||
src = sourcePath;
|
||||
filter = path: type:
|
||||
let
|
||||
baseName = baseNameOf path;
|
||||
# Always include .git directory
|
||||
isGit = baseName == ".git" || lib.hasInfix "/.git/" path || lib.hasSuffix "/.git" path;
|
||||
in
|
||||
isGit || (
|
||||
# Apply base cleanSourceFilter
|
||||
lib.cleanSourceFilter path type &&
|
||||
# Additional exclusions
|
||||
baseName != "_site" &&
|
||||
baseName != "node_modules"
|
||||
);
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "volpe";
|
||||
version = "1.0.0";
|
||||
|
||||
src = lib.cleanSource ./..;
|
||||
src = filteredSrc;
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm
|
||||
pnpmConfigHook
|
||||
git
|
||||
];
|
||||
|
||||
# fetchPnpmDeps creates the offline store
|
||||
# Use clean source (excludes .git, _site, node_modules)
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit (finalAttrs) pname version;
|
||||
src = lib.cleanSource sourcePath;
|
||||
hash = "sha256-rN8P6g/Wuug+fv0rm/qbKN01NgcbpgEQmhDFe2X42uA=";
|
||||
fetcherVersion = 3; # pnpm store version
|
||||
};
|
||||
|
|
@ -45,4 +68,4 @@ in
|
|||
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue