> Hi,
>
> >> Committed this, had to clean up a bit but did have time to check that it
> >
> >> still compiles. I don't think I broke it by please try it :
> > All ok; it compiles and runs without problems.
> >
> > By the way, I think your clean up was a nice improvement! Thanks!
>
> with me it doesn't build, because it uses the network to download
> something.
> This is because I (and hydra) build everything in chroot
> (in nixos: nix.useChroot = true ) . Could you please patch the package
> so it can be built in hydra?
I think the attached patch fixes it; it built here with useChroot = true. The
Python package paramiko was getting its dependency pycrypto from the net
instead of using the one already in Nixpkgs, because I failed to specify it as
an input.
Apologies for missing the network impurity.
I also included a patch to bump the version of Mysql Workbench.
>
> greetings,
> Rob
From cec4ec7e75420929f5fd7b11a695f8b85a204344 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@eka.(none)>
Date: Fri, 1 Oct 2010 22:10:39 -0430
Subject: [PATCH 1/2] Version bump.
---
pkgs/applications/misc/mysql-workbench/default.nix | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 0f3b3f2..bbe9cfa 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "mysql-workbench";
- version = "5.2.27";
+ version = "5.2.28";
src = fetchurl {
- url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}.tar.gz";;
- sha256 = "01l15f9nvcpcsb56r7qb39jjlknh0dkj5iwfg1pj5bm12pbligng";
+ url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";;
+ sha256 = "1i7icrf3z09rijlvlg99w6m1n3xw0650840hk95ymgrb95kc3437";
};
buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
--
1.7.3.1
From 6e022c5c994c893aea3a64d36c9459369f8df967 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@eka.(none)>
Date: Fri, 1 Oct 2010 23:47:59 -0430
Subject: [PATCH 2/2] Have paramiko use pycrypto from Nixpkgs instead of getting it from the network.
This is needed in order to chroot build paramiko ( such as Hydra does ).
---
pkgs/applications/misc/mysql-workbench/default.nix | 4 ++--
pkgs/top-level/python-packages.nix | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index bbe9cfa..5c7a8c6 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
, glib, glibc, gnome_keyring, gtk, gtkmm, intltool, libctemplate, libglade
, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
-, pango, paramiko, pcre, pexpect, pkgconfig, python, sqlite
+, pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake boost file gettext glib glibc gnome_keyring gtk gtkmm intltool
libctemplate libglade libgnome libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
- mysql paramiko pcre pexpect pkgconfig python sqlite ];
+ mysql paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
preConfigure = ''
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58bfa7e..0cb0ce5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -548,6 +548,8 @@ rec {
sha256 = "00jhzl3s9xdkbj32h1kq1swk8wpx9zky7qfda40n8mb204xjcn9h";
};
+ buildInputs = [ pkgs.pycrypto ];
+
doCheck = false;
meta = {
--
1.7.3.1
_______________________________________________
nix-dev mailing list
[email protected]
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
