Filter src input to derivation

strykeforce · Feb 4, 2024 · 1134e37 · 1134e37
1 parent 6b19fa0
commit 1134e37
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 137 deletions.
diff --git a/admin/flake.nix b/admin/flake.nix
@@ -22,19 +22,20 @@
             deadeye-admin = mkPoetryApplication { projectDir = self; };
             default = self.packages.${system}.deadeye-admin;
 
-            venv = mkPoetryEnv
-              {
-                projectDir = self;
-                groups = [ "main" "dev" ];
-              };
+            venv = mkPoetryEnv {
+              projectDir = self;
+              groups = [ "main" "dev" ];
+            };
 
-            dockerImage = pkgs.dockerTools.streamLayeredImage {
+            dockerImage = pkgs.dockerTools.buildLayeredImage {
               name = "j3ff/deadeye-admin";
               tag = "latest";
-              contents = [
-                self.packages.${system}.deadeye-admin.dependencyEnv
-              ];
-              config.Cmd = [ "/bin/deadeye-server" ];
+
+              config.Cmd =
+                let
+                  deadeyePkg = self.packages.${system}.deadeye-admin.dependencyEnv;
+                in
+                [ "${deadeyePkg}/bin/deadeye-server" ];
             };
           };
 

diff --git a/admin/justfile b/admin/justfile
@@ -8,7 +8,7 @@ VERSION := `git rev-parse --short HEAD`
 
 docker:
   nix build .#dockerImage
-  ./result | docker load
+  docker load < result
   docker tag {{ IMAGE }}:latest {{ IMAGE }}:{{VERSION}}
 
 run: docker
@@ -17,6 +17,6 @@ run: docker
 
 deploy: docker
   docker push {{ IMAGE }}:{{VERSION}}
-  
+
 venv:
   nix build .#venv -o .venv
diff --git a/daemon/flake.lock b/daemon/flake.lock
diff --git a/daemon/flake.nix b/daemon/flake.nix
@@ -2,15 +2,17 @@
   description = "Deadeye vision pipeline daemon";
 
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    nix-filter.url = "github:numtide/nix-filter";
   };
 
-  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
+  outputs = { self, nixpkgs, flake-utils, nix-filter }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
+          filter = nix-filter.lib;
         in
         {
           packages = {
@@ -28,7 +30,10 @@
                 {
                   pname = "deadeye-daemon";
                   version = "22.2.0";
-                  src = self;
+                  src = filter {
+                    root = self;
+                    include = [ ./src ./cmake "CMakeLists.txt" "version.cmake" ];
+                  };
 
                   nativeBuildInputs = with pkgs; [
                     cmake
@@ -66,6 +71,8 @@
 
                 };
 
+            default = self.packages.${system}.deadeye-daemon;
+
             dockerImage = pkgs.dockerTools.buildLayeredImage {
               name = "j3ff/deadeye-daemon";
               tag = "latest";

diff --git a/web/flake.lock b/web/flake.lock
diff --git a/web/flake.nix b/web/flake.nix
@@ -1,24 +1,39 @@
 {
+  description = "Deadeye vision system admin dashboard";
+
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    nix-filter.url = "github:numtide/nix-filter";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, nix-filter }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
           version = "22.2.0";
           nodeDependencies = (pkgs.callPackage config/default.nix { }).nodeDependencies;
+          filter = nix-filter.lib;
         in
         {
           packages.nodeDependencies = nodeDependencies;
 
           packages.deadeye-web = pkgs.stdenv.mkDerivation {
             pname = "deadeye-web";
             inherit version;
-            src = ./.;
+            src = filter {
+              root = self;
+              include = [
+                ./config
+                "nginx.conf"
+                "package.json"
+                "package-lock.json"
+                "postcss.config.js"
+                ./public
+                ./src
+              ];
+            };
 
             buildInputs = with pkgs; [ nodejs_18 ];
 
@@ -71,7 +86,6 @@
 
           packages.default = self.packages.${system}.deadeye-web;
 
-          #
           devShells.default = pkgs.mkShell {
             packages = with pkgs; [ just nodejs_18 node2nix ];
           };