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: d1febbeb1bfc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 214e19c049a0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 6, 2020

  1. buildGoModule: copy vendor instead of symlinking 

    Allow the second phase to modify the contents of the vendor directory.
    @zowoq
    zowoq committed Nov 6, 2020
    Copy the full SHA
    66d4245 View commit details

  2. kopia: drop vendor workaround

    @zowoq
    zowoq committed Nov 6, 2020
    Copy the full SHA
    214e19c View commit details
Showing with 4 additions and 10 deletions.
  1. +4 −4 pkgs/development/go-modules/generic/default.nix
  2. +0 −6 pkgs/tools/backup/kopia/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/go-modules/generic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -136,10 +136,10 @@ let
export GOSUMDB=off
export GOPROXY=off
cd "$modRoot"
if [ -n "${go-modules}" ]; then
rm -rf vendor
ln -s ${go-modules} vendor
fi
'' + lib.optionalString (go-modules != "") ''
rm -rf vendor
cp -r --reflink=auto ${go-modules} vendor
'' + ''
runHook postConfigure
'';
6 changes: 0 additions & 6 deletions pkgs/tools/backup/kopia/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,12 +24,6 @@ buildGoModule rec {
'';

postConfigure = ''
# make 'vendor' writable
cp -L -r vendor tmp-vendor
rm -rf vendor
chmod -R u+w tmp-vendor
mv tmp-vendor vendor
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
--replace "/bin/stty" "${coreutils}/bin/stty"