From 830eb4fd167805ad5693caaf32fdf1b616d3ee5d Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Fri, 17 Nov 2023 14:45:48 +0000 Subject: [PATCH] Generated commit to update templated files based on rev bacdd9b in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: sbernauer with message [fix-tilt-and-add-license] --- default.nix | 5 +++++ deny.toml | 1 + nix/sources.json | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 780e70b5..975f6187 100644 --- a/default.nix +++ b/default.nix @@ -27,6 +27,11 @@ LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang.cc.lib}/lib/clang/${pkgs.lib.getVersion pkgs.clang.cc}/include"; }; + # FIXME: Remove when https://github.com/NixOS/nixpkgs/pull/266787 is merged. + # See https://github.com/stackabletech/operator-templating/pull/289 for details. + ring = attrs: { + CARGO_MANIFEST_LINKS = attrs.links; + }; }; } , meta ? pkgs.lib.importJSON ./nix/meta.json diff --git a/deny.toml b/deny.toml index 6d238dca..6a93d939 100644 --- a/deny.toml +++ b/deny.toml @@ -24,6 +24,7 @@ default = "deny" confidence-threshold = 1.0 allow = [ "Apache-2.0", + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "ISC", diff --git a/nix/sources.json b/nix/sources.json index f56522a5..465276e7 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "kolloch", "repo": "crate2nix", - "rev": "8749f46953b46d44fd181b002399e4a20371f323", - "sha256": "13gn5zynbzih8lrhf2y486km7g0dhfiss5hh2m2mssn8r50k6jqx", + "rev": "a3fb25472c3796718b100a6e36f41088b0a0de14", + "sha256": "0g6zi7gzq9snpilrn3fkid5p9k9fdy4xcfn3q5c4kadrr9i3hbr8", "type": "tarball", - "url": "https://github.com/kolloch/crate2nix/archive/8749f46953b46d44fd181b002399e4a20371f323.tar.gz", + "url": "https://github.com/kolloch/crate2nix/archive/a3fb25472c3796718b100a6e36f41088b0a0de14.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": {