Skip to content

Commit 15e7a89

Browse files
authored
bazel, bazel_7: move to pkgs/by-name/ba/ (#375056)
2 parents 81bf156 + 036ae34 commit 15e7a89

19 files changed

+5
-606
lines changed

ci/OWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
337337
/pkgs/development/compilers/idris2 @mattpolzin
338338

339339
# Bazel
340-
/pkgs/development/tools/build-managers/bazel @Profpatsch
340+
/pkgs/by-name/ba/bazel_7 @Profpatsch
341341

342342
# NixOS modules for e-mail and dns services
343343
/nixos/modules/services/mail/mailman.nix @peti
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,21 +369,21 @@ stdenv.mkDerivation rec {
369369
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
370370
# This is breaking the build of any C target. This patch removes the last
371371
# argument if it's found to be an empty string.
372-
../trim-last-argument-to-gcc-if-empty.patch
372+
./trim-last-argument-to-gcc-if-empty.patch
373373

374374
# --experimental_strict_action_env (which may one day become the default
375375
# see bazelbuild/bazel#2574) hardcodes the default
376376
# action environment to a non hermetic value (e.g. "/usr/local/bin").
377377
# This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
378378
# So we are replacing this bazel paths by defaultShellPath,
379379
# improving hermeticity and making it work in nixos.
380-
(replaceVars ../strict_action_env.patch {
380+
(replaceVars ./strict_action_env.patch {
381381
strictActionEnvPatch = defaultShellPath;
382382
})
383383

384384
# bazel reads its system bazelrc in /etc
385385
# override this path to a builtin one
386-
(replaceVars ../bazel_rc.patch {
386+
(replaceVars ./bazel_rc.patch {
387387
bazelSystemBazelRCPath = bazelRC;
388388
})
389389
]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)