Merge remote-tracking branch 'upstream/master' into hardened-stdenv
This commit is contained in:
commit
99cb230b47
|
@ -372,7 +372,12 @@ rec {
|
||||||
getVersion pkgs.youtube-dl
|
getVersion pkgs.youtube-dl
|
||||||
=> "2016.01.01"
|
=> "2016.01.01"
|
||||||
*/
|
*/
|
||||||
getVersion = x: (builtins.parseDrvName (x.name or x)).version;
|
getVersion = x:
|
||||||
|
let
|
||||||
|
parse = drv: (builtins.parseDrvName drv).version;
|
||||||
|
in if isString x
|
||||||
|
then parse x
|
||||||
|
else x.version or (parse x.name);
|
||||||
|
|
||||||
/* Extract name with version from URL. Ask for separator which is
|
/* Extract name with version from URL. Ask for separator which is
|
||||||
supposed to start extension.
|
supposed to start extension.
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "abc-verifier-${version}";
|
name = "abc-verifier-${version}";
|
||||||
version = "20150614";
|
version = "20160813";
|
||||||
|
|
||||||
src = fetchhg {
|
src = fetchhg {
|
||||||
url = "https://bitbucket.org/alanmi/abc";
|
url = "https://bitbucket.org/alanmi/abc";
|
||||||
rev = "38661894bc1287cad9bd35978bd252dbfe3e6c56";
|
rev = "1df0b06d7bf615c50014df0952a61e11891ee306";
|
||||||
sha256 = "04v0hkvj501r10pj3yrqrk2463d1d7lhl8dzfjwkmlbmlmpjlvvv";
|
sha256 = "0i0b9i2gs0y1q8nqnqyzfbff8aiknzja27m383nvccxscvg355z5";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ readline ];
|
buildInputs = [ readline ];
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "compcert-${version}";
|
name = "compcert-${version}";
|
||||||
version = "2.6";
|
version = "2.7.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://compcert.inria.fr/release/${name}.tgz";
|
url = "http://compcert.inria.fr/release/${name}.tgz";
|
||||||
sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";
|
sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
|
buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
|
||||||
|
|
43
pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
Normal file
43
pkgs/development/libraries/protobuf/3.0.0-beta-2.nix
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
{ 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;
|
||||||
|
}
|
|
@ -25,15 +25,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Protocol Buffers - Google's data interchange format";
|
description = "Protocol Buffers - Google's data interchange format";
|
||||||
|
|
||||||
longDescription =
|
longDescription =
|
||||||
'' Protocol Buffers are a way of encoding structured data in an
|
'' Protocol Buffers are a way of encoding structured data in an
|
||||||
efficient yet extensible format. Google uses Protocol Buffers for
|
efficient yet extensible format. Google uses Protocol Buffers for
|
||||||
almost all of its internal RPC protocols and file formats.
|
almost all of its internal RPC protocols and file formats.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
license = "mBSD";
|
license = "mBSD";
|
||||||
|
|
||||||
homepage = https://developers.google.com/protocol-buffers/;
|
homepage = https://developers.google.com/protocol-buffers/;
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "hwdata-0.276";
|
name = "hwdata-${version}";
|
||||||
|
version = "0.291";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.276.tar.xz";
|
url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-${version}.tar.xz";
|
||||||
sha256 = "0pg0ms6kb2mm25mdklsb0xn2spcwi2mhygzc7bkpji72qq8srzsh";
|
sha256 = "121qixrdhdncva1cnj7m7jlqvi1kbj85dpi844jiis3a8hgpzw5a";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = "patchShebangs ./configure";
|
preConfigure = "patchShebangs ./configure";
|
||||||
|
|
|
@ -4382,6 +4382,7 @@ in
|
||||||
else {}
|
else {}
|
||||||
) // {
|
) // {
|
||||||
ocamlPackages = ocamlPackages_4_02;
|
ocamlPackages = ocamlPackages_4_02;
|
||||||
|
coq = coq_8_5;
|
||||||
});
|
});
|
||||||
|
|
||||||
cryptol = self.haskell.packages.lts.cryptol;
|
cryptol = self.haskell.packages.lts.cryptol;
|
||||||
|
@ -9044,6 +9045,8 @@ in
|
||||||
|
|
||||||
protobuf = protobuf2_6;
|
protobuf = protobuf2_6;
|
||||||
protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
|
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_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
|
||||||
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
|
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
|
||||||
|
|
||||||
|
|
|
@ -17754,6 +17754,7 @@ in modules // {
|
||||||
|
|
||||||
protobuf = self.protobuf2_6;
|
protobuf = self.protobuf2_6;
|
||||||
protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; };
|
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_6 = self.protobufBuild pkgs.protobuf2_6;
|
||||||
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
|
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
|
||||||
protobufBuild = protobuf: buildPythonPackage rec {
|
protobufBuild = protobuf: buildPythonPackage rec {
|
||||||
|
@ -28848,15 +28849,15 @@ in modules // {
|
||||||
|
|
||||||
tensorflowNoGpuSupport = buildPythonPackage rec {
|
tensorflowNoGpuSupport = buildPythonPackage rec {
|
||||||
name = "tensorflow";
|
name = "tensorflow";
|
||||||
version = "0.8.0";
|
version = "0.9.0";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
|
url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
|
||||||
sha256 = "07lb6rknngq9bicd7z1q9caiqxlqn4fdx8q24s3rqvv9wi79szws";
|
sha256 = "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.swig ];
|
propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig ];
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
|
RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
|
||||||
|
@ -28872,6 +28873,23 @@ in modules // {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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;
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ];
|
||||||
|
|
||||||
|
src = pkgs.fetchurl {
|
||||||
|
url = "mirror://pypi/t/tflearn/${name}.tar.gz";
|
||||||
|
sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
simpleai = buildPythonPackage rec {
|
simpleai = buildPythonPackage rec {
|
||||||
version = "0.7.11";
|
version = "0.7.11";
|
||||||
name = "simpleai-${version}";
|
name = "simpleai-${version}";
|
||||||
|
|
Loading…
Reference in a new issue