Skip to content

Commit Nix lockfiles #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickLarsenNZ merged 12 commits into from
Feb 6, 2024
Merged

Commit Nix lockfiles #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7027fe1
Commit Nix lockfiles
nightkr Nov 7, 2023
d94ef10
Merge branch 'main' into feature/commit-nix-lockfiles
nightkr Nov 7, 2023
e8697a5
Update crate2nix and lockfile
nightkr Nov 7, 2023
e8c6429
Merge branch 'main' into feature/commit-nix-lockfiles
nightkr Dec 5, 2023
05f4d59
Update lockfiles
nightkr Dec 5, 2023
0b4a349
Update nixpkgs/crate2nix
nightkr Dec 5, 2023
21d80dd
Fix bitrotted Nix build of stackablectl
nightkr Dec 5, 2023
7f87caa
Merge remote-tracking branch 'origin/main' into feature/commit-nix-lo…
NickLarsenNZ Jan 10, 2024
062defa
make regenerate-nix
NickLarsenNZ Jan 10, 2024
2f49e31
Merge remote-tracking branch 'origin/main' into feature/commit-nix-lo…
NickLarsenNZ Jan 18, 2024
20dd2e9
update nixpkgs
NickLarsenNZ Feb 5, 2024
75d8d97
make regenerate-nix
NickLarsenNZ Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13,134 changes: 13,134 additions & 0 deletions Cargo.nix
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions crate-hashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
11 changes: 10 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
};
Expand Down Expand Up @@ -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"
Expand Down
Loading