fix: fixed publish dates for builds

This commit is contained in:
Leyla Becker 2026-02-18 16:10:54 -06:00
parent 51b237dd8e
commit e8fd233a30
4 changed files with 46 additions and 9 deletions

View file

@ -18,16 +18,21 @@
f { f {
pkgs = import nixpkgs {inherit overlays system;}; pkgs = import nixpkgs {inherit overlays system;};
}); });
realSrc = /. + (builtins.getEnv "PWD");
in { in {
packages = forEachSupportedSystem ({pkgs}: { packages = forEachSupportedSystem ({pkgs}: {
default = pkgs.callPackage ./nix/package.nix { default = pkgs.callPackage ./nix/package.nix {
siteUrl = "https://blog.jan-leila.com"; siteUrl = "https://blog.jan-leila.com";
sourcePath = realSrc;
}; };
blog = pkgs.callPackage ./nix/package.nix { blog = pkgs.callPackage ./nix/package.nix {
siteUrl = "https://blog.jan-leila.com"; siteUrl = "https://blog.jan-leila.com";
sourcePath = realSrc;
}; };
volpe = pkgs.callPackage ./nix/package.nix { volpe = pkgs.callPackage ./nix/package.nix {
siteUrl = "https://volpe.jan-leila.com"; siteUrl = "https://volpe.jan-leila.com";
sourcePath = realSrc;
}; };
}); });
@ -46,7 +51,7 @@
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
./nix/configuration.nix ./nix/configuration.nix
]; ];
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs realSrc;};
}; };
# Deployment helper - use with: nix run .#deploy # Deployment helper - use with: nix run .#deploy
@ -58,7 +63,8 @@
echo "Building and deploying to cyberian@69.61.19.180..." echo "Building and deploying to cyberian@69.61.19.180..."
nixos-rebuild switch --flake .#volpe \ nixos-rebuild switch --flake .#volpe \
--target-host cyberian@69.61.19.180 \ --target-host cyberian@69.61.19.180 \
--sudo --sudo \
--impure
''); '');
}; };
}); });

View file

@ -1,4 +1,4 @@
{inputs, ...}: { {inputs, realSrc, ...}: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./module.nix ./module.nix
@ -41,6 +41,7 @@
]; ];
enableACME = true; enableACME = true;
acmeEmail = "leyla@jan-leila.com"; acmeEmail = "leyla@jan-leila.com";
sourcePath = realSrc;
}; };
services.tor = { services.tor = {

View file

@ -28,6 +28,7 @@
in in
pkgs.callPackage ./package.nix { pkgs.callPackage ./package.nix {
siteUrl = "${protocol}://${domain}"; siteUrl = "${protocol}://${domain}";
sourcePath = cfg.sourcePath;
}; };
allDomains = [cfg.domain] ++ cfg.extraDomains; allDomains = [cfg.domain] ++ cfg.extraDomains;
@ -118,6 +119,12 @@ in {
default = ""; default = "";
description = "Email address for ACME certificate registration."; 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 { config = lib.mkIf cfg.enable {

View file

@ -5,26 +5,49 @@
pnpm_10, pnpm_10,
fetchPnpmDeps, fetchPnpmDeps,
pnpmConfigHook, pnpmConfigHook,
git,
siteUrl, siteUrl,
sourcePath ? ./..
}: let }: let
nodejs = nodejs_latest; nodejs = nodejs_latest;
pnpm = pnpm_10; 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 in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "volpe"; pname = "volpe";
version = "1.0.0"; version = "1.0.0";
src = lib.cleanSource ./..; src = filteredSrc;
nativeBuildInputs = [ nativeBuildInputs = [
nodejs nodejs
pnpm pnpm
pnpmConfigHook pnpmConfigHook
git
]; ];
# fetchPnpmDeps creates the offline store # fetchPnpmDeps creates the offline store
# Use clean source (excludes .git, _site, node_modules)
pnpmDeps = fetchPnpmDeps { pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version;
src = lib.cleanSource sourcePath;
hash = "sha256-rN8P6g/Wuug+fv0rm/qbKN01NgcbpgEQmhDFe2X42uA="; hash = "sha256-rN8P6g/Wuug+fv0rm/qbKN01NgcbpgEQmhDFe2X42uA=";
fetcherVersion = 3; # pnpm store version fetcherVersion = 3; # pnpm store version
}; };