diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
| commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
| tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/development/libraries/protobuf | |
| parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
| parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
| download | nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.gz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.bz2 nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.lz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.xz nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.tar.zst nixpkgs-985d1ac425735963d396e1c09dd49ad111813649.zip | |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/development/libraries/protobuf')
| -rw-r--r-- | pkgs/development/libraries/protobuf/3.9.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/protobuf/3.9.nix b/pkgs/development/libraries/protobuf/3.9.nix index 6652ba7648c..a2f3e0e0164 100644 --- a/pkgs/development/libraries/protobuf/3.9.nix +++ b/pkgs/development/libraries/protobuf/3.9.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.9.0"; - sha256 = "1xq2njqrbmizwg91ggi1lqr0n26cm2jdyk668ljc24ihrpk0z9bw"; + version = "3.9.1"; + sha256 = "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h"; } |