diff options
| author | Wouter den Breejen <uu@denbreejen.net> | 2007-05-28 15:40:17 +0000 |
|---|---|---|
| committer | Wouter den Breejen <uu@denbreejen.net> | 2007-05-28 15:40:17 +0000 |
| commit | 6a758e14bf983821e7661b1c9a680617e80ecd43 (patch) | |
| tree | c1864295bab6d4e85250c6ac8799192f72ce9413 /pkgs/top-level/all-packages.nix | |
| parent | 9700781f4e2c03acfd651f6e5afa3329d3ae1b23 (diff) | |
| download | nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.tar nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.tar.gz nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.tar.bz2 nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.tar.lz nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.tar.xz nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.tar.zst nixpkgs-6a758e14bf983821e7661b1c9a680617e80ecd43.zip | |
samba moved van services to servers, updated all-packages
svn path=/nixpkgs/trunk/; revision=8793
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f3af6e3851..1ef6f587762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2142,6 +2142,10 @@ rec { inherit fetchurl stdenv ant; }; + samba = import ../servers/samba { + inherit stdenv fetchurl; + }; + tomcat5 = import ../servers/http/tomcat { inherit fetchurl stdenv jdk; }; @@ -3226,10 +3230,6 @@ rec { inherit fetchurl stdenv x11 mesa; }; - samba = import ../../../services/samba { - inherit stdenv fetchurl; - }; - saneBackends = import ../misc/sane-backends { inherit fetchurl stdenv; }; |