Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e286885b0f2a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6dfd1a277281
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 13, 2021

  1. buildBazelPackage: only rewrite relevant symlinks

    @lukegb
    lukegb committed Jan 13, 2021
    Copy the full SHA
    c7102b2 View commit details

Commits on Jan 14, 2021

  1. envoy: init at 1.16.2

    @lukegb
    lukegb committed Jan 14, 2021
    Copy the full SHA
    6e684ca View commit details

Commits on Jan 19, 2021

  1. Merge pull request #108741 from lukegb/envoy 

    envoy: init at 1.16.2
    @adisbladis
    adisbladis authored Jan 19, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6dfd1a2 View commit details
4 changes: 3 additions & 1 deletion pkgs/build-support/build-bazel-package/default.nix
View file
Original file line number Diff line number Diff line change
@@ -172,7 +172,9 @@ in stdenv.mkDerivation (fBuildAttrs // {
chmod -R +w $bazelOut
find $bazelOut -type l | while read symlink; do
ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then
ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
fi
done
'' + fBuildAttrs.preConfigure or "";

Loading