Commit Nix lockfiles (#139)

* Commit Nix lockfiles

This should allow users to build the package via import-from-derivation

* Update crate2nix and lockfile

* Update lockfiles

* Update nixpkgs/crate2nix

* Fix bitrotted Nix build of stackablectl

* make regenerate-nix

* update nixpkgs

* make regenerate-nix

---------

Co-authored-by: Nick Larsen <[email protected]>

Author: nightkr

Cargo.nix

@@ -75,7 +75,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
 

Makefile

@@ -10,7 +10,7 @@ operator_name = meta['operator']['name']
 
 custom_build(
     registry + '/' + operator_name,
-    'nix run -f . regenerateNixLockfiles && 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
       'rust', 'Cargo.toml', 'Cargo.lock', 'vendor',

Tiltfile

@@ -0,0 +1,5 @@
+{
+  "product-config 0.6.0 (git+https://github.com/stackabletech/product-config.git?tag=0.6.0#ad2c3ea6a291e415d978eb4271fb309e75861ef0)": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41",
+  "stackable-operator 0.61.0 (git+https://github.com/stackabletech/operator-rs.git?tag=0.61.0#ddc57addbc741e3977b1589e553164505a59f639)": "1scwkw9gjd1gaijz8nxdpps88r85mxkxn5l2805m9g6cm6zbgvc0",
+  "stackable-operator-derive 0.61.0 (git+https://github.com/stackabletech/operator-rs.git?tag=0.61.0#ddc57addbc741e3977b1589e553164505a59f639)": "1scwkw9gjd1gaijz8nxdpps88r85mxkxn5l2805m9g6cm6zbgvc0"
+}

crate-hashes.json

@@ -38,7 +38,9 @@ rec {
           '';
       };
       helm-sys = attrs: {
-        GO_HELM_WRAPPER = goHelmWrapper + "/bin/go-helm-wrapper";
+        GO_HELM_WRAPPER = goHelmWrapper + "/bin";
+        LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
+        BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang.cc.lib}/lib/clang/${pkgs.lib.versions.major (pkgs.lib.getVersion pkgs.clang.cc)}/include";
       };
     };
   };
@@ -129,6 +131,13 @@ rec {
     pwd = ./rust/helm-sys/go-helm-wrapper;
     modules = ./gomod2nix.toml;
     ldflags = "-buildmode c-archive";
+    allowGoReference = true;
+    postBuild =
+      ''
+        for pkg in $(getGoDirs ""); do
+          buildFlags="-buildmode c-archive -o $GOPATH/bin/libgo-helm-wrapper.a" buildGoDir build "$pkg"
+        done
+      '';
   };
 
   regenerateNixLockfiles = pkgs.writeScriptBin "regenerate-nix-lockfiles"