@@ -1077,6 +1077,10 @@ rec {
1077 inherit fetchurl stdenv;
1077 inherit fetchurl stdenv;
1080+ sqlite3 = (import ../development/libraries/sqlite-3.3) {
1081+ inherit stdenv fetchurl;
1080 lcms = (import ../development/libraries/lcms) {
1084 lcms = (import ../development/libraries/lcms) {
1081 inherit fetchurl stdenv;
1085 inherit fetchurl stdenv;
@@ -1330,6 +1334,10 @@ rec {
1330 inherit fetchurl stdenv mysql libtool zlib unixODBC;
1334 inherit fetchurl stdenv mysql libtool zlib unixODBC;
1337+ clearsilver = import ../development/libraries/clearsilver {
1338+ inherit fetchurl stdenv python;
1333 ### DEVELOPMENT / LIBRARIES / JAVA
1341 ### DEVELOPMENT / LIBRARIES / JAVA
1335 saxon = (import ../development/libraries/java/saxon) {
1343 saxon = (import ../development/libraries/java/saxon) {
@@ -2429,6 +2437,28 @@ rec {
2431 martyr = (import ../development/libraries/martyr) {
2439 martyr = (import ../development/libraries/martyr) {
2432− inherit stdenv fetchurl apacheAnt;
2440+ inherit stdenv fetchurl apacheAnt;
2443+ trac = (import ../misc/trac) {
2444+ inherit stdenv fetchurl python clearsilver makeWrapper;
2448+ subversion = (import ../applications/version-management/subversion-1.3.x) {
2449+ inherit fetchurl stdenv openssl db4 expat jdk swig zlib;
2450+ localServer = true;
2451+ httpServer = false;
2453+ compressionSupport = true;
2454+ httpd = apacheHttpd;
2455+ pythonBindings = true; # Enable python bindings
2458+ pysqlite = (import ../development/libraries/pysqlite) {
2459+ inherit stdenv fetchurl python substituter;