From 0cf252399ce11fdf0eab0cbf3bca9762bb4ccd90 Mon Sep 17 00:00:00 2001 From: Noratrieb <48135649+Noratrieb@users.noreply.github.com> Date: Fri, 4 Jul 2025 18:43:55 +0200 Subject: [PATCH] does-it-build updates --- newinfra/nix/apps/does-it-build/default.nix | 11 +++++++++-- newinfra/nix/hive.nix | 2 ++ newinfra/nix/my-projects.json | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/newinfra/nix/apps/does-it-build/default.nix b/newinfra/nix/apps/does-it-build/default.nix index 284d553..ad52759 100644 --- a/newinfra/nix/apps/does-it-build/default.nix +++ b/newinfra/nix/apps/does-it-build/default.nix @@ -1,4 +1,11 @@ -{ pkgs, lib, does-it-build, ... }: { +{ pkgs, lib, does-it-build, my-projects-versions, ... }: +let + does-it-build-base = does-it-build { inherit pkgs; }; + does-it-build-with-commit = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: { + DOES_IT_BUILD_OVERRIDE_VERSION = my-projects-versions.does-it-build; + }); +in +{ systemd.services.does-it-build = { description = "https://github.com/Noratrieb/does-it-build"; wantedBy = [ "multi-user.target" ]; @@ -8,7 +15,7 @@ serviceConfig = { User = "does-it-build"; Group = "does-it-build"; - ExecStart = "${lib.getExe' (does-it-build {inherit pkgs;}) "does-it-build" }"; + ExecStart = "${lib.getExe' (does-it-build-with-commit) "does-it-build" }"; Environment = "DB_PATH=/var/lib/does-it-build/db.sqlite"; }; }; diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 4ee5fe2..ec84717 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -20,6 +20,8 @@ quotdd = import (fetchTarball "https://github.com/Noratrieb/quotdd/archive/${my-projects-versions.quotdd}.tar.gz"); does-it-build = import (fetchTarball "https://github.com/Noratrieb/does-it-build/archive/${my-projects-versions.does-it-build}.tar.gz"); + inherit my-projects-versions; + inherit nixpkgs-path; networkingConfig = { diff --git a/newinfra/nix/my-projects.json b/newinfra/nix/my-projects.json index 2d14b6f..90ea32b 100644 --- a/newinfra/nix/my-projects.json +++ b/newinfra/nix/my-projects.json @@ -4,5 +4,5 @@ "slides": "0401f35c22b124b69447655f0c537badae9e223c", "pretense": "270b01fc1118dfd713c1c41530d1a7d98f04527d", "quotdd": "e922229e1d9e055be35dabd112bafc87a0686548", - "does-it-build": "5ec24bbfaf39edd60865b2879107835b99e133d0" + "does-it-build": "9de21d41983e86fa8afe5c373c6c7b9e3deece28" }