diff options
| -rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/bazaar/tools.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/2.5/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/builder-defs.nix | 5 |
5 files changed, 46 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index c21b38d55232c..c2b5306b2e2a6 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation { wrapProgram $out/bin/bzr --prefix PYTHONPATH : "$(toPythonPath $out)" ''; + passthru = { + # If someone wants to assert python features.. + inherit python; + }; + meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix new file mode 100644 index 0000000000000..c36ac2d63dc38 --- /dev/null +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -0,0 +1,23 @@ +args : with args; + +if ! bazaar.python.readlineSupport then + throw "Bazaar Tools require readline support in python." +else + +rec { + src = fetchurl { + url = http://launchpad.net/bzrtools/stable/1.5.0/+download/bzrtools-1.5.0.tar.gz; + sha256 = "0lm4qhsjy3k8zp9hcahlf37v69w6lhhz2x3hjskgm3rk6b0bngjz"; + }; + + buildInputs = []; + configureFlags = []; + + /* doConfigure should be specified separately */ + phaseNames = [(simplyShare "bzrtools")]; + + name = "bzr-tools-1.5"; + meta = { + description = "Bazaar plugins."; + }; +} diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index f2a81c7f763fe..ee13a8dceb80c 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -2,6 +2,7 @@ gdbmSupport ? true, gdbm ? null , sqlite ? null , db4 ? null + , readline ? null }: assert zlibSupport -> zlib != null; @@ -18,6 +19,7 @@ let ++ optional gdbmSupport gdbm ++ optional (sqlite != null) sqlite ++ optional (db4 != null) db4 + ++ optional (readline != null) readline ; in @@ -46,7 +48,9 @@ stdenv.mkDerivation { for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - "; + " + (if readline != null then '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" + '' else ""); postInstall = " ensureDir $out/nix-support @@ -58,6 +62,7 @@ stdenv.mkDerivation { inherit zlibSupport; sqliteSupport = sqlite != null; db4Support = db4 != null; + readlineSupport = readline != null; libPrefix = "python2.5"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1798c7aa99111..0b6e1ffa793e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1838,6 +1838,7 @@ let pkgs = rec { python25 = python25Fun { db4 = if getConfig ["python" "db4Support"] false then db4 else null; sqlite = if getConfig ["python" "sqlite"] false then sqlite else null; + readline = if getConfig ["python" "readlineSupport"] false then readline else null; } null; pyrex = pyrex095; @@ -5004,9 +5005,14 @@ let pkgs = rec { }; bazaar = import ../applications/version-management/bazaar { - inherit fetchurl stdenv python makeWrapper; + inherit fetchurl stdenv makeWrapper; + python = python25; }; + bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { + inherit bazaar; + } null; + bitlbee = import ../applications/networking/instant-messengers/bitlbee { inherit fetchurl stdenv gnutls pkgconfig; inherit (gtkLibs) glib; diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index 582893095dd76..b847a99c141d4 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -474,4 +474,9 @@ args: with args; with stringsWithDeps; with lib; cp *.map $out/share/texmf/fonts/map/${args.name} || echo No fontmap data '') ["minInit" "defEnsureDir"]; + simplyShare = shareName: FullDepEntry ('' + ensureDir $out/share + cp -r . $out/share/${shareName} + '') ["doUnpack" "defEnsureDir"]; + }) // args |