Author: sandervanderburg
Date: Thu Dec 23 17:35:22 2010
New Revision: 25264
URL: https://svn.nixos.org/websvn/nix/?rev=25264&sc=1
Log:
Updated service models using a pkgs parameter
Modified:
disnix/examples/php-mysql/trunk/deployment/DistributedDeployment/services.nix
disnix/examples/php-mysql/trunk/deployment/top-level/all-packages.nix
Modified:
disnix/examples/php-mysql/trunk/deployment/DistributedDeployment/services.nix
==============================================================================
---
disnix/examples/php-mysql/trunk/deployment/DistributedDeployment/services.nix
Thu Dec 23 17:35:15 2010 (r25263)
+++
disnix/examples/php-mysql/trunk/deployment/DistributedDeployment/services.nix
Thu Dec 23 17:35:22 2010 (r25264)
@@ -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 {
### Databases
rooms = {
name = "rooms";
- pkg = pkgs.rooms;
+ pkg = customPkgs.rooms;
dependsOn = {};
type = "mysql-database";
};
staff = {
name = "staff";
- pkg = pkgs.staff;
+ pkg = customPkgs.staff;
dependsOn = {};
type = "mysql-database";
};
zipcodes = {
name = "zipcodes";
- pkg = pkgs.zipcodes;
+ pkg = customPkgs.zipcodes;
dependsOn = {};
type = "mysql-database";
};
@@ -30,7 +30,7 @@
stafftracker = {
name = "stafftracker";
- pkg = pkgs.stafftracker;
+ pkg = customPkgs.stafftracker;
dependsOn = {
inherit rooms staff zipcodes;
};
Modified: disnix/examples/php-mysql/trunk/deployment/top-level/all-packages.nix
==============================================================================
--- disnix/examples/php-mysql/trunk/deployment/top-level/all-packages.nix
Thu Dec 23 17:35:15 2010 (r25263)
+++ disnix/examples/php-mysql/trunk/deployment/top-level/all-packages.nix
Thu Dec 23 17:35:22 2010 (r25264)
@@ -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
