Author: sandervanderburg
Date: Fri Dec 24 14:04:10 2010
New Revision: 25272
URL: https://svn.nixos.org/websvn/nix/?rev=25272&sc=1
Log:
Fixed nix expressions to cope with the new services model format
Modified:
disnix/dydisnix/trunk/data/gendist.nix
disnix/dydisnix/trunk/data/try-build.nix.in
Modified: disnix/dydisnix/trunk/data/gendist.nix
==============================================================================
--- disnix/dydisnix/trunk/data/gendist.nix Fri Dec 24 13:52:48 2010
(r25271)
+++ disnix/dydisnix/trunk/data/gendist.nix Fri Dec 24 14:04:10 2010
(r25272)
@@ -18,7 +18,7 @@
qosFun = import qosFile;
# Evaluations
- services = servicesFun { distribution = null; system = null; };
+ services = servicesFun { distribution = null; system = null; pkgs = null; };
serviceProperties = filters.filterDerivations services;
Modified: disnix/dydisnix/trunk/data/try-build.nix.in
==============================================================================
--- disnix/dydisnix/trunk/data/try-build.nix.in Fri Dec 24 13:52:48 2010
(r25271)
+++ disnix/dydisnix/trunk/data/try-build.nix.in Fri Dec 24 14:04:10 2010
(r25272)
@@ -9,12 +9,13 @@
lib = import @DISNIX_PREFIX@/share/disnix/lib.nix;
- services = servicesFun { system = builtins.currentSystem; distribution =
null; };
+ services = servicesFun { system = builtins.currentSystem; distribution =
null; pkgs = null; };
distribution = distributionFun { inherit infrastructure; };
servicesWithTargets = lib.augumentTargetsInDependsOn distribution services;
target = getAttr targetName infrastructure;
system = if target ? system then target.system else builtins.currentSystem;
- service = getAttr serviceName (servicesFun { inherit distribution system; });
+ pkgs = lib.selectPkgs system;
+ service = getAttr serviceName (servicesFun { inherit distribution system
pkgs; });
in
if service ? dependsOn && service.dependsOn != {} then service.pkg
(service.dependsOn) else service.pkg
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
