diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-08-16T23·09+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-08-17T09·54+0000 |
| commit | 6f5659c88b8159bf748c5015df3f79eda3d8f546 (patch) | |
| tree | e708b98fd6413ffdcd22816ba7390f1f6265ec44 /third_party | |
| parent | 711a20620d058c1c2f5329ea11b82ab465e450c7 (diff) | |
chore(3p): Bump nixos-unstable channel r/1662
This bumps the channel to a commit that includes fixes for an nginx issue we have been seeing: https://github.com/NixOS/nixpkgs/pull/95264 Includes the following compatibility fixes: - tests disabled in third_party.bufbuild: These were enabled unexpectedly by the update, but don't run in the sandbox because they want to download things from github Change-Id: I98a3b5de57f62f1fd3a37701fa1896eddeedff85 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1759 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/bufbuild/default.nix | 2 | ||||
| -rw-r--r-- | third_party/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/third_party/bufbuild/default.nix b/third_party/bufbuild/default.nix index 7706067e20..12683b1062 100644 --- a/third_party/bufbuild/default.nix +++ b/third_party/bufbuild/default.nix @@ -14,6 +14,8 @@ pkgs.buildGoModule { sha256 = "1rni5swfnb4sbrd9rls4mc3902xhqrlsja96lfcdfjzx08g6kg20"; }; + doCheck = false; + # TODO(riking): postinstall produce shell completions for bash, fish, zsh # bin/buf bash-completion # bin/buf zsh-completion diff --git a/third_party/default.nix b/third_party/default.nix index 1781c3d33b..7cd3b9f2c9 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -5,11 +5,11 @@ { ... }: let - # Tracking nixos-unstable as of 2020-08-04. - nixpkgsCommit = "840c782d507d60aaa49aa9e3f6d0b0e780912742"; + # Tracking nixos-unstable as of 2020-08-16. + nixpkgsCommit = "16fc531784ac226fb268cc59ad573d2746c109c1"; nixpkgsSrc = fetchTarball { url = "https://github.com/NixOS/nixpkgs-channels/archive/${nixpkgsCommit}.tar.gz"; - sha256 = "14q3kvnmgz19pgwyq52gxx0cs90ddf24pnplmq33pdddbb6c51zn"; + sha256 = "0qw1jpdfih9y0dycslapzfp8bl4z7vfg9c7qz176wghwybm4sx0a"; }; nixpkgs = import nixpkgsSrc { config.allowUnfree = true; |