maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays (2024-07-28)

Browse source 
* 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>
This commit is contained in:
Aspen Smith 2024-07-28 12:58:22 -04:00 • committed by clbot
parent bdf8269859
commit 756539a596
50 changed files with 281 additions and 22463 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/buildBazelPackageNG/bazelRulesJavaHook/default.nix
View file

@ -1,6 +1,7 @@
{ makeSetupHook }:
makeSetupHook {
makeSetupHook
{
name = "rules_java_bazel_hook";
substitutions = {
local_java = ./local_java;

4
nix/buildBazelPackageNG/bazelRulesNodeJS5Hook/default.nix
View file

@ -37,7 +37,9 @@ let
cp -R . $out
'';
};
in makeSetupHook {
in
makeSetupHook
{
name = "bazelbuild-rules_nodejs-5-hook";
propagatedBuildInputs = [
nodejs

13
nix/buildBazelPackageNG/buildBazelPackageNG.nix
View file

@ -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