diff options
| author | Florian Franzen <Florian.Franzen@gmail.com> | 2019-03-09 15:19:32 +0100 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-04-14 13:19:38 +0200 |
| commit | d1feec73e4b5058cf86b122fe08d2c838cfffdc2 (patch) | |
| tree | c9b0cf202c5baffae0069ac01ccd1ee4f77caf40 /pkgs | |
| parent | 34aa254f9ebf5899636a9927ceefbc9df80230f4 (diff) | |
| download | nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.tar nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.tar.gz nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.tar.bz2 nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.tar.lz nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.tar.xz nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.tar.zst nixpkgs-d1feec73e4b5058cf86b122fe08d2c838cfffdc2.zip | |
protobuf3_6: 3.6.1 -> 3.6.1.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/protobuf/3.6.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/protobuf/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix index 0009209d9ce..16decc44e84 100644 --- a/pkgs/development/libraries/protobuf/3.6.nix +++ b/pkgs/development/libraries/protobuf/3.6.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.6.1"; - sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; + version = "3.6.1.3"; + sha256 = "1spj0d4flx6h3phxx3sg9r00yv734hina3365avkcz9brnm089c1"; } diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 4f00537db0c..cc6b2e2fb45 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; - patches = optional isPy37 - # Python 3.7 compatibility (remove when protobuf 3.7 is released) + patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) + # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; |