From 12a1c2e6c58aa54446adefa63b9006545fe3617e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 25 Sep 2018 01:43:15 +0000 Subject: [PATCH 1/2] protobuf: rename github owner to protocolbuffers https://github.com/google/protobuf redirects to https://github.com/protocolbuffers/protobuf --- pkgs/development/libraries/protobuf/generic-v3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 5f0006c0589..79e4c387cdf 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { - owner = "google"; + owner = "protocolbuffers"; repo = "protobuf"; rev = "v${version}"; inherit sha256; From 1c3ecab0f71d13744cd18690e573ff4ac6aa8979 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 25 Sep 2018 01:44:46 +0000 Subject: [PATCH 2/2] protobuf3_6: init at 3.6.1 --- pkgs/development/libraries/protobuf/3.6.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/3.6.nix diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix new file mode 100644 index 00000000000..0009209d9ce --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.6.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.6.1"; + sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c76073d1ad6..7a164b6cfd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11644,6 +11644,7 @@ with pkgs; protobuf = protobuf3_4; + protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; 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 { };