Author: eelco
Date: Mon Feb 20 18:59:43 2012
New Revision: 32436
URL: https://nixos.org/websvn/nix/?rev=32436&sc=1
Log:
* Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
rebuild of the trunk in a few days.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
Mon Feb 20 18:52:52 2012 (r32435)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
Mon Feb 20 18:59:43 2012 (r32436)
@@ -1,12 +1,12 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }:
stdenv.mkDerivation rec {
- name = "svn2git-2.2.0";
+ name = "svn2git-2.1.0-20111206";
src = fetchgit {
url = https://github.com/nirvdrum/svn2git;
- rev = "db0769835e9d1d3ff324091a3bb7756200a09932";
- sha256 =
"6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2";
+ rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
+ sha256 =
"26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
};
buildInputs = [ ruby makeWrapper ];
Modified:
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Mon Feb 20 18:52:52 2012 (r32435)
+++ nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Mon Feb 20 18:59:43 2012 (r32436)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
-, guiSupport ? false, tk ? null, curses }:
+, guiSupport ? false, tk ? null, ssl, curses }:
let
name = "mercurial-2.0.2";
@@ -13,7 +13,7 @@
};
inherit python; # pass it so that the same version can be used in hg2git
- pythonPackages = [ curses ];
+ pythonPackages = [ ssl curses ];
buildInputs = [ python makeWrapper docutils unzip ];
@@ -35,7 +35,7 @@
''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
- --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \
+ --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \
$WRAP_TK
done
Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Mon Feb
20 18:52:52 2012 (r32435)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Mon Feb
20 18:59:43 2012 (r32436)
@@ -38,7 +38,7 @@
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
- [ bzip2 openssl ]
+ [ bzip2 ]
++ optional zlibSupport zlib
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
@@ -172,6 +172,11 @@
deps = [ sqlite ];
};
+ ssl = buildInternalPythonModule {
+ moduleName = "ssl";
+ deps = [ openssl ];
+ };
+
tkinter = buildInternalPythonModule {
moduleName = "tkinter";
deps = [ tcl tk x11 ];
Modified: nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix Mon Feb 20
18:52:52 2012 (r32435)
+++ nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix Mon Feb 20
18:59:43 2012 (r32436)
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage }:
+{ fetchurl, buildPythonPackage, ssl }:
buildPythonPackage {
name = "offlineimap-6.2.0.2";
@@ -8,6 +8,8 @@
sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
};
+ propagatedBuildInputs = [ ssl ];
+
doCheck = false;
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 20 18:52:52
2012 (r32435)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 20 18:59:43
2012 (r32436)
@@ -1110,7 +1110,9 @@
odt2txt = callPackage ../tools/text/odt2txt { };
- offlineimap = callPackage ../tools/networking/offlineimap { };
+ offlineimap = callPackage ../tools/networking/offlineimap {
+ ssl = pythonPackages.ssl;
+ };
opendbx = callPackage ../development/libraries/opendbx { };
@@ -7183,7 +7185,7 @@
};
mercurial = callPackage ../applications/version-management/mercurial {
- inherit (pythonPackages) curses;
+ inherit (pythonPackages) ssl curses;
guiSupport = false; # use mercurialFull to get hgk GUI
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
