Author: sandervanderburg
Date: Thu Jan 27 13:25:35 2011
New Revision: 25699
URL: https://svn.nixos.org/websvn/nix/?rev=25699&sc=1
Log:
Remove ugly with pkgs;
Modified:
disnix/examples/viewvc/trunk/top-level/all-packages.nix
Modified: disnix/examples/viewvc/trunk/top-level/all-packages.nix
==============================================================================
--- disnix/examples/viewvc/trunk/top-level/all-packages.nix Thu Jan 27
13:21:31 2011 (r25698)
+++ disnix/examples/viewvc/trunk/top-level/all-packages.nix Thu Jan 27
13:25:35 2011 (r25699)
@@ -1,35 +1,33 @@
{system, pkgs}:
-with pkgs;
-
rec {
### Databases
viewvcdb = import ../pkgs/viewvcdb {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
### Subversion repositories
ViewVCRepository = import ../pkgs/ViewVCRepository {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
aefs = import ../pkgs/aefs {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
maak = import ../pkgs/maak {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
### Web front-end
viewvc = import ../pkgs/viewvc {
- inherit stdenv fetchurl enscript gnused python setuptools;
+ inherit (pkgs) stdenv fetchurl enscript gnused python setuptools;
inherit (pkgs.pythonPackages) MySQL_python;
- subversion = subversion.override {
+ subversion = pkgs.subversion.override {
pythonBindings = true;
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits