From 14e5b375005c9af51899afc342405a02506ec022 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sat, 20 Apr 2024 01:06:46 -0400 Subject: [PATCH] backend: use nix-inclusive to prevent unnecessary rebuilds --- flake.nix | 6 +++--- govtool/backend/default.nix | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 111e06753..bc7eae6e9 100644 --- a/flake.nix +++ b/flake.nix @@ -15,9 +15,9 @@ frontend = nodePkgs.callPackage ./govtool/frontend { pkgs = nodePkgs; incl = nix-inclusive.lib.inclusive; }; in { - packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = nodePkgs; }; - packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = nodePkgs; }; - packages.backend = defaultPkgs.callPackage ./govtool/backend { pkgs = defaultPkgs; }; + packages.scripts = defaultPkgs.callPackage ./scripts/govtool { pkgs = defaultPkgs; }; + packages.infra = defaultPkgs.callPackage ./infra/terraform { pkgs = defaultPkgs; }; + packages.backend = defaultPkgs.callPackage ./govtool/backend { pkgs = defaultPkgs; incl = nix-inclusive.lib.inclusive; }; packages.frontend = frontend; packages.webserver = defaultPkgs.callPackage frontend.webserver { staticSiteRoot = frontend.staticSite.overrideAttrs (finalAttrs: prevAttrs: { diff --git a/govtool/backend/default.nix b/govtool/backend/default.nix index 575bf4dcc..03df035c3 100644 --- a/govtool/backend/default.nix +++ b/govtool/backend/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import { } }: +{ pkgs ? import { }, incl }: let inherit (pkgs.lib.trivial) pipe; inherit (pkgs) haskell; @@ -22,7 +22,13 @@ let modifier = drv: pipe drv [ appendLibraries appendTools ]; project = ghcPackages.developPackage { - root = ./.; + root = incl ./. [ + ./vva-be.cabal + ./app + ./src + ./CHANGELOG.md + ./sql + ]; modifier = modifier; overrides = self: super: { openapi3 = useBroken super.openapi3; }; };