Author: sandervanderburg
Date: Thu Dec 23 17:34:33 2010
New Revision: 25261
URL: https://svn.nixos.org/websvn/nix/?rev=25261&sc=1
Log:
Updated service models using a pkg parameter
Modified:
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-with-proxy.nix
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-without-proxy.nix
disnix/examples/disnix-proxy-example/trunk/deployment/top-level/all-packages.nix
Modified:
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-with-proxy.nix
==============================================================================
---
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-with-proxy.nix
Thu Dec 23 17:07:07 2010 (r25260)
+++
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-with-proxy.nix
Thu Dec 23 17:34:33 2010 (r25261)
@@ -1,18 +1,18 @@
-{system, distribution}:
+{system, distribution, pkgs}:
-let pkgs = import ../top-level/all-packages.nix { inherit system; };
+let customPkgs = import ../top-level/all-packages.nix { inherit system pkgs; };
in
rec {
hello_world_server = rec {
name = "hello_world_server";
- pkg = pkgs.hello_world_server { inherit port; };
+ pkg = customPkgs.hello_world_server { inherit port; };
port = 5000;
type = "wrapper";
};
hello_world_client = {
name = "hello_world_client";
- pkg = pkgs.hello_world_client;
+ pkg = customPkgs.hello_world_client;
dependsOn = {
hello_world_server = disnix_tcp_proxy;
};
@@ -21,7 +21,7 @@
disnix_tcp_proxy = rec {
name = "disnix_tcp_proxy";
- pkg = pkgs.disnix_tcp_proxy { inherit port; };
+ pkg = customPkgs.disnix_tcp_proxy { inherit port; };
port = 6000;
dependsOn = {
inherit hello_world_server;
Modified:
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-without-proxy.nix
==============================================================================
---
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-without-proxy.nix
Thu Dec 23 17:07:07 2010 (r25260)
+++
disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/services-without-proxy.nix
Thu Dec 23 17:34:33 2010 (r25261)
@@ -1,18 +1,18 @@
-{system, distribution}:
+{system, distribution, pkgs}:
-let pkgs = import ../top-level/all-packages.nix { inherit system; };
+let customPkgs = import ../top-level/all-packages.nix { inherit system pkgs; };
in
rec {
hello_world_server = rec {
name = "hello_world_server";
- pkg = pkgs.hello_world_server { inherit port; };
+ pkg = customPkgs.hello_world_server { inherit port; };
port = 5000;
type = "wrapper";
};
hello_world_client = {
name = "hello_world_client";
- pkg = pkgs.hello_world_client;
+ pkg = customPkgs.hello_world_client;
dependsOn = {
inherit hello_world_server;
};
Modified:
disnix/examples/disnix-proxy-example/trunk/deployment/top-level/all-packages.nix
==============================================================================
---
disnix/examples/disnix-proxy-example/trunk/deployment/top-level/all-packages.nix
Thu Dec 23 17:07:07 2010 (r25260)
+++
disnix/examples/disnix-proxy-example/trunk/deployment/top-level/all-packages.nix
Thu Dec 23 17:34:33 2010 (r25261)
@@ -1,7 +1,5 @@
-{system}:
+{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
