nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35424 from volth/protobuf-3.5

Browse Source 
protobuf: 3.4.0 -> {3.4.1, 3.5.1.1}
This commit is contained in:
Jörg Thalheim 2018-02-24 14:26:46 +00:00 committed by GitHub
commit bd72d71be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/protobuf/3.4.nix
View File

@ -1,6 +1,6 @@
{ callPackage, lib, ... }:
lib.overrideDerivation (callPackage ./generic-v3.nix {
version = "3.4.0";
sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";
version = "3.4.1";
sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

6
pkgs/development/libraries/protobuf/3.5.nix Normal file
View File

@ -0,0 +1,6 @@
{ callPackage, lib, ... }:
lib.overrideDerivation (callPackage ./generic-v3.nix {
version = "3.5.1.1";
sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

4
pkgs/top-level/all-packages.nix
View File

@ -10795,8 +10795,10 @@ with pkgs;
postgis = callPackage ../development/libraries/postgis { };
postgis_2_3 = callPackage ../development/libraries/postgis/2.3.nix { };
protobuf = callPackage ../development/libraries/protobuf/3.4.nix { };
protobuf = protobuf3_4;
protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };