Author: sandervanderburg
Date: Tue Nov 22 13:49:00 2011
New Revision: 30524
URL: https://nixos.org/websvn/nix/?rev=30524&sc=1
Log:
Removed with pkgs; stuff, because it's confusing and we no longer use it in the
examples
Modified:
disnix/disnix/trunk/doc/manual/models.xml
Modified: disnix/disnix/trunk/doc/manual/models.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/models.xml Tue Nov 22 12:59:22 2011
(r30523)
+++ disnix/disnix/trunk/doc/manual/models.xml Tue Nov 22 13:49:00 2011
(r30524)
@@ -386,38 +386,36 @@
<programlisting>
{system, pkgs}:
-with pkgs; <co xml:id='co-2-withPkgs' />
-
rec { <co xml:id='co-3-rec' />
### Databases
rooms = import ../pkgs/databases/rooms {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
staff = import ../pkgs/databases/staff {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
zipcodes = import ../pkgs/databases/zipcodes {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
### Web services + Clients
ZipcodeService = import ../pkgs/webservices/ZipcodeService { <co
xml:id='co-4-composition' />
- inherit stdenv apacheAnt axis2;
+ inherit (pkgs) stdenv apacheAnt axis2;
};
ZipcodeServiceClient = import ../pkgs/webservices/ZipcodeServiceClient {
- inherit stdenv apacheAnt axis2;
+ inherit (pkgs) stdenv apacheAnt axis2;
};
...
### Web applications
StaffTracker = import ../pkgs/webapplications/StaffTracker {
- inherit stdenv apacheAnt axis2;
+ inherit (pkgs) stdenv apacheAnt axis2;
inherit GeolocationServiceClient RoomServiceClient StaffServiceClient
ZipcodeServiceClient;
};
}
@@ -430,13 +428,6 @@
</para>
<calloutlist>
- <callout arearefs='co-2-withPkgs'>
- <para>
- This statement will make it easier to
refer to packages defined in Nixpkgs.
- Otherwise you have to refer them by
<code>pkgs.axis2</code> and so on.
- </para>
- </callout>
-
<callout arearefs='co-3-rec'>
<para>
Like the
<code>pkgs/top-level/all-packages.nix</code> file in Nixpkgs, this composition
expression
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
