Author: sandervanderburg
Date: Thu Dec 23 17:35:29 2010
New Revision: 25265
URL: https://svn.nixos.org/websvn/nix/?rev=25265&sc=1
Log:
Updated service models using a pkgs parameter
Modified:
disnix/examples/viewvc/trunk/DistributedDeployment/services.nix
disnix/examples/viewvc/trunk/top-level/all-packages.nix
Modified: disnix/examples/viewvc/trunk/DistributedDeployment/services.nix
==============================================================================
--- disnix/examples/viewvc/trunk/DistributedDeployment/services.nix Thu Dec
23 17:35:22 2010 (r25264)
+++ disnix/examples/viewvc/trunk/DistributedDeployment/services.nix Thu Dec
23 17:35:29 2010 (r25265)
@@ -1,27 +1,27 @@
-{distribution, system}:
+{distribution, system, pkgs}:
-let pkgs = import ../top-level/all-packages.nix { inherit system; };
+let customPkgs = import ../top-level/all-packages.nix { inherit system pkgs; };
in
rec {
### Subversion repositories
ViewVCRepository = {
name = "ViewVCRepository";
- pkg = pkgs.ViewVCRepository;
+ pkg = customPkgs.ViewVCRepository;
dependsOn = {};
type = "subversion-repository";
};
aefs = {
name = "aefs";
- pkg = pkgs.aefs;
+ pkg = customPkgs.aefs;
dependsOn = {};
type = "subversion-repository";
};
maak = {
name = "maak";
- pkg = pkgs.maak;
+ pkg = customPkgs.maak;
dependsOn = {};
type = "subversion-repository";
};
@@ -30,7 +30,7 @@
viewvcdb = {
name = "viewvcdb";
- pkg = pkgs.viewvcdb;
+ pkg = customPkgs.viewvcdb;
dependsOn = {};
type = "mysql-database";
};
@@ -39,7 +39,7 @@
viewvc = {
name = "viewvc";
- pkg = pkgs.viewvc;
+ pkg = customPkgs.viewvc;
dependsOn = {
inherit viewvcdb;
inherit ViewVCRepository aefs maak; # Add your own subversion
repositories here
Modified: disnix/examples/viewvc/trunk/top-level/all-packages.nix
==============================================================================
--- disnix/examples/viewvc/trunk/top-level/all-packages.nix Thu Dec 23
17:35:22 2010 (r25264)
+++ disnix/examples/viewvc/trunk/top-level/all-packages.nix Thu Dec 23
17:35:29 2010 (r25265)
@@ -1,7 +1,5 @@
-{system ? builtins.currentSystem}:
+{system, pkgs}:
-let pkgs = import (builtins.getEnv "NIXPKGS_ALL") { inherit system; };
-in
with pkgs;
rec {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
