Skip to content

Commit e3f897b

Browse files
Generated commit to update templated files based on rev bacdd9b in stackabletech/operator-templating repo. (#307)
Triggered by: Manual run triggered by: sbernauer with message [fix-tilt-and-add-license]
1 parent 7ab51ff commit e3f897b

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

default.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
2828
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang.cc.lib}/lib/clang/${pkgs.lib.getVersion pkgs.clang.cc}/include";
2929
};
30+
# FIXME: Remove when https://github.com/NixOS/nixpkgs/pull/266787 is merged.
31+
# See https://github.com/stackabletech/operator-templating/pull/289 for details.
32+
ring = attrs: {
33+
CARGO_MANIFEST_LINKS = attrs.links;
34+
};
3035
};
3136
}
3237
, meta ? pkgs.lib.importJSON ./nix/meta.json

deny.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ default = "deny"
2424
confidence-threshold = 1.0
2525
allow = [
2626
"Apache-2.0",
27+
"BSD-2-Clause",
2728
"BSD-3-Clause",
2829
"CC0-1.0",
2930
"ISC",

nix/sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": "",
66
"owner": "kolloch",
77
"repo": "crate2nix",
8-
"rev": "8749f46953b46d44fd181b002399e4a20371f323",
9-
"sha256": "13gn5zynbzih8lrhf2y486km7g0dhfiss5hh2m2mssn8r50k6jqx",
8+
"rev": "a3fb25472c3796718b100a6e36f41088b0a0de14",
9+
"sha256": "0g6zi7gzq9snpilrn3fkid5p9k9fdy4xcfn3q5c4kadrr9i3hbr8",
1010
"type": "tarball",
11-
"url": "https://github.com/kolloch/crate2nix/archive/8749f46953b46d44fd181b002399e4a20371f323.tar.gz",
11+
"url": "https://github.com/kolloch/crate2nix/archive/a3fb25472c3796718b100a6e36f41088b0a0de14.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"nixpkgs": {

0 commit comments

Comments
 (0)