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

a package does not need to include setuptools manually

Browse Source 
this breaks for now
This commit is contained in:
Florian Friesdorf 2012-12-03 04:40:38 +01:00
parent 3438681d80
commit 5436356733
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/calibre/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
fontconfig podofo qt4 pil chmlib icu fontconfig podofo qt4 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.cssutils pythonPackages.beautifulsoup
pythonPackages.setuptools pythonPackages.sqlite3 sqlite pythonPackages.sqlite3 sqlite
]; ];
installPhase = '' installPhase = ''

2
pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = with pythonPackages; buildInputs = with pythonPackages;
[ [
python twisted urwid beautifulsoup wxPython distribute pygobject python twisted urwid beautifulsoup wxPython distribute pygobject
wokkel pythonDBus pyfeed pythonPackages.setuptools wrapPython wokkel pythonDBus pyfeed wrapPython
]; ];
configurePhase = '' configurePhase = ''

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, setuptools, unzip { stdenv, fetchurl, python, makeWrapper, docutils, unzip
, guiSupport ? false, tk ? null, curses }: , guiSupport ? false, tk ? null, curses }:
let let
@ -15,7 +15,7 @@ stdenv.mkDerivation {
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
pythonPackages = [ curses ]; pythonPackages = [ curses ];
buildInputs = [ python makeWrapper docutils setuptools unzip ]; buildInputs = [ python makeWrapper docutils unzip ];
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";