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

partially fix pythonPackages.protobuf

Browse Source
This commit is contained in:
Domen Kožar 2015-02-11 10:21:51 +01:00
parent 4869902a70
commit 2024e08564
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/protobuf/2.5.nix
View File

@ -2,6 +2,7 @@
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2.5.0"; version = "2.5.0";
# make sure you test also -A pythonPackages.protobuf
src = fetchurl { src = fetchurl {
url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";

1
pkgs/development/libraries/protobuf/2.6.nix
View File

@ -2,6 +2,7 @@
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2.6.1"; version = "2.6.1";
# make sure you test also -A pythonPackages.protobuf
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "protobuf"; repo = "protobuf";

2
pkgs/development/libraries/protobuf/generic.nix
View File

@ -4,7 +4,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "protobuf-${version}"; name = "protobuf-v${version}";
inherit src; inherit src;

3
pkgs/top-level/python-packages.nix
View File

@ -7490,8 +7490,7 @@ let
inherit (pkgs.protobuf) name src; inherit (pkgs.protobuf) name src;
propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ];
sourceRoot = "${name}/python"; sourceRoot = "${name}-src/python";
meta = { meta = {
description = "Protocol Buffers are Google's data interchange format"; description = "Protocol Buffers are Google's data interchange format";