take makr regenerate-nix from stackabletech/stackable-cockpit@d885d3c

Author: NickLarsenNZ

template/Makefile.j2

@@ -132,7 +132,10 @@ clean: chart-clean
 
 regenerate-charts: chart-clean compile-chart
 
-build: regenerate-charts helm-package docker-build
+regenerate-nix:
+	nix run -f . regenerateNixLockfiles
+
+build: regenerate-charts regenerate-nix helm-package docker-build
 
 publish: build docker-publish helm-publish
 

template/Tiltfile

@@ -10,7 +10,7 @@ operator_name = meta['operator']['name']
 
 custom_build(
     registry + '/' + operator_name,
-    'nix shell -f . crate2nix -c crate2nix generate && nix-build . -A docker --argstr dockerName "${EXPECTED_REGISTRY}/' + operator_name + '" && ./result/load-image | docker load',
+    'make regenerate-nix && nix-build . -A docker --argstr dockerName "${EXPECTED_REGISTRY}/' + operator_name + '" && ./result/load-image | docker load',
     deps=['rust', 'Cargo.toml', 'Cargo.lock', 'default.nix', "nix", 'build.rs', 'vendor'],
     ignore=['*.~undo-tree~'],
     # ignore=['result*', 'Cargo.nix', 'target', *.yaml],

template/default.nix

@@ -96,4 +96,11 @@ rec {
   # need to use vendored crate2nix because of https://github.com/kolloch/crate2nix/issues/264
   crate2nix = import sources.crate2nix {};
   tilt = pkgs.tilt;
+
+  regenerateNixLockfiles = pkgs.writeScriptBin "regenerate-nix-lockfiles"
+  ''
+    set -euo pipefail
+    echo Running crate2nix
+    ${crate2nix}/bin/crate2nix generate
+  ''; 
 }