Author: sandervanderburg
Date: Thu Dec 23 11:43:03 2010
New Revision: 25251
URL: https://svn.nixos.org/websvn/nix/?rev=25251&sc=1
Log:
- Added aefs repository
- Fix path to sed so that we can use GNU enscript for syntax highlighting
Added:
disnix/examples/viewvc/trunk/pkgs/aefs/
disnix/examples/viewvc/trunk/pkgs/aefs/default.nix
disnix/examples/viewvc/trunk/pkgs/aefs/svnrepodump-aefs.gz (contents,
props changed)
Modified:
disnix/examples/viewvc/trunk/DistributedDeployment/distribution.nix
disnix/examples/viewvc/trunk/DistributedDeployment/infrastructure.nix
disnix/examples/viewvc/trunk/DistributedDeployment/services.nix
disnix/examples/viewvc/trunk/configurations/test-vm2-subversion.nix
disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix
disnix/examples/viewvc/trunk/top-level/all-packages.nix
Modified: disnix/examples/viewvc/trunk/DistributedDeployment/distribution.nix
==============================================================================
--- disnix/examples/viewvc/trunk/DistributedDeployment/distribution.nix Thu Dec
23 11:40:11 2010 (r25250)
+++ disnix/examples/viewvc/trunk/DistributedDeployment/distribution.nix Thu Dec
23 11:43:03 2010 (r25251)
@@ -3,5 +3,6 @@
{
viewvcdb = [ infrastructure.test1 ];
viewvc = [ infrastructure.test1 ];
+ aefs = [ infrastructure.test2 ];
ViewVCRepository = [ infrastructure.test2 ];
}
Modified: disnix/examples/viewvc/trunk/DistributedDeployment/infrastructure.nix
==============================================================================
--- disnix/examples/viewvc/trunk/DistributedDeployment/infrastructure.nix
Thu Dec 23 11:40:11 2010 (r25250)
+++ disnix/examples/viewvc/trunk/DistributedDeployment/infrastructure.nix
Thu Dec 23 11:43:03 2010 (r25251)
@@ -10,5 +10,6 @@
test2 = {
hostname = "test2";
svnBaseDir = "/repos";
+ svnGroup = "root";
};
}
Modified: disnix/examples/viewvc/trunk/DistributedDeployment/services.nix
==============================================================================
--- disnix/examples/viewvc/trunk/DistributedDeployment/services.nix Thu Dec
23 11:40:11 2010 (r25250)
+++ disnix/examples/viewvc/trunk/DistributedDeployment/services.nix Thu Dec
23 11:43:03 2010 (r25251)
@@ -3,13 +3,24 @@
let pkgs = import ../top-level/all-packages.nix { inherit system; };
in
rec {
+ ### Subversion repositories
+
ViewVCRepository = {
name = "ViewVCRepository";
pkg = pkgs.ViewVCRepository;
dependsOn = {};
type = "subversion-repository";
};
+
+ aefs = {
+ name = "aefs";
+ pkg = pkgs.aefs;
+ dependsOn = {};
+ type = "subversion-repository";
+ };
+ ### Databases
+
viewvcdb = {
name = "viewvcdb";
pkg = pkgs.viewvcdb;
@@ -17,12 +28,14 @@
type = "mysql-database";
};
+ ### Web front-ends
+
viewvc = {
name = "viewvc";
pkg = pkgs.viewvc;
dependsOn = {
inherit viewvcdb;
- inherit ViewVCRepository;
+ inherit ViewVCRepository aefs; # Add your own subversion repositories
here
};
type = "apache-webapplication";
};
Modified: disnix/examples/viewvc/trunk/configurations/test-vm2-subversion.nix
==============================================================================
--- disnix/examples/viewvc/trunk/configurations/test-vm2-subversion.nix Thu Dec
23 11:40:11 2010 (r25250)
+++ disnix/examples/viewvc/trunk/configurations/test-vm2-subversion.nix Thu Dec
23 11:43:03 2010 (r25251)
@@ -26,6 +26,9 @@
disnix = {
enable = true;
+ infrastructure = {
+ svnGroup = "root";
+ };
};
svnserve = {
Added: disnix/examples/viewvc/trunk/pkgs/aefs/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ disnix/examples/viewvc/trunk/pkgs/aefs/default.nix Thu Dec 23 11:43:03
2010 (r25251)
@@ -0,0 +1,11 @@
+{stdenv}:
+
+stdenv.mkDerivation {
+ name = "aefs";
+ src = ./svnrepodump-aefs.gz;
+ buildCommand = ''
+ ensureDir $out/subversion-repositories
+ cp $src $out/subversion-repositories/svnrepodump-aesfs.gz
+ gunzip $out/subversion-repositories/svnrepodump-aesfs.gz
+ '';
+}
Added: disnix/examples/viewvc/trunk/pkgs/aefs/svnrepodump-aefs.gz
==============================================================================
Binary file. No diff available.
Modified: disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix
==============================================================================
--- disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix Thu Dec 23
11:40:11 2010 (r25250)
+++ disnix/examples/viewvc/trunk/pkgs/viewvc/default.nix Thu Dec 23
11:43:03 2010 (r25251)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, subversion, MySQL_python, setuptools}:
+{stdenv, fetchurl, enscript, gnused, python, subversion, MySQL_python,
setuptools}:
interdependenc...@{viewvcdb, ...}:
let
@@ -36,12 +36,17 @@
-e '/import os/aos.environ["PYTHON_EGG_CACHE"] = "/tmp"' \
$out/webapps/viewvc/bin/svndbadmin
+ # Fix the path to sed so that syntax highlighting will work
+ sed -i -e "s|'sed'|'${gnused}/bin/sed'|" $out/webapps/viewvc/lib/viewvc.py
+
# Tweak the ViewVC configuration file
sed -i -e "s/cvs_roots =/#cvs_roots =/" \
-e "s%#svn_roots = svn: /home/svnrepos%svn_roots = ${svnRoots}%" \
-e "s/root_as_url_component = 0/root_as_url_component = 1/" \
-e "s/enabled = 0/enabled = 1/" \
+ -e "s/use_enscript = 0/use_enscript = 1/" \
+ -e "s%enscript_path =%enscript_path = ${enscript}/bin/%" \
-e "s/#host = localhost/host = ${viewvcdb.target.hostname}/" \
-e "s/#port = 3306/port = ${toString viewvcdb.target.mysqlPort}/" \
-e "s/#database_name = ViewVC/database_name = ${viewvcdb.name}/" \
Modified: disnix/examples/viewvc/trunk/top-level/all-packages.nix
==============================================================================
--- disnix/examples/viewvc/trunk/top-level/all-packages.nix Thu Dec 23
11:40:11 2010 (r25250)
+++ disnix/examples/viewvc/trunk/top-level/all-packages.nix Thu Dec 23
11:43:03 2010 (r25251)
@@ -5,20 +5,30 @@
with pkgs;
rec {
+ ### Databases
+
viewvcdb = import ../pkgs/viewvcdb {
inherit stdenv;
};
+ ### Subversion repositories
+
+ ViewVCRepository = import ../pkgs/ViewVCRepository {
+ inherit stdenv;
+ };
+
+ aefs = import ../pkgs/aefs {
+ inherit stdenv;
+ };
+
+ ### Web front-end
+
viewvc = import ../pkgs/viewvc {
- inherit stdenv fetchurl python setuptools;
+ inherit stdenv fetchurl enscript gnused python setuptools;
inherit (pythonPackages) MySQL_python;
subversion = subversion.override {
pythonBindings = true;
};
};
-
- ViewVCRepository = import ../pkgs/ViewVCRepository {
- inherit stdenv;
- };
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
