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

Remove top-level setuptools

Browse Source 
See #11567.
This commit is contained in:
Frederik Rietdijk 2016-08-14 13:06:42 +02:00
parent 57b9ff06f1
commit eb3e23c49e
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/audio/morituri/default.nix
View File

@ -1,8 +1,10 @@
{ stdenv, fetchgit, python, pythonPackages, cdparanoia, cdrdao { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
, pygobject, gst_python, gst_plugins_base, gst_plugins_good , gst_python, gst_plugins_base, gst_plugins_good
, setuptools, utillinux, makeWrapper, substituteAll, autoreconfHook }: , utillinux, makeWrapper, substituteAll, autoreconfHook }:
stdenv.mkDerivation rec { let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
name = "morituri-${version}"; name = "morituri-${version}";
version = "0.2.3.20151109"; version = "0.2.3.20151109";
namePrefix = ""; namePrefix = "";
@ -14,10 +16,10 @@ stdenv.mkDerivation rec {
sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k"; sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k";
}; };
pythonPath = [ pythonPath = with pythonPackages; [
pygobject gst_python pythonPackages.musicbrainzngs pygobject gst_python musicbrainzngs
pythonPackages.pycdio pythonPackages.pyxdg setuptools pycdio pyxdg setuptools
pythonPackages.CDDB CDDB
]; ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];

7
pkgs/tools/backup/duplicity/default.nix
View File

@ -1,11 +1,10 @@
{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper { stdenv, fetchurl, pythonPackages, librsync, ncftp, gnupg, makeWrapper
, lockfile, setuptools, paramiko, pycrypto, ecdsa
}: }:
let let
version = "0.7.07.1"; version = "0.7.07.1";
in inherit (pythonPackages) boto ecdsa lockfile paramiko pycrypto python setuptools;
stdenv.mkDerivation { in stdenv.mkDerivation {
name = "duplicity-${version}"; name = "duplicity-${version}";
src = fetchurl { src = fetchurl {

11
pkgs/tools/misc/debian-devscripts/default.nix
View File

@ -1,10 +1,13 @@
{stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
, FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper , FileDesktopEntry, libxslt, docbook_xsl, makeWrapper
, python3Packages
, perlPackages, curl, gnupg, diffutils , perlPackages, curl, gnupg, diffutils
, sendmailPath ? "/var/setuid-wrappers/sendmail" , sendmailPath ? "/var/setuid-wrappers/sendmail"
}: }:
stdenv.mkDerivation rec { let
inherit (python3Packages) python setuptools;
in stdenv.mkDerivation rec {
version = "2.16.6"; version = "2.16.6";
name = "debian-devscripts-${version}"; name = "debian-devscripts-${version}";
@ -14,13 +17,13 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile
FileDesktopEntry libxslt python3 setuptools makeWrapper FileDesktopEntry libxslt python setuptools makeWrapper
perlPackages.ParseDebControl perlPackages.LWPProtocolHttps perlPackages.ParseDebControl perlPackages.LWPProtocolHttps
curl gnupg diffutils ]; curl gnupg diffutils ];
preConfigure = '' preConfigure = ''
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
tgtpy="$out/lib/${python3.libPrefix}/site-packages" tgtpy="$out/lib/${python.libPrefix}/site-packages"
mkdir -p "$tgtpy" mkdir -p "$tgtpy"
export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
find po4a scripts -type f -exec sed -r \ find po4a scripts -type f -exec sed -r \

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

@ -1398,7 +1398,6 @@ in
duo-unix = callPackage ../tools/security/duo-unix { }; duo-unix = callPackage ../tools/security/duo-unix { };
duplicity = callPackage ../tools/backup/duplicity { duplicity = callPackage ../tools/backup/duplicity {
inherit (pythonPackages) boto lockfile paramiko ecdsa pycrypto;
gnupg = gnupg1; gnupg = gnupg1;
}; };
@ -10095,8 +10094,6 @@ in
rebol = callPackage ../development/interpreters/rebol { }; rebol = callPackage ../development/interpreters/rebol { };
setuptools = pythonPackages.setuptools;
slowaes = pythonPackages.slowaes; slowaes = pythonPackages.slowaes;
twisted = pythonPackages.twisted; twisted = pythonPackages.twisted;

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

@ -10836,7 +10836,7 @@ in modules // {
# FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase) # FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
doCheck = false; doCheck = false;
buildInputs = with self; [ pkgs.setuptools ]; buildInputs = with self; [ setuptools ];
meta = { meta = {
description = "Python components for parsing HTML, XML and other textual content"; description = "Python components for parsing HTML, XML and other textual content";
@ -10930,7 +10930,7 @@ in modules // {
sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42"; sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42";
}; };
buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); buildInputs = with self; [ setuptools ] ++ (optional isPy26 argparse);
meta = { meta = {
description = "Automatically generated zsh completion function for Python's option parser modules"; description = "Automatically generated zsh completion function for Python's option parser modules";
@ -23705,7 +23705,7 @@ in modules // {
PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
propagatedBuildInputs = with self; [ genshi pkgs.setuptools modules.sqlite3 ]; propagatedBuildInputs = with self; [ genshi setuptools modules.sqlite3 ];
meta = { meta = {
description = "Enhanced wiki and issue tracking system for software development projects"; description = "Enhanced wiki and issue tracking system for software development projects";