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

Remove top-level pycrypto 

See #11567.
This commit is contained in:
Frederik Rietdijk 2016-08-14 14:28:05 +02:00
parent b54b5a90e4
commit e4b47de694
8 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/screencloud/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python, pycrypto, glib }: { stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim"; sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
}; };
buildInputs = [ cmake qt4 quazip qt-mobility qxt python pycrypto ]; buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
patchPhase = '' patchPhase = ''
# Required to make the configure script work. Normally, screencloud's # Required to make the configure script work. Normally, screencloud's
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
patchShebangs $prefix/opt/screencloud/screencloud.sh patchShebangs $prefix/opt/screencloud/screencloud.sh
substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
mkdir $prefix/bin mkdir $prefix/bin
mkdir $prefix/lib mkdir $prefix/lib
ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud

7
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -3,10 +3,13 @@
, libctemplate, libglade , libctemplate, libglade
, libiodbc , libiodbc
, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql , libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql
, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo , pango, pcre, pkgconfig, sqlite, sudo
, pythonPackages
}: }:
stdenv.mkDerivation rec { let
inherit (pythonPackages) pexpect pycrypto python paramiko;
in stdenv.mkDerivation rec {
pname = "mysql-workbench"; pname = "mysql-workbench";
version = "5.2.47"; version = "5.2.47";
name = "${pname}-${version}"; name = "${pname}-${version}";

6
pkgs/tools/backup/obnam/default.nix
View File

@ -1,18 +1,16 @@
{ stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: { stdenv, fetchurl, pythonPackages, attr }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "obnam-${version}"; name = "obnam-${version}";
version = "1.19.1"; version = "1.19.1";
namePrefix = "";
src = fetchurl rec { src = fetchurl rec {
url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc"; sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc";
}; };
buildInputs = [ pythonPackages.sphinx attr ]; buildInputs = [ pythonPackages.sphinx attr ];
propagatedBuildInputs = [ pycrypto pythonPackages.paramiko pythonPackages.tracing pythonPackages.ttystatus pythonPackages.cliapp pythonPackages.larch pythonPackages.pyyaml pythonPackages.fuse ]; propagatedBuildInputs = with pythonPackages; [ pycrypto paramiko tracing ttystatus cliapp larch pyyaml fuse ];
doCheck = false; doCheck = false;

10
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, fetchFromGitHub, makeWrapper, python, perl, zip { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip
, rtmpdump, nose, mock, pycrypto, requests2, substituteAll }: , rtmpdump, substituteAll }:
stdenv.mkDerivation rec { let
inherit (pythonPackages) python nose pycrypto requests2 mock;
in stdenv.mkDerivation rec {
name = "svtplay-dl-${version}"; name = "svtplay-dl-${version}";
version = "1.1"; version = "1.1";
@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
--replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH'
''; '';
makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python}/bin/python"; makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python.interpreter}";
postInstall = '' postInstall = ''
wrapProgram "$out/bin/svtplay-dl" \ wrapProgram "$out/bin/svtplay-dl" \

6
pkgs/tools/security/knockknock/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonApplication, python, pycrypto, hping }: { stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication, hping }:
buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
rev = "bf14bbff"; rev = "bf14bbff";
name = "knockknock-r${rev}"; name = "knockknock-r${rev}";
@ -11,7 +11,7 @@ buildPythonApplication rec {
sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4"; sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";
}; };
propagatedBuildInputs = [ pycrypto ]; propagatedBuildInputs = [ pythonPackages.pycrypto ];
patchPhase = '' patchPhase = ''
sed -i '/build\//d' setup.py sed -i '/build\//d' setup.py

8
pkgs/tools/security/volatility/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, fetchurl, buildPythonApplication, pycrypto }: { stdenv, fetchurl, pythonPackages }:
buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
namePrefix = "";
name = "volatility-2.4"; name = "volatility-2.4";
src = fetchurl { src = fetchurl {
url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz"; url = "http://downloads.volatilityfoundation.org/releases/2.4/${name}.tar.gz";
sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8"; sha256 = "1wffrkvj2lrkqhwamyix9fy05y6g6w8h1sz2iqlm6i6ag7yxykv8";
@ -12,7 +10,7 @@ buildPythonApplication rec {
doCheck = false; doCheck = false;
propagatedBuildInputs = [ pycrypto ]; propagatedBuildInputs = [ pythonPackages.pycrypto ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://code.google.com/p/volatility; homepage = https://code.google.com/p/volatility;

7
pkgs/top-level/all-packages.nix
View File

@ -3624,9 +3624,7 @@ in
svnfs = callPackage ../tools/filesystems/svnfs { }; svnfs = callPackage ../tools/filesystems/svnfs { };
svtplay-dl = callPackage ../tools/misc/svtplay-dl { svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
inherit (pythonPackages) nose mock requests2;
};
sysbench = callPackage ../development/tools/misc/sysbench {}; sysbench = callPackage ../development/tools/misc/sysbench {};
@ -10052,8 +10050,6 @@ in
pycapnp = pythonPackages.pycapnp; pycapnp = pythonPackages.pycapnp;
pycrypto = pythonPackages.pycrypto;
pyexiv2 = pythonPackages.pyexiv2; pyexiv2 = pythonPackages.pyexiv2;
pygobject = pythonPackages.pygobject; pygobject = pythonPackages.pygobject;
@ -17240,7 +17236,6 @@ in
mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
lua = lua5_1; lua = lua5_1;
libctemplate = libctemplate_2_2; libctemplate = libctemplate_2_2;
inherit (pythonPackages) pexpect paramiko;
}; };
redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { }; redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { };

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

@ -1940,7 +1940,7 @@ in modules // {
sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw"; sha256 = "0grid93yz6i6jb2zggrqncp5awdf7qi88j5y2k7dq0k9r6b8zydw";
}; };
propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ]
++ optional visualizationSupport [ pyqtgraph ]; ++ optional visualizationSupport [ pyqtgraph ];
meta = with stdenv.lib; { meta = with stdenv.lib; {