diff --git a/newinfra/nix/apps/does-it-build/default.nix b/newinfra/nix/apps/does-it-build/default.nix index ad52759..284d553 100644 --- a/newinfra/nix/apps/does-it-build/default.nix +++ b/newinfra/nix/apps/does-it-build/default.nix @@ -1,11 +1,4 @@ -{ 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 -{ +{ pkgs, lib, does-it-build, ... }: { systemd.services.does-it-build = { description = "https://github.com/Noratrieb/does-it-build"; wantedBy = [ "multi-user.target" ]; @@ -15,7 +8,7 @@ in serviceConfig = { User = "does-it-build"; Group = "does-it-build"; - ExecStart = "${lib.getExe' (does-it-build-with-commit) "does-it-build" }"; + ExecStart = "${lib.getExe' (does-it-build {inherit pkgs;}) "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 ec84717..4ee5fe2 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -20,8 +20,6 @@ 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 8681389..2d14b6f 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": "3f302c71801d6d8bca5baa57becb990aa2729b49" + "does-it-build": "5ec24bbfaf39edd60865b2879107835b99e133d0" }