Author: eelco
Date: Fri Oct 8 12:57:02 2010
New Revision: 24184
URL: https://svn.nixos.org/websvn/nix/?rev=24184&sc=1
Log:
* Pass pkgs.
Modified:
services/trunk/twiki/twiki-instance.nix
services/trunk/twiki/twiki-plugins.nix
Modified: services/trunk/twiki/twiki-instance.nix
==============================================================================
--- services/trunk/twiki/twiki-instance.nix Fri Oct 8 12:50:24 2010
(r24183)
+++ services/trunk/twiki/twiki-instance.nix Fri Oct 8 12:57:02 2010
(r24184)
@@ -1,9 +1,8 @@
# This is a pure version of TWiki. It is easy to configure an impure version.
-rec {
- pkgs =
- import ../pkgs/top-level/all-packages.nix {};
+{ pkgs }:
+rec {
twiki = config :
(import ./server-pkgs/twiki.nix) ({
inherit (pkgs) stdenv fetchurl;
@@ -28,5 +27,5 @@
} // config);
plugins =
- (import ./twiki-plugins.nix);
+ (import ./twiki-plugins.nix { inherit pkgs; });
}
Modified: services/trunk/twiki/twiki-plugins.nix
==============================================================================
--- services/trunk/twiki/twiki-plugins.nix Fri Oct 8 12:50:24 2010
(r24183)
+++ services/trunk/twiki/twiki-plugins.nix Fri Oct 8 12:57:02 2010
(r24184)
@@ -1,7 +1,6 @@
-rec {
- pkgs =
- import ../pkgs/top-level/all-packages.nix {};
+{ pkgs }:
+rec {
BlueBoxSkin =
(import ./server-pkgs/bluebox-skin.nix) {
inherit (pkgs) stdenv fetchurl unzip;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
