diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/protobuf/2.5.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/protobuf/2.6.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/protobuf/3.0.0-beta-2.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/protobuf/3.0.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/protobuf/3.2.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/protobuf/3.3.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/tensorflow/default.nix | 4 |
7 files changed, 2 insertions, 48 deletions
diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix deleted file mode 100644 index 9d7bb38cf3c9..000000000000 --- a/pkgs/development/libraries/protobuf/2.5.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.5.0"; - # make sure you test also -A pythonPackages.protobuf - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; - }; -}) diff --git a/pkgs/development/libraries/protobuf/2.6.nix b/pkgs/development/libraries/protobuf/2.6.nix deleted file mode 100644 index 49ed9d9ade19..000000000000 --- a/pkgs/development/libraries/protobuf/2.6.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.6.1"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070"; - }; -}) diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix deleted file mode 100644 index 26b829669b8e..000000000000 --- a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.0.0-beta-2"; - sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; -} diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix deleted file mode 100644 index 4e77e7f1fbee..000000000000 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.0.2"; - sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09"; -} diff --git a/pkgs/development/libraries/protobuf/3.2.nix b/pkgs/development/libraries/protobuf/3.2.nix deleted file mode 100644 index 338156bbdf98..000000000000 --- a/pkgs/development/libraries/protobuf/3.2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, lib, ... }: - -lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.2.0"; - sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14"; -}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.3.nix b/pkgs/development/libraries/protobuf/3.3.nix deleted file mode 100644 index e6a8f05cc18d..000000000000 --- a/pkgs/development/libraries/protobuf/3.3.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, lib, ... }: - -lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.3.0"; - sha256 = "1258yz9flyyaswh3izv227kwnhwcxn4nwavdz9iznqmh24qmi59w"; -}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 388d27e06867..b8fb107968bc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -8,7 +8,7 @@ , linuxPackages ? null , numpy , six -, protobuf3_2 +, protobuf , swig , werkzeug , mock @@ -94,7 +94,7 @@ buildPythonPackage rec { ); propagatedBuildInputs = with stdenv.lib; - [ numpy six protobuf3_2 swig werkzeug mock ] + [ numpy six protobuf swig werkzeug mock ] ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; # Note that we need to run *after* the fixup phase because the |