Merge pull request #17375 from houqp/master

pythonPackpages.tensorflow: 0.8.0 -> 0.9.0

Changed files
+67 -6
pkgs
development
libraries
top-level
+43
pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
···
···
+
{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }:
+
+
stdenv.mkDerivation rec {
+
name = "protobuf-${version}";
+
+
version = "3.0.0-beta-2";
+
# make sure you test also -A pythonPackages.protobuf
+
src = fetchFromGitHub {
+
owner = "google";
+
repo = "protobuf";
+
rev = "v${version}";
+
sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
+
};
+
+
postPatch = ''
+
rm -rf gmock
+
cp -r ${gmock.source} gmock
+
chmod -R a+w gmock
+
'' + stdenv.lib.optionalString stdenv.isDarwin ''
+
substituteInPlace src/google/protobuf/testing/googletest.cc \
+
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
+
'';
+
+
buildInputs = [ autoreconfHook zlib ];
+
+
enableParallelBuilding = true;
+
+
doCheck = true;
+
+
meta = {
+
description = "Google's data interchange format";
+
longDescription =
+
''Protocol Buffers are a way of encoding structured data in an efficient
+
yet extensible format. Google uses Protocol Buffers for almost all of
+
its internal RPC protocols and file formats.
+
'';
+
license = stdenv.lib.licenses.bsd3;
+
platforms = stdenv.lib.platforms.unix;
+
homepage = https://developers.google.com/protocol-buffers/;
+
};
+
+
passthru.version = version;
+
}
-3
pkgs/development/libraries/protobuf/generic.nix
···
meta = {
description = "Protocol Buffers - Google's data interchange format";
-
longDescription =
'' Protocol Buffers are a way of encoding structured data in an
efficient yet extensible format. Google uses Protocol Buffers for
almost all of its internal RPC protocols and file formats.
'';
-
license = "mBSD";
-
homepage = https://developers.google.com/protocol-buffers/;
platforms = stdenv.lib.platforms.unix;
};
···
meta = {
description = "Protocol Buffers - Google's data interchange format";
longDescription =
'' Protocol Buffers are a way of encoding structured data in an
efficient yet extensible format. Google uses Protocol Buffers for
almost all of its internal RPC protocols and file formats.
'';
license = "mBSD";
homepage = https://developers.google.com/protocol-buffers/;
platforms = stdenv.lib.platforms.unix;
};
+2
pkgs/top-level/all-packages.nix
···
protobuf = protobuf2_6;
protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
···
protobuf = protobuf2_6;
protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
+
# 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0.
+
protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { });
protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
+22 -3
pkgs/top-level/python-packages.nix
···
protobuf = self.protobuf2_6;
protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; };
protobuf2_6 = self.protobufBuild pkgs.protobuf2_6;
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
protobufBuild = protobuf: buildPythonPackage rec {
···
tensorflowNoGpuSupport = buildPythonPackage rec {
name = "tensorflow";
-
version = "0.8.0";
format = "wheel";
src = pkgs.fetchurl {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-
sha256 = "07lb6rknngq9bicd7z1q9caiqxlqn4fdx8q24s3rqvv9wi79szws";
};
-
propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.swig ];
preFixup = ''
RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
···
description = "TensorFlow helps the tensors flow (no gpu support)";
homepage = http://tensorflow.org;
license = licenses.asl20;
};
};
···
protobuf = self.protobuf2_6;
protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; };
+
protobuf3_0_0b2 = (self.protobufBuild pkgs.protobuf3_0_0b2).override { doCheck = false; };
protobuf2_6 = self.protobufBuild pkgs.protobuf2_6;
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
protobufBuild = protobuf: buildPythonPackage rec {
···
tensorflowNoGpuSupport = buildPythonPackage rec {
name = "tensorflow";
+
version = "0.9.0";
format = "wheel";
src = pkgs.fetchurl {
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
+
sha256 = "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh";
};
+
propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig ];
preFixup = ''
RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
···
description = "TensorFlow helps the tensors flow (no gpu support)";
homepage = http://tensorflow.org;
license = licenses.asl20;
+
};
+
};
+
+
tflearn = buildPythonPackage rec {
+
name = "tflearn-0.2.1";
+
+
meta = {
+
description = "Deep learning library featuring a higher-level API for TensorFlow";
+
homepage = "https://github.com/tflearn/tflearn";
+
license = licenses.mit;
+
maintainers = with maintainers; [ houqp ];
+
};
+
+
propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ];
+
+
src = pkgs.fetchurl {
+
url = "mirror://pypi/t/tflearn/${name}.tar.gz";
+
sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0";
};
};