mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
Python: fixup modules that were removed
This commit is contained in:
parent
56a49e6cda
commit
efb6052f40
|
@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with pythonPackages; [
|
propagatedBuildInputs = with pythonPackages; [
|
||||||
feedparser dbus-python mygpoclient sqlite3 pygtk eyeD3
|
feedparser dbus-python mygpoclient pygtk eyeD3
|
||||||
] ++ stdenv.lib.optional ipodSupport libgpod;
|
] ++ stdenv.lib.optional ipodSupport libgpod;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
|
{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
|
||||||
, libart_lgpl, qt4, pythonFull, cups, fontconfig, libjpeg
|
, libart_lgpl, qt4, python, cups, fontconfig, libjpeg
|
||||||
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
|
, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
let
|
||||||
|
pythonEnv = python.withPackages(ps: [ps.tkinter]);
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
name = "scribus-1.4.6";
|
name = "scribus-1.4.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = with xorg;
|
buildInputs = with xorg;
|
||||||
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
|
[ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4
|
||||||
pythonFull cups fontconfig
|
pythonEnv cups fontconfig
|
||||||
libjpeg zlib libpng podofo aspell cairo
|
libjpeg zlib libpng podofo aspell cairo
|
||||||
boost # for internal 2geom library
|
boost # for internal 2geom library
|
||||||
libXaw libXext libX11 libXtst libXi libXinerama
|
libXaw libXext libX11 libXtst libXi libXinerama
|
||||||
|
|
|
@ -6,7 +6,7 @@ let
|
||||||
# if you bump version, update pkgs.tortoisehg too or ping maintainer
|
# if you bump version, update pkgs.tortoisehg too or ping maintainer
|
||||||
version = "3.9.1";
|
version = "3.9.1";
|
||||||
name = "mercurial-${version}";
|
name = "mercurial-${version}";
|
||||||
inherit (python2Packages) curses docutils hg-git dulwich python;
|
inherit (python2Packages) docutils hg-git dulwich python;
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -18,7 +18,6 @@ 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 ];
|
|
||||||
|
|
||||||
buildInputs = [ python makeWrapper docutils unzip ];
|
buildInputs = [ python makeWrapper docutils unzip ];
|
||||||
|
|
||||||
|
@ -43,7 +42,7 @@ stdenv.mkDerivation {
|
||||||
''
|
''
|
||||||
for i in $(cd $out/bin && ls); do
|
for i in $(cd $out/bin && ls); do
|
||||||
wrapProgram $out/bin/$i \
|
wrapProgram $out/bin/$i \
|
||||||
--prefix PYTHONPATH : "$(toPythonPath "$out ${curses}"):$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \
|
--prefix PYTHONPATH : "$(toPythonPath "$out ${hg-git}"):$(toPythonPath "$out ${dulwich}")" \
|
||||||
$WRAP_TK
|
$WRAP_TK
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib,
|
{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib,
|
||||||
gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
|
gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
|
||||||
libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }:
|
libXmu, mesa, openal, pixman, pkgconfig, python27, SDL }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "privateer-1.03";
|
name = "privateer-1.03";
|
||||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng
|
[ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng
|
||||||
libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal
|
libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal
|
||||||
pixman pkgconfig python27Full SDL ];
|
pixman pkgconfig python27 SDL ];
|
||||||
|
|
||||||
patches = [ ./0001-fix-VSFile-constructor.patch ];
|
patches = [ ./0001-fix-VSFile-constructor.patch ];
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, python27Full }:
|
{ stdenv, fetchFromGitHub, python27 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "fpp-${version}";
|
name = "fpp-${version}";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27Full.interpreter}"'
|
substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27.interpreter}"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -4396,9 +4396,7 @@ in
|
||||||
|
|
||||||
es = callPackage ../shells/es { };
|
es = callPackage ../shells/es { };
|
||||||
|
|
||||||
fish = callPackage ../shells/fish {
|
fish = callPackage ../shells/fish { };
|
||||||
python = python27Full;
|
|
||||||
};
|
|
||||||
|
|
||||||
fish-foreign-env = callPackage ../shells/fish-foreign-env { };
|
fish-foreign-env = callPackage ../shells/fish-foreign-env { };
|
||||||
|
|
||||||
|
|
|
@ -1492,7 +1492,7 @@ in {
|
||||||
url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz";
|
url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz";
|
||||||
};
|
};
|
||||||
propagatedBuildInputs = with self; [
|
propagatedBuildInputs = with self; [
|
||||||
configobj prompt_toolkit awscli boto3 pygments sqlite3 mock pytest
|
configobj prompt_toolkit awscli boto3 pygments mock pytest
|
||||||
pytestcov unittest2 tox
|
pytestcov unittest2 tox
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -2586,7 +2586,7 @@ in {
|
||||||
sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
|
sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = with self; [ hypothesis sqlite3 ];
|
buildInputs = with self; [ hypothesis ];
|
||||||
|
|
||||||
propagatedBuildInputs = with self; [ chardet ];
|
propagatedBuildInputs = with self; [ chardet ];
|
||||||
|
|
||||||
|
@ -5426,7 +5426,7 @@ in {
|
||||||
sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0";
|
sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = with self; [ mock sqlite3 ];
|
buildInputs = with self; [ mock ];
|
||||||
|
|
||||||
propagatedBuildInputs = with self; [ self.six requests2 ];
|
propagatedBuildInputs = with self; [ self.six requests2 ];
|
||||||
|
|
||||||
|
@ -9735,7 +9735,7 @@ in {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
# Requires Django >= 1.8
|
# Requires Django >= 1.8
|
||||||
buildInputs = with self ; [ sqlite3 django ];
|
buildInputs = with self; [ django ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Django extension that provides database and form color fields";
|
description = "Django extension that provides database and form color fields";
|
||||||
|
@ -9834,7 +9834,7 @@ in {
|
||||||
sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895";
|
sha256 = "1m7y3brk3697hr2cvkzl8dry4pp7wkmhvxmf8db1ardz1r9d8895";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock sqlite3 ];
|
buildInputs = with self ; [ pytestrunner pytestdjango django_environ mock ];
|
||||||
propagatedBuildInputs = with self ; [ django six ];
|
propagatedBuildInputs = with self ; [ django six ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
@ -12497,7 +12497,7 @@ in {
|
||||||
|
|
||||||
propagatedBuildInputs = with self;
|
propagatedBuildInputs = with self;
|
||||||
[ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
|
[ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
|
||||||
simplegeneric traitlets requests2 pathlib2 pexpect sqlite3 ]
|
simplegeneric traitlets requests2 pathlib2 pexpect ]
|
||||||
++ optionals stdenv.isDarwin [appnope];
|
++ optionals stdenv.isDarwin [appnope];
|
||||||
|
|
||||||
LC_ALL="en_US.UTF-8";
|
LC_ALL="en_US.UTF-8";
|
||||||
|
@ -13663,9 +13663,6 @@ in {
|
||||||
dateutil
|
dateutil
|
||||||
colorama
|
colorama
|
||||||
six
|
six
|
||||||
|
|
||||||
readline
|
|
||||||
sqlite3
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -18954,7 +18951,7 @@ in {
|
||||||
|
|
||||||
disabled = isPy3k || isPyPy;
|
disabled = isPy3k || isPyPy;
|
||||||
|
|
||||||
propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ];
|
propagatedBuildInputs = with self; [ vobject lxml requests urwid pyxdg ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Command-line interface carddav client";
|
description = "Command-line interface carddav client";
|
||||||
|
|
Loading…
Reference in a new issue