alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Revert r32435. We'll be doing a stdenv merge in a few days, so

Browse source 
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
This commit is contained in:
Eelco Dolstra 2012-02-20 18:59:43 +00:00
parent 95cbf4ed55
commit 45fed14272
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/version-management/git-and-tools/svn2git/default.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }: { stdenv, fetchgit, ruby, makeWrapper, git }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "svn2git-2.2.0"; name = "svn2git-2.1.0-20111206";
src = fetchgit { src = fetchgit {
url = https://github.com/nirvdrum/svn2git; url = https://github.com/nirvdrum/svn2git;
rev = "db0769835e9d1d3ff324091a3bb7756200a09932"; rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2"; sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
}; };
buildInputs = [ ruby makeWrapper ]; buildInputs = [ ruby makeWrapper ];

6
pkgs/applications/version-management/mercurial/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip { stdenv, fetchurl, python, makeWrapper, docutils, unzip
, guiSupport ? false, tk ? null, curses }: , guiSupport ? false, tk ? null, ssl, curses }:
let let
name = "mercurial-2.0.2"; name = "mercurial-2.0.2";
@ -13,7 +13,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 = [ ssl curses ];
buildInputs = [ python makeWrapper docutils unzip ]; buildInputs = [ python makeWrapper docutils unzip ];
@ -35,7 +35,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}")" \ --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
$WRAP_TK $WRAP_TK
done done

7
pkgs/development/interpreters/python/2.7/default.nix
View file

@ -38,7 +38,7 @@ let
buildInputs = buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 openssl ] [ bzip2 ]
++ optional zlibSupport zlib ++ optional zlibSupport zlib
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
@ -172,6 +172,11 @@ let
deps = [ sqlite ]; deps = [ sqlite ];
}; };
ssl = buildInternalPythonModule {
moduleName = "ssl";
deps = [ openssl ];
};
tkinter = buildInternalPythonModule { tkinter = buildInternalPythonModule {
moduleName = "tkinter"; moduleName = "tkinter";
deps = [ tcl tk x11 ]; deps = [ tcl tk x11 ];

4
pkgs/tools/networking/offlineimap/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, buildPythonPackage }: { fetchurl, buildPythonPackage, ssl }:
buildPythonPackage { buildPythonPackage {
name = "offlineimap-6.2.0.2"; name = "offlineimap-6.2.0.2";
@ -8,6 +8,8 @@ buildPythonPackage {
sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
}; };
propagatedBuildInputs = [ ssl ];
doCheck = false; doCheck = false;
meta = { meta = {

6
pkgs/top-level/all-packages.nix
View file

@ -1110,7 +1110,9 @@ let
odt2txt = callPackage ../tools/text/odt2txt { }; odt2txt = callPackage ../tools/text/odt2txt { };
offlineimap = callPackage ../tools/networking/offlineimap { }; offlineimap = callPackage ../tools/networking/offlineimap {
ssl = pythonPackages.ssl;
};
opendbx = callPackage ../development/libraries/opendbx { }; opendbx = callPackage ../development/libraries/opendbx { };
@ -7183,7 +7185,7 @@ let
}; };
mercurial = callPackage ../applications/version-management/mercurial { mercurial = callPackage ../applications/version-management/mercurial {
inherit (pythonPackages) curses; inherit (pythonPackages) ssl curses;
guiSupport = false; # use mercurialFull to get hgk GUI guiSupport = false; # use mercurialFull to get hgk GUI
}; };