public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-21 19:49:05 -07:00
parent 901fb5e64e 422e6e5449
commit 7507aed4e1
18 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/grpc/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
version = "1.37.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
version = "1.38.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "0mjlz2cax5v37g7xnrbf5px88bm7xzl4a5pds112yk096d7wmxm5";
sha256 = "0an903nh8lz3xlf79zsh2v55nrwnjzzavkjlrsl7j9aysgwmgn4r";
fetchSubmodules = true;
};
patches = [