diff options
| author | Aspen Smith <root@gws.fyi> | 2024-07-28T16·58-0400 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-08-01T10·06+0000 |
| commit | 756539a59687f9abc9fef5fce50b5590c35a242f (patch) | |
| tree | 06bd57732c359bb5b366b225043b59c6dd2f2ad9 /nix/buildBazelPackageNG | |
| parent | bdf82698592acc3f27fa7a9aa612ea1ad7970437 (diff) | |
chore(3p/sources): Bump channels & overlays (2024-07-28) r/8435
* Treewide: re-run depotfmt * //third_party/nixpkgs:html5validator: build with Python 3.11, dependency openstackdocstheme doesn't support 3.12 * //users/sterni/machines/ingeborg: adapt to poorly handled fcgiwrap module API change: https://github.com/NixOS/nixpkgs/pull/318599 * //tvix/*-go: regenerate protobuf files * //third_party/nixpkgs:treefmt: Remove patch for merged pull request * //users/flokli/ipu6-softisp: rebase, drop upstreamed kernel patches Change-Id: Ie4e0df007c287e8cd6207683a9a25838aa5bd39a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11971 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: aspen <root@gws.fyi> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Diffstat (limited to 'nix/buildBazelPackageNG')
| -rw-r--r-- | nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix | 3 | ||||
| -rw-r--r-- | nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix | 4 | ||||
| -rw-r--r-- | nix/buildBazelPackageNG/buildBazelPackageNG.nix | 13 |
3 files changed, 14 insertions, 6 deletions
diff --git a/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix b/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix index eb8332e44eef..38edcccaa59c 100644 --- a/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix +++ b/nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix @@ -1,6 +1,7 @@ { makeSetupHook }: -makeSetupHook { +makeSetupHook +{ name = "rules_java_bazel_hook"; substitutions = { local_java = ./local_java; diff --git a/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix b/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix index c99cc39e9e4c..21703dea0a82 100644 --- a/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix +++ b/nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix @@ -37,7 +37,9 @@ let cp -R . $out ''; }; -in makeSetupHook { +in +makeSetupHook +{ name = "bazelbuild-rules_nodejs-5-hook"; propagatedBuildInputs = [ nodejs diff --git a/nix/buildBazelPackageNG/buildBazelPackageNG.nix b/nix/buildBazelPackageNG/buildBazelPackageNG.nix index 5195d3e89fa8..39c67adea797 100644 --- a/nix/buildBazelPackageNG/buildBazelPackageNG.nix +++ b/nix/buildBazelPackageNG/buildBazelPackageNG.nix @@ -16,12 +16,16 @@ let cleanAttrs = lib.flip removeAttrs [ - "bazelTargets" "depsHash" "extraCacheInstall" "extraBuildSetup" "extraBuildInstall" + "bazelTargets" + "depsHash" + "extraCacheInstall" + "extraBuildSetup" + "extraBuildInstall" ]; attrs = cleanAttrs baseAttrs; base = stdenv.mkDerivation (attrs // { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ bazel ]; @@ -69,7 +73,7 @@ let inherit cache; - nativeBuildInputs = (base.nativeBuildInputs or []) ++ [ + nativeBuildInputs = (base.nativeBuildInputs or [ ]) ++ [ coreutils ]; @@ -102,4 +106,5 @@ let runHook postInstall ''; }); -in build +in +build |